diff --git a/assets/characters/Perso 5.png b/assets/characters/Perso 5.png index f516be9..c1f119c 100644 Binary files a/assets/characters/Perso 5.png and b/assets/characters/Perso 5.png differ diff --git a/assets/characters/Perso 6.png b/assets/characters/Perso 6.png index 3d3ba49..4b5bf6e 100644 Binary files a/assets/characters/Perso 6.png and b/assets/characters/Perso 6.png differ diff --git a/assets/decor/table_item_a.png b/assets/decor/table_item_a.png new file mode 100644 index 0000000..d2b23ae Binary files /dev/null and b/assets/decor/table_item_a.png differ diff --git a/assets/decor/table_item_a.png.import b/assets/decor/table_item_a.png.import new file mode 100644 index 0000000..c572e4b --- /dev/null +++ b/assets/decor/table_item_a.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4u3o7fyryxxq" +path="res://.godot/imported/table_item_a.png-522fc7383fdc65eaf35efbe9c6929a47.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/decor/table_item_a.png" +dest_files=["res://.godot/imported/table_item_a.png-522fc7383fdc65eaf35efbe9c6929a47.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/decor/table_item_a_2.png b/assets/decor/table_item_a_2.png new file mode 100644 index 0000000..0c0c5c0 Binary files /dev/null and b/assets/decor/table_item_a_2.png differ diff --git a/assets/decor/table_item_a_2.png.import b/assets/decor/table_item_a_2.png.import new file mode 100644 index 0000000..40a9894 --- /dev/null +++ b/assets/decor/table_item_a_2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dj267xgqniy2i" +path="res://.godot/imported/table_item_a_2.png-37b92b0a6951aa7a1f1fbd357146f7f9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/decor/table_item_a_2.png" +dest_files=["res://.godot/imported/table_item_a_2.png-37b92b0a6951aa7a1f1fbd357146f7f9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/arrow_001.png b/assets/ui/arrow_001.png new file mode 100644 index 0000000..7bc275a Binary files /dev/null and b/assets/ui/arrow_001.png differ diff --git a/assets/ui/arrow_001.png.import b/assets/ui/arrow_001.png.import new file mode 100644 index 0000000..984bbc2 --- /dev/null +++ b/assets/ui/arrow_001.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cgrudt5ev651p" +path="res://.godot/imported/arrow_001.png-8d87bd07e0d68ddcf2becce916fef606.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/arrow_001.png" +dest_files=["res://.godot/imported/arrow_001.png-8d87bd07e0d68ddcf2becce916fef606.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/arrow_002.png b/assets/ui/arrow_002.png new file mode 100644 index 0000000..532ac5a Binary files /dev/null and b/assets/ui/arrow_002.png differ diff --git a/assets/ui/arrow_002.png.import b/assets/ui/arrow_002.png.import new file mode 100644 index 0000000..600902e --- /dev/null +++ b/assets/ui/arrow_002.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://54gb4s5ff7xo" +path="res://.godot/imported/arrow_002.png-ff2c6050e4f2a5449ed8e5d1fc2a2588.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/arrow_002.png" +dest_files=["res://.godot/imported/arrow_002.png-ff2c6050e4f2a5449ed8e5d1fc2a2588.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/arrow_003.png b/assets/ui/arrow_003.png new file mode 100644 index 0000000..9abaf0c Binary files /dev/null and b/assets/ui/arrow_003.png differ diff --git a/assets/ui/arrow_003.png.import b/assets/ui/arrow_003.png.import new file mode 100644 index 0000000..3dc10eb --- /dev/null +++ b/assets/ui/arrow_003.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8u7evk61gllv" +path="res://.godot/imported/arrow_003.png-52bea9e21dd658988633bcd33dbf6bf5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/arrow_003.png" +dest_files=["res://.godot/imported/arrow_003.png-52bea9e21dd658988633bcd33dbf6bf5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/arrow_004.png b/assets/ui/arrow_004.png new file mode 100644 index 0000000..b61de95 Binary files /dev/null and b/assets/ui/arrow_004.png differ diff --git a/assets/ui/arrow_004.png.import b/assets/ui/arrow_004.png.import new file mode 100644 index 0000000..340b4c7 --- /dev/null +++ b/assets/ui/arrow_004.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3jx3y0mbueoo" +path="res://.godot/imported/arrow_004.png-81457993b3c6def7347cd9bf17f2e1d3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/arrow_004.png" +dest_files=["res://.godot/imported/arrow_004.png-81457993b3c6def7347cd9bf17f2e1d3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/button_001.png b/assets/ui/button_001.png new file mode 100644 index 0000000..52143b7 Binary files /dev/null and b/assets/ui/button_001.png differ diff --git a/assets/ui/button_001.png.import b/assets/ui/button_001.png.import new file mode 100644 index 0000000..98d19d9 --- /dev/null +++ b/assets/ui/button_001.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cr150l381ucdc" +path="res://.godot/imported/button_001.png-765b48ae576676ab729bda93e9fc0e94.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/button_001.png" +dest_files=["res://.godot/imported/button_001.png-765b48ae576676ab729bda93e9fc0e94.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/button_001_2.png b/assets/ui/button_001_2.png new file mode 100644 index 0000000..38da3ab Binary files /dev/null and b/assets/ui/button_001_2.png differ diff --git a/assets/ui/button_001_2.png.import b/assets/ui/button_001_2.png.import new file mode 100644 index 0000000..836f525 --- /dev/null +++ b/assets/ui/button_001_2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dd7trh7sqrqj7" +path="res://.godot/imported/button_001_2.png-fc50bb75b7d5e87e161f049ba14348d2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/button_001_2.png" +dest_files=["res://.godot/imported/button_001_2.png-fc50bb75b7d5e87e161f049ba14348d2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/button_002.png b/assets/ui/button_002.png new file mode 100644 index 0000000..cfa82f3 Binary files /dev/null and b/assets/ui/button_002.png differ diff --git a/assets/ui/button_002.png.import b/assets/ui/button_002.png.import new file mode 100644 index 0000000..cf1bc12 --- /dev/null +++ b/assets/ui/button_002.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8v2op3mk14fo" +path="res://.godot/imported/button_002.png-b4c9c45d7619988ee6eaba58cdd467fa.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/button_002.png" +dest_files=["res://.godot/imported/button_002.png-b4c9c45d7619988ee6eaba58cdd467fa.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/gauge_bad.png b/assets/ui/gauge_bad.png new file mode 100644 index 0000000..a73e706 Binary files /dev/null and b/assets/ui/gauge_bad.png differ diff --git a/assets/ui/gauge_bad.png.import b/assets/ui/gauge_bad.png.import new file mode 100644 index 0000000..098d5bf --- /dev/null +++ b/assets/ui/gauge_bad.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bb7ue2p5j2xw4" +path="res://.godot/imported/gauge_bad.png-51110018edc6536bc0764048d6a25380.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/gauge_bad.png" +dest_files=["res://.godot/imported/gauge_bad.png-51110018edc6536bc0764048d6a25380.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/gauge_good.png b/assets/ui/gauge_good.png new file mode 100644 index 0000000..8ee9a2d Binary files /dev/null and b/assets/ui/gauge_good.png differ diff --git a/assets/ui/gauge_good.png.import b/assets/ui/gauge_good.png.import new file mode 100644 index 0000000..1d73c5d --- /dev/null +++ b/assets/ui/gauge_good.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c2r11gpa8hbp1" +path="res://.godot/imported/gauge_good.png-3469f87ed76afa97b5e714529ec9a283.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/gauge_good.png" +dest_files=["res://.godot/imported/gauge_good.png-3469f87ed76afa97b5e714529ec9a283.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/gauge_neutral.png b/assets/ui/gauge_neutral.png new file mode 100644 index 0000000..cfcf95f Binary files /dev/null and b/assets/ui/gauge_neutral.png differ diff --git a/assets/ui/gauge_neutral.png.import b/assets/ui/gauge_neutral.png.import new file mode 100644 index 0000000..b026a89 --- /dev/null +++ b/assets/ui/gauge_neutral.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cpstggjctej7i" +path="res://.godot/imported/gauge_neutral.png-b9c5a56f85edc5c4ad55109d41b4d7f7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/gauge_neutral.png" +dest_files=["res://.godot/imported/gauge_neutral.png-b9c5a56f85edc5c4ad55109d41b4d7f7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ui/seat_selector.png b/assets/ui/seat_selector.png new file mode 100644 index 0000000..326d3b0 Binary files /dev/null and b/assets/ui/seat_selector.png differ diff --git a/assets/ui/seat_selector.png.import b/assets/ui/seat_selector.png.import new file mode 100644 index 0000000..ccb26e8 --- /dev/null +++ b/assets/ui/seat_selector.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://belkmlrr588ki" +path="res://.godot/imported/seat_selector.png-7b14bb40baede7915297e9e1c683260c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/seat_selector.png" +dest_files=["res://.godot/imported/seat_selector.png-7b14bb40baede7915297e9e1c683260c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/characters/farmer.tres b/resources/characters/farmer.tres index 8b3b39b..ad706cf 100644 --- a/resources/characters/farmer.tres +++ b/resources/characters/farmer.tres @@ -20,7 +20,7 @@ [resource] script = ExtResource("2_vlbot") -name = "farmer" +name = "Farmer" chara_sprite = ExtResource("1_qptnb") mask_eyes_position = Vector2(112.37, 228.755) mask_mouth_position = Vector2(78.295, 132.145) diff --git a/resources/characters/knight.tres b/resources/characters/knight.tres index d278047..5cf5ded 100644 --- a/resources/characters/knight.tres +++ b/resources/characters/knight.tres @@ -19,7 +19,7 @@ [resource] script = ExtResource("2_tdxmb") -name = "knight" +name = "Knight" chara_sprite = ExtResource("1_3vdcn") mask_eyes_position = Vector2(-94.815, 12.665) mask_eyes_rotation = 0.029670597283903404 diff --git a/resources/characters/nun.tres b/resources/characters/nun.tres index a2e6874..97e846d 100644 --- a/resources/characters/nun.tres +++ b/resources/characters/nun.tres @@ -18,7 +18,7 @@ [resource] script = ExtResource("2_8e28v") -name = "nun" +name = "Nun" chara_sprite = ExtResource("1_8e28v") mask_eyes_position = Vector2(156.99, 241.13) mask_mouth_position = Vector2(151.42, 203.93) diff --git a/resources/characters/prince.tres b/resources/characters/prince.tres index c0c58c1..ed42f72 100644 --- a/resources/characters/prince.tres +++ b/resources/characters/prince.tres @@ -19,7 +19,7 @@ [resource] script = ExtResource("2_ef0f3") -name = "prince" +name = "Prince" chara_sprite = ExtResource("1_ef0f3") mask_eyes_position = Vector2(104.295, 9.395) mask_eyes_rotation = -0.017453292519943295 diff --git a/resources/masks/blind.tres b/resources/masks/blind.tres index 105ed12..b358513 100644 --- a/resources/masks/blind.tres +++ b/resources/masks/blind.tres @@ -5,6 +5,8 @@ [resource] script = ExtResource("1_namv3") +name = "Mask of the Blind" +description = "Cannot see anything" mask_sprite = ExtResource("1_ls5lh") stimuli_multiplier = 0.0 metadata/_custom_type_script = "uid://d26mv2xtvmpqt" diff --git a/resources/masks/deaf.tres b/resources/masks/deaf.tres index 5ceb6d1..0218d3d 100644 --- a/resources/masks/deaf.tres +++ b/resources/masks/deaf.tres @@ -5,6 +5,8 @@ [resource] script = ExtResource("1_ef12a") +name = "Mask of the Deaf" +description = "Cannot hear anything" mask_sprite = ExtResource("1_ubhtg") stimuli = 1 stimuli_multiplier = 0.0 diff --git a/resources/masks/falsy.tres b/resources/masks/falsy.tres index f0b5369..be26f83 100644 --- a/resources/masks/falsy.tres +++ b/resources/masks/falsy.tres @@ -5,6 +5,8 @@ [resource] script = ExtResource("2_ncal4") +name = "Mask of the Liar" +description = "Invert all preferences" mask_sprite = ExtResource("1_r5drl") region = 1 stimuli = 1 diff --git a/resources/masks/mute.tres b/resources/masks/mute.tres index f298528..8d2fd8f 100644 --- a/resources/masks/mute.tres +++ b/resources/masks/mute.tres @@ -5,6 +5,8 @@ [resource] script = ExtResource("1_urvbb") +name = "Mask of the Mute" +description = "Cannot say anything" mask_sprite = ExtResource("1_wp4x3") region = 1 stimuli = 1 diff --git a/resources/masks/no_smell.tres b/resources/masks/no_smell.tres index ab0bcfc..2e61d7f 100644 --- a/resources/masks/no_smell.tres +++ b/resources/masks/no_smell.tres @@ -5,6 +5,8 @@ [resource] script = ExtResource("1_tqqjf") +name = "Mask of the Anosmiac" +description = "Cannot smell anything" mask_sprite = ExtResource("1_kk6ma") stimuli = 2 stimuli_multiplier = 0.0 diff --git a/resources/masks/truthy.tres b/resources/masks/truthy.tres index 919afa2..5fcb9d9 100644 --- a/resources/masks/truthy.tres +++ b/resources/masks/truthy.tres @@ -5,6 +5,8 @@ [resource] script = ExtResource("2_cle5s") +name = "Mask of the Honest" +description = "All preferences are intensified" mask_sprite = ExtResource("1_dunu4") region = 1 stimuli = 1 diff --git a/resources/traits/alone.tres b/resources/traits/alone.tres index 2f12227..4db1f65 100644 --- a/resources/traits/alone.tres +++ b/resources/traits/alone.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_w8hps") -name = "alone" +name = "Being alone" stimulis = Array[int]([0, 1, 2]) category = 5 tag = 14 diff --git a/resources/traits/animals.tres b/resources/traits/animals.tres index 3444987..ef2cb30 100644 --- a/resources/traits/animals.tres +++ b/resources/traits/animals.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_6b1l6") -name = "speaks_of_animals" +name = "Talks about animals" stimulis = Array[int]([1]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/black.tres b/resources/traits/black.tres index 6795996..b45ee34 100644 --- a/resources/traits/black.tres +++ b/resources/traits/black.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_hu4qv") -name = "black" +name = "Black" stimulis = Array[int]([0]) category = 3 tag = 9 diff --git a/resources/traits/brave.tres b/resources/traits/brave.tres index 786a560..b1e6a12 100644 --- a/resources/traits/brave.tres +++ b/resources/traits/brave.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_af1sn") -name = "brave" +name = "Brave" stimulis = Array[int]([0]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/clean.tres b/resources/traits/clean.tres index d272057..239d8d7 100644 --- a/resources/traits/clean.tres +++ b/resources/traits/clean.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_kdrvf") -name = "clean" +name = "Clean" stimulis = Array[int]([2]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/enby.tres b/resources/traits/enby.tres index 5cb47e1..31c22c1 100644 --- a/resources/traits/enby.tres +++ b/resources/traits/enby.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_yly7p") -name = "enby" +name = "Enby" stimulis = Array[int]([0, 1]) category = 1 tag = 5 diff --git a/resources/traits/man.tres b/resources/traits/man.tres index 041a679..86c9fc7 100644 --- a/resources/traits/man.tres +++ b/resources/traits/man.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_ca15b") -name = "man" +name = "Man" stimulis = Array[int]([0, 1]) category = 1 tag = 3 diff --git a/resources/traits/married.tres b/resources/traits/married.tres index e0227b1..70e73be 100644 --- a/resources/traits/married.tres +++ b/resources/traits/married.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_b58s2") -name = "married" +name = "Married" stimulis = Array[int]([0, 1]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/noble.tres b/resources/traits/noble.tres index 474c71f..6320390 100644 --- a/resources/traits/noble.tres +++ b/resources/traits/noble.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_p35wh") -name = "royal" +name = "Noble" stimulis = Array[int]([0]) category = 2 tag = 7 diff --git a/resources/traits/noisy.tres b/resources/traits/noisy.tres index a2fcb5d..0e3a674 100644 --- a/resources/traits/noisy.tres +++ b/resources/traits/noisy.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_gykwb") -name = "noisy" +name = "Noisy" stimulis = Array[int]([1]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/old.tres b/resources/traits/old.tres index 78929ee..b96613c 100644 --- a/resources/traits/old.tres +++ b/resources/traits/old.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_70ur6") -name = "old" +name = "Old" stimulis = Array[int]([1, 2]) tag = 2 metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/peasant.tres b/resources/traits/peasant.tres index de6a684..20977d7 100644 --- a/resources/traits/peasant.tres +++ b/resources/traits/peasant.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_7inbg") -name = "peasant" +name = "Peasant" stimulis = Array[int]([0]) category = 2 tag = 8 diff --git a/resources/traits/silent.tres b/resources/traits/silent.tres index 68084a4..c0a0bfb 100644 --- a/resources/traits/silent.tres +++ b/resources/traits/silent.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_750wv") -name = "silent" +name = "Silent" stimulis = Array[int]([1]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/single.tres b/resources/traits/single.tres index 5aeb8bf..20ade18 100644 --- a/resources/traits/single.tres +++ b/resources/traits/single.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_d5xxp") -name = "single" +name = "Single" stimulis = Array[int]([1]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/smelly.tres b/resources/traits/smelly.tres index 01c6513..d90bb9f 100644 --- a/resources/traits/smelly.tres +++ b/resources/traits/smelly.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_3ykpy") -name = "smelly" +name = "Smelly" stimulis = Array[int]([2]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/talkative.tres b/resources/traits/talkative.tres index eef3782..e510ec8 100644 --- a/resources/traits/talkative.tres +++ b/resources/traits/talkative.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_rcjnw") -name = "talkative" +name = "Talkative" stimulis = Array[int]([1]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/weak.tres b/resources/traits/weak.tres index 0180f22..6949a17 100644 --- a/resources/traits/weak.tres +++ b/resources/traits/weak.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_c1q5c") -name = "weak" +name = "Weak" stimulis = Array[int]([0]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/white.tres b/resources/traits/white.tres index bf226fc..2f8bdab 100644 --- a/resources/traits/white.tres +++ b/resources/traits/white.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_yr2j7") -name = "white" +name = "White" stimulis = Array[int]([0]) category = 3 tag = 10 diff --git a/resources/traits/woman.tres b/resources/traits/woman.tres index a883c14..586f21f 100644 --- a/resources/traits/woman.tres +++ b/resources/traits/woman.tres @@ -4,7 +4,7 @@ [resource] script = ExtResource("1_yihyr") -name = "woman" +name = "Woman" stimulis = Array[int]([0, 1]) category = 1 tag = 4 diff --git a/resources/traits/young.tres b/resources/traits/young.tres index eccebeb..7507205 100644 --- a/resources/traits/young.tres +++ b/resources/traits/young.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_msbkw") -name = "young" +name = "Young" stimulis = Array[int]([1]) metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/scenes/list/list.gd b/scenes/list/list.gd index cb35dde..37d5e12 100644 --- a/scenes/list/list.gd +++ b/scenes/list/list.gd @@ -2,6 +2,17 @@ extends Area2D class_name List var current_item = 0 +var mask_list: Array[MaskResource] +var guest_list: Array[CharacterResource] +var items: Array + +var pref_score_name: Dictionary[CharacterResource.Preference, String] = { + CharacterResource.Preference.LOVE: "Loves ", + CharacterResource.Preference.APPROVE: "Likes ", + CharacterResource.Preference.DONT_CARE: "Doesn't care about ", + CharacterResource.Preference.DISAPPROVE: "Disapproves ", + CharacterResource.Preference.HATE: "Hates ", +} @onready var label: Label = $Label @@ -14,23 +25,38 @@ func _ready() -> void: func _process(delta: float) -> void: pass - -func set_mask_list(items: Array[MaskResource]): - print(items) +func set_list(_items): + print(name) + for i in _items: + print(i.name) + current_item = 0 - if items.size() == 0: - label.text = "..." - -func set_chara_list(items: Array[CharacterResource]): - print(items) - current_item = 0 - if items.size() == 0: - label.text = "..." + if _items.size() == 0: + items = [] + label.text = "...\n...\n..." + return + items = _items + cycle_through_items() func cycle_through_items() -> void: + if items.size() == 0: + label.text = "...\n...\n..." + return + current_item += 1 - print(current_item) + var index = current_item % items.size() + var item = items.get(index) + if item is MaskResource: + label.text = "\n\n\n\n" + item.name + "\n\n" + item.description + elif item is CharacterResource: + label.text = item.name + "\n\nTraits\n" + for guest_trait: Trait in item.traits: + label.text += guest_trait.name + ", " + label.text += "\n\nPreferences\n" + for other_trait in item.preferences: + var pref = item.preferences[other_trait] + label.text += pref_score_name[pref] + other_trait.name + ", " func _on_mouse_entered() -> void: diff --git a/scenes/list/list.tscn b/scenes/list/list.tscn index f12af97..ab2f10c 100644 --- a/scenes/list/list.tscn +++ b/scenes/list/list.tscn @@ -14,14 +14,16 @@ shape = SubResource("CapsuleShape2D_trceg") [node name="Label" type="Label" parent="." unique_id=1624172949] z_index = 10 -custom_minimum_size = Vector2(360, 0) -offset_left = -179.0 -offset_top = -257.0 -offset_right = 121.0 -offset_bottom = -209.0 +offset_left = -150.0 +offset_top = -430.0 +offset_right = 195.41 +offset_bottom = -280.0 theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_constants/line_spacing = 1 theme_override_font_sizes/font_size = 24 -text = "..." +text = "... +... +..." autowrap_mode = 3 [connection signal="input_event" from="." to="." method="_on_input_event"] diff --git a/scenes/main/main.tscn b/scenes/main/main.tscn index 30f6dee..dc34be1 100644 --- a/scenes/main/main.tscn +++ b/scenes/main/main.tscn @@ -48,6 +48,8 @@ [ext_resource type="Texture2D" uid="uid://cl1a50j64nnlh" path="res://assets/decor/guest_page_held.png" id="36_62f45"] [ext_resource type="Texture2D" uid="uid://coahojeky8ul7" path="res://assets/decor/bell.png" id="37_6g32y"] [ext_resource type="Texture2D" uid="uid://cgl8g5eqy8xm0" path="res://assets/decor/hand_bell.png" id="39_62f45"] +[ext_resource type="Texture2D" uid="uid://dj267xgqniy2i" path="res://assets/decor/table_item_a_2.png" id="43_jucdw"] +[ext_resource type="Texture2D" uid="uid://b4u3o7fyryxxq" path="res://assets/decor/table_item_a.png" id="44_6miv3"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_gkmcc"] random_pitch = 1.122462 @@ -460,13 +462,23 @@ position = Vector2(95, 156) scale = Vector2(0.5, 0.5) texture = ExtResource("35_62f45") +[node name="TableItemA2" type="Sprite2D" parent="." unique_id=611798307] +position = Vector2(-933, 164) +scale = Vector2(0.5, 0.5) +texture = ExtResource("43_jucdw") + +[node name="TableItemA" type="Sprite2D" parent="." unique_id=1146510015] +position = Vector2(911.00006, 385.00003) +scale = Vector2(0.3, 0.3) +texture = ExtResource("44_6miv3") + [node name="MaskList" parent="." unique_id=437192154 instance=ExtResource("25_6llfj")] position = Vector2(409, 523) rotation = 0.1675516 scale = Vector2(0.99999994, 0.99999994) [node name="Sprite2D" type="Sprite2D" parent="MaskList" unique_id=1216540471] -position = Vector2(209.40524, 188.72063) +position = Vector2(213.79706, 100.75635) scale = Vector2(0.5, 0.5) texture = ExtResource("35_1k3ck") flip_h = true @@ -476,8 +488,8 @@ position = Vector2(-409, 523) rotation = -0.16732943 [node name="Sprite2D" type="Sprite2D" parent="GuestList" unique_id=2026369586] -position = Vector2(-218.29799, 139.59222) -scale = Vector2(0.5, 0.5) +position = Vector2(-224.08743, 155.85515) +scale = Vector2(0.6, 0.6) texture = ExtResource("36_62f45") [node name="ReadyBell" type="Area2D" parent="." unique_id=1350504622] diff --git a/scenes/managers/game_manager.gd b/scenes/managers/game_manager.gd index 6624cdc..985cd41 100644 --- a/scenes/managers/game_manager.gd +++ b/scenes/managers/game_manager.gd @@ -32,6 +32,7 @@ class_name GameManager @export_category("Random levels") @export var current_level: Levels = Levels.LVL1 @export var max_number_guests: int = 9 +@export var no_mask_probability: float = 0.2 @export var dual_mask_probability: float = 0.2 @export_tool_button("Create chara roster") var create_roster_action = create_new_roster @@ -70,6 +71,11 @@ func create_new_roster() -> void: var mouth_mask: MaskResource var eyes_mask: MaskResource + var no_masked = randf() <= no_mask_probability + if (no_masked): + current_chara_roster.append(MaskedChara.new(chara, eyes_mask, mouth_mask)) + continue + var should_pick_eye_mask = randi_range(0, 1) == 1 var dual_masked = randf() <= dual_mask_probability if (should_pick_eye_mask): @@ -81,10 +87,6 @@ func create_new_roster() -> void: if dual_masked: eyes_mask = face_mask_roster.pick_random() - # Associate a single mask (for now) to the character - # var mask: MaskResource = mask_roster.pick_random() - # var face_mask = mask if mask.region == MaskResource.Region.EYES else null - # var mouth_mask = mask if mask.region == MaskResource.Region.MOUTH else null var masked_chara = MaskedChara.new(chara, eyes_mask, mouth_mask) current_chara_roster.append(masked_chara) @@ -174,13 +176,13 @@ func on_ready_bell_pressed() -> void: var all_masks_in_current_roster: Array[MaskResource] = [] for masked_chara in current_chara_roster: all_chara_in_current_roster.append(masked_chara.character) - if masked_chara.face_mask != null and masked_chara.face_mask.resource_name: + if masked_chara.face_mask != null: all_masks_in_current_roster.append(masked_chara.face_mask) - if masked_chara.mouth_mask != null and masked_chara.mouth_mask.resource_name: + if masked_chara.mouth_mask != null: all_masks_in_current_roster.append(masked_chara.mouth_mask) - mask_list.set_mask_list(all_masks_in_current_roster) - guest_list.set_chara_list(all_chara_in_current_roster) + mask_list.set_list(all_masks_in_current_roster) + guest_list.set_list(all_chara_in_current_roster) current_game_state = GameState.GUEST_REVIEW bell_anim_player.stop() diff --git a/scenes/mask/mask_resource.gd b/scenes/mask/mask_resource.gd index 621b01e..a58d95c 100644 --- a/scenes/mask/mask_resource.gd +++ b/scenes/mask/mask_resource.gd @@ -8,6 +8,9 @@ enum Region { } @export_category("General") +@export var name: String +@export var description: String + @export var mask_sprite: Texture2D: set(value): mask_sprite = value diff --git a/scenes/seat/seat.tscn b/scenes/seat/seat.tscn index 697205a..b1d8f35 100644 --- a/scenes/seat/seat.tscn +++ b/scenes/seat/seat.tscn @@ -2,20 +2,61 @@ [ext_resource type="Script" uid="uid://cuojjiwxidmwu" path="res://scenes/seat/seat.gd" id="1_pceab"] [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"] +[ext_resource type="Texture2D" uid="uid://belkmlrr588ki" path="res://assets/ui/seat_selector.png" id="3_wnjs1"] + +[sub_resource type="Animation" id="Animation_wnjs1"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} + +[sub_resource type="Animation" id="Animation_dxmy0"] +resource_name = "idle" +length = 3.0 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1.5000001), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(0, -30)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_wnjs1"] +_data = { +&"RESET": SubResource("Animation_wnjs1"), +&"idle": SubResource("Animation_dxmy0") +} [sub_resource type="RectangleShape2D" id="RectangleShape2D_rofvo"] -size = Vector2(128, 128) +size = Vector2(128, 256) [node name="Seat" type="Area2D" unique_id=1604639021] script = ExtResource("1_pceab") [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] -texture = ExtResource("4_wnjs1") +scale = Vector2(0.5, 0.5) +texture = ExtResource("3_wnjs1") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Empty" unique_id=288853041] +libraries/ = SubResource("AnimationLibrary_wnjs1") +autoplay = &"idle" [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1054126207] shape = SubResource("RectangleShape2D_rofvo")