Refactor death screen logic; update level resource scene path and add new levels to game manager

objects/game_manager.tscn

@@ -1,16 +1,17 @@
-[gd_scene load_steps=4 format=3 uid="uid://b4eifkc31jsun"]
+[gd_scene load_steps=5 format=3 uid="uid://b4eifkc31jsun"]
 
 [ext_resource type="Script" uid="uid://dd30bgqiagi25" path="res://scripts/game_manager.gd" id="1_58t7u"]
-[ext_resource type="PackedScene" uid="uid://h60obxmju6mo" path="res://scenes/level_village_1.tscn" id="2_bentb"]
+[ext_resource type="PackedScene" uid="uid://bol7g83v2accs" path="res://scenes/level_village_1.tscn" id="2_bentb"]
 [ext_resource type="PackedScene" uid="uid://chqb11pfoqmeb" path="res://scenes/level_village_2.tscn" id="3_ajlkg"]
+[ext_resource type="PackedScene" uid="uid://h60obxmju6mo" path="res://scenes/level_village_4.tscn" id="4_se5tb"]
 
 [node name="GameManager" type="Node"]
 script = ExtResource("1_58t7u")
-level_scenes = Array[PackedScene]([ExtResource("2_bentb"), ExtResource("3_ajlkg")])
+level_scenes = Array[PackedScene]([ExtResource("2_bentb"), ExtResource("3_ajlkg"), null, ExtResource("4_se5tb")])
 player_state = {
 "coins": 0,
 "current_level": 0,
 "lives": 3,
-"unlocked_levels": [ExtResource("2_bentb")],
+"unlocked_levels": [ExtResource("4_se5tb")],
 "unlocked_skills": []
 }

objects/level/base_level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=4 uid="uid://fw5fbdy5gcmx"]
+[gd_scene load_steps=20 format=4 uid="uid://fw5fbdy5gcmx"]
 
 [ext_resource type="PackedScene" uid="uid://cawlpch2lk3a2" path="res://objects/level/world_environment.tscn" id="1_hb5r3"]
 [ext_resource type="PackedScene" uid="uid://bqi5s710xb1ju" path="res://objects/entities/brick_player.tscn" id="1_lbnsn"]
@@ -12,6 +12,7 @@
 [ext_resource type="TileSet" uid="uid://bc5a20s6kuy8e" path="res://resources/tilesets/village/entities.tres" id="10_8xrv5"]
 [ext_resource type="TileSet" uid="uid://bbppo0irxdmqy" path="res://resources/tilesets/village/foreground.tres" id="11_0vx27"]
 [ext_resource type="Script" uid="uid://8r1y8elyw7kt" path="res://scripts/console_management.gd" id="12_8xrv5"]
+[ext_resource type="PackedScene" uid="uid://bqom4cm7r18db" path="res://objects/entities/killzone.tscn" id="13_0vx27"]
 
 [sub_resource type="Gradient" id="Gradient_qb72p"]
 colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0)
@@ -60,6 +61,16 @@ process_material = SubResource("ParticleProcessMaterial_lgb3u")
 
 [node name="UI Layer" parent="." instance=ExtResource("2_lbnsn")]
 
+[node name="HUD" parent="UI Layer" index="0" node_paths=PackedStringArray("player_health")]
+player_health = NodePath("../../Brick Player/HealthComponent")
+
+[node name="DeathScreen" parent="UI Layer" index="1" node_paths=PackedStringArray("nodes_to_disable")]
+nodes_to_disable = [NodePath("../../Brick Player")]
+
+[node name="Marketplace" parent="UI Layer" index="3" node_paths=PackedStringArray("skill_unlocker", "components_to_disable")]
+skill_unlocker = NodePath("../../Brick Player/SkillUnlockerComponent")
+components_to_disable = [NodePath("../../Brick Player")]
+
 [node name="Global Light" parent="." instance=ExtResource("3_3732a")]
 
 [node name="Camera2D" parent="." instance=ExtResource("5_517ha")]
@@ -100,4 +111,8 @@ skill_unlocker = NodePath("../Brick Player/SkillUnlockerComponent")
 skill_manager = NodePath("../Brick Player/SkillManager")
 metadata/_custom_type_script = "uid://8r1y8elyw7kt"
 
