set back up some masks and a third tuto level

2026-02-01 08:53:10 +01:00
parent 4e3d70cd61
commit 1dbafe1940
16 changed files with 106 additions and 69 deletions
--- a/resources/characters/duchex.tres
+++ b/resources/characters/duchex.tres
@@ -5,14 +5,19 @@
 [ext_resource type="Resource" uid="uid://b6614fqoymxur" path="res://resources/traits/silent.tres" id="3_q0kni"]
 [ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="3_s53hh"]
 [ext_resource type="Resource" uid="uid://lhskiwag15k" path="res://resources/traits/talkative.tres" id="4_w5qmk"]
+[ext_resource type="Resource" uid="uid://ct4iy75ai7lmy" path="res://resources/traits/enby.tres" id="6_cyb15"]
+[ext_resource type="Resource" uid="uid://cb8jguybr1tlj" path="res://resources/traits/white.tres" id="7_s53hh"]
+[ext_resource type="Resource" uid="uid://blu5de2dhiu46" path="res://resources/traits/young.tres" id="8_p10lp"]

 [resource]
 script = ExtResource("2_cyb15")
 name = "Duchex"
 chara_sprite = ExtResource("1_tppor")
-mask_eyes_position = Vector2(59.355, 227)
-mask_mouth_position = Vector2(64.8, 432.04)
-traits = Array[ExtResource("3_s53hh")]([ExtResource("4_w5qmk")])
+mask_eyes_position = Vector2(92.37, 201.415)
+mask_eyes_rotation = -0.017453292519943295
+mask_mouth_position = Vector2(111.16, 442.425)
+mask_mouth_rotation = 0.017453292519943295
+traits = Array[ExtResource("3_s53hh")]([ExtResource("4_w5qmk"), ExtResource("6_cyb15"), ExtResource("7_s53hh"), ExtResource("8_p10lp")])
 preferences = Dictionary[ExtResource("3_s53hh"), int]({
 ExtResource("3_q0kni"): 0
 })
--- a/resources/characters/duke.tres
+++ b/resources/characters/duke.tres
@@ -10,9 +10,9 @@
 script = ExtResource("2_ce0p8")
 name = "Duke"
 chara_sprite = ExtResource("1_d1fpd")
