Survival mode ready

scenes/entities/Zombies/bucket_zombie.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=5 format=3 uid="uid://xu4i6tmkv00a"]
+[gd_scene load_steps=8 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://d0eo5uuj222c4" path="res://assets/shaders/CG_color_blender.gdshader" id="2_3mrqj"]
 [ext_resource type="Texture2D" uid="uid://ce04l60l6mhfk" path="res://assets/sprites/bucket.tres" id="3_0nlp0"]
+[ext_resource type="Script" uid="uid://c3cfnrmnnuqms" path="res://addons/floatmodifiers/FloatModifiers.cs" id="4_1s2fn"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_wdi07"]
 resource_local_to_scene = true
@@ -10,6 +11,20 @@ shader = ExtResource("2_3mrqj")
 shader_parameter/blend_color = Color(1, 1, 1, 1)
 shader_parameter/amount = 0.0
 
+[sub_resource type="Resource" id="Resource_2bm8y"]
+resource_local_to_scene = true
+script = ExtResource("4_1s2fn")
+flat_value = 10.0
+percentage_value = 0.0
+mult_value = 1.0
+
+[sub_resource type="Resource" id="Resource_lt6ps"]
+resource_local_to_scene = true
+script = ExtResource("4_1s2fn")
+flat_value = 0.2
+percentage_value = 0.0
+mult_value = 1.0
+
 [node name="BucketZombie" instance=ExtResource("1_mwqpo")]
 
 [node name="CanvasGroup" parent="." index="0"]
@@ -19,5 +34,11 @@ material = SubResource("ShaderMaterial_wdi07")
 position = Vector2(-12, -83)
 texture = ExtResource("3_0nlp0")
 
+[node name="Eatbox" parent="." index="2"]
+_damage = SubResource("Resource_2bm8y")
+
+[node name="Mover" parent="." index="5"]
+_speed = SubResource("Resource_lt6ps")
+
 [node name="Armor" parent="." index="7"]
-_maxHP = 180
+_maxHP = 385

scenes/entities/Zombies/cone_zombie.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=3 uid="uid://hhjbqkjqpt7x"]
+[gd_scene load_steps=9 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://d0eo5uuj222c4" path="res://assets/shaders/CG_color_blender.gdshader" id="2_2dq8e"]
 [ext_resource type="Script" uid="uid://fd4im1fmwc5n" path="res://scripts/components/Armor.cs" id="3_5s7in"]
 [ext_resource type="Texture2D" uid="uid://ceqvdmude7cgg" path="res://assets/sprites/cone.tres" id="4_qdhik"]
+[ext_resource type="Script" uid="uid://c3cfnrmnnuqms" path="res://addons/floatmodifiers/FloatModifiers.cs" id="4_qof5v"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_sat5k"]
 resource_local_to_scene = true
@@ -11,6 +12,20 @@ shader = ExtResource("2_2dq8e")
 shader_parameter/blend_color = Color(1, 1, 1, 1)
 shader_parameter/amount = 0.0
 
+[sub_resource type="Resource" id="Resource_w70im"]
+resource_local_to_scene = true
+script = ExtResource("4_qof5v")
+flat_value = 10.0
+percentage_value = 0.0
+mult_value = 1.0
+
+[sub_resource type="Resource" id="Resource_qof5v"]
+resource_local_to_scene = true
+script = ExtResource("4_qof5v")
+flat_value = 0.2
+percentage_value = 0.0
+mult_value = 1.0
+
 [node name="ConeZombie" node_paths=PackedStringArray("_armor") instance=ExtResource("1_3dq4c")]
 _armor = NodePath("Armor")
 
@@ -21,8 +36,14 @@ material = SubResource("ShaderMaterial_sat5k")
 position = Vector2(-12, -88)
 texture = ExtResource("4_qdhik")
 
+[node name="Eatbox" parent="." index="2"]
+_damage = SubResource("Resource_w70im")
+
+[node name="Mover" parent="." index="5"]
+_speed = SubResource("Resource_qof5v")
+
 [node name="Armor" type="Node" parent="." index="7"]
 script = ExtResource("3_5s7in")
-_maxHP = 60
+_maxHP = 130
 
 [connection signal="ArmorLost" from="Armor" to="CanvasGroup/Hat" method="queue_free"]

scenes/entities/Zombies/hobo.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=31 format=3 uid="uid://bgqmwsb6ynm81"]
+[gd_scene load_steps=34 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="Texture2D" uid="uid://cse1504ao4g8e" path="res://assets/sprites/atlases/zombies/hobo.png" id="3_6qr4h"]
 [ext_resource type="AnimationLibrary" uid="uid://cuh2kyb21hmkm" path="res://resources/animations/zombies/basic_zombie.res" id="4_02fim"]
 [ext_resource type="Script" uid="uid://c5v2og85t7s6j" path="res://scripts/components/zombies/behaviours/HoboBehaviour.cs" id="4_5selg"]
+[ext_resource type="Script" uid="uid://c3cfnrmnnuqms" path="res://addons/floatmodifiers/FloatModifiers.cs" id="4_c1y3b"]
 [ext_resource type="Script" uid="uid://fd4im1fmwc5n" path="res://scripts/components/Armor.cs" id="4_w8pya"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_w8pya"]
@@ -21,6 +22,13 @@ region = Rect2(0, 15, 40, 49)
 atlas = ExtResource("3_6qr4h")
 region = Rect2(3, 0, 35, 11)
 
+[sub_resource type="Resource" id="Resource_qg8rq"]
+resource_local_to_scene = true
+script = ExtResource("4_c1y3b")
+flat_value = 10.0
+percentage_value = 0.0
+mult_value = 1.0
+
 [sub_resource type="Animation" id="Animation_qv5y7"]
 length = 0.001
 tracks/0/type = "value"
@@ -35,6 +43,18 @@ tracks/0/keys = {
 "update": 0,
 "values": [Color(1, 1, 1, 1)]
 }
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Mover:_speedControlMult")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [0.0]
+}
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_sq25x"]
 _data = {
@@ -50,12 +70,9 @@ tracks/0/path = NodePath("Mover")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 1.93333),
-"transitions": PackedFloat32Array(1, 1),
+"times": PackedFloat32Array(1.93333),
+"transitions": PackedFloat32Array(1),
 "values": [{
-"args": [0.0],
-"method": &"SetSpeedMult"
-}, {
 "args": [3.0],
 "method": &"SetSpeedMult"
 }]
@@ -72,22 +89,32 @@ tracks/1/keys = {
 "update": 0,
 "values": [Color(1, 1, 1, 1), Color(1, 0, 0, 1)]
 }
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("Mover:_speedControlMult")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0, 2),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [0.0, 1.0]
+}
 
 [sub_resource type="Animation" id="Animation_5selg"]
 resource_name = "walk"
