From c6ceaa28d2e59701bc7d2da480b39c0597caad6a Mon Sep 17 00:00:00 2001 From: Rendo Date: Wed, 23 Jul 2025 16:39:56 +0500 Subject: [PATCH] Zombie hp meta rebalanced --- assets/levels/balance_and_spawn_test.tres | 1 + assets/levels/test_level_for_execution.tres | 153 ------------------- assets/shaders/CG_color_blender.gdshader | 16 -- assets/shaders/CG_color_blender.gdshader.uid | 1 - assets/shaders/radial_progress.gdshader | 5 + assets/shaders/radial_progress.gdshader.uid | 1 + assets/zombies/door_zombie.tres | 16 -- scenes/entities/Zombies/bucket_zombie.tscn | 70 ++++++--- scenes/entities/Zombies/cone_zombie.tscn | 57 ++++--- scenes/entities/Zombies/hobo.tscn | 88 ++++------- scenes/entities/Zombies/zombie.tscn | 46 +++--- scenes/gui/shovel_button.tscn | 9 +- scripts/gui/ShovelButton.cs | 1 + 13 files changed, 155 insertions(+), 309 deletions(-) delete mode 100644 assets/levels/test_level_for_execution.tres delete mode 100644 assets/shaders/CG_color_blender.gdshader delete mode 100644 assets/shaders/CG_color_blender.gdshader.uid create mode 100644 assets/shaders/radial_progress.gdshader create mode 100644 assets/shaders/radial_progress.gdshader.uid delete mode 100644 assets/zombies/door_zombie.tres diff --git a/assets/levels/balance_and_spawn_test.tres b/assets/levels/balance_and_spawn_test.tres index e3038a4..67c67ec 100644 --- a/assets/levels/balance_and_spawn_test.tres +++ b/assets/levels/balance_and_spawn_test.tres @@ -131,5 +131,6 @@ wavePercentage = 0.5 standardWaveDelay = 30.0 initialWaveDelay = 20.0 reward = ExtResource("1_pd3l1") +forbiddenPlants = [] waves = [SubResource("Resource_qsvr4"), SubResource("Resource_otfbt"), SubResource("Resource_nv3y4"), SubResource("Resource_mt5r8"), SubResource("Resource_kugcf"), SubResource("Resource_oyvhx"), SubResource("Resource_k4k25"), SubResource("Resource_oxbea"), SubResource("Resource_5cdj6")] initialScenes = Array[PackedScene]([null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]) diff --git a/assets/levels/test_level_for_execution.tres b/assets/levels/test_level_for_execution.tres deleted file mode 100644 index ec3011c..0000000 --- a/assets/levels/test_level_for_execution.tres +++ /dev/null @@ -1,153 +0,0 @@ -[gd_resource type="Resource" script_class="AdventureLevelResource" load_steps=40 format=3 uid="uid://br3364jty1j0i"] - -[ext_resource type="PackedScene" uid="uid://xu4i6tmkv00a" path="res://scenes/entities/Zombies/bucket_zombie.tscn" id="1_n6yt3"] -[ext_resource type="Script" uid="uid://bximdujbkj2n4" path="res://addons/pvzadventure/AdventureLevelResource.cs" id="1_qb1ge"] -[ext_resource type="PackedScene" uid="uid://bw1w8jp0yeypy" path="res://scenes/entities/plants/aloe.tscn" id="1_y8rkm"] -[ext_resource type="Script" uid="uid://cw7yc3i2lgcja" path="res://addons/pvzadventure/WaveEvent.cs" id="2_8aewt"] -[ext_resource type="PackedScene" uid="uid://qq0cw8xtcoj3" path="res://scenes/entities/plants/garlic.tscn" id="2_dbrq5"] -[ext_resource type="Script" uid="uid://7rptlb5qr3b6" path="res://addons/pvzadventure/WaveData.cs" id="3_hlq35"] -[ext_resource type="PackedScene" uid="uid://bgqmwsb6ynm81" path="res://scenes/entities/Zombies/hobo.tscn" id="4_8h2xm"] -[ext_resource type="Script" uid="uid://dl12rj75tk2qi" path="res://addons/pvzadventure/RowSpawn.cs" id="4_8miqm"] -[ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="5_8miqm"] -[ext_resource type="Resource" uid="uid://dkhjlu7u0vny6" path="res://assets/zombies/buckethead.tres" id="6_s62qb"] -[ext_resource type="Resource" uid="uid://nceohd32fkxk" path="res://assets/zombies/conehead.tres" id="7_yvl2y"] -[ext_resource type="Resource" uid="uid://buvacn56kyy2p" path="res://assets/zombies/basic.tres" id="8_ulhin"] -[ext_resource type="Resource" uid="uid://c38vfdw5b60xw" path="res://assets/zombies/hobo.tres" id="9_ulhin"] -[ext_resource type="Resource" uid="uid://cugwy5bw4wljr" path="res://assets/zombies/door_zombie.tres" id="10_cafd0"] - -[sub_resource type="Resource" id="Resource_n6yt3"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, ExtResource("8_ulhin"), null, null]) - -[sub_resource type="Resource" id="Resource_8aewt"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_n6yt3")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 30.0 -isHugeWave = true - -[sub_resource type="Resource" id="Resource_8h2xm"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, ExtResource("8_ulhin"), null, ExtResource("8_ulhin"), null]) - -[sub_resource type="Resource" id="Resource_hlq35"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_8h2xm")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 30.0 -isHugeWave = false - -[sub_resource type="Resource" id="Resource_lxlrs"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, ExtResource("8_ulhin"), null, null]) - -[sub_resource type="Resource" id="Resource_8miqm"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_lxlrs")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = true - -[sub_resource type="Resource" id="Resource_3hvjc"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, ExtResource("7_yvl2y"), ExtResource("7_yvl2y"), null]) - -[sub_resource type="Resource" id="Resource_3h7h3"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([ExtResource("7_yvl2y"), null, ExtResource("7_yvl2y"), null, null]) - -[sub_resource type="Resource" id="Resource_s62qb"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_3hvjc"), SubResource("Resource_3h7h3")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = false - -[sub_resource type="Resource" id="Resource_ntuje"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, ExtResource("8_ulhin"), null, ExtResource("7_yvl2y")]) - -[sub_resource type="Resource" id="Resource_psuap"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, ExtResource("8_ulhin"), null, ExtResource("7_yvl2y"), null]) - -[sub_resource type="Resource" id="Resource_yvl2y"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_ntuje"), SubResource("Resource_psuap")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = false - -[sub_resource type="Resource" id="Resource_elhtc"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, null, ExtResource("8_ulhin"), null]) - -[sub_resource type="Resource" id="Resource_cmki6"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, ExtResource("8_ulhin"), null, null]) - -[sub_resource type="Resource" id="Resource_f5jkp"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, ExtResource("6_s62qb"), null, null, null]) - -[sub_resource type="Resource" id="Resource_ulhin"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_elhtc"), SubResource("Resource_cmki6"), SubResource("Resource_f5jkp")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = false - -[sub_resource type="Resource" id="Resource_ipg75"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, ExtResource("8_ulhin"), null, ExtResource("8_ulhin"), null]) - -[sub_resource type="Resource" id="Resource_4vq7k"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, ExtResource("9_ulhin"), null, null]) - -[sub_resource type="Resource" id="Resource_cafd0"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_ipg75"), SubResource("Resource_4vq7k")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = true - -[sub_resource type="Resource" id="Resource_2tcqp"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([null, null, null, ExtResource("7_yvl2y"), null]) - -[sub_resource type="Resource" id="Resource_y8rkm"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_2tcqp")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = false - -[sub_resource type="Resource" id="Resource_6i5yw"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([ExtResource("10_cafd0"), ExtResource("8_ulhin"), ExtResource("6_s62qb"), ExtResource("7_yvl2y"), ExtResource("9_ulhin")]) - -[sub_resource type="Resource" id="Resource_y4q8x"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([ExtResource("7_yvl2y"), ExtResource("7_yvl2y"), ExtResource("8_ulhin"), ExtResource("8_ulhin"), null]) - -[sub_resource type="Resource" id="Resource_71fmc"] -script = ExtResource("4_8miqm") -zombies = Array[ExtResource("5_8miqm")]([ExtResource("9_ulhin"), ExtResource("8_ulhin"), ExtResource("8_ulhin"), null, null]) - -[sub_resource type="Resource" id="Resource_dbrq5"] -script = ExtResource("3_hlq35") -zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_6i5yw"), SubResource("Resource_y4q8x"), SubResource("Resource_71fmc")]) -events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = true - -[resource] -script = ExtResource("1_qb1ge") -startSun = 50 -wavePercentage = 0.5 -standardWaveDelay = 5.0 -initialWaveDelay = 20.0 -waves = [SubResource("Resource_8aewt"), SubResource("Resource_hlq35"), SubResource("Resource_8miqm"), SubResource("Resource_s62qb"), SubResource("Resource_yvl2y"), SubResource("Resource_ulhin"), SubResource("Resource_cafd0"), SubResource("Resource_y8rkm"), SubResource("Resource_dbrq5")] -initialScenes = Array[PackedScene]([null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ExtResource("1_n6yt3"), null, null, null, ExtResource("1_y8rkm"), null, ExtResource("2_dbrq5"), null, null, null, null, null, null, null, null, null, null, null, ExtResource("4_8h2xm"), null, null, null, null, null, null, null, null, null]) -metadata/_custom_type_script = "uid://bximdujbkj2n4" diff --git a/assets/shaders/CG_color_blender.gdshader b/assets/shaders/CG_color_blender.gdshader deleted file mode 100644 index 8dfdb93..0000000 --- a/assets/shaders/CG_color_blender.gdshader +++ /dev/null @@ -1,16 +0,0 @@ -shader_type canvas_item; -render_mode unshaded; - -uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest; -uniform vec4 blend_color : source_color; -uniform float amount : hint_range(0,1,0.01); - -void fragment() { - vec4 c = textureLod(screen_texture, SCREEN_UV, 0.0); - - if (c.a > 0.0001) { - c.rgb /= c.a; - } - - COLOR *= mix(c,blend_color * c.a,amount); -} \ No newline at end of file diff --git a/assets/shaders/CG_color_blender.gdshader.uid b/assets/shaders/CG_color_blender.gdshader.uid deleted file mode 100644 index ca88a52..0000000 --- a/assets/shaders/CG_color_blender.gdshader.uid +++ /dev/null @@ -1 +0,0 @@ -uid://d0eo5uuj222c4 diff --git a/assets/shaders/radial_progress.gdshader b/assets/shaders/radial_progress.gdshader new file mode 100644 index 0000000..1840e61 --- /dev/null +++ b/assets/shaders/radial_progress.gdshader @@ -0,0 +1,5 @@ +shader_type canvas_item; + +void fragment() { + COLOR = vec4(1); +} diff --git a/assets/shaders/radial_progress.gdshader.uid b/assets/shaders/radial_progress.gdshader.uid new file mode 100644 index 0000000..44ff23e --- /dev/null +++ b/assets/shaders/radial_progress.gdshader.uid @@ -0,0 +1 @@ +uid://c5kv2gwtme1dk diff --git a/assets/zombies/door_zombie.tres b/assets/zombies/door_zombie.tres deleted file mode 100644 index dfe80d9..0000000 --- a/assets/zombies/door_zombie.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=3 format=3 uid="uid://cugwy5bw4wljr"] - -[ext_resource type="PackedScene" uid="uid://p5jhgg2r7e07" path="res://scenes/entities/Zombies/door_zombie.tscn" id="1_3664b"] -[ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="3_bydiv"] - -[resource] -script = ExtResource("3_bydiv") -name_key = "doorz" -description_key = "doorz_desc" -Cost = 4.5 -Scene = ExtResource("1_3664b") -ReloadTime = 1.0 -ReloadProgress = 0.0 -Layer = 1 -Order = 4 -metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/scenes/entities/Zombies/bucket_zombie.tscn b/scenes/entities/Zombies/bucket_zombie.tscn index 8768e5a..e48a05c 100644 --- a/scenes/entities/Zombies/bucket_zombie.tscn +++ b/scenes/entities/Zombies/bucket_zombie.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=13 format=3 uid="uid://xu4i6tmkv00a"] +[gd_scene load_steps=17 format=3 uid="uid://xu4i6tmkv00a"] [ext_resource type="PackedScene" uid="uid://hhjbqkjqpt7x" path="res://scenes/entities/Zombies/cone_zombie.tscn" id="1_mwqpo"] +[ext_resource type="Shader" uid="uid://btf4xhu31ln6n" path="res://assets/shaders/canvas_group_flash.gdshader" id="2_lea3a"] [ext_resource type="Texture2D" uid="uid://ce04l60l6mhfk" path="res://assets/sprites/bucket1.tres" id="3_0nlp0"] +[ext_resource type="Shader" uid="uid://cgc7spjkhsx7c" path="res://assets/shaders/generic_flash.gdshader" id="3_xq7ta"] [ext_resource type="Script" uid="uid://c3cfnrmnnuqms" path="res://addons/floatmodifiers/FloatModifiers.cs" id="4_1s2fn"] [ext_resource type="Texture2D" uid="uid://ikk4jp7mvm3s" path="res://assets/sprites/bucket2.tres" id="4_xx7fu"] [ext_resource type="AudioStream" uid="uid://bu1egfsyplpx4" path="res://assets/audio/sfx/metalhit_generic.tres" id="5_lt6ps"] @@ -9,6 +11,20 @@ [ext_resource type="AudioStream" uid="uid://w0qfwds4o3ti" path="res://assets/audio/sfx/hit_generic.tres" id="6_kedip"] [ext_resource type="Texture2D" uid="uid://dacgbwohpmeed" path="res://assets/sprites/zombies/basic.png" id="6_lea3a"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_03nuu"] +resource_local_to_scene = true +shader = ExtResource("2_lea3a") +shader_parameter/FLASH_COLOR = Color(1, 0.709804, 0.439216, 0.5) +shader_parameter/blend = 0.0 +shader_parameter/selected = false + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_1iamf"] +resource_local_to_scene = true +shader = ExtResource("3_xq7ta") +shader_parameter/FLASH_COLOR = Color(1, 0.709804, 0.439216, 0.5) +shader_parameter/selected = false +shader_parameter/blend = 0.0 + [sub_resource type="AtlasTexture" id="AtlasTexture_wfem3"] atlas = ExtResource("6_lea3a") region = Rect2(24, 2, 9, 9) @@ -33,6 +49,9 @@ mult_value = 1.0 [node name="BucketZombie" instance=ExtResource("1_mwqpo")] +[node name="CanvasGroup" parent="." index="0"] +material = SubResource("ShaderMaterial_03nuu") + [node name="Zombie" parent="CanvasGroup/basic_zombie_walk" index="0"] use_parent_material = false @@ -45,53 +64,55 @@ use_parent_material = false [node name="RightUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="1"] use_parent_material = false -scale = Vector2(0.999836, 0.999836) +scale = Vector2(0.999834, 0.999834) [node name="RightLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="1"] -scale = Vector2(0.999831, 0.999831) +scale = Vector2(0.999833, 0.999833) [node name="RightFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" index="0"] -scale = Vector2(0.999833, 0.999833) +scale = Vector2(0.999832, 0.999832) [node name="LeftUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="2"] use_parent_material = false -scale = Vector2(0.999831, 0.999831) +scale = Vector2(0.999832, 0.999832) [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] scale = Vector2(0.999833, 0.999833) [node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] -scale = Vector2(0.999832, 0.999832) +scale = Vector2(0.999835, 0.999835) [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] use_parent_material = false -scale = Vector2(0.999826, 0.999826) +scale = Vector2(0.999825, 0.999825) [node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] use_parent_material = false -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999828, 0.999828) [node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999826, 0.999826) [node name="RightHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" index="0"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999829, 0.999829) [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] -rotation = 0.0612749 +rotation = 0.111661 [node name="Head" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="3"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999826, 0.999826) [node name="Right_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="0"] position = Vector2(-16, -8) +scale = Vector2(1, 1) [node name="Left_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="1"] position = Vector2(-4, -9) +scale = Vector2(1, 1) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] -position = Vector2(-2.82709, 2.57856) -rotation = 0.0226432 +position = Vector2(-2.90626, 2.76757) +rotation = 0.0199805 scale = Vector2(0.999827, 0.999827) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="1"] @@ -101,28 +122,29 @@ scale = Vector2(0.999827, 0.999827) position = Vector2(-6, -8) [node name="Sprite" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Hat" index="0"] +material = SubResource("ShaderMaterial_1iamf") position = Vector2(0.994479, -10.0058) texture = ExtResource("3_0nlp0") degradationStages = Array[Texture]([ExtResource("3_0nlp0"), ExtResource("4_xx7fu"), ExtResource("5_v1iwd")]) [node name="LeftUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="4"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999829, 0.999829) [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] -rotation = 0.132621 +rotation = 0.146066 scale = Vector2(0.999996, 0.999996) [node name="Left_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" index="0"] show_behind_parent = false position = Vector2(-0.99983, 12.9978) -rotation = -0.0968181 -scale = Vector2(0.999658, 0.999658) +rotation = -0.085433 +scale = Vector2(0.999659, 0.999659) [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] scale = Vector2(0.999826, 0.999826) [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999829, 0.999829) [node name="Left_Hand" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm/LeftHand" index="0"] texture = SubResource("AtlasTexture_wfem3") @@ -141,11 +163,17 @@ _damage = SubResource("Resource_lea3a") [node name="Mover" parent="." index="4"] _speed = SubResource("Resource_v1iwd") -_speedControlMult = 2.25202 +_speedControlMult = 1.88019 [node name="HitPlayer" parent="." index="5"] playlist = Array[AudioStream]([ExtResource("5_lt6ps"), ExtResource("6_kedip")]) channels = Array[String](["metal_hit", "hit"]) [node name="Armor" parent="." index="6"] -MaxHP = 375.0 +MaxHP = 550.0 + +[node name="FlashController" parent="Armor" index="0"] +shaderMaterial = SubResource("ShaderMaterial_1iamf") + +[node name="FlashController" parent="." index="10"] +shaderMaterial = SubResource("ShaderMaterial_03nuu") diff --git a/scenes/entities/Zombies/cone_zombie.tscn b/scenes/entities/Zombies/cone_zombie.tscn index c5adc24..67109b7 100644 --- a/scenes/entities/Zombies/cone_zombie.tscn +++ b/scenes/entities/Zombies/cone_zombie.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=16 format=3 uid="uid://hhjbqkjqpt7x"] +[gd_scene load_steps=18 format=3 uid="uid://hhjbqkjqpt7x"] [ext_resource type="PackedScene" uid="uid://co11v3w8hbwgf" path="res://scenes/entities/Zombies/zombie.tscn" id="1_3dq4c"] +[ext_resource type="Shader" uid="uid://btf4xhu31ln6n" path="res://assets/shaders/canvas_group_flash.gdshader" id="2_s2p07"] [ext_resource type="Script" uid="uid://fd4im1fmwc5n" path="res://scripts/entities/Armor.cs" id="3_5s7in"] [ext_resource type="Material" uid="uid://cn7ac4meka1hc" path="res://assets/GenericFlashMaterial.tres" id="3_b8kja"] [ext_resource type="Script" uid="uid://dt5uj25u0g6y3" path="res://scripts/particles/FallParticle.cs" id="3_w70im"] @@ -13,6 +14,13 @@ [ext_resource type="AudioStream" uid="uid://w0qfwds4o3ti" path="res://assets/audio/sfx/hit_generic.tres" id="7_67t4t"] [ext_resource type="Script" uid="uid://30pbgasu64aw" path="res://scripts/entities/FlashShaderController.cs" id="13_7fceb"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_b8kja"] +resource_local_to_scene = true +shader = ExtResource("2_s2p07") +shader_parameter/FLASH_COLOR = Color(1, 0.709804, 0.439216, 0.5) +shader_parameter/blend = 0.0 +shader_parameter/selected = false + [sub_resource type="CircleShape2D" id="CircleShape2D_67t4t"] [sub_resource type="Resource" id="Resource_011r0"] @@ -32,8 +40,11 @@ mult_value = 1.0 [node name="ConeZombie" node_paths=PackedStringArray("_armor") instance=ExtResource("1_3dq4c")] _armor = NodePath("Armor") +[node name="CanvasGroup" parent="." index="0"] +material = SubResource("ShaderMaterial_b8kja") + [node name="RightUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="1"] -scale = Vector2(0.999834, 0.999834) +scale = Vector2(0.999832, 0.999832) [node name="RightLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="1"] scale = Vector2(0.999832, 0.999832) @@ -42,43 +53,44 @@ scale = Vector2(0.999832, 0.999832) scale = Vector2(0.999831, 0.999831) [node name="LeftUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="2"] -scale = Vector2(0.999832, 0.999832) +scale = Vector2(0.999834, 0.999834) [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] -scale = Vector2(0.999832, 0.999832) +scale = Vector2(0.999833, 0.999833) [node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] scale = Vector2(0.99983, 0.99983) [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] -scale = Vector2(0.999829, 0.999829) - -[node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] scale = Vector2(0.99983, 0.99983) +[node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] +scale = Vector2(0.999829, 0.999829) + [node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"] -scale = Vector2(0.999825, 0.999825) +scale = Vector2(0.999828, 0.999828) [node name="RightHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" index="0"] scale = Vector2(0.99983, 0.99983) [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] -rotation = 0.116614 -skew = -0.000146031 +rotation = -0.0737795 +skew = -0.00014627 [node name="Head" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="3"] scale = Vector2(0.999828, 0.999828) [node name="Right_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="0"] -position = Vector2(-16, -8) +position = Vector2(-16, -8.00001) scale = Vector2(1, 1) [node name="Left_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="1"] +position = Vector2(-4, -9) scale = Vector2(1, 1) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] -position = Vector2(-3.00143, 2.99758) -rotation = 0.011317 +position = Vector2(-2.90837, 2.77886) +rotation = -0.0515354 scale = Vector2(0.999829, 0.999829) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="1"] @@ -115,26 +127,26 @@ shape = SubResource("CircleShape2D_67t4t") scale = Vector2(0.999828, 0.999828) [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] -rotation = 0.109643 -scale = Vector2(0.999998, 0.999998) +rotation = -0.0781998 +scale = Vector2(0.999999, 0.999999) [node name="Left_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" index="0"] position = Vector2(-0.99983, 12.9978) -rotation = -0.0483896 -scale = Vector2(0.999657, 0.999657) +rotation = -0.0644599 +scale = Vector2(0.999659, 0.999659) [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999829, 0.999829) [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] -scale = Vector2(0.999827, 0.999827) +scale = Vector2(0.999829, 0.999829) [node name="Eatbox" parent="." index="2"] _damage = SubResource("Resource_011r0") [node name="Mover" parent="." index="4"] _speed = SubResource("Resource_b6mal") -_speedControlMult = 0.670374 +_speedControlMult = 0.113427 [node name="HitPlayer" parent="." index="5"] playlist = Array[AudioStream]([ExtResource("7_0amn8"), ExtResource("7_67t4t")]) @@ -142,12 +154,15 @@ channels = Array[String](["plastic_hit", "hit"]) [node name="Armor" type="Node" parent="." index="6"] script = ExtResource("3_5s7in") -MaxHP = 135.0 +MaxHP = 195.0 [node name="FlashController" type="Node" parent="Armor" index="0"] script = ExtResource("13_7fceb") shaderMaterial = ExtResource("3_b8kja") +[node name="FlashController" parent="." index="10"] +shaderMaterial = SubResource("ShaderMaterial_b8kja") + [connection signal="ArmorLost" from="Armor" to="HitPlayer" method="Next"] [connection signal="ArmorLost" from="Armor" to="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Hat" method="FallOff"] [connection signal="Damaged" from="Armor" to="HitPlayer" method="Play"] diff --git a/scenes/entities/Zombies/hobo.tscn b/scenes/entities/Zombies/hobo.tscn index e546aad..ff44005 100644 --- a/scenes/entities/Zombies/hobo.tscn +++ b/scenes/entities/Zombies/hobo.tscn @@ -1,8 +1,6 @@ -[gd_scene load_steps=71 format=3 uid="uid://bgqmwsb6ynm81"] +[gd_scene load_steps=65 format=3 uid="uid://bgqmwsb6ynm81"] [ext_resource type="PackedScene" uid="uid://co11v3w8hbwgf" path="res://scenes/entities/Zombies/zombie.tscn" id="1_fnu7s"] -[ext_resource type="Shader" uid="uid://d0eo5uuj222c4" path="res://assets/shaders/CG_color_blender.gdshader" id="2_6qr4h"] -[ext_resource type="Script" uid="uid://bcc7skl7ts6sh" path="res://scripts/systems/effects/Effect.cs" id="2_n380g"] [ext_resource type="Resource" uid="uid://dsg1vjx76ifgu" path="res://assets/effects/GarlicEffect.tres" id="3_b583s"] [ext_resource type="Script" uid="uid://dt5uj25u0g6y3" path="res://scripts/particles/FallParticle.cs" id="3_tu6af"] [ext_resource type="Script" uid="uid://c5v2og85t7s6j" path="res://scripts/entities/zombies/behaviours/HoboBehaviour.cs" id="4_5selg"] @@ -11,7 +9,7 @@ [ext_resource type="Texture2D" uid="uid://dri70dxyks7xh" path="res://assets/sprites/zombies/hobo.png" id="5_b583s"] [ext_resource type="Script" uid="uid://bbw848msxb4re" path="res://scripts/entities/DegradingSprite.cs" id="5_ndwp0"] [ext_resource type="Texture2D" uid="uid://8h5vg1pk32b2" path="res://assets/sprites/garbage_can1.tres" id="6_i6nje"] -[ext_resource type="Shader" uid="uid://cgc7spjkhsx7c" path="res://assets/shaders/generic_flash.gdshader" id="7_nlwsb"] +[ext_resource type="Material" uid="uid://cn7ac4meka1hc" path="res://assets/GenericFlashMaterial.tres" id="6_vn3j1"] [ext_resource type="Texture2D" uid="uid://cogfbn4re3kob" path="res://assets/sprites/garbage_can2.tres" id="7_txjqc"] [ext_resource type="AnimationLibrary" uid="uid://ceb3khu7rwgy8" path="res://assets/animations/zombies/basic.res" id="7_vn3j1"] [ext_resource type="AudioStream" uid="uid://bu1egfsyplpx4" path="res://assets/audio/sfx/metalhit_generic.tres" id="8_4248q"] @@ -24,11 +22,12 @@ [ext_resource type="Script" uid="uid://30pbgasu64aw" path="res://scripts/entities/FlashShaderController.cs" id="19_8y6c0"] [ext_resource type="Shader" uid="uid://btf4xhu31ln6n" path="res://assets/shaders/canvas_group_flash.gdshader" id="23_nc6p3"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_w8pya"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_vn3j1"] resource_local_to_scene = true -shader = ExtResource("2_6qr4h") -shader_parameter/blend_color = Color(1, 1, 1, 1) -shader_parameter/amount = 0.0 +shader = ExtResource("23_nc6p3") +shader_parameter/FLASH_COLOR = Color(1, 0.709804, 0.439216, 0.5) +shader_parameter/blend = 0.0 +shader_parameter/selected = false [sub_resource type="AtlasTexture" id="AtlasTexture_txjqc"] atlas = ExtResource("5_b583s") @@ -74,18 +73,6 @@ region = Rect2(91, 32, 9, 15) atlas = ExtResource("5_b583s") region = Rect2(137, 19, 29, 39) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_y0p2l"] -resource_local_to_scene = true -shader = ExtResource("7_nlwsb") -shader_parameter/selected = false -shader_parameter/blend = 0.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_op0h6"] -resource_local_to_scene = true -shader = ExtResource("7_nlwsb") -shader_parameter/selected = false -shader_parameter/blend = 0.0 - [sub_resource type="AtlasTexture" id="AtlasTexture_5selg"] atlas = ExtResource("5_b583s") region = Rect2(0, 29, 35, 11) @@ -102,12 +89,6 @@ region = Rect2(80, 0, 32, 30) atlas = ExtResource("5_b583s") region = Rect2(38, 22, 22, 13) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_0s5wm"] -resource_local_to_scene = true -shader = ExtResource("7_nlwsb") -shader_parameter/selected = false -shader_parameter/blend = 0.0 - [sub_resource type="AtlasTexture" id="AtlasTexture_n380g"] atlas = ExtResource("5_b583s") region = Rect2(34, 38, 45, 27) @@ -775,19 +756,13 @@ flat_value = 0.4 percentage_value = 0.0 mult_value = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_pjhfy"] -resource_local_to_scene = true -shader = ExtResource("23_nc6p3") -shader_parameter/blend = 0.0 -shader_parameter/selected = false - [node name="Hobo" node_paths=PackedStringArray("_armor") instance=ExtResource("1_fnu7s")] _armor = NodePath("CanArmor") -MaxHP = 130.0 -_effectImmunities = Array[ExtResource("2_n380g")]([ExtResource("3_b583s")]) +MaxHP = 185.0 +_effectImmunities = [ExtResource("3_b583s")] [node name="CanvasGroup" parent="." index="0"] -material = SubResource("ShaderMaterial_w8pya") +material = SubResource("ShaderMaterial_vn3j1") [node name="Butt" parent="CanvasGroup/basic_zombie_walk/Zombie" index="0"] scale = Vector2(0.999902, 0.999902) @@ -796,13 +771,13 @@ scale = Vector2(0.999902, 0.999902) texture = SubResource("AtlasTexture_txjqc") [node name="RightUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="1"] -scale = Vector2(0.99982, 0.99982) +scale = Vector2(0.999826, 0.999826) [node name="Right_Upper_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="0"] texture = SubResource("AtlasTexture_b583s") [node name="RightLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="1"] -scale = Vector2(0.999826, 0.999826) +scale = Vector2(0.99983, 0.99983) [node name="RightFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" index="0"] scale = Vector2(0.999826, 0.999826) @@ -814,7 +789,7 @@ texture = SubResource("AtlasTexture_uoit3") texture = SubResource("AtlasTexture_vn3j1") [node name="LeftUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="2"] -scale = Vector2(0.999823, 0.999823) +scale = Vector2(0.999828, 0.999828) [node name="Left_Upper_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="0"] texture = SubResource("AtlasTexture_yb81c") @@ -826,13 +801,13 @@ scale = Vector2(0.999829, 0.999829) texture = SubResource("AtlasTexture_nlwsb") [node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] -scale = Vector2(0.999822, 0.999822) +scale = Vector2(0.999818, 0.999818) [node name="Left_Foot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg/LeftFoot" index="0"] texture = SubResource("AtlasTexture_8y6c0") [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] -scale = Vector2(0.999825, 0.999825) +scale = Vector2(0.999828, 0.999828) [node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] scale = Vector2(0.999828, 0.999828) @@ -841,7 +816,7 @@ scale = Vector2(0.999828, 0.999828) texture = SubResource("AtlasTexture_nc6p3") [node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"] -scale = Vector2(0.999811, 0.999811) +scale = Vector2(0.999814, 0.999814) [node name="Right_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm/RightHand" index="0"] texture = SubResource("AtlasTexture_y0p2l") @@ -853,7 +828,7 @@ texture = SubResource("AtlasTexture_op0h6") texture = SubResource("AtlasTexture_0s5wm") [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] -rotation = 0.0327417 +rotation = 0.0564365 scale = Vector2(1e-05, 1e-05) [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Tie" index="0"] @@ -872,7 +847,7 @@ maxTorque = 45.0 Impulse = 100.0 [node name="Sprite2D" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Can" index="0" node_paths=PackedStringArray("armor")] -material = SubResource("ShaderMaterial_y0p2l") +material = ExtResource("6_vn3j1") position = Vector2(-5.9999, -4.5002) texture = ExtResource("6_i6nje") script = ExtResource("5_ndwp0") @@ -882,7 +857,7 @@ thresholdPercentage = Array[float]([1.0, 0.667, 0.333]) [node name="Sprite2D2" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Can" index="1"] z_index = -1 -material = SubResource("ShaderMaterial_op0h6") +material = ExtResource("6_vn3j1") position = Vector2(-7.4999, -27.5002) texture = SubResource("AtlasTexture_5selg") @@ -904,8 +879,8 @@ position = Vector2(-4, -9) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] position = Vector2(-3, 3) -rotation = -0.0532523 -scale = Vector2(0.999828, 0.999828) +rotation = -0.0917904 +scale = Vector2(0.999825, 0.999825) texture = SubResource("AtlasTexture_7cvmi") offset = Vector2(-14, -2) @@ -920,7 +895,7 @@ data = NodePath("../../../../../../../../..") [node name="Trashcan_lid" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head/TrashcanLid" index="0"] z_index = -1 -material = SubResource("ShaderMaterial_0s5wm") +material = ExtResource("6_vn3j1") position = Vector2(2.99822, -20.0166) scale = Vector2(1, 1) texture = SubResource("AtlasTexture_n380g") @@ -937,7 +912,7 @@ _threshold = 0.333 _observedArmor = NodePath("../../../../../../../../../../CanArmor") [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="1"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999825, 0.999825) [node name="TrashcanLid" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="4"] position = Vector2(-0.0022974, -17.0131) @@ -952,24 +927,24 @@ editor_settings/show_bone_gizmo = false remote_path = NodePath("../../HeadParticle/Head/TrashcanLid/Trashcan_lid") [node name="LeftUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="5"] -scale = Vector2(0.99981, 0.99981) +scale = Vector2(0.999826, 0.999826) [node name="Left_Upper_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="0"] texture = SubResource("AtlasTexture_tebih") [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] -rotation = 0.0295357 -scale = Vector2(0.999991, 0.999991) +rotation = 0.0509104 +scale = Vector2(1, 1) texture = SubResource("AtlasTexture_auxav") [node name="Left_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" index="0"] position = Vector2(-0.99983, 12.9978) -rotation = 0.0 +rotation = 3.72659e-09 scale = Vector2(0.999652, 0.999652) texture = SubResource("AtlasTexture_dntsa") [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] -scale = Vector2(0.999821, 0.999821) +scale = Vector2(0.99983, 0.99983) [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] scale = Vector2(0.999822, 0.999822) @@ -990,6 +965,7 @@ advance_expression_base_node = NodePath("../Behaviour") [node name="Mover" parent="." index="4"] _speed = SubResource("Resource_4248q") +_speedControlMult = 0.0 [node name="HitPlayer" parent="." index="5"] playlist = Array[AudioStream]([ExtResource("8_4248q"), ExtResource("9_tu6af")]) @@ -997,12 +973,12 @@ channels = Array[String](["metal_hit", "hit"]) [node name="CanArmor" type="Node" parent="." index="7"] script = ExtResource("4_w8pya") -MaxHP = 385.0 +MaxHP = 550.0 metadata/_custom_type_script = "uid://fd4im1fmwc5n" [node name="FlashController" type="Node" parent="CanArmor" index="0"] script = ExtResource("19_8y6c0") -shaderMaterial = SubResource("ShaderMaterial_0s5wm") +shaderMaterial = ExtResource("6_vn3j1") [node name="Behaviour" type="Node" parent="." index="8" node_paths=PackedStringArray("_eatBox", "_animationTree")] script = ExtResource("4_5selg") @@ -1016,7 +992,7 @@ channel = "anger" metadata/_custom_type_script = "uid://c36bj8u7jghc7" [node name="FlashController" parent="." index="12"] -shaderMaterial = SubResource("ShaderMaterial_pjhfy") +shaderMaterial = SubResource("ShaderMaterial_vn3j1") [connection signal="ThresholdReached" from="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head/TrashcanLid/Observer" to="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head/TrashcanLid" method="FallOff"] [connection signal="ThresholdReached" from="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head/TrashcanLid/Observer" to="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/TrashcanLid/RemoteTransform2D" method="queue_free"] diff --git a/scenes/entities/Zombies/zombie.tscn b/scenes/entities/Zombies/zombie.tscn index efdb166..1c27296 100644 --- a/scenes/entities/Zombies/zombie.tscn +++ b/scenes/entities/Zombies/zombie.tscn @@ -783,7 +783,7 @@ metadata/_custom_type_script = "uid://c1x4n4nqyq72f" [node name="Zombie" type="Node2D" node_paths=PackedStringArray("_player", "_tree")] y_sort_enabled = true script = ExtResource("1_qq3f1") -MaxHP = 70.0 +MaxHP = 100.0 _player = NodePath("CanvasGroup/basic_zombie_walk/AnimationPlayer") _tree = NodePath("AnimationTree") metadata/_edit_vertical_guides_ = [-159.0] @@ -832,7 +832,7 @@ editor_settings/show_bone_gizmo = false [node name="RightFoot" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg"] position = Vector2(-2, 14) -scale = Vector2(0.999832, 0.999832) +scale = Vector2(0.99983, 0.99983) rest = Transform2D(1, 0, 0, 1, -2, 14) auto_calculate_length_and_angle = false length = 12.0 @@ -855,7 +855,7 @@ metadata/_edit_lock_ = true [node name="LeftUpperLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt"] use_parent_material = true position = Vector2(6, 4) -scale = Vector2(0.999835, 0.999835) +scale = Vector2(0.999834, 0.999834) rest = Transform2D(1, 0, 0, 1, 6, 4) editor_settings/show_bone_gizmo = false @@ -867,7 +867,7 @@ metadata/_edit_lock_ = true [node name="LeftLowerLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg"] position = Vector2(-1, 13) -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999829, 0.999829) rest = Transform2D(1, 0, 0, 1, -1, 13) editor_settings/show_bone_gizmo = false @@ -895,7 +895,7 @@ metadata/_edit_lock_ = true [node name="Body" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt"] use_parent_material = true position = Vector2(1, -2) -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999829, 0.999829) rest = Transform2D(1, 0, 0, 1, 1, -2) editor_settings/show_bone_gizmo = false @@ -903,7 +903,7 @@ editor_settings/show_bone_gizmo = false z_index = -1 use_parent_material = true position = Vector2(-14, -23) -scale = Vector2(0.999827, 0.999827) +scale = Vector2(0.999826, 0.999826) rest = Transform2D(1, 0, 0, 1, -14, -23) editor_settings/show_bone_gizmo = false @@ -915,13 +915,13 @@ metadata/_edit_lock_ = true [node name="RightLowerArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm"] position = Vector2(-2, 15) -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999827, 0.999827) rest = Transform2D(1, 0, 0, 1, -2, 15) editor_settings/show_bone_gizmo = false [node name="RightHand" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm"] position = Vector2(-1, 13) -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.999827, 0.999827) rest = Transform2D(1, 0, 0, 1, -1, 13) auto_calculate_length_and_angle = false length = 8.0 @@ -949,8 +949,8 @@ metadata/_edit_lock_ = true [node name="Tie" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] position = Vector2(-9, -21) -rotation = -0.134944 -skew = -0.000461102 +rotation = 0.0501575 +skew = -0.000461817 rest = Transform2D(1, 0, 0, 1, -9, -21) auto_calculate_length_and_angle = false length = 24.0 @@ -965,7 +965,7 @@ metadata/_edit_lock_ = true [node name="Head" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] position = Vector2(-10, -25) -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999833, 0.999833) rest = Transform2D(1, 0, 0, 1, -10, -25) editor_settings/show_bone_gizmo = false @@ -988,22 +988,24 @@ metadata/_edit_lock_ = true [node name="Right_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] position = Vector2(-16, -8) +scale = Vector2(1, 1) texture = SubResource("AtlasTexture_vcc72") centered = false offset = Vector2(-2, -2) metadata/_edit_lock_ = true [node name="Left_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] -position = Vector2(-4, -9) +position = Vector2(-4, -9.00001) +scale = Vector2(1, 1) texture = SubResource("AtlasTexture_kto0i") centered = false offset = Vector2(-2, -2) metadata/_edit_lock_ = true [node name="Jaw" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] -position = Vector2(-2.83241, 2.59553) -rotation = -0.0942595 -scale = Vector2(0.999826, 0.999826) +position = Vector2(-2.80962, 2.53685) +rotation = 0.0232306 +scale = Vector2(0.999825, 0.999825) texture = SubResource("AtlasTexture_x5uj2") centered = false offset = Vector2(-12, -2) @@ -1020,7 +1022,7 @@ _observedEntity = NodePath("../../../../../../../..") [node name="Jaw" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head"] position = Vector2(-3, 3) -scale = Vector2(0.999826, 0.999826) +scale = Vector2(0.999825, 0.999825) rest = Transform2D(1, 0, 0, 1, -3, 3) auto_calculate_length_and_angle = false length = 11.0 @@ -1054,7 +1056,7 @@ remote_path = NodePath("../../HeadParticle/Head/Left_Eye") [node name="LeftUpperArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] position = Vector2(-1, -20) -scale = Vector2(0.999827, 0.999827) +scale = Vector2(0.999828, 0.999828) rest = Transform2D(1, 0, 0, 1, -1, -20) editor_settings/show_bone_gizmo = false @@ -1076,8 +1078,8 @@ minTorque = -45.0 maxTorque = 45.0 [node name="Left_Lower_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile"] -rotation = -0.143029 -scale = Vector2(0.999994, 0.999994) +rotation = 0.129655 +scale = Vector2(0.999996, 0.999996) texture = SubResource("AtlasTexture_auqeq") centered = false offset = Vector2(-5, 0) @@ -1086,7 +1088,7 @@ metadata/_edit_lock_ = true [node name="Left_Hand" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm"] show_behind_parent = true position = Vector2(-0.99983, 12.9978) -rotation = -0.117899 +rotation = -0.0993302 scale = Vector2(0.999658, 0.999658) texture = SubResource("AtlasTexture_vlvtp") centered = false @@ -1103,7 +1105,7 @@ _observedEntity = NodePath("../../../../../../../..") [node name="LeftLowerArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm"] position = Vector2(-2, 14) -scale = Vector2(0.999824, 0.999824) +scale = Vector2(0.999827, 0.999827) rest = Transform2D(1, 0, 0, 1, -2, 14) editor_settings/show_bone_gizmo = false @@ -1159,7 +1161,7 @@ entity = NodePath("..") [node name="Mover" type="Node" parent="."] script = ExtResource("4_u5syx") _speed = SubResource("Resource_ckb7n") -_speedControlMult = 0.77483 +_speedControlMult = 2.33406 [node name="HitPlayer" type="Node" parent="."] script = ExtResource("12_he8da") diff --git a/scenes/gui/shovel_button.tscn b/scenes/gui/shovel_button.tscn index 19f8e4a..a48ea39 100644 --- a/scenes/gui/shovel_button.tscn +++ b/scenes/gui/shovel_button.tscn @@ -1,10 +1,15 @@ -[gd_scene load_steps=4 format=3 uid="uid://t0vpmycj6c8j"] +[gd_scene load_steps=6 format=3 uid="uid://t0vpmycj6c8j"] [ext_resource type="Texture2D" uid="uid://cw73vihkrfenc" path="res://assets/sprites/gui/Shovel.tres" id="1_46afk"] +[ext_resource type="Shader" uid="uid://c5kv2gwtme1dk" path="res://assets/shaders/radial_progress.gdshader" id="1_jj4sa"] [ext_resource type="Texture2D" uid="uid://fd6drk2su0df" path="res://assets/sprites/gui/EmptyShovel.tres" id="2_pw2pj"] [ext_resource type="Script" uid="uid://d4dbg0us5ngxy" path="res://scripts/gui/ShovelButton.cs" id="3_u6gir"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_grw26"] +shader = ExtResource("1_jj4sa") + [node name="ShovelButton" type="TextureButton" node_paths=PackedStringArray("raycast")] +material = SubResource("ShaderMaterial_grw26") anchors_preset = -1 anchor_right = 0.085 anchor_bottom = 0.117 @@ -27,5 +32,3 @@ collision_mask = 24 hit_from_inside = true collide_with_areas = true collide_with_bodies = false - -[connection signal="focus_exited" from="." to="." method="OnFocusExited"] diff --git a/scripts/gui/ShovelButton.cs b/scripts/gui/ShovelButton.cs index cb47ce7..3c72f02 100644 --- a/scripts/gui/ShovelButton.cs +++ b/scripts/gui/ShovelButton.cs @@ -19,6 +19,7 @@ public partial class ShovelButton : TextureButton public override void _Ready() { raycast.Reparent(PoolContainer.Instance); + FocusExited += OnFocusExited; } public override void _Toggled(bool toggledOn)