-mask_eyes_position = Vector2(-87.17, -459.345)
-mask_eyes_rotation = 0.11693705988361988
-mask_mouth_position = Vector2(-60.07, -343.01)
+mask_eyes_rotation = -0.03490658503988659
+mask_mouth_position = Vector2(15, 230)
+mask_mouth_rotation = -0.017453292519943295
 traits = Array[ExtResource("3_n21sh")]([ExtResource("5_tl7uu")])
 preferences = Dictionary[ExtResource("3_n21sh"), int]({
 ExtResource("3_tvmgq"): 0
--- a/resources/characters/queen.tres
+++ b/resources/characters/queen.tres
@@ -3,11 +3,24 @@
 [ext_resource type="Texture2D" uid="uid://c726frtpkk1a8" path="res://assets/characters/Perso 2.png" id="1_d1164"]
 [ext_resource type="Script" uid="uid://bwam50qxikpw4" path="res://scenes/character/chara_resource.gd" id="2_g8bvo"]
 [ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="3_dkw07"]
+[ext_resource type="Resource" uid="uid://lhskiwag15k" path="res://resources/traits/talkative.tres" id="3_y3hrs"]
+[ext_resource type="Resource" uid="uid://b6614fqoymxur" path="res://resources/traits/silent.tres" id="4_hdamc"]
+[ext_resource type="Resource" uid="uid://ct4iy75ai7lmy" path="res://resources/traits/enby.tres" id="5_wjlcp"]
+[ext_resource type="Resource" uid="uid://bvophatys2o1o" path="res://resources/traits/old.tres" id="8_j0xhd"]
+[ext_resource type="Resource" uid="uid://cb8jguybr1tlj" path="res://resources/traits/white.tres" id="9_aywjr"]
+[ext_resource type="Resource" uid="uid://dmd7gilnmcefr" path="res://resources/traits/woman.tres" id="10_tw1u2"]

 [resource]
 script = ExtResource("2_g8bvo")
 name = "Queen"
 chara_sprite = ExtResource("1_d1164")
-mask_eyes_position = Vector2(13.285, 181.09)
-mask_mouth_position = Vector2(26.595, 398.745)
+mask_eyes_position = Vector2(48, 130)
+mask_eyes_rotation = 0.05235987755982989
+mask_mouth_position = Vector2(51.77, 409.63)
+traits = Array[ExtResource("3_dkw07")]([ExtResource("3_y3hrs"), ExtResource("9_aywjr"), ExtResource("10_tw1u2"), ExtResource("8_j0xhd")])
+preferences = Dictionary[ExtResource("3_dkw07"), int]({
+ExtResource("3_y3hrs"): 4,
+ExtResource("4_hdamc"): 0,
+ExtResource("5_wjlcp"): 3
+})
 metadata/_custom_type_script = "uid://bwam50qxikpw4"
--- a/resources/guests/duchex_cat.tres
+++ b/resources/guests/duchex_cat.tres
@@ -1,12 +0,0 @@
-[gd_resource type="Resource" script_class="MaskedChara" format=3 uid="uid://ctqdbo8xg3v88"]
-
-[ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="1_mu37d"]
-[ext_resource type="Resource" uid="uid://c87odmn680x7" path="res://resources/characters/duchex.tres" id="1_vsvkr"]
-[ext_resource type="Script" uid="uid://b8peyg02l0mrn" path="res://scenes/managers/masked_chara.gd" id="2_f07ys"]
-[ext_resource type="Resource" uid="uid://cuf1ocb4px4m3" path="res://resources/masks/cat.tres" id="3_4tayd"]
-
-[resource]
-script = ExtResource("2_f07ys")
-character = ExtResource("1_vsvkr")
-masks = Array[ExtResource("1_mu37d")]([ExtResource("3_4tayd")])
-metadata/_custom_type_script = "uid://b8peyg02l0mrn"
--- a/resources/guests/duchex_mute.tres
+++ b/resources/guests/duchex_mute.tres
@@ -0,0 +1,11 @@
+[gd_resource type="Resource" script_class="MaskedChara" format=3 uid="uid://c25kg6um2k1dy"]
+
+[ext_resource type="Resource" uid="uid://c87odmn680x7" path="res://resources/characters/duchex.tres" id="1_nsuhm"]
+[ext_resource type="Script" uid="uid://b8peyg02l0mrn" path="res://scenes/managers/masked_chara.gd" id="2_lb6bi"]
+[ext_resource type="Resource" uid="uid://pdiaprcknftw" path="res://resources/masks/mute.tres" id="2_xmkje"]
+
+[resource]
+script = ExtResource("2_lb6bi")
+character = ExtResource("1_nsuhm")
+mouth_mask = ExtResource("2_xmkje")
+metadata/_custom_type_script = "uid://b8peyg02l0mrn"
--- a/resources/guests/queen_blind.tres
+++ b/resources/guests/queen_blind.tres
@@ -0,0 +1,11 @@
+[gd_resource type="Resource" script_class="MaskedChara" format=3 uid="uid://im83307vumpx"]
+
+[ext_resource type="Resource" uid="uid://wq3g1j3l4gl6" path="res://resources/characters/queen.tres" id="1_8rhpq"]
+[ext_resource type="Resource" uid="uid://vsvgpvluq7sh" path="res://resources/masks/blind.tres" id="2_57tio"]
+[ext_resource type="Script" uid="uid://b8peyg02l0mrn" path="res://scenes/managers/masked_chara.gd" id="2_84xil"]
+
+[resource]
+script = ExtResource("2_84xil")
+character = ExtResource("1_8rhpq")
+face_mask = ExtResource("2_57tio")
+metadata/_custom_type_script = "uid://b8peyg02l0mrn"
--- a/resources/guests/queen_unracist.tres
+++ b/resources/guests/queen_unracist.tres
@@ -1,12 +0,0 @@
-[gd_resource type="Resource" script_class="MaskedChara" format=3 uid="uid://ca2fcdibf0mdm"]
-
-[ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="1_ns508"]
-[ext_resource type="Resource" uid="uid://wq3g1j3l4gl6" path="res://resources/characters/queen.tres" id="1_xr5g8"]
-[ext_resource type="Script" uid="uid://b8peyg02l0mrn" path="res://scenes/managers/masked_chara.gd" id="2_5n8mj"]
-[ext_resource type="Resource" uid="uid://cbcqtj8mxngfy" path="res://resources/masks/unracist.tres" id="3_ugmdk"]
-
-[resource]
-script = ExtResource("2_5n8mj")
-character = ExtResource("1_xr5g8")
-masks = Array[ExtResource("1_ns508")]([ExtResource("3_ugmdk")])
-metadata/_custom_type_script = "uid://b8peyg02l0mrn"
--- a/resources/masks/cat.tres
+++ b/resources/masks/cat.tres
@@ -1,12 +0,0 @@
-[gd_resource type="Resource" script_class="MaskResource" format=3 uid="uid://cuf1ocb4px4m3"]
-
-[ext_resource type="Texture2D" uid="uid://buql3bcbqx4pp" path="res://menus/assets/git_logo/Git-Logo-2Color.png" id="1_1u1n5"]
-[ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="2_ypt8w"]
-
-[resource]
-script = ExtResource("2_ypt8w")
-mask_sprite = ExtResource("1_1u1n5")
-tags_multipliers = Dictionary[int, int]({
-12: 0
-})
-metadata/_custom_type_script = "uid://d26mv2xtvmpqt"
--- a/resources/masks/unracist.tres
+++ b/resources/masks/unracist.tres
@@ -1,12 +1,12 @@
-[gd_resource type="Resource" script_class="MaskResource" format=3 uid="uid://cbcqtj8mxngfy"]
+[gd_resource type="Resource" script_class="MaskResource" format=3 uid="uid://kau80jesm22w"]

-[ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="1_fs0fy"]
-[ext_resource type="Texture2D" uid="uid://cftllq6l7xclt" path="res://icon.svg" id="1_fv3id"]
+[ext_resource type="Texture2D" uid="uid://cftllq6l7xclt" path="res://icon.svg" id="1_r5drl"]
+[ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="2_ncal4"]

 [resource]
-script = ExtResource("1_fs0fy")
-mask_sprite = ExtResource("1_fv3id")
-mask_transform = null
-category = 3
-category_multiplier = 0.0
+script = ExtResource("2_ncal4")
+mask_sprite = ExtResource("1_r5drl")
+region = 1
+stimuli = 1
+stimuli_multiplier = -2.0
 metadata/_custom_type_script = "uid://d26mv2xtvmpqt"
--- a/resources/masks/mute.tres
+++ b/resources/masks/mute.tres
@@ -8,4 +8,5 @@ script = ExtResource("1_urvbb")
 mask_sprite = ExtResource("1_wp4x3")
 region = 1
 stimuli = 1
+stimuli_multiplier = 0.0
 metadata/_custom_type_script = "uid://d26mv2xtvmpqt"
--- a/resources/masks/truthy.tres
+++ b/resources/masks/truthy.tres
@@ -0,0 +1,12 @@
+[gd_resource type="Resource" script_class="MaskResource" format=3 uid="uid://divy6byhpwgs2"]
+
+[ext_resource type="Texture2D" uid="uid://cftllq6l7xclt" path="res://icon.svg" id="1_dunu4"]
+[ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="2_cle5s"]
+
+[resource]
+script = ExtResource("2_cle5s")
+mask_sprite = ExtResource("1_dunu4")
+region = 1
+stimuli = 1
+stimuli_multiplier = 2.0
+metadata/_custom_type_script = "uid://d26mv2xtvmpqt"
--- a/scenes/character/character.tscn
+++ b/scenes/character/character.tscn
@@ -164,10 +164,11 @@ chara_resource = ExtResource("2_fgi2k")
 texture = ExtResource("3_f8hpl")

 [node name="MaskMouth" parent="." unique_id=1087336064 instance=ExtResource("3_mutn8")]
-position = Vector2(26.595, 398.745)
+position = Vector2(51.77, 409.63)

 [node name="MaskEyes" parent="." unique_id=428968220 instance=ExtResource("3_mutn8")]
-position = Vector2(13.285, 181.09)
+position = Vector2(48, 130)
+rotation = 0.05235988

 [node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=713965213]
 libraries/ = SubResource("AnimationLibrary_7ex5l")
--- a/scenes/main/main.tscn
+++ b/scenes/main/main.tscn
@@ -18,20 +18,24 @@
 [ext_resource type="AudioStream" uid="uid://x6erlvj03nlm" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-8.ogg" id="9_i7in8"]
 [ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="9_m4h2d"]
 [ext_resource type="AudioStream" uid="uid://vrw6idscfnei" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-1.ogg" id="10_6llfj"]
-[ext_resource type="Resource" uid="uid://cuf1ocb4px4m3" path="res://resources/masks/cat.tres" id="10_p8abn"]
 [ext_resource type="AudioStream" uid="uid://b5ea6pr6bv85d" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-2.ogg" id="11_0bhws"]
 [ext_resource type="Resource" uid="uid://pdiaprcknftw" path="res://resources/masks/mute.tres" id="11_s17dp"]
-[ext_resource type="Resource" uid="uid://cbcqtj8mxngfy" path="res://resources/masks/unracist.tres" id="12_37hlw"]
 [ext_resource type="AudioStream" uid="uid://dpv07j0ia0ayl" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-3.ogg" id="12_62atk"]
 [ext_resource type="AudioStream" uid="uid://b7pe3ogc8rbvx" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-4.ogg" id="13_i7in8"]
 [ext_resource type="Script" uid="uid://cgctwciolfqe5" path="res://scenes/camera/camera_controller.gd" id="14_0bhws"]
 [ext_resource type="Texture2D" uid="uid://c60m6ulhqcbga" path="res://assets/decor/BG.png" id="14_os81g"]
 [ext_resource type="Texture2D" uid="uid://dbpdehppn5h8v" path="res://assets/decor/entrance_bg_objects.png" id="15_1k3ck"]
+[ext_resource type="Resource" uid="uid://vsvgpvluq7sh" path="res://resources/masks/blind.tres" id="24_g2upo"]
 [ext_resource type="PackedScene" uid="uid://0rq12xgcteak" path="res://scenes/list/list.tscn" id="25_6llfj"]
+[ext_resource type="Resource" uid="uid://t2n1q71ce4x6" path="res://resources/masks/deaf.tres" id="25_38d3o"]
+[ext_resource type="Resource" uid="uid://kau80jesm22w" path="res://resources/masks/falsy.tres" id="26_i6fjx"]
 [ext_resource type="Resource" uid="uid://bfvky2dpu6vv0" path="res://resources/guests/duke_unmasked.tres" id="27_6w6mm"]
 [ext_resource type="Resource" uid="uid://cfargib0urafc" path="res://resources/guests/duchex_unmasked.tres" id="27_62f45"]
-[ext_resource type="Resource" uid="uid://ca2fcdibf0mdm" path="res://resources/guests/queen_unracist.tres" id="28_r1bmu"]
-[ext_resource type="Resource" uid="uid://ctqdbo8xg3v88" path="res://resources/guests/duchex_cat.tres" id="29_6w6mm"]
+[ext_resource type="Resource" uid="uid://q3o5oxegjx2" path="res://resources/masks/no_smell.tres" id="28_7dg2i"]
+[ext_resource type="Resource" uid="uid://divy6byhpwgs2" path="res://resources/masks/truthy.tres" id="29_08tbl"]
+[ext_resource type="Resource" uid="uid://c25kg6um2k1dy" path="res://resources/guests/duchex_mute.tres" id="29_62f45"]
+[ext_resource type="Resource" uid="uid://dfguca2526tk6" path="res://resources/guests/queen_unmasked.tres" id="30_6g32y"]
+[ext_resource type="Resource" uid="uid://im83307vumpx" path="res://resources/guests/queen_blind.tres" id="33_f4j1x"]
 [ext_resource type="Script" uid="uid://bb0od2qqdx3or" path="res://scenes/main/ready_bell.gd" id="33_tbnf8"]
 [ext_resource type="Texture2D" uid="uid://c3bxwu75mcl87" path="res://assets/decor/mask_page_held.png" id="35_1k3ck"]
 [ext_resource type="Texture2D" uid="uid://ce7wdct4e27e1" path="res://assets/decor/reception.png" id="35_62f45"]
@@ -373,15 +377,17 @@ texture = ExtResource("15_1k3ck")
 [node name="GameManager" type="Node" parent="." unique_id=528989100 node_paths=PackedStringArray("character", "guest_list", "mask_list", "tables")]
 script = ExtResource("3_hxu8e")
 character_roster = Array[ExtResource("4_nvumn")]([ExtResource("5_ou6is"), ExtResource("6_necax"), ExtResource("7_r4lks"), ExtResource("8_pg34l")])
-mask_roster = Array[ExtResource("9_m4h2d")]([ExtResource("10_p8abn"), ExtResource("11_s17dp"), ExtResource("12_37hlw")])
+mask_roster = Array[ExtResource("9_m4h2d")]([ExtResource("24_g2upo"), ExtResource("25_38d3o"), ExtResource("26_i6fjx"), ExtResource("11_s17dp"), ExtResource("28_7dg2i"), ExtResource("29_08tbl")])
 character = NodePath("../Character")
 guest_list = NodePath("../GuestList")
 mask_list = NodePath("../MaskList")
 tables = [NodePath("../Table"), NodePath("../Table2"), NodePath("../Table3")]
 lvl1_guest_1 = ExtResource("27_62f45")
 lvl1_guest_2 = ExtResource("27_6w6mm")
-lvl2_guest_1 = ExtResource("28_r1bmu")
-lvl2_guest_2 = ExtResource("29_6w6mm")
+lvl2_guest_1 = ExtResource("27_62f45")
+lvl2_guest_2 = ExtResource("30_6g32y")
+lvl3_guest_1 = ExtResource("33_f4j1x")
+lvl3_guest_2 = ExtResource("29_62f45")

 [node name="Camera2D" type="Camera2D" parent="." unique_id=1166192115]
 limit_left = -960
--- a/scenes/managers/game_manager.gd
+++ b/scenes/managers/game_manager.gd
@@ -23,8 +23,11 @@ class_name GameManager
@export var lvl2_guest_1: MaskedChara
@export var lvl2_guest_2: MaskedChara

+@export_group("Level 3")
+@export var lvl3_guest_1: MaskedChara
+@export var lvl3_guest_2: MaskedChara
+
@export_category("Random levels")
-@export var max_roster_size: int = 3;
@export_tool_button("Create chara roster") var create_roster_action = create_new_roster

 var current_chara_roster: Array[MaskedChara]
@@ -37,13 +40,15 @@ enum GameState {
 enum Levels {
 	LVL1,
 	LVL2,
+	LVL3,
 	RANDOM
 }
 var current_game_state = GameState.READY
-var current_level = Levels.LVL1
+var current_level = Levels.LVL2
 var first_guest = true
 var current_guest: MaskedChara
 var selected_seat: Seat
+var roster_size: int = 2

@onready var camera_2d: Camera2D = $"../Camera2D"
@onready var ring_bell: Sprite2D = $"../RingBell"
@@ -54,7 +59,7 @@ func create_new_roster() -> void:
 	current_chara_roster = []
 	print(character_roster.size())
 	var roster_for_this_round = character_roster.duplicate()
-	var max_number_of_people = min(max_roster_size, character_roster.size())
+	var max_number_of_people = min(roster_size, character_roster.size())
 	for i in range(max_number_of_people):
 		# Pick unique characters for the roster
 		var random_index = randi_range(0, roster_for_this_round.size() - 1)
@@ -113,7 +118,10 @@ func ending_tween_cb():
 	mask_list.visible = false
 	if current_level == Levels.LVL1:
 		current_level = Levels.LVL2
+	elif current_level == Levels.LVL2:
+		current_level = Levels.LVL3
 	else:
+		roster_size += 1
 		current_level = Levels.RANDOM
 	

@@ -140,6 +148,8 @@ func on_ready_bell_pressed() -> void:
 		current_chara_roster = [lvl1_guest_1, lvl1_guest_2]
 	elif current_level == Levels.LVL2:
 		current_chara_roster = [lvl2_guest_1, lvl2_guest_2]
+	elif current_level == Levels.LVL3:
+		current_chara_roster = [lvl3_guest_1, lvl3_guest_2]
 	else:
 		create_new_roster()
 		
--- a/scenes/mask/mask.tscn
+++ b/scenes/mask/mask.tscn
@@ -1,12 +1,12 @@
 [gd_scene format=3 uid="uid://3jlukpb5hefb"]

 [ext_resource type="Script" uid="uid://cfo3mk5f2q3ej" path="res://scenes/mask/mask.gd" id="1_61b51"]
-[ext_resource type="Texture2D" uid="uid://cftllq6l7xclt" path="res://icon.svg" id="1_jlvus"]
-[ext_resource type="Resource" uid="uid://pdiaprcknftw" path="res://resources/masks/mute.tres" id="2_0pm64"]
+[ext_resource type="Resource" uid="uid://q3o5oxegjx2" path="res://resources/masks/no_smell.tres" id="2_0pm64"]
+[ext_resource type="Texture2D" uid="uid://b4d451508si3t" path="res://assets/masks/Masque 3.png" id="3_htpgb"]

 [node name="Mask" type="Node2D" unique_id=428968220]
 script = ExtResource("1_61b51")
 mask_resource = ExtResource("2_0pm64")

 [node name="MaskSprite" type="Sprite2D" parent="." unique_id=1997645103]
-texture = ExtResource("1_jlvus")
+texture = ExtResource("3_htpgb")
--- a/scenes/seat/seat.tscn
+++ b/scenes/seat/seat.tscn
@@ -1,8 +1,9 @@
 [gd_scene format=3 uid="uid://l0hl170iqkgx"]

 [ext_resource type="Script" uid="uid://cuojjiwxidmwu" path="res://scenes/seat/seat.gd" id="1_pceab"]
-[ext_resource type="Resource" uid="uid://ca2fcdibf0mdm" path="res://resources/guests/queen_unracist.tres" id="2_wnjs1"]
+[ext_resource type="Resource" uid="uid://c25kg6um2k1dy" path="res://resources/guests/duchex_mute.tres" id="2_i14o5"]
 [ext_resource type="PackedScene" uid="uid://bvpyqyftqhy45" path="res://scenes/character/character.tscn" id="3_dxmy0"]
+[ext_resource type="Resource" uid="uid://c87odmn680x7" path="res://resources/characters/duchex.tres" id="4_ipxud"]
 [ext_resource type="Texture2D" uid="uid://cftllq6l7xclt" path="res://icon.svg" id="4_wnjs1"]

 [sub_resource type="RectangleShape2D" id="RectangleShape2D_rofvo"]
@@ -10,11 +11,13 @@ size = Vector2(128, 128)

 [node name="Seat" type="Area2D" unique_id=1604639021]
 script = ExtResource("1_pceab")
-guest = ExtResource("2_wnjs1")
+guest = ExtResource("2_i14o5")

 [node name="Character" parent="." unique_id=138741531 instance=ExtResource("3_dxmy0")]
+chara_resource = ExtResource("4_ipxud")

 [node name="Empty" type="Sprite2D" parent="." unique_id=357649392]
+visible = false
 texture = ExtResource("4_wnjs1")

 [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1054126207]