-tracks/0/type = "method"
+tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("Mover")
+tracks/0/path = NodePath("Mover:_speedControlMult")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
-"values": [{
-"args": [0.1],
-"method": &"SetSpeedFlat"
-}]
+"update": 0,
+"values": [1.0]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_5selg"]
@@ -165,6 +192,13 @@ states/hobo_zombie_run/position = Vector2(866, 89)
 transitions = ["Start", "basic_zombie_idle", SubResource("AnimationNodeStateMachineTransition_vxhht"), "basic_zombie_idle", "basic_zombie_eat", SubResource("AnimationNodeStateMachineTransition_y2ivb"), "basic_zombie_walk", "basic_zombie_eat", SubResource("AnimationNodeStateMachineTransition_7d3k4"), "basic_zombie_idle", "basic_zombie_walk", SubResource("AnimationNodeStateMachineTransition_qg8rq"), "basic_zombie_idle", "hobo_zombie_run", SubResource("AnimationNodeStateMachineTransition_4248q"), "hobo_zombie_run", "basic_zombie_eat", SubResource("AnimationNodeStateMachineTransition_tu6af"), "basic_zombie_eat", "hobo_zombie_run", SubResource("AnimationNodeStateMachineTransition_yalvk"), "hobo_zombie_can_destroy", "basic_zombie_idle", SubResource("AnimationNodeStateMachineTransition_7jlle"), "basic_zombie_eat", "basic_zombie_walk", SubResource("AnimationNodeStateMachineTransition_w1b1s"), "basic_zombie_walk", "hobo_zombie_run", SubResource("AnimationNodeStateMachineTransition_02fim")]
 graph_offset = Vector2(55, -28)
 
+[sub_resource type="Resource" id="Resource_4248q"]
+resource_local_to_scene = true
+script = ExtResource("4_c1y3b")
+flat_value = 0.2
+percentage_value = 0.0
+mult_value = 1.0
+
 [node name="Hobo" node_paths=PackedStringArray("_armor") instance=ExtResource("1_fnu7s")]
 _armor = NodePath("CanArmor")
 
@@ -182,6 +216,9 @@ z_index = -1
 position = Vector2(-6, -63)
 texture = SubResource("AtlasTexture_5selg")
 
+[node name="Eatbox" parent="." index="2"]
+_damage = SubResource("Resource_qg8rq")
+
 [node name="AnimationPlayer" parent="." index="3"]
 libraries = {
 &"": SubResource("AnimationLibrary_sq25x"),
@@ -195,9 +232,12 @@ speed_scale = 3.0
 tree_root = SubResource("AnimationNodeStateMachine_xg3p6")
 advance_expression_base_node = NodePath("../Behaviour")
 
+[node name="Mover" parent="." index="5"]
+_speed = SubResource("Resource_4248q")
+
 [node name="CanArmor" type="Node" parent="." index="7"]
 script = ExtResource("4_w8pya")
-_maxHP = 100
+_maxHP = 180
 metadata/_custom_type_script = "uid://fd4im1fmwc5n"
 
 [node name="Behaviour" type="Node" parent="." index="8" node_paths=PackedStringArray("_eatBox", "_animationTree")]

scenes/entities/Zombies/zombie.tscn

@@ -21,6 +21,7 @@ shader_parameter/amount = 0.0
 size = Vector2(2, 48)
 
 [sub_resource type="Resource" id="Resource_ruqsf"]
+resource_local_to_scene = true
 script = ExtResource("7_b3p4o")
 flat_value = 10.0
 percentage_value = 0.0
@@ -34,14 +35,14 @@ length = 0.001
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("AnimationTree:parameters/conditions/no_can")
+tracks/0/path = NodePath("Mover:_speedControlMult")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [false]
+"update": 0,
+"values": [0.0]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_sq25x"]
@@ -88,15 +89,16 @@ transitions = ["Start", "basic_zombie_idle", SubResource("AnimationNodeStateMach
 graph_offset = Vector2(13, 26)
 
 [sub_resource type="Resource" id="Resource_ckb7n"]
+resource_local_to_scene = true
 script = ExtResource("7_b3p4o")
-flat_value = 0.1
+flat_value = 0.2
 percentage_value = 0.0
 mult_value = 1.0
 
 [node name="Zombie" type="Node2D"]
 y_sort_enabled = true
 script = ExtResource("1_qq3f1")
-_maxHP = 100
+_maxHP = 70
 
 [node name="CanvasGroup" type="CanvasGroup" parent="."]
 material = SubResource("ShaderMaterial_63ls2")