Skip to content

Commit

Permalink
Fixed the connections for Demo_level
Browse files Browse the repository at this point in the history
Now demo_level has a working death menu
  • Loading branch information
M4rcu2 committed Sep 19, 2024
1 parent 50ebce1 commit d3be79b
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 29 deletions.
18 changes: 9 additions & 9 deletions scenes/characters/mouse/player.tscn
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down
16 changes: 10 additions & 6 deletions scenes/levels/demo_level.tscn
Original file line number Diff line number Diff line change
@@ -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"]
Expand All @@ -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="."]

Expand Down Expand Up @@ -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"]
12 changes: 7 additions & 5 deletions scenes/levels/game.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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="."]

Expand Down Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions scenes/menus/death_menu.tscn
Original file line number Diff line number Diff line change
@@ -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="."]
Expand Down
4 changes: 2 additions & 2 deletions scenes/menus/main_menu.tscn
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 2 additions & 2 deletions scenes/menus/win_menu.tscn
Original file line number Diff line number Diff line change
@@ -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="."]
Expand Down
1 change: 1 addition & 0 deletions scenes/test/tile_map.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
6 changes: 3 additions & 3 deletions scripts/characters/mouse/player.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d3be79b

Please sign in to comment.