From f9cb59d182c6a4ee3e0147555f4a20424249d124 Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Sun, 31 Aug 2025 15:17:47 +0200 Subject: [PATCH] Add HealthComponent to bullet and update various resources for skill upgrades --- objects/entities/bullet.tscn | 8 +++++++- objects/fxs/shockwave.tscn | 4 ++-- resources/skills/brick_armor.tres | 2 +- resources/skills/brick_shield.tres | 2 +- resources/skills/brick_throw.tres | 2 +- resources/skills/double_jump.tres | 2 +- resources/skills/explosive_brick.tres | 2 +- resources/skills/fire_brick.tres | 2 +- resources/skills/ground_pound_skill.tres | 2 +- resources/skills/ice_brick.tres | 2 +- resources/skills/magnetic.tres | 2 +- resources/skills/xray_vision.tres | 2 +- scenes/level_village_2.tscn | 14 ++++++++++++-- 13 files changed, 31 insertions(+), 15 deletions(-) diff --git a/objects/entities/bullet.tscn b/objects/entities/bullet.tscn index 9b280c5..f6509c9 100644 --- a/objects/entities/bullet.tscn +++ b/objects/entities/bullet.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://bhc7y4xugu4q7"] +[gd_scene load_steps=11 format=3 uid="uid://bhc7y4xugu4q7"] [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_w543f"] [ext_resource type="Script" uid="uid://2i7p7v135u7c" path="res://scripts/components/DamageComponent.cs" id="2_6th6w"] @@ -8,6 +8,7 @@ [ext_resource type="Script" uid="uid://c7p06t0eax8am" path="res://scripts/components/StraightMotionComponent.cs" id="6_lycw2"] [ext_resource type="Script" uid="uid://cfw8nbrarex0i" path="res://scripts/components/BulletComponent.cs" id="7_2aweg"] [ext_resource type="PackedScene" uid="uid://c1iorglk708g0" path="res://objects/fxs/terrain_hit_fx.tscn" id="8_6th6w"] +[ext_resource type="Script" uid="uid://dgb8bqcri7nsj" path="res://scripts/components/HealthComponent.cs" id="9_e0mqp"] [sub_resource type="CircleShape2D" id="CircleShape2D_txsw8"] radius = 4.0 @@ -63,3 +64,8 @@ BulletSprite = NodePath("../Sprite2D") [node name="TerrainHitFX" parent="." instance=ExtResource("8_6th6w")] z_index = 3 + +[node name="HealthComponent" type="Node2D" parent="."] +script = ExtResource("9_e0mqp") +Health = 0.1 +metadata/_custom_type_script = "uid://dgb8bqcri7nsj" diff --git a/objects/fxs/shockwave.tscn b/objects/fxs/shockwave.tscn index 67bf10a..1da3217 100644 --- a/objects/fxs/shockwave.tscn +++ b/objects/fxs/shockwave.tscn @@ -4,10 +4,10 @@ [ext_resource type="Script" uid="uid://oyf25mpc5etr" path="res://scripts/components/LifetimeComponent.cs" id="2_mcqxt"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_jwgyp"] -size = Vector2(128, 20) +size = Vector2(128, 32) [node name="Shockwave" type="Area2D"] -collision_layer = 0 +collision_layer = 20 collision_mask = 72 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/resources/skills/brick_armor.tres b/resources/skills/brick_armor.tres index 59601fb..9e3b28b 100644 --- a/resources/skills/brick_armor.tres +++ b/resources/skills/brick_armor.tres @@ -21,5 +21,5 @@ IsActive = false Level = 1 Type = 1 Node = ExtResource("1_aqcna") -Upgrades = [SubResource("Resource_xwv1u"), SubResource("Resource_xwv1u")] +Upgrades = Array[ExtResource("2_kqsqd")]([SubResource("Resource_xwv1u"), SubResource("Resource_xwv1u")]) metadata/_custom_type_script = "uid://d4crrfmbgxnqf" diff --git a/resources/skills/brick_shield.tres b/resources/skills/brick_shield.tres index 0b6ff05..238ac00 100644 --- a/resources/skills/brick_shield.tres +++ b/resources/skills/brick_shield.tres @@ -30,5 +30,5 @@ IsActive = false Level = 1 Type = 2 Node = ExtResource("1_xjknp") -Upgrades = [SubResource("Resource_mu2sy"), SubResource("Resource_5ab4a")] +Upgrades = Array[ExtResource("2_lr0w4")]([SubResource("Resource_mu2sy"), SubResource("Resource_5ab4a")]) metadata/_custom_type_script = "uid://d4crrfmbgxnqf" diff --git a/resources/skills/brick_throw.tres b/resources/skills/brick_throw.tres index e88e85d..a718a08 100644 --- a/resources/skills/brick_throw.tres +++ b/resources/skills/brick_throw.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" load_steps=6 format=3 uid="uid://dw5ee2lpeypnb"] +[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://dw5ee2lpeypnb"] [ext_resource type="PackedScene" uid="uid://coayig4dxelo2" path="res://objects/player_skills/brick_throw_skill.tscn" id="1_5gnea"] [ext_resource type="Texture2D" uid="uid://dxtdwgg3po0eg" path="res://sprites/brick_power_Skill_icon.png" id="2_yimbq"] diff --git a/resources/skills/double_jump.tres b/resources/skills/double_jump.tres index b15b10f..4310f76 100644 --- a/resources/skills/double_jump.tres +++ b/resources/skills/double_jump.tres @@ -19,5 +19,5 @@ IsActive = false Level = 1 Type = 2 Node = ExtResource("1_t7o84") -Upgrades = [SubResource("Resource_0fn2n")] +Upgrades = Array[ExtResource("2_kywbf")]([SubResource("Resource_0fn2n")]) metadata/_custom_type_script = "uid://d4crrfmbgxnqf" diff --git a/resources/skills/explosive_brick.tres b/resources/skills/explosive_brick.tres index 898d7d2..d675bea 100644 --- a/resources/skills/explosive_brick.tres +++ b/resources/skills/explosive_brick.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" load_steps=6 format=3 uid="uid://cdp8sex36vdq2"] +[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://cdp8sex36vdq2"] [ext_resource type="PackedScene" uid="uid://cfses3kn3y8qw" path="res://objects/player_skills/exploding_brick_throw_skill.tscn" id="2_gt8f6"] [ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="3_txev8"] diff --git a/resources/skills/fire_brick.tres b/resources/skills/fire_brick.tres index adb596d..5d727e0 100644 --- a/resources/skills/fire_brick.tres +++ b/resources/skills/fire_brick.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" load_steps=6 format=3 uid="uid://cr5lo4h8wm0jc"] +[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://cr5lo4h8wm0jc"] [ext_resource type="PackedScene" uid="uid://dfm2you3v5ap4" path="res://objects/player_skills/fire_brick_throw_skill.tscn" id="2_d6y6i"] [ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="3_1ooyb"] diff --git a/resources/skills/ground_pound_skill.tres b/resources/skills/ground_pound_skill.tres index b5bb2ba..18748ab 100644 --- a/resources/skills/ground_pound_skill.tres +++ b/resources/skills/ground_pound_skill.tres @@ -19,5 +19,5 @@ IsActive = false Level = 1 Type = 2 Node = ExtResource("1_auljr") -Upgrades = [SubResource("Resource_upxa7")] +Upgrades = Array[ExtResource("2_tkhf7")]([SubResource("Resource_upxa7")]) metadata/_custom_type_script = "uid://d4crrfmbgxnqf" diff --git a/resources/skills/ice_brick.tres b/resources/skills/ice_brick.tres index 40802a0..9ffda13 100644 --- a/resources/skills/ice_brick.tres +++ b/resources/skills/ice_brick.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" load_steps=6 format=3 uid="uid://ceakv6oqob6m7"] +[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://ceakv6oqob6m7"] [ext_resource type="PackedScene" uid="uid://dpmmacva7qf8j" path="res://objects/player_skills/ice_brick_throw_skill.tscn" id="2_gm1ka"] [ext_resource type="Texture2D" uid="uid://c1qaxspv8aemf" path="res://sprites/ice_brick_skill_icon.png" id="3_6btth"] diff --git a/resources/skills/magnetic.tres b/resources/skills/magnetic.tres index 1f69f9d..b207d3b 100644 --- a/resources/skills/magnetic.tres +++ b/resources/skills/magnetic.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" load_steps=6 format=3 uid="uid://d3bjre2etov1n"] +[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://d3bjre2etov1n"] [ext_resource type="Texture2D" uid="uid://cvhoq7aubxlmq" path="res://sprites/ui/magnetic_skill_icon.png" id="1_16qcg"] [ext_resource type="PackedScene" uid="uid://cunyndudjh2he" path="res://objects/player_skills/magnetic_skill.tscn" id="1_er41s"] diff --git a/resources/skills/xray_vision.tres b/resources/skills/xray_vision.tres index 4019da9..dcee98d 100644 --- a/resources/skills/xray_vision.tres +++ b/resources/skills/xray_vision.tres @@ -30,5 +30,5 @@ IsActive = false Level = 1 Type = 1 Node = ExtResource("1_ax2d8") -Upgrades = [SubResource("Resource_72ltj"), SubResource("Resource_2kdfi")] +Upgrades = Array[ExtResource("2_o726x")]([SubResource("Resource_72ltj"), SubResource("Resource_2kdfi")]) metadata/_custom_type_script = "uid://d4crrfmbgxnqf" diff --git a/scenes/level_village_2.tscn b/scenes/level_village_2.tscn index ff0b14e..0d62d5c 100644 --- a/scenes/level_village_2.tscn +++ b/scenes/level_village_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=4 uid="uid://chqb11pfoqmeb"] +[gd_scene load_steps=25 format=4 uid="uid://chqb11pfoqmeb"] [ext_resource type="PackedScene" uid="uid://bqi5s710xb1ju" path="res://objects/entities/brick_player.tscn" id="1_wcma7"] [ext_resource type="PackedScene" uid="uid://cawlpch2lk3a2" path="res://objects/level/world_environment.tscn" id="2_ot3dy"] @@ -16,6 +16,7 @@ [ext_resource type="PackedScene" uid="uid://d0s2abysa86rq" path="res://objects/entities/child.tscn" id="16_lc0ll"] [ext_resource type="PackedScene" uid="uid://to2xnqev0pu1" path="res://objects/entities/cage.tscn" id="17_h4uvs"] [ext_resource type="PackedScene" uid="uid://bwdlmualj6xbw" path="res://objects/entities/enemy.tscn" id="18_girek"] +[ext_resource type="PackedScene" uid="uid://bqom4cm7r18db" path="res://objects/entities/killzone.tscn" id="18_hcsb6"] [ext_resource type="PackedScene" uid="uid://bd51frym6mm7v" path="res://objects/entities/lever.tscn" id="20_h4uvs"] [sub_resource type="Gradient" id="Gradient_qb72p"] @@ -50,7 +51,7 @@ color_ramp = SubResource("GradientTexture1D_f1fvy") [sub_resource type="Resource" id="Resource_0nwt7"] script = ExtResource("7_y1tp2") -duration = 0.25 +duration = 0.1 transition = 3 ease = 2 @@ -62,6 +63,12 @@ z_index = 1 [node name="HitParticles" parent="Brick Player" index="25"] process_material = SubResource("ParticleProcessMaterial_lgb3u") +[node name="VisibleOnScreenNotifier2D" parent="Brick Player" index="28"] +process_mode = 4 + +[node name="KillPlayerOutOfScreen" parent="Brick Player" index="29"] +process_mode = 4 + [node name="WorldEnvironment" parent="." instance=ExtResource("2_ot3dy")] [node name="UI Layer" parent="." instance=ExtResource("3_cjqhe")] @@ -165,6 +172,9 @@ position = Vector2(792, -784) [node name="Lever" parent="." instance=ExtResource("20_h4uvs")] position = Vector2(-231, -776) +[node name="Killzone" parent="." instance=ExtResource("18_hcsb6")] +position = Vector2(625, 568) + [connection signal="Death" from="Brick Player/HealthComponent" to="UI Layer/DeathScreen" method="OnPlayerDeath"] [connection signal="Death" from="Brick Player/HealthComponent" to="UI Layer/GameOverScreen" method="OnPlayerDeath"]