diff --git a/assets/characters/Perso 8.png b/assets/characters/Perso 8.png index 1eca754..0091d4c 100644 Binary files a/assets/characters/Perso 8.png and b/assets/characters/Perso 8.png differ diff --git a/assets/characters/Perso 9.png b/assets/characters/Perso 9.png index a7e6c28..17abcbe 100644 Binary files a/assets/characters/Perso 9.png and b/assets/characters/Perso 9.png differ diff --git a/assets/decor/BG.png b/assets/decor/BG.png index fdc1a49..e5cdf14 100644 Binary files a/assets/decor/BG.png and b/assets/decor/BG.png differ diff --git a/default_bus_layout.tres b/default_bus_layout.tres index b032d48..e6f33e7 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -5,7 +5,7 @@ bus/1/name = &"Music" bus/1/solo = false bus/1/mute = false bus/1/bypass_fx = false -bus/1/volume_db = -9.632782 +bus/1/volume_db = -3.7683105 bus/1/send = &"Master" bus/2/name = &"SFX" bus/2/solo = false diff --git a/resources/characters/bishop.tres b/resources/characters/bishop.tres index d720544..d439311 100644 --- a/resources/characters/bishop.tres +++ b/resources/characters/bishop.tres @@ -15,9 +15,9 @@ script = ExtResource("2_ilqpx") name = "Bishop" chara_sprite = ExtResource("1_ilqpx") -mask_eyes_position = Vector2(58.7, 91.365) -mask_eyes_rotation = -0.05934119456780681 -mask_mouth_position = Vector2(46.125, 123.665) +mask_eyes_position = Vector2(63.135, 91.365) +mask_eyes_rotation = 0.015707963267948568 +mask_mouth_position = Vector2(47.37, 103.725) traits = Array[ExtResource("1_kq1ar")]([ExtResource("6_4wm6o"), ExtResource("9_yew24"), ExtResource("14_lkxga")]) preferences = Dictionary[ExtResource("1_kq1ar"), int]({ ExtResource("3_kbmal"): 4, diff --git a/resources/characters/duchex.tres b/resources/characters/duchex.tres index 3049d55..f577978 100644 --- a/resources/characters/duchex.tres +++ b/resources/characters/duchex.tres @@ -15,7 +15,7 @@ script = ExtResource("2_cyb15") name = "Duchex" chara_sprite = ExtResource("1_tppor") -mask_eyes_position = Vector2(61.445, 168.635) +mask_eyes_position = Vector2(78.08, 181.815) mask_eyes_rotation = -0.06981317007977318 mask_mouth_position = Vector2(76.505, 203.355) mask_mouth_rotation = -0.05235987755982989 diff --git a/resources/characters/duke.tres b/resources/characters/duke.tres index 7474f75..9919ba7 100644 --- a/resources/characters/duke.tres +++ b/resources/characters/duke.tres @@ -15,9 +15,9 @@ script = ExtResource("2_ce0p8") name = "Duke" chara_sprite = ExtResource("1_d1fpd") -mask_eyes_position = Vector2(-23.295, -0.335) +mask_eyes_position = Vector2(-9.205, -13.46) mask_eyes_rotation = -0.03490658503988659 -mask_mouth_position = Vector2(-1.83, 2.27) +mask_mouth_position = Vector2(4.755, -2.32) traits = Array[ExtResource("3_n21sh")]([ExtResource("5_tl7uu"), ExtResource("7_12asi"), ExtResource("9_ce0p8")]) preferences = Dictionary[ExtResource("3_n21sh"), int]({ ExtResource("3_tvmgq"): 0, diff --git a/resources/characters/farmer.tres b/resources/characters/farmer.tres index ed90773..e907283 100644 --- a/resources/characters/farmer.tres +++ b/resources/characters/farmer.tres @@ -13,8 +13,9 @@ script = ExtResource("2_vlbot") name = "Farmer" chara_sprite = ExtResource("1_qptnb") -mask_eyes_position = Vector2(112.37, 228.755) -mask_mouth_position = Vector2(78.295, 132.145) +mask_eyes_position = Vector2(122.665, 137.92) +mask_mouth_position = Vector2(106.575, 137.815) +mask_mouth_rotation = 0.07504915783575637 traits = Array[ExtResource("1_jl8hl")]([ExtResource("5_6sspe"), ExtResource("11_tclm6"), ExtResource("10_nvopw")]) preferences = Dictionary[ExtResource("1_jl8hl"), int]({ ExtResource("3_s3hb5"): 4, diff --git a/resources/characters/king.tres b/resources/characters/king.tres index 065a3eb..fab0324 100644 --- a/resources/characters/king.tres +++ b/resources/characters/king.tres @@ -15,10 +15,10 @@ script = ExtResource("3_vvog1") name = "King" chara_sprite = ExtResource("1_u46dm") -mask_eyes_position = Vector2(6.675, -38.825) +mask_eyes_position = Vector2(12.56, -38.825) mask_eyes_rotation = 0.06981317007977318 -mask_mouth_position = Vector2(-12.43, -47.06) -mask_mouth_rotation = -0.12915436464757998 +mask_mouth_position = Vector2(12.375, -68.335) +mask_mouth_rotation = 0.019198621771938023 traits = Array[ExtResource("4_0s3fj")]([ExtResource("7_j8s63"), ExtResource("6_vvog1"), ExtResource("9_teajx")]) preferences = Dictionary[ExtResource("4_0s3fj"), int]({ ExtResource("6_u46dm"): 0, diff --git a/resources/characters/knight.tres b/resources/characters/knight.tres index 191b918..518e833 100644 --- a/resources/characters/knight.tres +++ b/resources/characters/knight.tres @@ -16,9 +16,9 @@ script = ExtResource("2_tdxmb") name = "Knight" chara_sprite = ExtResource("1_3vdcn") -mask_eyes_position = Vector2(-94.815, 12.665) -mask_eyes_rotation = 0.029670597283903404 -mask_mouth_position = Vector2(-84.16, -17.325) +mask_eyes_position = Vector2(-103.465, -11.925) +mask_eyes_rotation = -0.026179938779914945 +mask_mouth_position = Vector2(-76.23, -5.335) mask_mouth_rotation = 0.029670597283903404 traits = Array[ExtResource("1_iqt1j")]([ExtResource("3_bsgk7"), ExtResource("4_aiy02"), ExtResource("7_5qve6"), ExtResource("11_xxla0")]) preferences = Dictionary[ExtResource("1_iqt1j"), int]({ diff --git a/resources/characters/nun.tres b/resources/characters/nun.tres index 2dc3aae..c97d15e 100644 --- a/resources/characters/nun.tres +++ b/resources/characters/nun.tres @@ -15,8 +15,9 @@ script = ExtResource("2_8e28v") name = "Nun" chara_sprite = ExtResource("1_8e28v") -mask_eyes_position = Vector2(156.99, 241.13) -mask_mouth_position = Vector2(151.42, 203.93) +mask_eyes_position = Vector2(159.75, 230.135) +mask_eyes_rotation = 0.07504915783575637 +mask_mouth_position = Vector2(152.9, 203.93) mask_mouth_rotation = 0.029670597283903404 traits = Array[ExtResource("1_83ubb")]([ExtResource("8_yhtr4"), ExtResource("10_emld2"), ExtResource("14_1axfg")]) preferences = Dictionary[ExtResource("1_83ubb"), int]({ diff --git a/resources/characters/prince.tres b/resources/characters/prince.tres index 1001914..3bc4948 100644 --- a/resources/characters/prince.tres +++ b/resources/characters/prince.tres @@ -14,9 +14,10 @@ script = ExtResource("2_ef0f3") name = "Prince" chara_sprite = ExtResource("1_ef0f3") -mask_eyes_position = Vector2(104.295, 9.395) +mask_eyes_position = Vector2(106.405, -3.38) mask_eyes_rotation = -0.017453292519943295 -mask_mouth_position = Vector2(88.32, -14.73) +mask_mouth_position = Vector2(79.52, -53.32) +mask_mouth_rotation = 0.038397243543875054 traits = Array[ExtResource("1_3d6c6")]([ExtResource("8_bwj4q"), ExtResource("7_drjus"), ExtResource("14_6apw1")]) preferences = Dictionary[ExtResource("1_3d6c6"), int]({ ExtResource("5_33mra"): 0, diff --git a/resources/characters/queen.tres b/resources/characters/queen.tres index 934344a..91647b7 100644 --- a/resources/characters/queen.tres +++ b/resources/characters/queen.tres @@ -15,8 +15,8 @@ script = ExtResource("2_g8bvo") name = "Queen" chara_sprite = ExtResource("1_d1164") -mask_eyes_position = Vector2(48, 187.345) -mask_eyes_rotation = 0.05235987755982989 +mask_eyes_position = Vector2(47.78, 157.815) +mask_eyes_rotation = 0.03316125578789186 mask_mouth_position = Vector2(31.595, 176.245) mask_mouth_rotation = 0.01745329251994329 traits = Array[ExtResource("3_dkw07")]([ExtResource("3_y3hrs"), ExtResource("8_j0xhd"), ExtResource("9_hdamc"), ExtResource("12_4ysbx")]) diff --git a/scenes/camera/camera_controller.gd b/scenes/camera/camera_controller.gd index b5d3caf..a7cbdc0 100644 --- a/scenes/camera/camera_controller.gd +++ b/scenes/camera/camera_controller.gd @@ -6,6 +6,9 @@ extends Camera2D var should_move_right = false var should_move_left = false +@onready var arrow_001: Sprite2D = $"../Arrow001" +@onready var arrow_002: Sprite2D = $"../Arrow002" + # Called when the node enters the scene tree for the first time. func _ready() -> void: @@ -14,6 +17,9 @@ func _ready() -> void: # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: + arrow_001.visible = position.x <= 440.0 + arrow_002.visible = position.x >= 2076.0 + var limit_left_at_center = limit_left + get_viewport_rect().size.x/2 var limit_right_at_center = limit_right - get_viewport_rect().size.x/2 if position.x < limit_left_at_center: diff --git a/scenes/character/character.tscn b/scenes/character/character.tscn index 7c95c3c..5ee5799 100644 --- a/scenes/character/character.tscn +++ b/scenes/character/character.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://bvpyqyftqhy45"] [ext_resource type="Script" uid="uid://dnt4l1eghm1gi" path="res://scenes/character/character.gd" id="1_cuyo6"] -[ext_resource type="Resource" uid="uid://i4yr7hqobna7" path="res://resources/characters/prince.tres" id="2_fgi2k"] -[ext_resource type="Texture2D" uid="uid://c61n5v2xrlwy2" path="res://assets/characters/Perso 5.png" id="3_f8hpl"] +[ext_resource type="Resource" uid="uid://wq3g1j3l4gl6" path="res://resources/characters/queen.tres" id="2_fgi2k"] +[ext_resource type="Texture2D" uid="uid://c726frtpkk1a8" path="res://assets/characters/Perso 2.png" id="3_f8hpl"] [ext_resource type="PackedScene" uid="uid://3jlukpb5hefb" path="res://scenes/mask/mask.tscn" id="3_mutn8"] [sub_resource type="Animation" id="Animation_fgi2k"] @@ -164,11 +164,13 @@ chara_resource = ExtResource("2_fgi2k") texture = ExtResource("3_f8hpl") [node name="MaskMouth" parent="." unique_id=1087336064 instance=ExtResource("3_mutn8")] -position = Vector2(88.32, -14.73) +position = Vector2(31.595, 176.245) +rotation = 0.017453292 [node name="MaskEyes" parent="." unique_id=428968220 instance=ExtResource("3_mutn8")] -position = Vector2(104.295, 9.395) -rotation = -0.017453292 +visible = false +position = Vector2(47.78, 157.815) +rotation = 0.033161256 [node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=713965213] libraries/ = SubResource("AnimationLibrary_7ex5l") diff --git a/scenes/main/main.tscn b/scenes/main/main.tscn index 45ad6b1..8124a70 100644 --- a/scenes/main/main.tscn +++ b/scenes/main/main.tscn @@ -51,6 +51,7 @@ [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"] [ext_resource type="Texture2D" uid="uid://c3jx3y0mbueoo" path="res://assets/ui/arrow_004.png" id="47_6miv3"] +[ext_resource type="Texture2D" uid="uid://cgrudt5ev651p" path="res://assets/ui/arrow_001.png" id="52_yisfj"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_gkmcc"] random_pitch = 1.122462 @@ -392,6 +393,44 @@ _data = { &"idle": SubResource("Animation_62f45") } +[sub_resource type="Animation" id="Animation_ftp6y"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0.5, 0.5)] +} + +[sub_resource type="Animation" id="Animation_pd34m"] +resource_name = "idle" +length = 2.0 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:scale") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0.5, 0.5), Vector2(0.4, 0.4)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_qjyke"] +_data = { +&"RESET": SubResource("Animation_ftp6y"), +&"idle": SubResource("Animation_pd34m") +} + [node name="Main" type="Node2D" unique_id=875553242] script = ExtResource("1_7smn1") @@ -469,12 +508,12 @@ 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) +position = Vector2(-882, 149) +scale = Vector2(0.4, 0.4) texture = ExtResource("43_jucdw") [node name="TableItemA" type="Sprite2D" parent="." unique_id=1146510015] -position = Vector2(911.00006, 385.00003) +position = Vector2(903, 382) scale = Vector2(0.3, 0.3) texture = ExtResource("44_6miv3") @@ -531,6 +570,25 @@ texture = ExtResource("39_62f45") libraries/ = SubResource("AnimationLibrary_6g32y") autoplay = &"idle" +[node name="Arrow001" type="Sprite2D" parent="." unique_id=2051768141] +position = Vector2(828, 7) +scale = Vector2(0.5, 0.5) +texture = ExtResource("52_yisfj") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Arrow001" unique_id=23670381] +libraries/ = SubResource("AnimationLibrary_qjyke") +autoplay = &"idle" + +[node name="Arrow002" type="Sprite2D" parent="." unique_id=557480206] +position = Vector2(1631.9999, 4.9999995) +rotation = 3.1415927 +scale = Vector2(0.5, 0.5) +texture = ExtResource("52_yisfj") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Arrow002" unique_id=1862466503] +libraries/ = SubResource("AnimationLibrary_qjyke") +autoplay = &"idle" + [connection signal="defeat_noise" from="GameManager" to="." method="_on_game_manager_defeat_noise"] [connection signal="ring_bell_noise" from="GameManager" to="." method="_on_game_manager_ring_bell_noise"] [connection signal="victory_noise" from="GameManager" to="." method="_on_game_manager_victory_noise"] diff --git a/scenes/mask/mask.tscn b/scenes/mask/mask.tscn index 4e96f7f..683341a 100644 --- a/scenes/mask/mask.tscn +++ b/scenes/mask/mask.tscn @@ -1,8 +1,8 @@ [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="Resource" uid="uid://vsvgpvluq7sh" path="res://resources/masks/blind.tres" id="2_0pm64"] -[ext_resource type="Texture2D" uid="uid://sf7sjug1spau" path="res://assets/masks/Masque 1.png" id="3_htpgb"] +[ext_resource type="Resource" uid="uid://divy6byhpwgs2" path="res://resources/masks/truthy.tres" id="2_0pm64"] +[ext_resource type="Texture2D" uid="uid://02al0mfbvjc1" path="res://assets/masks/Bouche 2.png" id="3_htpgb"] [node name="Mask" type="Node2D" unique_id=428968220] script = ExtResource("1_61b51")