diff --git a/Assets/Textures/eye_dog.png b/Assets/Textures/eye_dog.png deleted file mode 100644 index 9f8214b..0000000 Binary files a/Assets/Textures/eye_dog.png and /dev/null differ diff --git a/Assets/Textures/eye_dog.png.import b/Assets/Textures/eye_dog.png.import deleted file mode 100644 index 8d3810a..0000000 --- a/Assets/Textures/eye_dog.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dj13g1w14mekw" -path="res://.godot/imported/eye_dog.png-2b08e774f06f7b23a123081bdacd558a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Textures/eye_dog.png" -dest_files=["res://.godot/imported/eye_dog.png-2b08e774f06f7b23a123081bdacd558a.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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=0 diff --git a/Assets/Textures/eye_dog_boss.png b/Assets/Textures/eye_dog_boss.png deleted file mode 100644 index ef5309c..0000000 Binary files a/Assets/Textures/eye_dog_boss.png and /dev/null differ diff --git a/Assets/Textures/eye_dog_boss.png.import b/Assets/Textures/eye_dog_boss.png.import deleted file mode 100644 index a1e3d99..0000000 --- a/Assets/Textures/eye_dog_boss.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c070a2dbkw55e" -path="res://.godot/imported/eye_dog_boss.png-f98e154c9696724f63bbab7ab14fd483.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Textures/eye_dog_boss.png" -dest_files=["res://.godot/imported/eye_dog_boss.png-f98e154c9696724f63bbab7ab14fd483.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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=0 diff --git a/Assets/Textures/eye_dog_fast.png b/Assets/Textures/eye_dog_fast.png deleted file mode 100644 index 37b15dd..0000000 Binary files a/Assets/Textures/eye_dog_fast.png and /dev/null differ diff --git a/Assets/Textures/eye_dog_heavy.png b/Assets/Textures/eye_dog_heavy.png deleted file mode 100644 index 47152c3..0000000 Binary files a/Assets/Textures/eye_dog_heavy.png and /dev/null differ diff --git a/Assets/Textures/eye_dog_heavy.png.import b/Assets/Textures/eye_dog_heavy.png.import deleted file mode 100644 index 9ba4e4f..0000000 --- a/Assets/Textures/eye_dog_heavy.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://54qqmcwcnsun" -path="res://.godot/imported/eye_dog_heavy.png-661153760342e712ba1555603a9dd9b8.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Textures/eye_dog_heavy.png" -dest_files=["res://.godot/imported/eye_dog_heavy.png-661153760342e712ba1555603a9dd9b8.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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=0 diff --git a/Assets/Textures/icon_eye_dog.png b/Assets/Textures/icon_eye_dog.png deleted file mode 100644 index c5e9060..0000000 Binary files a/Assets/Textures/icon_eye_dog.png and /dev/null differ diff --git a/Assets/Textures/icon_eye_dog_boss.png b/Assets/Textures/icon_eye_dog_boss.png deleted file mode 100644 index 2c052df..0000000 Binary files a/Assets/Textures/icon_eye_dog_boss.png and /dev/null differ diff --git a/Assets/Textures/icon_eye_dog_fast.png b/Assets/Textures/icon_eye_dog_fast.png deleted file mode 100644 index 61d9e24..0000000 Binary files a/Assets/Textures/icon_eye_dog_fast.png and /dev/null differ diff --git a/Assets/Textures/icon_eye_dog_heavy.png b/Assets/Textures/icon_eye_dog_heavy.png deleted file mode 100644 index b7e173c..0000000 Binary files a/Assets/Textures/icon_eye_dog_heavy.png and /dev/null differ diff --git a/Assets/Textures/icon_eye_dog_heavy.png.import b/Assets/Textures/icon_eye_dog_heavy.png.import deleted file mode 100644 index eef6976..0000000 --- a/Assets/Textures/icon_eye_dog_heavy.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://08n5jvq5tptf" -path="res://.godot/imported/icon_eye_dog_heavy.png-ba04528959a64035e32de54c20620c3f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Textures/icon_eye_dog_heavy.png" -dest_files=["res://.godot/imported/icon_eye_dog_heavy.png-ba04528959a64035e32de54c20620c3f.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/Assets/Textures/spike.png b/Assets/Textures/spike.png deleted file mode 100644 index f27c3f6..0000000 Binary files a/Assets/Textures/spike.png and /dev/null differ diff --git a/Enemies/BabyEyeDog/baby_eye_dog.tres b/Enemies/BabyEyeDog/baby_eye_dog.tres deleted file mode 100644 index 55c10dd..0000000 --- a/Enemies/BabyEyeDog/baby_eye_dog.tres +++ /dev/null @@ -1,23 +0,0 @@ -[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://cvehqh4tt28g7"] - -[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="1_k5sd1"] -[ext_resource type="Texture2D" uid="uid://cv5p03aw78vwd" path="res://Assets/Textures/icon_eye_dog_fast.png" id="1_xgen5"] -[ext_resource type="Texture2D" uid="uid://dgdofekr7ow73" path="res://Assets/Textures/dead_eye_dog_fast.png" id="1_yj87d"] -[ext_resource type="Texture2D" uid="uid://dd212gh03wloa" path="res://Assets/TextureAtlases/dog_fast.tres" id="2_mkbm6"] -[ext_resource type="PackedScene" uid="uid://dtahuv0kpxx03" path="res://Enemies/BabyEyeDog/baby_eye_dog.tscn" id="3_otbdk"] - -[resource] -script = ExtResource("1_k5sd1") -title = "ENEMY_FAST_BABY" -description = "ENEMY_DESC_FAST_BABY" -target_type = 1 -icon = ExtResource("1_xgen5") -scene = ExtResource("3_otbdk") -death_sprite = ExtResource("1_yj87d") -sprite = ExtResource("2_mkbm6") -spawn_power = 6 -group_size = 10 -health = 15 -penalty = 4 -movement_speed = 3.5 -spawn_cooldown = 0.6 diff --git a/Enemies/BabyEyeDog/baby_eye_dog_mat.tres b/Enemies/BabyEyeDog/baby_eye_dog_mat.tres deleted file mode 100644 index 5ec654d..0000000 --- a/Enemies/BabyEyeDog/baby_eye_dog_mat.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="ShaderMaterial" format=3 uid="uid://bm7wkdbbvgscq"] - -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_0addr"] -[ext_resource type="Texture2D" uid="uid://rjijctm2a70f" path="res://Enemies/BabyEyeDog/baby_eyedog_tex.png" id="2_4kam3"] - -[resource] -render_priority = 0 -shader = ExtResource("1_0addr") -shader_parameter/albedo = ExtResource("2_4kam3") -shader_parameter/jitter_z_coordinate = true -shader_parameter/jitter_depth_independent = true -shader_parameter/alpha_scissor = 0.5 diff --git a/Enemies/BabyEyeDog/baby_eyedog.glb b/Enemies/BabyEyeDog/baby_eyedog.glb deleted file mode 100644 index eef821a..0000000 Binary files a/Enemies/BabyEyeDog/baby_eyedog.glb and /dev/null differ diff --git a/Enemies/BabyEyeDog/baby_eyedog_tex.png b/Enemies/BabyEyeDog/baby_eyedog_tex.png deleted file mode 100644 index f91e747..0000000 Binary files a/Enemies/BabyEyeDog/baby_eyedog_tex.png and /dev/null differ diff --git a/Enemies/BabyEyeDog/baby_eyedog_tex.png.import b/Enemies/BabyEyeDog/baby_eyedog_tex.png.import deleted file mode 100644 index 326080c..0000000 --- a/Enemies/BabyEyeDog/baby_eyedog_tex.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://rjijctm2a70f" -path="res://.godot/imported/baby_eyedog_tex.png-25aa8a1ed412d7c34d0e08868517ff47.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Enemies/BabyEyeDog/baby_eyedog_tex.png" -dest_files=["res://.godot/imported/baby_eyedog_tex.png-25aa8a1ed412d7c34d0e08868517ff47.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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=0 diff --git a/Enemies/Crystalisk/crystalisk.tres b/Enemies/Crystalisk/crystalisk.tres deleted file mode 100644 index b67c636..0000000 --- a/Enemies/Crystalisk/crystalisk.tres +++ /dev/null @@ -1,22 +0,0 @@ -[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://bffhb5krs5elm"] - -[ext_resource type="Texture2D" uid="uid://b1lwaxw62yp3p" path="res://Assets/Textures/dead_spike.png" id="1_skyfd"] -[ext_resource type="Texture2D" uid="uid://duywsy7jmh4u" path="res://Assets/Textures/spike.png" id="2_idym2"] -[ext_resource type="PackedScene" uid="uid://cveiaa0y66gln" path="res://Enemies/Crystalisk/crystal_enemy.tscn" id="3_fmkhl"] -[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="4_x2l2n"] -[ext_resource type="Texture2D" uid="uid://sybn6bjbj5fh" path="res://Assets/TextureAtlases/spike.tres" id="5_okcvf"] - -[resource] -script = ExtResource("4_x2l2n") -title = "ENEMY_FLYING_CRYSTAL" -description = "ENEMY_DESC_FLYING_CRYSTAL" -target_type = 2 -icon = ExtResource("2_idym2") -scene = ExtResource("3_fmkhl") -death_sprite = ExtResource("1_skyfd") -sprite = ExtResource("5_okcvf") -spawn_power = 6 -group_size = 6 -health = 90 -penalty = 7 -movement_speed = 1.0 diff --git a/Enemies/Crystalisk/ene_crystalisk.tres b/Enemies/Crystalisk/ene_crystalisk.tres new file mode 100644 index 0000000..5d0d9d7 --- /dev/null +++ b/Enemies/Crystalisk/ene_crystalisk.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://bffhb5krs5elm"] + +[ext_resource type="Texture2D" uid="uid://b1lwaxw62yp3p" path="res://Assets/Textures/dead_spike.png" id="1_oypxu"] +[ext_resource type="Texture2D" uid="uid://bic78xsdnr8qy" path="res://Enemies/Crystalisk/icon_crystalisk.png" id="2_p71wu"] +[ext_resource type="PackedScene" uid="uid://cveiaa0y66gln" path="res://Enemies/Crystalisk/scn_crystalisk.tscn" id="3_1ao04"] +[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="4_5kn4m"] + +[resource] +script = ExtResource("4_5kn4m") +title = "ENEMY_FLYING_CRYSTAL" +description = "ENEMY_DESC_FLYING_CRYSTAL" +target_type = 2 +icon = ExtResource("2_p71wu") +scene = ExtResource("3_1ao04") +death_sprite = ExtResource("1_oypxu") +spawn_power = 6 +group_size = 6 +health = 90 +penalty = 7 +movement_speed = 1.0 diff --git a/Enemies/Crystalisk/icon_crystalisk.png b/Enemies/Crystalisk/icon_crystalisk.png new file mode 100644 index 0000000..6876993 Binary files /dev/null and b/Enemies/Crystalisk/icon_crystalisk.png differ diff --git a/Assets/Textures/icon_eye_dog_boss.png.import b/Enemies/Crystalisk/icon_crystalisk.png.import similarity index 72% rename from Assets/Textures/icon_eye_dog_boss.png.import rename to Enemies/Crystalisk/icon_crystalisk.png.import index 8be519b..64addab 100644 --- a/Assets/Textures/icon_eye_dog_boss.png.import +++ b/Enemies/Crystalisk/icon_crystalisk.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cde0voyrwnqkl" -path="res://.godot/imported/icon_eye_dog_boss.png-2e375a379507be43f07a5b78a57627eb.ctex" +uid="uid://bic78xsdnr8qy" +path="res://.godot/imported/icon_crystalisk.png-4c70a2107210c8d3df52e85a38aff5c9.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Textures/icon_eye_dog_boss.png" -dest_files=["res://.godot/imported/icon_eye_dog_boss.png-2e375a379507be43f07a5b78a57627eb.ctex"] +source_file="res://Enemies/Crystalisk/icon_crystalisk.png" +dest_files=["res://.godot/imported/icon_crystalisk.png-4c70a2107210c8d3df52e85a38aff5c9.ctex"] [params] diff --git a/Enemies/Crystalisk/crystal_enemy_mat.tres b/Enemies/Crystalisk/mat_crystalisk.tres similarity index 89% rename from Enemies/Crystalisk/crystal_enemy_mat.tres rename to Enemies/Crystalisk/mat_crystalisk.tres index e993e1f..1715a5f 100644 --- a/Enemies/Crystalisk/crystal_enemy_mat.tres +++ b/Enemies/Crystalisk/mat_crystalisk.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://dylmoyx1tasat"] [ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_13w0y"] -[ext_resource type="Texture2D" uid="uid://d01y8kogfuayr" path="res://Enemies/Crystalisk/crystal_enemy.png" id="2_l5awy"] +[ext_resource type="Texture2D" uid="uid://d01y8kogfuayr" path="res://Enemies/Crystalisk/tex_crystalisk.png" id="2_l5awy"] [resource] render_priority = 0 diff --git a/Enemies/Crystalisk/crystal_enemy.glb b/Enemies/Crystalisk/mdl_crystalisk.glb similarity index 100% rename from Enemies/Crystalisk/crystal_enemy.glb rename to Enemies/Crystalisk/mdl_crystalisk.glb diff --git a/Enemies/Crystalisk/crystal_enemy.glb.import b/Enemies/Crystalisk/mdl_crystalisk.glb.import similarity index 99% rename from Enemies/Crystalisk/crystal_enemy.glb.import rename to Enemies/Crystalisk/mdl_crystalisk.glb.import index eb2982c..dbfbf1f 100644 --- a/Enemies/Crystalisk/crystal_enemy.glb.import +++ b/Enemies/Crystalisk/mdl_crystalisk.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://o6whohcbalui" -path="res://.godot/imported/crystal_enemy.glb-c13aa4a405d2f70db8609b6b88d49905.scn" +path="res://.godot/imported/mdl_crystalisk.glb-cf840293d3774b4b5d59729082ba23c0.scn" [deps] -source_file="res://Enemies/Crystalisk/crystal_enemy.glb" -dest_files=["res://.godot/imported/crystal_enemy.glb-c13aa4a405d2f70db8609b6b88d49905.scn"] +source_file="res://Enemies/Crystalisk/mdl_crystalisk.glb" +dest_files=["res://.godot/imported/mdl_crystalisk.glb-cf840293d3774b4b5d59729082ba23c0.scn"] [params] diff --git a/Enemies/Crystalisk/crystal_enemy.tscn b/Enemies/Crystalisk/scn_crystalisk.tscn similarity index 98% rename from Enemies/Crystalisk/crystal_enemy.tscn rename to Enemies/Crystalisk/scn_crystalisk.tscn index df0e047..eeb6923 100644 --- a/Enemies/Crystalisk/crystal_enemy.tscn +++ b/Enemies/Crystalisk/scn_crystalisk.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://cveiaa0y66gln"] [ext_resource type="PackedScene" uid="uid://bjo2q6vca5qlv" path="res://Worlds/GreenPlanet/Enemies/air_enemy.tscn" id="1_aormu"] -[ext_resource type="PackedScene" uid="uid://o6whohcbalui" path="res://Enemies/Crystalisk/crystal_enemy.glb" id="2_myjng"] +[ext_resource type="PackedScene" uid="uid://o6whohcbalui" path="res://Enemies/Crystalisk/mdl_crystalisk.glb" id="2_myjng"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="3_myjng"] [sub_resource type="ViewportTexture" id="ViewportTexture_ij8ev"] diff --git a/Enemies/Crystalisk/crystal_enemy.png b/Enemies/Crystalisk/tex_crystalisk.png similarity index 100% rename from Enemies/Crystalisk/crystal_enemy.png rename to Enemies/Crystalisk/tex_crystalisk.png diff --git a/Enemies/Crystalisk/crystal_enemy.png.import b/Enemies/Crystalisk/tex_crystalisk.png.import similarity index 75% rename from Enemies/Crystalisk/crystal_enemy.png.import rename to Enemies/Crystalisk/tex_crystalisk.png.import index 2747729..3d2d548 100644 --- a/Enemies/Crystalisk/crystal_enemy.png.import +++ b/Enemies/Crystalisk/tex_crystalisk.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d01y8kogfuayr" -path="res://.godot/imported/crystal_enemy.png-47c4105ce5ff19d6a767c397a2a82c0d.ctex" +path="res://.godot/imported/tex_crystalisk.png-2c4a182f8db5bfce8a32509f3cb5f387.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Enemies/Crystalisk/crystal_enemy.png" -dest_files=["res://.godot/imported/crystal_enemy.png-47c4105ce5ff19d6a767c397a2a82c0d.ctex"] +source_file="res://Enemies/Crystalisk/tex_crystalisk.png" +dest_files=["res://.godot/imported/tex_crystalisk.png-2c4a182f8db5bfce8a32509f3cb5f387.ctex"] [params] diff --git a/Enemies/Driftling/icon_driftling.png b/Enemies/Driftling/icon_driftling.png index d23235b..827dd82 100644 Binary files a/Enemies/Driftling/icon_driftling.png and b/Enemies/Driftling/icon_driftling.png differ diff --git a/Enemies/ElderEyeDog/elder_eye_dog.tres b/Enemies/ElderEyeDog/elder_eye_dog.tres deleted file mode 100644 index 3eafd77..0000000 --- a/Enemies/ElderEyeDog/elder_eye_dog.tres +++ /dev/null @@ -1,23 +0,0 @@ -[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://dxi17xvdlhkvc"] - -[ext_resource type="Texture2D" uid="uid://08n5jvq5tptf" path="res://Assets/Textures/icon_eye_dog_heavy.png" id="1_lck53"] -[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="1_q48il"] -[ext_resource type="Texture2D" uid="uid://e7lahg40lq8a" path="res://Assets/Textures/dead_eye_dog_heavy.png" id="1_qveaa"] -[ext_resource type="Texture2D" uid="uid://c0543ucoalwmi" path="res://Assets/TextureAtlases/dog_fast_heavy.tres" id="2_7nc4x"] -[ext_resource type="PackedScene" uid="uid://dl3rwqwbgrq2m" path="res://Enemies/ElderEyeDog/scn_elder_eye_dog.tscn" id="3_m808b"] - -[resource] -script = ExtResource("1_q48il") -title = "ENEMY_HEAVY_WALKER" -description = "ENEMY_DESC_HEAVY_WALKER" -target_type = 1 -icon = ExtResource("1_lck53") -scene = ExtResource("3_m808b") -death_sprite = ExtResource("1_qveaa") -sprite = ExtResource("2_7nc4x") -spawn_power = 8 -group_size = 4 -health = 150 -penalty = 15 -movement_speed = 1.4 -spawn_cooldown = 2.0 diff --git a/Enemies/ElderEyeDog/ene_elder_eye_dog.tres b/Enemies/ElderEyeDog/ene_elder_eye_dog.tres new file mode 100644 index 0000000..00da546 --- /dev/null +++ b/Enemies/ElderEyeDog/ene_elder_eye_dog.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://dxi17xvdlhkvc"] + +[ext_resource type="Texture2D" uid="uid://e7lahg40lq8a" path="res://Assets/Textures/dead_eye_dog_heavy.png" id="1_fqks5"] +[ext_resource type="Texture2D" uid="uid://h5svpdvo6tcd" path="res://Enemies/ElderEyeDog/icon_elder_eye_dog.png" id="2_7h6ly"] +[ext_resource type="PackedScene" uid="uid://dl3rwqwbgrq2m" path="res://Enemies/ElderEyeDog/scn_elder_eye_dog.tscn" id="3_01b8q"] +[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="4_egbcr"] + +[resource] +script = ExtResource("4_egbcr") +title = "ENEMY_HEAVY_WALKER" +description = "ENEMY_DESC_HEAVY_WALKER" +target_type = 1 +icon = ExtResource("2_7h6ly") +scene = ExtResource("3_01b8q") +death_sprite = ExtResource("1_fqks5") +spawn_power = 8 +group_size = 4 +health = 150 +penalty = 15 +movement_speed = 1.4 +spawn_cooldown = 2.0 diff --git a/Enemies/ElderEyeDog/icon_elder_eye_dog.png b/Enemies/ElderEyeDog/icon_elder_eye_dog.png new file mode 100644 index 0000000..5218d4a Binary files /dev/null and b/Enemies/ElderEyeDog/icon_elder_eye_dog.png differ diff --git a/Assets/Textures/icon_eye_dog_fast.png.import b/Enemies/ElderEyeDog/icon_elder_eye_dog.png.import similarity index 71% rename from Assets/Textures/icon_eye_dog_fast.png.import rename to Enemies/ElderEyeDog/icon_elder_eye_dog.png.import index 6c17f0a..43baf0c 100644 --- a/Assets/Textures/icon_eye_dog_fast.png.import +++ b/Enemies/ElderEyeDog/icon_elder_eye_dog.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cv5p03aw78vwd" -path="res://.godot/imported/icon_eye_dog_fast.png-0a08e5ef41b3ff60b195f0e078e24ab8.ctex" +uid="uid://h5svpdvo6tcd" +path="res://.godot/imported/icon_elder_eye_dog.png-d36b691ba4537e426e29a310609ed540.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Textures/icon_eye_dog_fast.png" -dest_files=["res://.godot/imported/icon_eye_dog_fast.png-0a08e5ef41b3ff60b195f0e078e24ab8.ctex"] +source_file="res://Enemies/ElderEyeDog/icon_elder_eye_dog.png" +dest_files=["res://.godot/imported/icon_elder_eye_dog.png-d36b691ba4537e426e29a310609ed540.ctex"] [params] diff --git a/Enemies/EyeDog/ene_eye_dog.tres b/Enemies/EyeDog/ene_eye_dog.tres new file mode 100644 index 0000000..f8b682b --- /dev/null +++ b/Enemies/EyeDog/ene_eye_dog.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://8eba45hql7bo"] + +[ext_resource type="Texture2D" uid="uid://cdnhe2mi5c5ln" path="res://Assets/Textures/dead_eye_dog.png" id="1_rbfn2"] +[ext_resource type="Texture2D" uid="uid://chmxo0rj26cxh" path="res://Enemies/EyeDog/icon_eye_dog.png" id="2_nef0e"] +[ext_resource type="PackedScene" uid="uid://bvq6tbkuv2mfp" path="res://Enemies/EyeDog/scn_eye_dog.tscn" id="3_fa8t4"] +[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="4_gobb7"] + +[resource] +resource_local_to_scene = true +script = ExtResource("4_gobb7") +title = "ENEMY_DOG" +description = "ENEMY_DESC_DOG" +target_type = 1 +icon = ExtResource("2_nef0e") +scene = ExtResource("3_fa8t4") +death_sprite = ExtResource("1_rbfn2") +spawn_power = 3 +health = 60 +movement_speed = 1.6 +spawn_cooldown = 1.2 diff --git a/Enemies/EyeDog/eye_dog.tres b/Enemies/EyeDog/eye_dog.tres deleted file mode 100644 index 73b3b3c..0000000 --- a/Enemies/EyeDog/eye_dog.tres +++ /dev/null @@ -1,27 +0,0 @@ -[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://8eba45hql7bo"] - -[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="1_ivs7a"] -[ext_resource type="Texture2D" uid="uid://cdnhe2mi5c5ln" path="res://Assets/Textures/dead_eye_dog.png" id="1_r8gpy"] -[ext_resource type="Texture2D" uid="uid://g00wwrlxxdc5" path="res://Assets/Textures/icon_eye_dog.png" id="2_tyyee"] -[ext_resource type="PackedScene" uid="uid://bvq6tbkuv2mfp" path="res://Enemies/EyeDog/eye_dog.tscn" id="3_mxg1o"] -[ext_resource type="Texture2D" uid="uid://dj13g1w14mekw" path="res://Assets/Textures/eye_dog.png" id="4_7ypa6"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_n6kdu"] -resource_local_to_scene = true -atlas = ExtResource("4_7ypa6") -region = Rect2(0, 0, 32, 32) - -[resource] -resource_local_to_scene = true -script = ExtResource("1_ivs7a") -title = "ENEMY_DOG" -description = "ENEMY_DESC_DOG" -target_type = 1 -icon = ExtResource("2_tyyee") -scene = ExtResource("3_mxg1o") -death_sprite = ExtResource("1_r8gpy") -sprite = SubResource("AtlasTexture_n6kdu") -spawn_power = 3 -health = 60 -movement_speed = 1.6 -spawn_cooldown = 1.2 diff --git a/Enemies/EyeDog/icon_eye_dog.png b/Enemies/EyeDog/icon_eye_dog.png new file mode 100644 index 0000000..0dc09b6 Binary files /dev/null and b/Enemies/EyeDog/icon_eye_dog.png differ diff --git a/Assets/Textures/icon_eye_dog.png.import b/Enemies/EyeDog/icon_eye_dog.png.import similarity index 73% rename from Assets/Textures/icon_eye_dog.png.import rename to Enemies/EyeDog/icon_eye_dog.png.import index 50baa4b..3a0c68e 100644 --- a/Assets/Textures/icon_eye_dog.png.import +++ b/Enemies/EyeDog/icon_eye_dog.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://g00wwrlxxdc5" -path="res://.godot/imported/icon_eye_dog.png-3bce6f978ac13692e2a12291b10c5729.ctex" +uid="uid://chmxo0rj26cxh" +path="res://.godot/imported/icon_eye_dog.png-791d061849bbbed621028cbde240ba88.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Textures/icon_eye_dog.png" -dest_files=["res://.godot/imported/icon_eye_dog.png-3bce6f978ac13692e2a12291b10c5729.ctex"] +source_file="res://Enemies/EyeDog/icon_eye_dog.png" +dest_files=["res://.godot/imported/icon_eye_dog.png-791d061849bbbed621028cbde240ba88.ctex"] [params] diff --git a/Enemies/EyeDog/psx_model_material.tres b/Enemies/EyeDog/mat_eye_dog.tres similarity index 90% rename from Enemies/EyeDog/psx_model_material.tres rename to Enemies/EyeDog/mat_eye_dog.tres index 6c2af1e..c670089 100644 --- a/Enemies/EyeDog/psx_model_material.tres +++ b/Enemies/EyeDog/mat_eye_dog.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://bo82o88d7vo1x"] [ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_1d6vt"] -[ext_resource type="Texture2D" uid="uid://br44qpy5v6ymr" path="res://Enemies/EyeDog/eye_dog_tex.png" id="2_1d6vt"] +[ext_resource type="Texture2D" uid="uid://br44qpy5v6ymr" path="res://Enemies/EyeDog/tex_eye_dog.png" id="2_1d6vt"] [resource] render_priority = 0 diff --git a/Enemies/EyeDog/eyedog.glb b/Enemies/EyeDog/mdl_eye_dog.glb similarity index 100% rename from Enemies/EyeDog/eyedog.glb rename to Enemies/EyeDog/mdl_eye_dog.glb diff --git a/Enemies/EyeDog/eyedog.glb.import b/Enemies/EyeDog/mdl_eye_dog.glb.import similarity index 99% rename from Enemies/EyeDog/eyedog.glb.import rename to Enemies/EyeDog/mdl_eye_dog.glb.import index 76526cb..41302f5 100644 --- a/Enemies/EyeDog/eyedog.glb.import +++ b/Enemies/EyeDog/mdl_eye_dog.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://dlhx6r23m5ceg" -path="res://.godot/imported/eyedog.glb-066d1d46e7943baa72fec506b08447f4.scn" +path="res://.godot/imported/mdl_eye_dog.glb-0f771e4c78c188462432b5e3ef7f2a08.scn" [deps] -source_file="res://Enemies/EyeDog/eyedog.glb" -dest_files=["res://.godot/imported/eyedog.glb-066d1d46e7943baa72fec506b08447f4.scn"] +source_file="res://Enemies/EyeDog/mdl_eye_dog.glb" +dest_files=["res://.godot/imported/mdl_eye_dog.glb-0f771e4c78c188462432b5e3ef7f2a08.scn"] [params] diff --git a/Enemies/EyeDog/eye_dog.tscn b/Enemies/EyeDog/scn_eye_dog.tscn similarity index 99% rename from Enemies/EyeDog/eye_dog.tscn rename to Enemies/EyeDog/scn_eye_dog.tscn index 5eb9026..cbdcceb 100644 --- a/Enemies/EyeDog/eye_dog.tscn +++ b/Enemies/EyeDog/scn_eye_dog.tscn @@ -6,7 +6,7 @@ [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="7_bkkhh"] [ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="8_k2835"] [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="9_t4oco"] -[ext_resource type="PackedScene" uid="uid://dlhx6r23m5ceg" path="res://Enemies/EyeDog/eyedog.glb" id="10_h25mw"] +[ext_resource type="PackedScene" uid="uid://dlhx6r23m5ceg" path="res://Enemies/EyeDog/mdl_eye_dog.glb" id="10_h25mw"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="11_kpdsm"] [sub_resource type="BoxShape3D" id="BoxShape3D_246sn"] diff --git a/Enemies/EyeDog/eye_dog_tex.png b/Enemies/EyeDog/tex_eye_dog.png similarity index 100% rename from Enemies/EyeDog/eye_dog_tex.png rename to Enemies/EyeDog/tex_eye_dog.png diff --git a/Enemies/EyeDog/eye_dog_tex.png.import b/Enemies/EyeDog/tex_eye_dog.png.import similarity index 76% rename from Enemies/EyeDog/eye_dog_tex.png.import rename to Enemies/EyeDog/tex_eye_dog.png.import index d6d592b..3594d81 100644 --- a/Enemies/EyeDog/eye_dog_tex.png.import +++ b/Enemies/EyeDog/tex_eye_dog.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://br44qpy5v6ymr" -path="res://.godot/imported/eye_dog_tex.png-7d4de85274337ceeb649543e4825dc79.ctex" +path="res://.godot/imported/tex_eye_dog.png-0cc7e2cef3a19b671bb3a4fd9aac852a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Enemies/EyeDog/eye_dog_tex.png" -dest_files=["res://.godot/imported/eye_dog_tex.png-7d4de85274337ceeb649543e4825dc79.ctex"] +source_file="res://Enemies/EyeDog/tex_eye_dog.png" +dest_files=["res://.godot/imported/tex_eye_dog.png-0cc7e2cef3a19b671bb3a4fd9aac852a.ctex"] [params] diff --git a/Enemies/Skitter/ene_skitter.tres b/Enemies/Skitter/ene_skitter.tres new file mode 100644 index 0000000..be86ed2 --- /dev/null +++ b/Enemies/Skitter/ene_skitter.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="Enemy" format=3 uid="uid://cvehqh4tt28g7"] + +[ext_resource type="Texture2D" uid="uid://dgdofekr7ow73" path="res://Assets/Textures/dead_eye_dog_fast.png" id="1_c7x0f"] +[ext_resource type="Texture2D" uid="uid://cn0177otlyej" path="res://Enemies/Skitter/icon_skitter.png" id="2_1jb1p"] +[ext_resource type="PackedScene" uid="uid://dtahuv0kpxx03" path="res://Enemies/Skitter/scn_skitter.tscn" id="3_8atvu"] +[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="4_5c3g2"] + +[resource] +script = ExtResource("4_5c3g2") +title = "ENEMY_FAST_BABY" +description = "ENEMY_DESC_FAST_BABY" +target_type = 1 +icon = ExtResource("2_1jb1p") +scene = ExtResource("3_8atvu") +death_sprite = ExtResource("1_c7x0f") +spawn_power = 6 +group_size = 10 +health = 15 +penalty = 4 +movement_speed = 3.5 +spawn_cooldown = 0.6 diff --git a/Enemies/Skitter/icon_skitter.png b/Enemies/Skitter/icon_skitter.png new file mode 100644 index 0000000..1126a24 Binary files /dev/null and b/Enemies/Skitter/icon_skitter.png differ diff --git a/Assets/Textures/eye_dog_fast.png.import b/Enemies/Skitter/icon_skitter.png.import similarity index 73% rename from Assets/Textures/eye_dog_fast.png.import rename to Enemies/Skitter/icon_skitter.png.import index db02adf..99b826e 100644 --- a/Assets/Textures/eye_dog_fast.png.import +++ b/Enemies/Skitter/icon_skitter.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://55cchelc8cqw" -path="res://.godot/imported/eye_dog_fast.png-b97e84283919cc098b006f3a56b30818.ctex" +uid="uid://cn0177otlyej" +path="res://.godot/imported/icon_skitter.png-8da13ce62049f7057228ee569f9d30bf.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Textures/eye_dog_fast.png" -dest_files=["res://.godot/imported/eye_dog_fast.png-b97e84283919cc098b006f3a56b30818.ctex"] +source_file="res://Enemies/Skitter/icon_skitter.png" +dest_files=["res://.godot/imported/icon_skitter.png-8da13ce62049f7057228ee569f9d30bf.ctex"] [params] diff --git a/Enemies/Skitter/mat_skitter.tres b/Enemies/Skitter/mat_skitter.tres new file mode 100644 index 0000000..5603ad3 --- /dev/null +++ b/Enemies/Skitter/mat_skitter.tres @@ -0,0 +1,12 @@ +[gd_resource type="ShaderMaterial" format=3 uid="uid://sit74yglb7lx"] + +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_878cd"] +[ext_resource type="Texture2D" uid="uid://c2oua8elqp1q4" path="res://Enemies/Skitter/tex_skitter.png" id="2_0rgil"] + +[resource] +render_priority = 0 +shader = ExtResource("1_878cd") +shader_parameter/albedo = ExtResource("2_0rgil") +shader_parameter/jitter_z_coordinate = true +shader_parameter/jitter_depth_independent = true +shader_parameter/alpha_scissor = 1.0 diff --git a/Enemies/Skitter/mdl_skitter.glb b/Enemies/Skitter/mdl_skitter.glb new file mode 100644 index 0000000..2fef3d0 Binary files /dev/null and b/Enemies/Skitter/mdl_skitter.glb differ diff --git a/Enemies/BabyEyeDog/baby_eyedog.glb.import b/Enemies/Skitter/mdl_skitter.glb.import similarity index 99% rename from Enemies/BabyEyeDog/baby_eyedog.glb.import rename to Enemies/Skitter/mdl_skitter.glb.import index ac12d9c..6d7f619 100644 --- a/Enemies/BabyEyeDog/baby_eyedog.glb.import +++ b/Enemies/Skitter/mdl_skitter.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://bgxr27by7jruo" -path="res://.godot/imported/baby_eyedog.glb-a187781f666218849f29856d9c82f6de.scn" +uid="uid://bqxa663yfj6ne" +path="res://.godot/imported/mdl_skitter.glb-ae894e5411f5d23fd2ef5941f66110cb.scn" [deps] -source_file="res://Enemies/BabyEyeDog/baby_eyedog.glb" -dest_files=["res://.godot/imported/baby_eyedog.glb-a187781f666218849f29856d9c82f6de.scn"] +source_file="res://Enemies/Skitter/mdl_skitter.glb" +dest_files=["res://.godot/imported/mdl_skitter.glb-ae894e5411f5d23fd2ef5941f66110cb.scn"] [params] @@ -2099,10 +2099,10 @@ _subresources={ "materials": { "Material": { "use_external/enabled": true, -"use_external/fallback_path": "res://Enemies/BabyEyeDog/baby_eye_dog_mat.tres", -"use_external/path": "uid://bm7wkdbbvgscq" +"use_external/fallback_path": "res://Enemies/Skitter/mat_skitter.tres", +"use_external/path": "uid://sit74yglb7lx" } } } -gltf/naming_version=1 +gltf/naming_version=2 gltf/embedded_image_handling=1 diff --git a/Enemies/BabyEyeDog/baby_eye_dog.tscn b/Enemies/Skitter/scn_skitter.tscn similarity index 50% rename from Enemies/BabyEyeDog/baby_eye_dog.tscn rename to Enemies/Skitter/scn_skitter.tscn index dda9231..78ccdae 100644 --- a/Enemies/BabyEyeDog/baby_eye_dog.tscn +++ b/Enemies/Skitter/scn_skitter.tscn @@ -5,20 +5,21 @@ [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="5_f7xim"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="6_lbm5h"] [ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="7_o1784"] +[ext_resource type="PackedScene" uid="uid://bqxa663yfj6ne" path="res://Enemies/Skitter/mdl_skitter.glb" id="7_pxxbh"] [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="8_1fak8"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="9_yrbee"] -[ext_resource type="PackedScene" uid="uid://bgxr27by7jruo" path="res://Enemies/BabyEyeDog/baby_eyedog.glb" id="10_8k5ts"] - -[sub_resource type="SphereShape3D" id="SphereShape3D_cavbv"] -radius = 0.364 - -[sub_resource type="SphereShape3D" id="SphereShape3D_h25mw"] -radius = 0.150315 [sub_resource type="ViewportTexture" id="ViewportTexture_1kwxq"] viewport_path = NodePath("SubViewport") -[node name="BabyEyeDog" type="CharacterBody3D" unique_id=1710427344 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar") groups=["Enemies"]] +[sub_resource type="BoxShape3D" id="BoxShape3D_8v4n0"] +size = Vector3(1, 0.25274658, 1.2819824) + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_cbvg7"] +radius = 0.19042969 +height = 0.7624512 + +[node name="Skitter" type="CharacterBody3D" unique_id=1710427344 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar") groups=["Enemies"]] collision_layer = 4 collision_mask = 0 script = ExtResource("1_8k5ts") @@ -29,19 +30,6 @@ corpse_scene = ExtResource("2_vl30x") health_bar = NodePath("SubViewport/HealthBar") metadata/_custom_type_script = "uid://ejqql2660u6h" -[node name="Hitbox" type="CollisionShape3D" parent="." unique_id=351984421] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.195078, -0.0104714) -shape = SubResource("SphereShape3D_cavbv") -script = ExtResource("5_f7xim") -metadata/_custom_type_script = "uid://cummt2be3r1gq" - -[node name="Hitbox2" type="CollisionShape3D" parent="." unique_id=2083525576] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.368244, -0.278334) -shape = SubResource("SphereShape3D_h25mw") -script = ExtResource("5_f7xim") -critical_zone = true -metadata/_custom_type_script = "uid://cummt2be3r1gq" - [node name="HealthBar" type="Sprite3D" parent="." unique_id=395203513] transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 1.20821, 0) sorting_offset = 1.0 @@ -85,40 +73,30 @@ metadata/_custom_type_script = "uid://cojjgevmbhwal" [node name="Node3D" type="Node3D" parent="." unique_id=2075469733] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.39813, 0) -[node name="baby_eyedog" parent="." unique_id=284376992 instance=ExtResource("10_8k5ts")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) +[node name="mdl_skitter" parent="." unique_id=1753143851 instance=ExtResource("7_pxxbh")] -[node name="Skeleton3D" parent="baby_eyedog/Armature" parent_id_path=PackedInt32Array(284376992, 1039790689) index="0" unique_id=65566848] -bones/1/rotation = Quaternion(-0.43930408, -1.0709029e-07, 5.2369124e-08, 0.89833844) -bones/3/rotation = Quaternion(0.23378512, 0.32485124, 0.5427555, 0.7383988) -bones/4/rotation = Quaternion(0.2025959, 0.7308365, 0.13344719, 0.637985) -bones/5/rotation = Quaternion(0.08071687, 0.11379393, 0.103388034, 0.98480797) -bones/6/rotation = Quaternion(0.18970048, 0.045550477, -0.014727625, 0.9806743) -bones/7/rotation = Quaternion(0.21259236, -0.040924743, -0.77614677, 0.5922212) -bones/8/rotation = Quaternion(0.14559563, -0.673764, -0.22377312, 0.68903524) -bones/9/rotation = Quaternion(0.21457952, -0.06795216, -0.27383056, 0.9350695) -bones/10/rotation = Quaternion(0.36169595, -0.022981033, -0.07378154, 0.9290878) -bones/11/position = Vector3(-0.18218139, 0.024974564, -0.29701275) -bones/13/rotation = Quaternion(-0.19031386, -0.3437138, 0.6673053, 0.6327283) -bones/14/rotation = Quaternion(-0.31594613, -0.57630664, -0.23705915, 0.71543807) -bones/15/rotation = Quaternion(0.36767012, -0.03635548, 0.34470242, 0.8629468) -bones/16/rotation = Quaternion(0.39200988, 0.014128355, 0.1034986, 0.91401124) -bones/17/rotation = Quaternion(-0.41564333, 0.23491889, -0.8066817, 0.34830806) -bones/18/rotation = Quaternion(-0.15507148, 0.54643595, 0.03793797, 0.8221443) -bones/19/rotation = Quaternion(0.16323948, -0.017942403, -0.15406615, 0.97431755) -bones/20/rotation = Quaternion(0.20094736, -0.03854681, -0.0018878406, 0.9788416) -bones/22/position = Vector3(-0.1285572, 0.015959304, 0.5192608) -bones/22/scale = Vector3(0.89347196, 1, 1) -bones/23/position = Vector3(0.25597548, 0.022818465, 0.20058686) -bones/23/scale = Vector3(0.89347196, 1, 1) -bones/24/position = Vector3(0.08454189, 0.014853473, 0.12984678) +[node name="Skeleton3D" parent="mdl_skitter/Armature" parent_id_path=PackedInt32Array(1753143851, 1635157965) index="0" unique_id=1089123257] +bones/1/rotation = Quaternion(-0.32276848, -0.08836041, 0.37510455, 0.86447066) +bones/3/rotation = Quaternion(0.05774434, -0.027616108, 0.8835519, 0.46393853) +bones/5/rotation = Quaternion(0.27334806, -0.034516517, 0.89473575, 0.3514789) +bones/7/rotation = Quaternion(-0.34224942, 0.09999892, -0.3036359, 0.8835558) +bones/9/rotation = Quaternion(-0.19445433, 0.17105538, -0.5590174, 0.7876719) +bones/11/rotation = Quaternion(-0.28836852, -0.021420462, 0.89958346, -0.32731378) -[node name="AnimationPlayer" parent="baby_eyedog" index="1" unique_id=101655042] +[node name="AnimationPlayer" parent="mdl_skitter" index="1" unique_id=966022087] autoplay = &"Walk" -[connection signal="recieved_effect" from="Hitbox" to="StatusEffector" method="add_effect"] -[connection signal="took_damage" from="Hitbox" to="." method="take_damage"] -[connection signal="recieved_effect" from="Hitbox2" to="StatusEffector" method="add_effect"] -[connection signal="took_damage" from="Hitbox2" to="." method="take_damage"] +[node name="Hitbox" type="CollisionShape3D" parent="." unique_id=438909712] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.28146362, 0.047973633) +shape = SubResource("BoxShape3D_8v4n0") +script = ExtResource("5_f7xim") +metadata/_custom_type_script = "uid://cummt2be3r1gq" -[editable path="baby_eyedog"] +[node name="Hitbox2" type="CollisionShape3D" parent="." unique_id=287967142] +transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0.36764592, 0.061401367) +shape = SubResource("CapsuleShape3D_cbvg7") +script = ExtResource("5_f7xim") +critical_zone = true +metadata/_custom_type_script = "uid://cummt2be3r1gq" + +[editable path="mdl_skitter"] diff --git a/Enemies/Skitter/tex_skitter.png b/Enemies/Skitter/tex_skitter.png new file mode 100644 index 0000000..2648adc Binary files /dev/null and b/Enemies/Skitter/tex_skitter.png differ diff --git a/Assets/Textures/spike.png.import b/Enemies/Skitter/tex_skitter.png.import similarity index 66% rename from Assets/Textures/spike.png.import rename to Enemies/Skitter/tex_skitter.png.import index ca3ba39..f86ad0a 100644 --- a/Assets/Textures/spike.png.import +++ b/Enemies/Skitter/tex_skitter.png.import @@ -2,20 +2,21 @@ importer="texture" type="CompressedTexture2D" -uid="uid://duywsy7jmh4u" -path="res://.godot/imported/spike.png-c96630296dde04541d0a1d2bf09362bf.ctex" +uid="uid://c2oua8elqp1q4" +path.s3tc="res://.godot/imported/tex_skitter.png-f536e411e9f4816e87f5726ae45cdd3e.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] -source_file="res://Assets/Textures/spike.png" -dest_files=["res://.godot/imported/spike.png-c96630296dde04541d0a1d2bf09362bf.ctex"] +source_file="res://Enemies/Skitter/tex_skitter.png" +dest_files=["res://.godot/imported/tex_skitter.png-f536e411e9f4816e87f5726ae45cdd3e.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 diff --git a/Levels/Level1/wave1.tres b/Levels/Level1/wave1.tres index fcf9496..f584f7b 100644 --- a/Levels/Level1/wave1.tres +++ b/Levels/Level1/wave1.tres @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_wj13r"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="2_tihwe"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_ywnes"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_ywnes"] [sub_resource type="Resource" id="Resource_1qdvn"] script = ExtResource("1_wj13r") diff --git a/Levels/Level1/wave2.tres b/Levels/Level1/wave2.tres index c371d09..b935a02 100644 --- a/Levels/Level1/wave2.tres +++ b/Levels/Level1/wave2.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://dfmwdshr7k10t"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_mipfg"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_yu6dw"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_yu6dw"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_pwjb7"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level1/wave3.tres b/Levels/Level1/wave3.tres index 2e7a170..3127c45 100644 --- a/Levels/Level1/wave3.tres +++ b/Levels/Level1/wave3.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://gi2aci5co4i0"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_p2cct"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_manrb"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_manrb"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_flldk"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="3_manrb"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="3_manrb"] [sub_resource type="Resource" id="Resource_wug4u"] script = ExtResource("1_p2cct") diff --git a/Levels/Level1/wave4.tres b/Levels/Level1/wave4.tres index d0a028c..1eaa882 100644 --- a/Levels/Level1/wave4.tres +++ b/Levels/Level1/wave4.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://b60npeapn8f82"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_n6h5y"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_euys0"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_euys0"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_xyjue"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level1/wave5.tres b/Levels/Level1/wave5.tres index 1c6c1b8..aa7656a 100644 --- a/Levels/Level1/wave5.tres +++ b/Levels/Level1/wave5.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://ckadophirmra5"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_0u7gc"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="2_0u7gc"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="2_0u7gc"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_qm0wt"] [sub_resource type="Resource" id="Resource_tab3n"] diff --git a/Levels/Level1/wave6.tres b/Levels/Level1/wave6.tres index 7118391..dcbf3c2 100644 --- a/Levels/Level1/wave6.tres +++ b/Levels/Level1/wave6.tres @@ -1,10 +1,10 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://bdskawdb7174i"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_njap1"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="2_1ll4s"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_o06hi"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="2_1ll4s"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_o06hi"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_1ll4s"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="3_i4lde"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="3_i4lde"] [sub_resource type="Resource" id="Resource_wug4u"] script = ExtResource("1_njap1") diff --git a/Levels/Level1/wave7.tres b/Levels/Level1/wave7.tres index 515031f..2cdfe00 100644 --- a/Levels/Level1/wave7.tres +++ b/Levels/Level1/wave7.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://bwe8kjkht7fcm"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_prhdl"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_nugbm"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_nugbm"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_b1t41"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="3_nugbm"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="3_nugbm"] [sub_resource type="Resource" id="Resource_wug4u"] script = ExtResource("1_prhdl") diff --git a/Levels/Level1/wave8.tres b/Levels/Level1/wave8.tres index d81553b..92c2ef4 100644 --- a/Levels/Level1/wave8.tres +++ b/Levels/Level1/wave8.tres @@ -1,10 +1,10 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://dgf3pxomo7pqs"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_qkeak"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_qado3"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="3_1s075"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_qado3"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="3_1s075"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_hijmv"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="4_1csii"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="4_1csii"] [sub_resource type="Resource" id="Resource_wug4u"] script = ExtResource("1_qkeak") diff --git a/Levels/Level2/wave1.tres b/Levels/Level2/wave1.tres index d51e270..7abe201 100644 --- a/Levels/Level2/wave1.tres +++ b/Levels/Level2/wave1.tres @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_t312x"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="2_50dab"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_t312x"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_t312x"] [sub_resource type="Resource" id="Resource_1qdvn"] script = ExtResource("1_t312x") diff --git a/Levels/Level2/wave2.tres b/Levels/Level2/wave2.tres index a644ba9..440f49f 100644 --- a/Levels/Level2/wave2.tres +++ b/Levels/Level2/wave2.tres @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_elghy"] [ext_resource type="Resource" uid="uid://dmmdh16m22yqm" path="res://Enemies/Driftling/ene_driftling.tres" id="2_ptdu7"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_ua2h7"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_ua2h7"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_ptdu7"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level2/wave3.tres b/Levels/Level2/wave3.tres index 05e2381..02c29cd 100644 --- a/Levels/Level2/wave3.tres +++ b/Levels/Level2/wave3.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://oxlng6hm84g5"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_xkw56"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_86qwl"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="3_lt3r0"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_86qwl"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="3_lt3r0"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="4_6qcon"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level2/wave4.tres b/Levels/Level2/wave4.tres index 71e412b..878868f 100644 --- a/Levels/Level2/wave4.tres +++ b/Levels/Level2/wave4.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://oxtyfouk3iwy"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_v1o46"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_45pet"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_45pet"] [ext_resource type="Resource" uid="uid://dmmdh16m22yqm" path="res://Enemies/Driftling/ene_driftling.tres" id="2_eqgft"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_eqgft"] diff --git a/Levels/Level2/wave5.tres b/Levels/Level2/wave5.tres index 18e27ba..307f609 100644 --- a/Levels/Level2/wave5.tres +++ b/Levels/Level2/wave5.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://dwujwl2lje0eo"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_ewf4r"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="2_q80cu"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="2_q80cu"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_bitxg"] [sub_resource type="Resource" id="Resource_tab3n"] diff --git a/Levels/Level2/wave6.tres b/Levels/Level2/wave6.tres index c309593..b6bb64f 100644 --- a/Levels/Level2/wave6.tres +++ b/Levels/Level2/wave6.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://c3nuewoyytuub"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_f652g"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="2_fx8vq"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="3_1m4r4"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="4_kv4so"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="2_fx8vq"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="3_1m4r4"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="4_kv4so"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="5_woxd8"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level2/wave7.tres b/Levels/Level2/wave7.tres index 267e501..58544f6 100644 --- a/Levels/Level2/wave7.tres +++ b/Levels/Level2/wave7.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://djt4ejnd84et5"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_hjmtq"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_ehipk"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="3_2nwt1"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_ehipk"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="3_2nwt1"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="4_nx0gs"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level2/wave8.tres b/Levels/Level2/wave8.tres index 3f67ec8..2308560 100644 --- a/Levels/Level2/wave8.tres +++ b/Levels/Level2/wave8.tres @@ -1,12 +1,12 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://qujnsxov3vwj"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_gehmj"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_5fnx2"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="3_xts1g"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="4_vvcwx"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_5fnx2"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="3_xts1g"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="4_vvcwx"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="5_nu1jj"] [ext_resource type="Resource" uid="uid://dmmdh16m22yqm" path="res://Enemies/Driftling/ene_driftling.tres" id="5_xts1g"] -[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/crystalisk.tres" id="6_vvcwx"] +[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/ene_crystalisk.tres" id="6_vvcwx"] [sub_resource type="Resource" id="Resource_wug4u"] script = ExtResource("1_gehmj") diff --git a/Levels/Level3/wave1.tres b/Levels/Level3/wave1.tres index ccabe10..6464744 100644 --- a/Levels/Level3/wave1.tres +++ b/Levels/Level3/wave1.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://cwy6wxuujgqbq"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_6ssfe"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="2_lvtoc"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="2_lvtoc"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_frc10"] [sub_resource type="Resource" id="Resource_hrsx4"] diff --git a/Levels/Level3/wave2.tres b/Levels/Level3/wave2.tres index d07428f..b3b88e5 100644 --- a/Levels/Level3/wave2.tres +++ b/Levels/Level3/wave2.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://bohdufnm1dks5"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_gvxxv"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_i33id"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_i33id"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_ix4r4"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level3/wave3.tres b/Levels/Level3/wave3.tres index 768f4fa..4cbd57e 100644 --- a/Levels/Level3/wave3.tres +++ b/Levels/Level3/wave3.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://bhr8y5kgxmuvv"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_ne7sg"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_rg4u0"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="3_tvw7f"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_rg4u0"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="3_tvw7f"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="4_ffn24"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level3/wave4.tres b/Levels/Level3/wave4.tres index 692ce45..8b4fa79 100644 --- a/Levels/Level3/wave4.tres +++ b/Levels/Level3/wave4.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://ucqn45ycymph"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_lp3sd"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_rjqud"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_rjqud"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_u5ksq"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level3/wave5.tres b/Levels/Level3/wave5.tres index da355c5..0c33d83 100644 --- a/Levels/Level3/wave5.tres +++ b/Levels/Level3/wave5.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://dj46tpmwm4l7b"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_pmka2"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="2_x60v4"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="2_x60v4"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_4nd0q"] [sub_resource type="Resource" id="Resource_tab3n"] diff --git a/Levels/Level3/wave6.tres b/Levels/Level3/wave6.tres index c29d47f..41b63a7 100644 --- a/Levels/Level3/wave6.tres +++ b/Levels/Level3/wave6.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://wvhye2e1qwlj"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_wa2nw"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="2_bx3j1"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="3_cdbhu"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="4_s5rr2"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="2_bx3j1"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="3_cdbhu"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="4_s5rr2"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="5_gie20"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level3/wave7.tres b/Levels/Level3/wave7.tres index 66d6b9a..9579a6e 100644 --- a/Levels/Level3/wave7.tres +++ b/Levels/Level3/wave7.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://cxntgjir527jj"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_p03je"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_tjn8k"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="3_sex8u"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_tjn8k"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="3_sex8u"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="4_6ef1c"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Levels/Level3/wave8.tres b/Levels/Level3/wave8.tres index 0a1e5ef..ff29e37 100644 --- a/Levels/Level3/wave8.tres +++ b/Levels/Level3/wave8.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://bi3gucreumocq"] [ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_rfadv"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="2_w1g3c"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="3_e1hdp"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="4_23mwp"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="2_w1g3c"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="3_e1hdp"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="4_23mwp"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="5_ri8w8"] [sub_resource type="Resource" id="Resource_wug4u"] diff --git a/Scripts/Resources/enemy.gd b/Scripts/Resources/enemy.gd index ca1f7c8..ba0e0da 100644 --- a/Scripts/Resources/enemy.gd +++ b/Scripts/Resources/enemy.gd @@ -7,7 +7,6 @@ extends Resource @export var icon: Texture @export var scene: PackedScene @export var death_sprite: Texture -@export var sprite: AtlasTexture @export var spawn_power: int = 10 @export var group_size: int = 5 @export var health: int = 100 diff --git a/Scripts/driftling_drippler.gd b/Scripts/driftling_drippler.gd index ae141f8..31c1c56 100644 --- a/Scripts/driftling_drippler.gd +++ b/Scripts/driftling_drippler.gd @@ -18,7 +18,6 @@ var time_to_bloat: float = 1.5 var time_to_float: float = 3.0 var time_to_choak: float = 0.8 var time_to_croak: float = 0.4 -var state: DriftlingDrippleState = DriftlingDrippleState.BLOATING func _ready() -> void: diff --git a/Zones/Cave/scn_cave.tscn b/Zones/Cave/scn_cave.tscn index e0d56c0..9a028ab 100644 --- a/Zones/Cave/scn_cave.tscn +++ b/Zones/Cave/scn_cave.tscn @@ -2,11 +2,11 @@ [ext_resource type="Script" uid="uid://cvejbo3srx8py" path="res://Scripts/level.gd" id="1_li03l"] [ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="2_1sih4"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="3_y5pxn"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="4_gow2y"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="3_y5pxn"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="4_gow2y"] [ext_resource type="PackedScene" uid="uid://bhroqr4s1qso5" path="res://Zones/Cave/model_cave.glb" id="4_x53u6"] [ext_resource type="Script" uid="uid://dkuxg6ek5us4f" path="res://Scripts/enemy_spawner.gd" id="5_e8b6i"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="5_y23i6"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="5_y23i6"] [ext_resource type="Script" uid="uid://cxwtuxytavfu5" path="res://Scripts/enemy_goal.gd" id="6_n26ay"] [ext_resource type="AudioStream" uid="uid://dknygn5eyuhxt" path="res://Audio/shot1.wav" id="7_e8b6i"] [ext_resource type="PackedScene" uid="uid://1b2ikdanl66b" path="res://Scenes/CardPrinter/card_printer.tscn" id="7_y5pxn"] diff --git a/Zones/Moat/scn_moat.tscn b/Zones/Moat/scn_moat.tscn index a46d963..dc440e2 100644 --- a/Zones/Moat/scn_moat.tscn +++ b/Zones/Moat/scn_moat.tscn @@ -3,10 +3,10 @@ [ext_resource type="Script" uid="uid://cvejbo3srx8py" path="res://Scripts/level.gd" id="1_ws6nn"] [ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="2_ks6qx"] [ext_resource type="PackedScene" uid="uid://d2yv447trxkwt" path="res://Scenes/enemy_spawner.tscn" id="3_5imwp"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/eye_dog.tres" id="3_6tcu8"] -[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/crystalisk.tres" id="4_uh5sr"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="5_g08yk"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="6_asmpj"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/ene_eye_dog.tres" id="3_6tcu8"] +[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/ene_crystalisk.tres" id="4_uh5sr"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="5_g08yk"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="6_asmpj"] [ext_resource type="Resource" uid="uid://dmmdh16m22yqm" path="res://Enemies/Driftling/ene_driftling.tres" id="7_1qlg4"] [ext_resource type="PackedScene" uid="uid://d1gauy86jxpnj" path="res://BrickPile/brick_pile.tscn" id="7_6tcu8"] [ext_resource type="PackedScene" uid="uid://1b2ikdanl66b" path="res://Scenes/CardPrinter/card_printer.tscn" id="9_r25gu"] diff --git a/level_mageccc.tscn b/level_mageccc.tscn index 96bf21c..abfcf23 100644 --- a/level_mageccc.tscn +++ b/level_mageccc.tscn @@ -9,11 +9,11 @@ [ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="7_bf6dr"] [ext_resource type="Texture2D" uid="uid://cdnhe2mi5c5ln" path="res://Assets/Textures/dead_eye_dog.png" id="8_5e5s6"] [ext_resource type="Texture2D" uid="uid://g00wwrlxxdc5" path="res://Assets/Textures/icon_eye_dog.png" id="9_s3gio"] -[ext_resource type="PackedScene" uid="uid://bvq6tbkuv2mfp" path="res://Enemies/EyeDog/eye_dog.tscn" id="10_tlmxb"] +[ext_resource type="PackedScene" uid="uid://bvq6tbkuv2mfp" path="res://Enemies/EyeDog/scn_eye_dog.tscn" id="10_tlmxb"] [ext_resource type="Texture2D" uid="uid://dj13g1w14mekw" path="res://Assets/Textures/eye_dog.png" id="11_xnj0i"] -[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/elder_eye_dog.tres" id="12_b1o6b"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="13_wnrwu"] -[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/crystalisk.tres" id="14_yipjp"] +[ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Enemies/ElderEyeDog/ene_elder_eye_dog.tres" id="12_b1o6b"] +[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/Skitter/ene_skitter.tres" id="13_wnrwu"] +[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/ene_crystalisk.tres" id="14_yipjp"] [sub_resource type="ViewportTexture" id="ViewportTexture_345c2"] viewport_path = NodePath("GreenWireframe") diff --git a/test_level.tscn b/test_level.tscn index 024a5cc..6c0e8f4 100644 --- a/test_level.tscn +++ b/test_level.tscn @@ -1,12 +1,12 @@ [gd_scene format=3 uid="uid://crr8kg4ack7rq"] -[ext_resource type="PackedScene" uid="uid://bvq6tbkuv2mfp" path="res://Enemies/EyeDog/eye_dog.tscn" id="1_sb12i"] +[ext_resource type="PackedScene" uid="uid://bvq6tbkuv2mfp" path="res://Enemies/EyeDog/scn_eye_dog.tscn" id="1_sb12i"] [ext_resource type="Texture2D" uid="uid://cdnhe2mi5c5ln" path="res://Assets/Textures/dead_eye_dog.png" id="2_6emce"] [ext_resource type="PackedScene" uid="uid://dl3rwqwbgrq2m" path="res://Enemies/ElderEyeDog/scn_elder_eye_dog.tscn" id="2_gbhdq"] [ext_resource type="Texture2D" uid="uid://g00wwrlxxdc5" path="res://Assets/Textures/icon_eye_dog.png" id="3_lowby"] -[ext_resource type="PackedScene" uid="uid://cveiaa0y66gln" path="res://Enemies/Crystalisk/crystal_enemy.tscn" id="3_y646j"] +[ext_resource type="PackedScene" uid="uid://cveiaa0y66gln" path="res://Enemies/Crystalisk/scn_crystalisk.tscn" id="3_y646j"] [ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="4_58smv"] -[ext_resource type="PackedScene" uid="uid://dtahuv0kpxx03" path="res://Enemies/BabyEyeDog/baby_eye_dog.tscn" id="4_lnbra"] +[ext_resource type="PackedScene" uid="uid://dtahuv0kpxx03" path="res://Enemies/Skitter/scn_skitter.tscn" id="4_lnbra"] [ext_resource type="PackedScene" uid="uid://dxgxbtf68lcv5" path="res://PCs/hero.tscn" id="5_6emce"] [ext_resource type="Texture2D" uid="uid://dj13g1w14mekw" path="res://Assets/Textures/eye_dog.png" id="5_a25ih"]