From d3be79b79062b7ec3baaffaf93ba3dcc4a305401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sj=C3=B6blom?= Date: Thu, 19 Sep 2024 14:49:43 +0200 Subject: [PATCH] Fixed the connections for Demo_level Now demo_level has a working death menu --- scenes/characters/mouse/player.tscn | 18 +++++++++--------- scenes/levels/demo_level.tscn | 16 ++++++++++------ scenes/levels/game.tscn | 12 +++++++----- scenes/menus/death_menu.tscn | 4 ++-- scenes/menus/main_menu.tscn | 4 ++-- scenes/menus/win_menu.tscn | 4 ++-- scenes/test/tile_map.tscn | 1 + scripts/characters/mouse/player.gd | 6 +++--- 8 files changed, 36 insertions(+), 29 deletions(-) diff --git a/scenes/characters/mouse/player.tscn b/scenes/characters/mouse/player.tscn index 345ff9b..da5f2cd 100644 --- a/scenes/characters/mouse/player.tscn +++ b/scenes/characters/mouse/player.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=97 format=3 uid="uid://dnlv8wuw8y7et"] [ext_resource type="Script" path="res://scripts/characters/mouse/player.gd" id="1_p3jmh"] -[ext_resource type="Texture2D" uid="uid://cyfqdjr67qal" path="res://assets/characters/mouse/roll.png" id="2_72rxg"] -[ext_resource type="Texture2D" uid="uid://bp1rcp1swh1qv" path="res://assets/characters/mouse/idle.png" id="2_ebnf0"] +[ext_resource type="Texture2D" uid="uid://cnc8pblqp3s00" path="res://assets/characters/mouse/roll.png" id="2_72rxg"] +[ext_resource type="Texture2D" uid="uid://c2jfclym1rp54" path="res://assets/characters/mouse/idle.png" id="2_ebnf0"] [ext_resource type="PackedScene" uid="uid://cq501sdvos586" path="res://scenes/tools/hud.tscn" id="2_ynafe"] -[ext_resource type="Texture2D" uid="uid://8pecrlij57r" path="res://assets/characters/mouse/damaged.png" id="3_7nwh7"] -[ext_resource type="Texture2D" uid="uid://bkcxs0v3dklet" path="res://assets/characters/mouse/walk.png" id="3_nllni"] -[ext_resource type="Texture2D" uid="uid://bsip3hbh6x65y" path="res://assets/characters/mouse/obstruct.png" id="3_wj4mi"] -[ext_resource type="Texture2D" uid="uid://2enbljnpdmo7" path="res://assets/characters/mouse/death.png" id="4_u5uvf"] -[ext_resource type="Texture2D" uid="uid://dcxnplpmjacyi" path="res://assets/characters/mouse/attack_left.png" id="4_uplh7"] -[ext_resource type="Texture2D" uid="uid://30jhstyt6adg" path="res://assets/characters/mouse/attack_right.png" id="5_q2nxq"] -[ext_resource type="Texture2D" uid="uid://cxc5dq2o6isif" path="res://assets/characters/mouse/fall.png" id="5_sjks1"] +[ext_resource type="Texture2D" uid="uid://qrrdbwcuial7" path="res://assets/characters/mouse/damaged.png" id="3_7nwh7"] +[ext_resource type="Texture2D" uid="uid://dlejngkxu8iex" path="res://assets/characters/mouse/walk.png" id="3_nllni"] +[ext_resource type="Texture2D" uid="uid://c57n7m8rd2p0r" path="res://assets/characters/mouse/obstruct.png" id="3_wj4mi"] +[ext_resource type="Texture2D" uid="uid://cx5sahijxh51p" path="res://assets/characters/mouse/death.png" id="4_u5uvf"] +[ext_resource type="Texture2D" uid="uid://d6c3ykmj83iu" path="res://assets/characters/mouse/attack_left.png" id="4_uplh7"] +[ext_resource type="Texture2D" uid="uid://dpfsuhd4kuo1" path="res://assets/characters/mouse/attack_right.png" id="5_q2nxq"] +[ext_resource type="Texture2D" uid="uid://dqsuohh178t6r" path="res://assets/characters/mouse/fall.png" id="5_sjks1"] [ext_resource type="PackedScene" uid="uid://cxb8foogagtu4" path="res://scenes/tools/hurt_box.tscn" id="7_d2iwd"] [ext_resource type="PackedScene" uid="uid://bq7xttj67lksf" path="res://scenes/tools/hit_box.tscn" id="7_j7bjn"] diff --git a/scenes/levels/demo_level.tscn b/scenes/levels/demo_level.tscn index 5a45241..69224b8 100644 --- a/scenes/levels/demo_level.tscn +++ b/scenes/levels/demo_level.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=12 format=4 uid="uid://dni2huswsn7rp"] +[gd_scene load_steps=13 format=4 uid="uid://dni2huswsn7rp"] [ext_resource type="PackedScene" uid="uid://y16vsgpfcas8" path="res://scenes/tools/tile_map_layers/room_layer.tscn" id="1_3im0l"] [ext_resource type="Script" path="res://scripts/game_manager.gd" id="1_k3ck1"] +[ext_resource type="PackedScene" uid="uid://bpw6urgdij01f" path="res://scenes/menus/win_menu.tscn" id="1_v7lt3"] [ext_resource type="PackedScene" uid="uid://c74xlu0of2unm" path="res://scenes/tools/tile_map_layers/furniture_layer.tscn" id="2_38877"] -[ext_resource type="PackedScene" uid="uid://by8676srd1166" path="res://scenes/death_screen.tscn" id="2_i0jtn"] +[ext_resource type="PackedScene" uid="uid://86tsdexohbg4" path="res://scenes/menus/death_menu.tscn" id="2_y8u5l"] [ext_resource type="PackedScene" uid="uid://cagii1m6affwl" path="res://scenes/tools/tile_map_layers/decoration_layer.tscn" id="3_7hcgq"] [ext_resource type="PackedScene" uid="uid://dnlv8wuw8y7et" path="res://scenes/characters/mouse/player.tscn" id="4_82wxn"] [ext_resource type="PackedScene" uid="uid://ct4xnrb6ua7pq" path="res://scenes/characters/enemies/bug_red.tscn" id="5_4bd2v"] @@ -14,12 +15,15 @@ [node name="demo_level" type="Node2D"] -[node name="game_manager" type="Node" parent="."] +[node name="win_menu" parent="." instance=ExtResource("1_v7lt3")] +unique_name_in_owner = true + +[node name="death_menu" parent="." instance=ExtResource("2_y8u5l")] unique_name_in_owner = true -script = ExtResource("1_k3ck1") -[node name="death_screen" parent="." instance=ExtResource("2_i0jtn")] +[node name="game_manager" type="Node" parent="."] unique_name_in_owner = true +script = ExtResource("1_k3ck1") [node name="level_layers" type="Node" parent="."] @@ -117,4 +121,4 @@ polygon = PackedVector2Array(18, -14, 30, -14, 30, -2, 18, -2) unique_name_in_owner = true position = Vector2(0, -16) -[connection signal="trigger_death_screen" from="player/player" to="game_manager" method="_on_player_trigger_death_screen"] +[connection signal="trigger_death_menu" from="player/player" to="game_manager" method="_on_player_trigger_death_menu"] diff --git a/scenes/levels/game.tscn b/scenes/levels/game.tscn index 40710a8..9e3a59f 100644 --- a/scenes/levels/game.tscn +++ b/scenes/levels/game.tscn @@ -22,23 +22,25 @@ script = ExtResource("1_sqrlk") [node name="win_menu" parent="." instance=ExtResource("2_1la2g")] unique_name_in_owner = true +visible = false [node name="death_menu" parent="." instance=ExtResource("2_wlcxk")] unique_name_in_owner = true +visible = false [node name="Cheeses" type="Node" parent="."] [node name="cheese_1" parent="Cheeses" groups=["Cheeses"] instance=ExtResource("6_prwsy")] -position = Vector2(-112, -59) +position = Vector2(-16, -48) [node name="cheese_2" parent="Cheeses" groups=["Cheeses"] instance=ExtResource("6_prwsy")] -position = Vector2(-112, 145) +position = Vector2(-80, 112) [node name="cheese_3" parent="Cheeses" groups=["Cheeses"] instance=ExtResource("6_prwsy")] -position = Vector2(113, 144) +position = Vector2(112, 80) [node name="cheese_4" parent="Cheeses" groups=["Cheeses"] instance=ExtResource("6_prwsy")] -position = Vector2(113, -58) +position = Vector2(112, -112) [node name="Enemies" type="Node" parent="."] @@ -72,4 +74,4 @@ position = Vector2(80, -48) shape = SubResource("RectangleShape2D_yseke") debug_color = Color(0.961248, 0, 0.511433, 0.42) -[connection signal="trigger_death_screen" from="player" to="game_manager" method="_on_player_trigger_death_menu"] +[connection signal="trigger_death_menu" from="player" to="game_manager" method="_on_player_trigger_death_menu"] diff --git a/scenes/menus/death_menu.tscn b/scenes/menus/death_menu.tscn index 0c13a51..d3b8e10 100644 --- a/scenes/menus/death_menu.tscn +++ b/scenes/menus/death_menu.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=3 format=3 uid="uid://86tsdexohbg4"] [ext_resource type="Script" path="res://scripts/menus/death_menu.gd" id="1_qinvd"] -[ext_resource type="FontFile" uid="uid://hu3cedqh4cft" path="res://assets/tools/fonts/PixelOperator8.ttf" id="1_vrx8g"] +[ext_resource type="FontFile" uid="uid://dwxiyviu3pln4" path="res://assets/tools/fonts/PixelOperator8.ttf" id="1_vrx8g"] -[node name="death_screen" type="CanvasLayer"] +[node name="death_menu" type="CanvasLayer"] script = ExtResource("1_qinvd") [node name="window" type="ColorRect" parent="."] diff --git a/scenes/menus/main_menu.tscn b/scenes/menus/main_menu.tscn index 72a2abf..9ea84e4 100644 --- a/scenes/menus/main_menu.tscn +++ b/scenes/menus/main_menu.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://bnvkpndk0p0c3"] [ext_resource type="Script" path="res://scripts/menus/main_menu.gd" id="1_q11qb"] -[ext_resource type="FontFile" uid="uid://bunedbeyryvnq" path="res://assets/tools/fonts/PixelOperator8-Bold.ttf" id="2_x5xsa"] -[ext_resource type="FontFile" uid="uid://hu3cedqh4cft" path="res://assets/tools/fonts/PixelOperator8.ttf" id="3_idsb0"] +[ext_resource type="FontFile" uid="uid://co7nycwx35e6j" path="res://assets/tools/fonts/PixelOperator8-Bold.ttf" id="2_x5xsa"] +[ext_resource type="FontFile" uid="uid://dwxiyviu3pln4" path="res://assets/tools/fonts/PixelOperator8.ttf" id="3_idsb0"] [node name="title_screen" type="CanvasLayer"] script = ExtResource("1_q11qb") diff --git a/scenes/menus/win_menu.tscn b/scenes/menus/win_menu.tscn index 52baffc..f504d0a 100644 --- a/scenes/menus/win_menu.tscn +++ b/scenes/menus/win_menu.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=3 format=3 uid="uid://bpw6urgdij01f"] [ext_resource type="Script" path="res://scripts/menus/win_menu.gd" id="1_5b8ax"] -[ext_resource type="FontFile" uid="uid://hu3cedqh4cft" path="res://assets/tools/fonts/PixelOperator8.ttf" id="1_ab6rm"] +[ext_resource type="FontFile" uid="uid://dwxiyviu3pln4" path="res://assets/tools/fonts/PixelOperator8.ttf" id="1_ab6rm"] -[node name="win_screen" type="CanvasLayer"] +[node name="win_menu" type="CanvasLayer"] script = ExtResource("1_5b8ax") [node name="window" type="ColorRect" parent="."] diff --git a/scenes/test/tile_map.tscn b/scenes/test/tile_map.tscn index 4dc8f2b..16426b7 100644 --- a/scenes/test/tile_map.tscn +++ b/scenes/test/tile_map.tscn @@ -287,5 +287,6 @@ format = 2 [node name="room_layer" parent="." instance=ExtResource("3_fn64f")] [node name="furniture_layer" parent="." instance=ExtResource("4_ao24x")] +tile_map_data = PackedByteArray(0, 0, 252, 255, 252, 255, 0, 0, 3, 0, 3, 0, 0, 0, 255, 255, 252, 255, 0, 0, 0, 0, 3, 0, 0, 0) [node name="decoration_layer" parent="." instance=ExtResource("5_1egfr")] diff --git a/scripts/characters/mouse/player.gd b/scripts/characters/mouse/player.gd index 891286c..a76d000 100644 --- a/scripts/characters/mouse/player.gd +++ b/scripts/characters/mouse/player.gd @@ -18,7 +18,7 @@ var spawn_point: Vector2 var max_health = 3 var current_health = max_health var is_dead = false -signal trigger_death_screen +signal trigger_death_menu # knockback variables var knockback_velocity = Vector2.ZERO @@ -180,7 +180,7 @@ func die(): is_dead = true animated_sprite_2d.play("death") Engine.time_scale = 0.5 - trigger_death_screen.emit() + trigger_death_menu.emit() # Function to check if hurtbox is entered func _on_hurtbox_body_entered(body): @@ -212,7 +212,7 @@ func fall_in_pit(): current_health = 0 hud.update_health(current_health) - trigger_death_screen.emit() + trigger_death_menu.emit() var tween = get_tree().create_tween() tween.tween_property($animated_sprite_2d, "scale", Vector2(), 1)