From e8a14ab767e0d020aceb35fae5733ab6e6248eed Mon Sep 17 00:00:00 2001 From: TheJP Date: Sun, 28 Jan 2024 21:49:42 +0100 Subject: [PATCH] Minor fixes * Sound bug in unpacking game * Cursor style fixes --- Catfluencer/credits/credits.tscn | 1 + Catfluencer/game_food/food_game.gd | 2 +- .../game_unpacking/unpacking_game.tscn | 2 -- Catfluencer/victory/victory.tscn | 30 +------------------ 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/Catfluencer/credits/credits.tscn b/Catfluencer/credits/credits.tscn index cac799b..c80a5d5 100644 --- a/Catfluencer/credits/credits.tscn +++ b/Catfluencer/credits/credits.tscn @@ -46,6 +46,7 @@ stretch_mode = 3 [node name="HomeButton" type="TextureButton" parent="CanvasLayer/MarginContainer/VBoxContainerMain"] layout_mode = 2 size_flags_horizontal = 4 +mouse_default_cursor_shape = 2 texture_normal = ExtResource("5_wvvut") texture_hover = ExtResource("6_tv3md") diff --git a/Catfluencer/game_food/food_game.gd b/Catfluencer/game_food/food_game.gd index 29787fa..f4e35b3 100644 --- a/Catfluencer/game_food/food_game.gd +++ b/Catfluencer/game_food/food_game.gd @@ -33,7 +33,7 @@ func _on_consume_food(food, is_good): #food.get_node("Sprite2D").visible = false good_food_count -= 1 - + if good_food_count <= 0: $Yummy.visible = true Level.finished_level(true) diff --git a/Catfluencer/game_unpacking/unpacking_game.tscn b/Catfluencer/game_unpacking/unpacking_game.tscn index 3fcfdd8..df4eaf8 100644 --- a/Catfluencer/game_unpacking/unpacking_game.tscn +++ b/Catfluencer/game_unpacking/unpacking_game.tscn @@ -13,8 +13,6 @@ script = ExtResource("1_1d0dx") [node name="Common" parent="." instance=ExtResource("2_vpgsf")] -neutral_sounds = Array[AudioStream]([]) -sad_sounds = Array[AudioStream]([]) [node name="Package" parent="." instance=ExtResource("2_e0cu1")] position = Vector2(738, 399) diff --git a/Catfluencer/victory/victory.tscn b/Catfluencer/victory/victory.tscn index 0c57d23..0607f7f 100644 --- a/Catfluencer/victory/victory.tscn +++ b/Catfluencer/victory/victory.tscn @@ -27,34 +27,6 @@ theme_override_constants/margin_top = 170 theme_override_constants/margin_right = 450 theme_override_constants/margin_bottom = 90 -[node name="VBoxContainerMain" type="VBoxContainer" parent="CanvasLayer/MarginContainer"] -visible = false -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 4 -theme_override_constants/separation = 50 - -[node name="Title" type="Label" parent="CanvasLayer/MarginContainer/VBoxContainerMain"] -layout_mode = 2 -theme_override_font_sizes/font_size = 100 -text = "Victory" -horizontal_alignment = 1 - -[node name="CreditsNames" type="Label" parent="CanvasLayer/MarginContainer/VBoxContainerMain"] -custom_minimum_size = Vector2(450, 0) -layout_mode = 2 -size_flags_horizontal = 4 -theme_override_font_sizes/font_size = 60 -text = "You've become the -Ultimate Catfluencer" -horizontal_alignment = 1 - -[node name="Button" type="Button" parent="CanvasLayer/MarginContainer/VBoxContainerMain"] -layout_mode = 2 -size_flags_horizontal = 4 -theme_override_font_sizes/font_size = 60 -text = " Credits " - [node name="VBoxContainerMain2" type="VBoxContainer" parent="CanvasLayer/MarginContainer"] layout_mode = 2 size_flags_vertical = 4 @@ -74,6 +46,7 @@ stretch_mode = 3 [node name="CreditsButton" type="TextureButton" parent="CanvasLayer/MarginContainer/VBoxContainerMain2"] layout_mode = 2 size_flags_horizontal = 4 +mouse_default_cursor_shape = 2 texture_normal = ExtResource("5_v1ec6") texture_hover = ExtResource("6_1p8o3") @@ -89,5 +62,4 @@ mouse_filter = 2 texture = ExtResource("7_6pvir") expand_mode = 1 -[connection signal="pressed" from="CanvasLayer/MarginContainer/VBoxContainerMain/Button" to="." method="_on_button_pressed"] [connection signal="pressed" from="CanvasLayer/MarginContainer/VBoxContainerMain2/CreditsButton" to="." method="_on_button_pressed"]