+[node name="Killzone" parent="." instance=ExtResource("13_0vx27")]
+position = Vector2(215, 324)
+
 [editable path="Brick Player"]
+[editable path="UI Layer"]

project.godot

@@ -16,9 +16,9 @@ config/name_localized={
 "pl": "Przygody Pana Cegły"
 }
 config/version="in-dev"
-run/main_scene="res://scenes/level_village_1.tscn"
+run/main_scene="uid://bol7g83v2accs"
 config/features=PackedStringArray("4.4", "GL Compatibility")
-run/max_fps=144
+run/max_fps=180
 boot_splash/show_image=false
 boot_splash/fullsize=false
 boot_splash/use_filter=false

resources/levels/village/village_1.tres

@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="LevelResource" load_steps=2 format=3 uid="uid://cqtalsov2bkpo"]
+
+[ext_resource type="Script" uid="uid://cp68km8bykymb" path="res://scripts/resources/level_resource.gd" id="2_a2hpx"]
+
+[resource]
+resource_local_to_scene = true
+script = ExtResource("2_a2hpx")
+level_name = "Village - 1"
+scene_path = "res://scenes/level_village_1.tscn"
+metadata/_custom_type_script = "uid://cp68km8bykymb"

resources/levels/village/village_2.tres

@@ -0,0 +1,9 @@
+[gd_resource type="Resource" script_class="LevelResource" load_steps=2 format=3 uid="uid://dlwkbjw1l33uq"]
+
+[ext_resource type="Script" uid="uid://cp68km8bykymb" path="res://scripts/resources/level_resource.gd" id="1_1tjmh"]
+
+[resource]
+script = ExtResource("1_1tjmh")
+level_name = "Village - 2"
+scene_path = "res://scenes/level_village_2.tscn"
+metadata/_custom_type_script = "uid://cp68km8bykymb"

resources/levels/village/village_3.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="LevelResource" load_steps=2 format=3 uid="uid://b63u5qfp8p7pv"]
+
+[ext_resource type="Script" uid="uid://cp68km8bykymb" path="res://scripts/resources/level_resource.gd" id="1_3v5yj"]
+
+[resource]
+script = ExtResource("1_3v5yj")
+level_name = "Village - 3"
+metadata/_custom_type_script = "uid://cp68km8bykymb"

resources/levels/village/village_4.tres

@@ -0,0 +1,9 @@
+[gd_resource type="Resource" script_class="LevelResource" load_steps=2 format=3 uid="uid://cxfei28yu3buh"]
+
+[ext_resource type="Script" uid="uid://cp68km8bykymb" path="res://scripts/resources/level_resource.gd" id="1_upuk8"]
+
+[resource]
+script = ExtResource("1_upuk8")
+level_name = "Village - 4"
+scene_path = "res://scenes/level_village_4.tscn"
+metadata/_custom_type_script = "uid://cp68km8bykymb"

resources/levels/village/village_5.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="LevelResource" load_steps=2 format=3 uid="uid://bhs2j7k0ety3a"]
+
+[ext_resource type="Script" uid="uid://cp68km8bykymb" path="res://scripts/resources/level_resource.gd" id="1_owe0p"]
+
+[resource]
+script = ExtResource("1_owe0p")
+level_name = "Village - 5"
+metadata/_custom_type_script = "uid://cp68km8bykymb"

scenes/level_village_2.tscn

@@ -48,6 +48,7 @@ color_ramp = SubResource("GradientTexture1D_f1fvy")
 [sub_resource type="Resource" id="Resource_bqjcg"]
 script = ExtResource("4_ufsbg")
 level_name = "Village -2 "
+scene_path = ""
 metadata/_custom_type_script = "uid://cp68km8bykymb"
 
 [sub_resource type="Resource" id="Resource_0nwt7"]

scripts/resources/level_resource.gd

@@ -2,4 +2,4 @@ class_name LevelResource
 extends Resource
 
 @export var level_name: String
-@export var scene_path: PackedScene
+@export var scene_path: String

scripts/ui/death_screen.gd

@@ -58,5 +58,5 @@ func on_timeout() -> void:
 
 	if gm.get_lives() == 0:
 		return
-		
+
 	get_tree().reload_current_scene()