diff --git a/Resources/Enemies/airenemy2.tres b/Enemies/Crystalisk/airenemy2.tres similarity index 61% rename from Resources/Enemies/airenemy2.tres rename to Enemies/Crystalisk/airenemy2.tres index 58ff216..72a2557 100644 --- a/Resources/Enemies/airenemy2.tres +++ b/Enemies/Crystalisk/airenemy2.tres @@ -1,19 +1,19 @@ [gd_resource type="Resource" script_class="Enemy" load_steps=6 format=3 uid="uid://bffhb5krs5elm"] -[ext_resource type="Texture2D" uid="uid://b1lwaxw62yp3p" path="res://Assets/Textures/dead_spike.png" id="1_1js8q"] -[ext_resource type="Texture2D" uid="uid://duywsy7jmh4u" path="res://Assets/Textures/spike.png" id="1_22o7e"] -[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="1_q5r05"] -[ext_resource type="PackedScene" uid="uid://cveiaa0y66gln" path="res://crystal_enemy.tscn" id="3_b3axe"] -[ext_resource type="Texture2D" uid="uid://sybn6bjbj5fh" path="res://Assets/TextureAtlases/spike.tres" id="3_tbb38"] +[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_7w5fm"] +[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("1_q5r05") -title = "spike" +script = ExtResource("4_x2l2n") +title = "Crystalisk" target_type = 2 -scene = ExtResource("3_b3axe") -icon = ExtResource("1_22o7e") -death_sprite = ExtResource("1_1js8q") -sprite = ExtResource("3_tbb38") +scene = ExtResource("3_7w5fm") +icon = ExtResource("2_idym2") +death_sprite = ExtResource("1_skyfd") +sprite = ExtResource("5_okcvf") spawn_power = 6 health = 120 penalty = 7 diff --git a/crystal_enemy.glb b/Enemies/Crystalisk/crystal_enemy.glb similarity index 100% rename from crystal_enemy.glb rename to Enemies/Crystalisk/crystal_enemy.glb diff --git a/crystal_enemy.glb.import b/Enemies/Crystalisk/crystal_enemy.glb.import similarity index 99% rename from crystal_enemy.glb.import rename to Enemies/Crystalisk/crystal_enemy.glb.import index 360f28f..03fa659 100644 --- a/crystal_enemy.glb.import +++ b/Enemies/Crystalisk/crystal_enemy.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://o6whohcbalui" -path="res://.godot/imported/crystal_enemy.glb-5db02a6c9798f184be321fd8ed4734ae.scn" +path="res://.godot/imported/crystal_enemy.glb-c13aa4a405d2f70db8609b6b88d49905.scn" [deps] -source_file="res://crystal_enemy.glb" -dest_files=["res://.godot/imported/crystal_enemy.glb-5db02a6c9798f184be321fd8ed4734ae.scn"] +source_file="res://Enemies/Crystalisk/crystal_enemy.glb" +dest_files=["res://.godot/imported/crystal_enemy.glb-c13aa4a405d2f70db8609b6b88d49905.scn"] [params] diff --git a/crystal_enemy.png b/Enemies/Crystalisk/crystal_enemy.png similarity index 100% rename from crystal_enemy.png rename to Enemies/Crystalisk/crystal_enemy.png diff --git a/crystal_enemy.png.import b/Enemies/Crystalisk/crystal_enemy.png.import similarity index 70% rename from crystal_enemy.png.import rename to Enemies/Crystalisk/crystal_enemy.png.import index b8d3c20..21d3850 100644 --- a/crystal_enemy.png.import +++ b/Enemies/Crystalisk/crystal_enemy.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d01y8kogfuayr" -path="res://.godot/imported/crystal_enemy.png-1a076fb76b0382c8c7482178fe2aaa81.ctex" +path="res://.godot/imported/crystal_enemy.png-47c4105ce5ff19d6a767c397a2a82c0d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://crystal_enemy.png" -dest_files=["res://.godot/imported/crystal_enemy.png-1a076fb76b0382c8c7482178fe2aaa81.ctex"] +source_file="res://Enemies/Crystalisk/crystal_enemy.png" +dest_files=["res://.godot/imported/crystal_enemy.png-47c4105ce5ff19d6a767c397a2a82c0d.ctex"] [params] diff --git a/crystal_enemy.tscn b/Enemies/Crystalisk/crystal_enemy.tscn similarity index 97% rename from crystal_enemy.tscn rename to Enemies/Crystalisk/crystal_enemy.tscn index f59029a..932f387 100644 --- a/crystal_enemy.tscn +++ b/Enemies/Crystalisk/crystal_enemy.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 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://crystal_enemy.glb" id="2_myjng"] +[ext_resource type="PackedScene" uid="uid://o6whohcbalui" path="res://Enemies/Crystalisk/crystal_enemy.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_c5uwa"] diff --git a/crystal_enemy_mat.tres b/Enemies/Crystalisk/crystal_enemy_mat.tres similarity index 90% rename from crystal_enemy_mat.tres rename to Enemies/Crystalisk/crystal_enemy_mat.tres index f26eae1..449f592 100644 --- a/crystal_enemy_mat.tres +++ b/Enemies/Crystalisk/crystal_enemy_mat.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://dylmoyx1tasat"] [ext_resource type="Shader" uid="uid://c5bffujq0l70k" path="res://jitter.gdshader" id="1_4cwdh"] -[ext_resource type="Texture2D" uid="uid://d01y8kogfuayr" path="res://crystal_enemy.png" id="2_l5awy"] +[ext_resource type="Texture2D" uid="uid://d01y8kogfuayr" path="res://Enemies/Crystalisk/crystal_enemy.png" id="2_l5awy"] [resource] render_priority = 0 diff --git a/Resources/Enemies/dog.tres b/Enemies/EyeDog/dog.tres similarity index 96% rename from Resources/Enemies/dog.tres rename to Enemies/EyeDog/dog.tres index ba89000..5b41bd6 100644 --- a/Resources/Enemies/dog.tres +++ b/Enemies/EyeDog/dog.tres @@ -3,7 +3,7 @@ [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://eye_dog.tscn" id="3_tyyee"] +[ext_resource type="PackedScene" uid="uid://bvq6tbkuv2mfp" path="res://Enemies/EyeDog/eye_dog.tscn" id="3_tyyee"] [ext_resource type="Texture2D" uid="uid://dj13g1w14mekw" path="res://Assets/Textures/eye_dog.png" id="4_7ypa6"] [sub_resource type="AtlasTexture" id="AtlasTexture_n6kdu"] diff --git a/eye_dog.tscn b/Enemies/EyeDog/eye_dog.tscn similarity index 98% rename from eye_dog.tscn rename to Enemies/EyeDog/eye_dog.tscn index 53147db..9fc4633 100644 --- a/eye_dog.tscn +++ b/Enemies/EyeDog/eye_dog.tscn @@ -8,7 +8,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://Scenes/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://eyedog.glb" id="10_h25mw"] +[ext_resource type="PackedScene" uid="uid://dlhx6r23m5ceg" path="res://Enemies/EyeDog/eyedog.glb" id="10_h25mw"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="11_kpdsm"] [sub_resource type="SphereShape3D" id="SphereShape3D_cavbv"] diff --git a/eyedog.glb b/Enemies/EyeDog/eyedog.glb similarity index 100% rename from eyedog.glb rename to Enemies/EyeDog/eyedog.glb diff --git a/eyedog.glb.import b/Enemies/EyeDog/eyedog.glb.import similarity index 79% rename from eyedog.glb.import rename to Enemies/EyeDog/eyedog.glb.import index d11f5cd..bfa2e38 100644 --- a/eyedog.glb.import +++ b/Enemies/EyeDog/eyedog.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://dlhx6r23m5ceg" -path="res://.godot/imported/eyedog.glb-e332c2bd7f518d74bf3d38e536e40139.scn" +path="res://.godot/imported/eyedog.glb-066d1d46e7943baa72fec506b08447f4.scn" [deps] -source_file="res://eyedog.glb" -dest_files=["res://.godot/imported/eyedog.glb-e332c2bd7f518d74bf3d38e536e40139.scn"] +source_file="res://Enemies/EyeDog/eyedog.glb" +dest_files=["res://.godot/imported/eyedog.glb-066d1d46e7943baa72fec506b08447f4.scn"] [params] diff --git a/eyedog_eyedog_tex.png b/Enemies/EyeDog/eyedog_eyedog_tex.png similarity index 100% rename from eyedog_eyedog_tex.png rename to Enemies/EyeDog/eyedog_eyedog_tex.png diff --git a/eyedog_eyedog_tex.png.import b/Enemies/EyeDog/eyedog_eyedog_tex.png.import similarity index 71% rename from eyedog_eyedog_tex.png.import rename to Enemies/EyeDog/eyedog_eyedog_tex.png.import index e1fdb64..58af069 100644 --- a/eyedog_eyedog_tex.png.import +++ b/Enemies/EyeDog/eyedog_eyedog_tex.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://wx4d2upch81n" -path.s3tc="res://.godot/imported/eyedog_eyedog_tex.png-e59f4e3560f0b0a0e86e8b4afbd1a1e9.s3tc.ctex" +path.s3tc="res://.godot/imported/eyedog_eyedog_tex.png-1f14344e8bf95fbf8ece2e5fc948c9ad.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://eyedog_eyedog_tex.png" -dest_files=["res://.godot/imported/eyedog_eyedog_tex.png-e59f4e3560f0b0a0e86e8b4afbd1a1e9.s3tc.ctex"] +source_file="res://Enemies/EyeDog/eyedog_eyedog_tex.png" +dest_files=["res://.godot/imported/eyedog_eyedog_tex.png-1f14344e8bf95fbf8ece2e5fc948c9ad.s3tc.ctex"] [params] diff --git a/psx_model_material.tres b/Enemies/EyeDog/psx_model_material.tres similarity index 90% rename from psx_model_material.tres rename to Enemies/EyeDog/psx_model_material.tres index 18e5f83..d824ff4 100644 --- a/psx_model_material.tres +++ b/Enemies/EyeDog/psx_model_material.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://bo82o88d7vo1x"] [ext_resource type="Shader" uid="uid://c5bffujq0l70k" path="res://jitter.gdshader" id="1_crvh7"] -[ext_resource type="Texture2D" uid="uid://wx4d2upch81n" path="res://eyedog_eyedog_tex.png" id="2_j3hec"] +[ext_resource type="Texture2D" uid="uid://wx4d2upch81n" path="res://Enemies/EyeDog/eyedog_eyedog_tex.png" id="2_j3hec"] [resource] render_priority = 0 diff --git a/Scenes/Menus/MainMenu/main_menu.tscn b/Scenes/Menus/MainMenu/main_menu.tscn index 66e10d8..34b01e9 100644 --- a/Scenes/Menus/MainMenu/main_menu.tscn +++ b/Scenes/Menus/MainMenu/main_menu.tscn @@ -12,7 +12,7 @@ [ext_resource type="Resource" uid="uid://dxi17xvdlhkvc" path="res://Resources/Enemies/dog_heavy.tres" id="10_day26"] [ext_resource type="Resource" uid="uid://boik1gnpl4v0a" path="res://Resources/Enemies/dog_boss.tres" id="11_1mes0"] [ext_resource type="Resource" uid="uid://dsgkwh3opyqtx" path="res://Resources/Enemies/airenemy.tres" id="12_5vny5"] -[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Resources/Enemies/airenemy2.tres" id="13_xb7gj"] +[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/airenemy2.tres" id="13_xb7gj"] [ext_resource type="Texture2D" uid="uid://cr1ucbuw3iotp" path="res://Assets/Textures/first_win_achievements.png" id="15_74epv"] [ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://Scenes/Menus/MainMenu/achievements_menu.gd" id="15_sv1gy"] [ext_resource type="Texture2D" uid="uid://cpa1hl36xfplg" path="res://Assets/Textures/first_scroll_seen.png" id="16_sv1gy"] diff --git a/Worlds/GreenPlanet/Levels/first_level.tscn b/Worlds/GreenPlanet/Levels/first_level.tscn index 2f69f0c..e9320e8 100644 --- a/Worlds/GreenPlanet/Levels/first_level.tscn +++ b/Worlds/GreenPlanet/Levels/first_level.tscn @@ -3,8 +3,8 @@ [ext_resource type="Script" uid="uid://cvejbo3srx8py" path="res://Scripts/level.gd" id="1_ws6nn"] [ext_resource type="PackedScene" uid="uid://d2yv447trxkwt" path="res://Scenes/enemy_spawner.tscn" id="3_5imwp"] [ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://Scripts/Resources/enemy.gd" id="3_6od8s"] -[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Resources/Enemies/dog.tres" id="5_6od8s"] -[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Resources/Enemies/airenemy2.tres" id="9_4gdda"] +[ext_resource type="Resource" uid="uid://8eba45hql7bo" path="res://Enemies/EyeDog/dog.tres" id="5_6od8s"] +[ext_resource type="Resource" uid="uid://bffhb5krs5elm" path="res://Enemies/Crystalisk/airenemy2.tres" id="9_4gdda"] [ext_resource type="PackedScene" uid="uid://cjvgqek2phoq1" path="res://obstacle1.tscn" id="9_luxf3"] [ext_resource type="PackedScene" uid="uid://1b2ikdanl66b" path="res://Scenes/CardPrinter/card_printer.tscn" id="9_r25gu"] [ext_resource type="Script" uid="uid://cxwtuxytavfu5" path="res://Scripts/enemy_goal.gd" id="9_s3rd7"]