diff --git a/assets/sprites/atlases/zombies/basic.png.import b/assets/sprites/atlases/zombies/basic.png.import index 4a0e4c0..0961ce4 100644 --- a/assets/sprites/atlases/zombies/basic.png.import +++ b/assets/sprites/atlases/zombies/basic.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://brj0buevfwv21" +uid="uid://cmxh4w4gkgdjm" path="res://.godot/imported/basic.png-6d11a963868a5f527d4b4e56da4660f0.ctex" metadata={ "vram_texture": false diff --git a/resources/animations/zombies/basic/basic.png b/assets/sprites/atlases/zombies/basic/basic.png similarity index 100% rename from resources/animations/zombies/basic/basic.png rename to assets/sprites/atlases/zombies/basic/basic.png diff --git a/resources/animations/zombies/basic/basic.png.import b/assets/sprites/atlases/zombies/basic/basic.png.import similarity index 100% rename from resources/animations/zombies/basic/basic.png.import rename to assets/sprites/atlases/zombies/basic/basic.png.import diff --git a/resources/animations/zombies/basic/body.tres b/assets/sprites/atlases/zombies/basic/body.tres similarity index 100% rename from resources/animations/zombies/basic/body.tres rename to assets/sprites/atlases/zombies/basic/body.tres diff --git a/resources/animations/zombies/basic/butt.tres b/assets/sprites/atlases/zombies/basic/butt.tres similarity index 100% rename from resources/animations/zombies/basic/butt.tres rename to assets/sprites/atlases/zombies/basic/butt.tres diff --git a/resources/animations/zombies/basic/head.tres b/assets/sprites/atlases/zombies/basic/head.tres similarity index 100% rename from resources/animations/zombies/basic/head.tres rename to assets/sprites/atlases/zombies/basic/head.tres diff --git a/resources/animations/zombies/basic/jaw.tres b/assets/sprites/atlases/zombies/basic/jaw.tres similarity index 100% rename from resources/animations/zombies/basic/jaw.tres rename to assets/sprites/atlases/zombies/basic/jaw.tres diff --git a/resources/animations/zombies/basic/left_foot.tres b/assets/sprites/atlases/zombies/basic/left_foot.tres similarity index 100% rename from resources/animations/zombies/basic/left_foot.tres rename to assets/sprites/atlases/zombies/basic/left_foot.tres diff --git a/resources/animations/zombies/basic/left_hand_eat.tres b/assets/sprites/atlases/zombies/basic/left_hand_eat.tres similarity index 100% rename from resources/animations/zombies/basic/left_hand_eat.tres rename to assets/sprites/atlases/zombies/basic/left_hand_eat.tres diff --git a/resources/animations/zombies/basic/left_hand_norm.tres b/assets/sprites/atlases/zombies/basic/left_hand_norm.tres similarity index 100% rename from resources/animations/zombies/basic/left_hand_norm.tres rename to assets/sprites/atlases/zombies/basic/left_hand_norm.tres diff --git a/resources/animations/zombies/basic/left_lower_arm.tres b/assets/sprites/atlases/zombies/basic/left_lower_arm.tres similarity index 100% rename from resources/animations/zombies/basic/left_lower_arm.tres rename to assets/sprites/atlases/zombies/basic/left_lower_arm.tres diff --git a/resources/animations/zombies/basic/left_lower_leg.tres b/assets/sprites/atlases/zombies/basic/left_lower_leg.tres similarity index 100% rename from resources/animations/zombies/basic/left_lower_leg.tres rename to assets/sprites/atlases/zombies/basic/left_lower_leg.tres diff --git a/resources/animations/zombies/basic/left_upper_arm.tres b/assets/sprites/atlases/zombies/basic/left_upper_arm.tres similarity index 100% rename from resources/animations/zombies/basic/left_upper_arm.tres rename to assets/sprites/atlases/zombies/basic/left_upper_arm.tres diff --git a/resources/animations/zombies/basic/left_upper_leg.tres b/assets/sprites/atlases/zombies/basic/left_upper_leg.tres similarity index 100% rename from resources/animations/zombies/basic/left_upper_leg.tres rename to assets/sprites/atlases/zombies/basic/left_upper_leg.tres diff --git a/resources/animations/zombies/basic/pupil.tres b/assets/sprites/atlases/zombies/basic/pupil.tres similarity index 100% rename from resources/animations/zombies/basic/pupil.tres rename to assets/sprites/atlases/zombies/basic/pupil.tres diff --git a/resources/animations/zombies/basic/right_foot.tres b/assets/sprites/atlases/zombies/basic/right_foot.tres similarity index 100% rename from resources/animations/zombies/basic/right_foot.tres rename to assets/sprites/atlases/zombies/basic/right_foot.tres diff --git a/resources/animations/zombies/basic/right_hand_eat.tres b/assets/sprites/atlases/zombies/basic/right_hand_eat.tres similarity index 100% rename from resources/animations/zombies/basic/right_hand_eat.tres rename to assets/sprites/atlases/zombies/basic/right_hand_eat.tres diff --git a/resources/animations/zombies/basic/right_hand_norm.tres b/assets/sprites/atlases/zombies/basic/right_hand_norm.tres similarity index 100% rename from resources/animations/zombies/basic/right_hand_norm.tres rename to assets/sprites/atlases/zombies/basic/right_hand_norm.tres diff --git a/resources/animations/zombies/basic/right_lower_arm.tres b/assets/sprites/atlases/zombies/basic/right_lower_arm.tres similarity index 100% rename from resources/animations/zombies/basic/right_lower_arm.tres rename to assets/sprites/atlases/zombies/basic/right_lower_arm.tres diff --git a/resources/animations/zombies/basic/right_lower_leg.tres b/assets/sprites/atlases/zombies/basic/right_lower_leg.tres similarity index 100% rename from resources/animations/zombies/basic/right_lower_leg.tres rename to assets/sprites/atlases/zombies/basic/right_lower_leg.tres diff --git a/resources/animations/zombies/basic/right_upper_arm.tres b/assets/sprites/atlases/zombies/basic/right_upper_arm.tres similarity index 100% rename from resources/animations/zombies/basic/right_upper_arm.tres rename to assets/sprites/atlases/zombies/basic/right_upper_arm.tres diff --git a/resources/animations/zombies/basic/right_upper_leg.tres b/assets/sprites/atlases/zombies/basic/right_upper_leg.tres similarity index 100% rename from resources/animations/zombies/basic/right_upper_leg.tres rename to assets/sprites/atlases/zombies/basic/right_upper_leg.tres diff --git a/resources/animations/zombies/basic/tie.tres b/assets/sprites/atlases/zombies/basic/tie.tres similarity index 100% rename from resources/animations/zombies/basic/tie.tres rename to assets/sprites/atlases/zombies/basic/tie.tres diff --git a/assets/sprites/atlases/zombies/basic_fem.png.import b/assets/sprites/atlases/zombies/basic_fem.png.import index cd67e82..e4c0364 100644 --- a/assets/sprites/atlases/zombies/basic_fem.png.import +++ b/assets/sprites/atlases/zombies/basic_fem.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d02m0kdhuio5e" +uid="uid://ca1m55xpsxa37" path="res://.godot/imported/basic_fem.png-6547f99bebbd8ad1bfe017dfea81a7c3.ctex" metadata={ "vram_texture": false diff --git a/resources/animations/zombies/hobo.png b/assets/sprites/atlases/zombies/hobo.png similarity index 100% rename from resources/animations/zombies/hobo.png rename to assets/sprites/atlases/zombies/hobo.png diff --git a/resources/animations/zombies/hobo.png.import b/assets/sprites/atlases/zombies/hobo.png.import similarity index 100% rename from resources/animations/zombies/hobo.png.import rename to assets/sprites/atlases/zombies/hobo.png.import diff --git a/resources/animations/zombies/polevaulter.png b/assets/sprites/atlases/zombies/polevaulter.png similarity index 100% rename from resources/animations/zombies/polevaulter.png rename to assets/sprites/atlases/zombies/polevaulter.png diff --git a/resources/animations/zombies/polevaulter.png.import b/assets/sprites/atlases/zombies/polevaulter.png.import similarity index 100% rename from resources/animations/zombies/polevaulter.png.import rename to assets/sprites/atlases/zombies/polevaulter.png.import diff --git a/resources/animations/zombies/screendoor.png b/assets/sprites/atlases/zombies/screendoor.png similarity index 100% rename from resources/animations/zombies/screendoor.png rename to assets/sprites/atlases/zombies/screendoor.png diff --git a/resources/animations/zombies/screendoor.png.import b/assets/sprites/atlases/zombies/screendoor.png.import similarity index 100% rename from resources/animations/zombies/screendoor.png.import rename to assets/sprites/atlases/zombies/screendoor.png.import diff --git a/resources/animations/zombies/screendoor_fem.png b/assets/sprites/atlases/zombies/screendoor_fem.png similarity index 100% rename from resources/animations/zombies/screendoor_fem.png rename to assets/sprites/atlases/zombies/screendoor_fem.png diff --git a/resources/animations/zombies/screendoor_fem.png.import b/assets/sprites/atlases/zombies/screendoor_fem.png.import similarity index 100% rename from resources/animations/zombies/screendoor_fem.png.import rename to assets/sprites/atlases/zombies/screendoor_fem.png.import diff --git a/resources/animations/zombies/Зондби.png b/assets/sprites/atlases/zombies/Зондби.png similarity index 100% rename from resources/animations/zombies/Зондби.png rename to assets/sprites/atlases/zombies/Зондби.png diff --git a/resources/animations/zombies/Зондби.png.import b/assets/sprites/atlases/zombies/Зондби.png.import similarity index 100% rename from resources/animations/zombies/Зондби.png.import rename to assets/sprites/atlases/zombies/Зондби.png.import diff --git a/assets/sprites/bucket.tres b/assets/sprites/bucket.tres index 7a2355c..f3684c7 100644 --- a/assets/sprites/bucket.tres +++ b/assets/sprites/bucket.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://ce04l60l6mhfk"] -[ext_resource type="Texture2D" uid="uid://brj0buevfwv21" path="res://assets/sprites/atlases/zombies/basic.png" id="1_n66kp"] +[ext_resource type="Texture2D" uid="uid://cmxh4w4gkgdjm" path="res://assets/sprites/atlases/zombies/basic.png" id="1_n66kp"] [resource] atlas = ExtResource("1_n66kp") diff --git a/assets/sprites/cone.tres b/assets/sprites/cone.tres index 80b838a..b680b8a 100644 --- a/assets/sprites/cone.tres +++ b/assets/sprites/cone.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://ceqvdmude7cgg"] -[ext_resource type="Texture2D" uid="uid://brj0buevfwv21" path="res://assets/sprites/atlases/zombies/basic.png" id="1_yijc6"] +[ext_resource type="Texture2D" uid="uid://cmxh4w4gkgdjm" path="res://assets/sprites/atlases/zombies/basic.png" id="1_yijc6"] [resource] atlas = ExtResource("1_yijc6") diff --git a/resources/animations/zombies/basic.png b/resources/animations/zombies/basic.png deleted file mode 100644 index 0f96b6d..0000000 Binary files a/resources/animations/zombies/basic.png and /dev/null differ diff --git a/resources/animations/zombies/basic.png.import b/resources/animations/zombies/basic.png.import deleted file mode 100644 index 4a0e4c0..0000000 --- a/resources/animations/zombies/basic.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://brj0buevfwv21" -path="res://.godot/imported/basic.png-6d11a963868a5f527d4b4e56da4660f0.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/sprites/atlases/zombies/basic.png" -dest_files=["res://.godot/imported/basic.png-6d11a963868a5f527d4b4e56da4660f0.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/resources/animations/zombies/basic_fem.png b/resources/animations/zombies/basic_fem.png deleted file mode 100644 index 790387b..0000000 Binary files a/resources/animations/zombies/basic_fem.png and /dev/null differ diff --git a/resources/animations/zombies/basic_fem.png.import b/resources/animations/zombies/basic_fem.png.import deleted file mode 100644 index cd67e82..0000000 --- a/resources/animations/zombies/basic_fem.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d02m0kdhuio5e" -path="res://.godot/imported/basic_fem.png-6547f99bebbd8ad1bfe017dfea81a7c3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/sprites/atlases/zombies/basic_fem.png" -dest_files=["res://.godot/imported/basic_fem.png-6547f99bebbd8ad1bfe017dfea81a7c3.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/scenes/debug_lvl.tscn b/scenes/debug_lvl.tscn index a609b97..b4cbd8e 100644 --- a/scenes/debug_lvl.tscn +++ b/scenes/debug_lvl.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://crxsvv7drckpw"] +[gd_scene load_steps=11 format=3 uid="uid://crxsvv7drckpw"] [ext_resource type="Script" uid="uid://bndu1h5kgcde8" path="res://scripts/components/level/RuntimeLevelData.cs" id="1_i3bf5"] [ext_resource type="Texture2D" uid="uid://b0tb2hjum40aw" path="res://assets/sprites/background_summer.png" id="2_vmxhy"] @@ -9,6 +9,7 @@ [ext_resource type="PackedScene" uid="uid://bpekho7leatr5" path="res://scenes/sun.tscn" id="6_ay12k"] [ext_resource type="Script" uid="uid://cslqjdd5wq4rc" path="res://scripts/components/level/SunSpawner.cs" id="6_lkguy"] [ext_resource type="PackedScene" uid="uid://xu4i6tmkv00a" path="res://scenes/entities/Zombies/bucket_zombie.tscn" id="9_u7o5c"] +[ext_resource type="PackedScene" uid="uid://hhjbqkjqpt7x" path="res://scenes/entities/Zombies/cone_zombie.tscn" id="10_q4fsb"] [node name="debug_lvl" type="Node2D"] @@ -52,4 +53,7 @@ autostart = true [node name="BucketZombie" parent="." instance=ExtResource("9_u7o5c")] position = Vector2(729, 257) +[node name="ConeZombie" parent="." instance=ExtResource("10_q4fsb")] +position = Vector2(729, 313) + [connection signal="timeout" from="SunSpawner/Timer" to="SunSpawner" method="Spawn"] diff --git a/scripts/components/Armor.cs b/scripts/components/Armor.cs index ab2a656..260850d 100644 --- a/scripts/components/Armor.cs +++ b/scripts/components/Armor.cs @@ -28,7 +28,7 @@ public partial class Armor : Node _hp -= damage; if(_hp <= 0) { - returnAmount = _hp; + returnAmount = -_hp; _hp = 0; EmitSignal(SignalName.ArmorLost); _lost = true; diff --git a/scripts/components/zombies/RuntimeZombieData.cs b/scripts/components/zombies/RuntimeZombieData.cs index 49f0b21..b60a1a3 100644 --- a/scripts/components/zombies/RuntimeZombieData.cs +++ b/scripts/components/zombies/RuntimeZombieData.cs @@ -12,6 +12,7 @@ public partial class RuntimeZombieData : Node2D, IEntity, ILocalTimescale, IEffe [Signal] public delegate void OnLocalTimescaleChangedEventHandler(int currentTimescale); + [Export] private int _hp; [Export] private int _maxHP; @@ -70,7 +71,7 @@ public partial class RuntimeZombieData : Node2D, IEntity, ILocalTimescale, IEffe public void TakeDamage(int amount, Node origin, Utility.DamageTypes damageType = Utility.DamageTypes.PHYSICAL) { - if(_armor != null) + if (_armor != null) { _hp -= _armor.RecieveDamage(amount); }