diff --git a/buildings/Building 1x2 fixed.png.import b/buildings/Building 1x2 fixed.png.import index 39a81c9..0ac93ca 100644 --- a/buildings/Building 1x2 fixed.png.import +++ b/buildings/Building 1x2 fixed.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Building 1x2 fixed.png-e90afc0d25a8919ada5700 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 @@ -27,10 +25,6 @@ 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 diff --git a/buildings/Building 2x1 downside.png.import b/buildings/Building 2x1 downside.png.import index 0e57d53..52d9ce5 100644 --- a/buildings/Building 2x1 downside.png.import +++ b/buildings/Building 2x1 downside.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Building 2x1 downside.png-4b432eb4152bab7dd59 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 @@ -27,10 +25,6 @@ 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 diff --git a/buildings/Building 2x1 fixed.png.import b/buildings/Building 2x1 fixed.png.import index e7fdbe6..a78eae3 100644 --- a/buildings/Building 2x1 fixed.png.import +++ b/buildings/Building 2x1 fixed.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Building 2x1 fixed.png-b02748fa52aebae62f987c 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 @@ -27,10 +25,6 @@ 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 diff --git a/building_generator.tscn b/buildings/building_generator.tscn similarity index 100% rename from building_generator.tscn rename to buildings/building_generator.tscn diff --git a/buildings/room_haunted_house.tscn b/buildings/room_haunted_house.tscn index 3c05dbb..67117e2 100644 --- a/buildings/room_haunted_house.tscn +++ b/buildings/room_haunted_house.tscn @@ -4,7 +4,7 @@ [ext_resource type="Shader" uid="uid://c7gb1nqwvkr37" path="res://buildings/building.gdshader" id="2_uv7v8"] [ext_resource type="Texture2D" uid="uid://djir4ehm8kif" path="res://buildings/Building 1x2 fixed.png" id="3_uv7v8"] [ext_resource type="Script" uid="uid://dj7d4d2xs3nci" path="res://buildings/building_mesh.gd" id="4_bl5jt"] -[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost.tscn" id="5_23fi7"] +[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost/ghost.tscn" id="5_23fi7"] [ext_resource type="PackedScene" uid="uid://4l3elvxpghw8" path="res://utils/platform.tscn" id="6_e6j05"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_qnfc1"] diff --git a/buildings/room_pedastal.tscn b/buildings/room_pedastal.tscn index b55ab88..bd5ba3a 100644 --- a/buildings/room_pedastal.tscn +++ b/buildings/room_pedastal.tscn @@ -4,7 +4,7 @@ [ext_resource type="Shader" uid="uid://c7gb1nqwvkr37" path="res://buildings/building.gdshader" id="2_wod1l"] [ext_resource type="Texture2D" uid="uid://djir4ehm8kif" path="res://buildings/Building 1x2 fixed.png" id="3_elmbw"] [ext_resource type="Script" uid="uid://dj7d4d2xs3nci" path="res://buildings/building_mesh.gd" id="4_1cnhw"] -[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost.tscn" id="5_rh5oo"] +[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost/ghost.tscn" id="5_rh5oo"] [ext_resource type="PackedScene" uid="uid://4l3elvxpghw8" path="res://utils/platform.tscn" id="6_caaff"] [ext_resource type="PackedScene" uid="uid://xj0of571aur1" path="res://items/generic/item_spawn.tscn" id="7_elmbw"] [ext_resource type="PackedScene" uid="uid://dpv1w56yr1xue" path="res://traps/morning_star.tscn" id="8_1cnhw"] diff --git a/buildings/room_temple.tscn b/buildings/room_temple.tscn index 47e0767..4bafc7f 100644 --- a/buildings/room_temple.tscn +++ b/buildings/room_temple.tscn @@ -6,10 +6,10 @@ [ext_resource type="Script" uid="uid://dj7d4d2xs3nci" path="res://buildings/building_mesh.gd" id="4_xr4t5"] [ext_resource type="Texture2D" uid="uid://3weywjfsapax" path="res://buildings/Building 2x1 downside.png" id="5_pfkkr"] [ext_resource type="PackedScene" uid="uid://dpv1w56yr1xue" path="res://traps/morning_star.tscn" id="5_xr4t5"] -[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost.tscn" id="7_35wcg"] +[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost/ghost.tscn" id="7_35wcg"] [ext_resource type="PackedScene" uid="uid://4l3elvxpghw8" path="res://utils/platform.tscn" id="8_sifiv"] [ext_resource type="PackedScene" uid="uid://xj0of571aur1" path="res://items/generic/item_spawn.tscn" id="9_i1qmw"] -[ext_resource type="PackedScene" uid="uid://b62xcg0dd3vct" path="res://enemies/leech.tscn" id="10_ibnxs"] +[ext_resource type="PackedScene" uid="uid://b62xcg0dd3vct" path="res://enemies/leech/leech.tscn" id="10_ibnxs"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_pfkkr"] shader = ExtResource("2_xx8ra") diff --git a/buildings/room_wide_item_above.tscn b/buildings/room_wide_item_above.tscn index 3fcf114..16df163 100644 --- a/buildings/room_wide_item_above.tscn +++ b/buildings/room_wide_item_above.tscn @@ -8,8 +8,8 @@ [ext_resource type="PackedScene" uid="uid://4l3elvxpghw8" path="res://utils/platform.tscn" id="6_me65q"] [ext_resource type="PackedScene" uid="uid://xj0of571aur1" path="res://items/generic/item_spawn.tscn" id="7_crruu"] [ext_resource type="PackedScene" uid="uid://h3caql0b6vft" path="res://traps/bear_trap.tscn" id="8_fkxmk"] -[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost.tscn" id="9_6hrl3"] -[ext_resource type="PackedScene" uid="uid://b62xcg0dd3vct" path="res://enemies/leech.tscn" id="10_7e5ul"] +[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost/ghost.tscn" id="9_6hrl3"] +[ext_resource type="PackedScene" uid="uid://b62xcg0dd3vct" path="res://enemies/leech/leech.tscn" id="10_7e5ul"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_pfkkr"] shader = ExtResource("2_7e5ul") diff --git a/blob.gd b/enemies/boss/blob.gd similarity index 100% rename from blob.gd rename to enemies/boss/blob.gd diff --git a/blob.gd.uid b/enemies/boss/blob.gd.uid similarity index 100% rename from blob.gd.uid rename to enemies/boss/blob.gd.uid diff --git a/blob_big.gd b/enemies/boss/blob_big.gd similarity index 100% rename from blob_big.gd rename to enemies/boss/blob_big.gd diff --git a/blob_big.gd.uid b/enemies/boss/blob_big.gd.uid similarity index 100% rename from blob_big.gd.uid rename to enemies/boss/blob_big.gd.uid diff --git a/blob_big.tscn b/enemies/boss/blob_big.tscn similarity index 87% rename from blob_big.tscn rename to enemies/boss/blob_big.tscn index 76f1546..1768f7a 100644 --- a/blob_big.tscn +++ b/enemies/boss/blob_big.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bg2hgia0jqnqf"] -[ext_resource type="Script" uid="uid://b22hbgn80m4l0" path="res://blob_big.gd" id="1_xkk63"] -[ext_resource type="PackedScene" uid="uid://ck0bj7444wfsl" path="res://blob_small.tscn" id="2_jl75s"] +[ext_resource type="Script" uid="uid://b22hbgn80m4l0" path="res://enemies/boss/blob_big.gd" id="1_xkk63"] +[ext_resource type="PackedScene" uid="uid://ck0bj7444wfsl" path="res://enemies/boss/blob_small.tscn" id="2_jl75s"] [node name="blob_big" type="Node2D"] script = ExtResource("1_xkk63") diff --git a/blob_small.tscn b/enemies/boss/blob_small.tscn similarity index 93% rename from blob_small.tscn rename to enemies/boss/blob_small.tscn index d6fe127..e4dd5ac 100644 --- a/blob_small.tscn +++ b/enemies/boss/blob_small.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://ck0bj7444wfsl"] -[ext_resource type="Script" uid="uid://d4n32kt7t726k" path="res://blob.gd" id="1_wigkh"] -[ext_resource type="Texture2D" uid="uid://dvlvu37up72gt" path="res://bubble.png" id="2_jle3w"] +[ext_resource type="Script" uid="uid://d4n32kt7t726k" path="res://enemies/boss/blob.gd" id="1_wigkh"] +[ext_resource type="Texture2D" uid="uid://dvlvu37up72gt" path="res://enemies/boss/bubble.png" id="2_jle3w"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_aaw6g"] particle_flag_disable_z = true diff --git a/boss.gd b/enemies/boss/boss.gd similarity index 100% rename from boss.gd rename to enemies/boss/boss.gd diff --git a/boss.gd.uid b/enemies/boss/boss.gd.uid similarity index 100% rename from boss.gd.uid rename to enemies/boss/boss.gd.uid diff --git a/boss.tscn b/enemies/boss/boss.tscn similarity index 93% rename from boss.tscn rename to enemies/boss/boss.tscn index e553bed..2cff1b9 100644 --- a/boss.tscn +++ b/enemies/boss/boss.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=8 format=3 uid="uid://cpe4s6vsn0ujd"] -[ext_resource type="Texture2D" uid="uid://d3b5hmhjw2jyc" path="res://enemies/ghost animation/Ghost 1.png" id="1_6xxrv"] -[ext_resource type="Script" uid="uid://uv672p8f4n6k" path="res://boss.gd" id="1_skx2t"] -[ext_resource type="PackedScene" uid="uid://bg2hgia0jqnqf" path="res://blob_big.tscn" id="2_o1i15"] +[ext_resource type="Texture2D" uid="uid://d3b5hmhjw2jyc" path="res://enemies/ghost/ghost animation/Ghost 1.png" id="1_6xxrv"] +[ext_resource type="Script" uid="uid://uv672p8f4n6k" path="res://enemies/boss/boss.gd" id="1_skx2t"] +[ext_resource type="PackedScene" uid="uid://bg2hgia0jqnqf" path="res://enemies/boss/blob_big.tscn" id="2_o1i15"] [ext_resource type="PackedScene" uid="uid://mtfsdd4cdf3a" path="res://utils/enemy_hurtbox.tscn" id="2_skx2t"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="4_lnbgr"] diff --git a/bubble.png b/enemies/boss/bubble.png similarity index 100% rename from bubble.png rename to enemies/boss/bubble.png diff --git a/bubble.png.import b/enemies/boss/bubble.png.import similarity index 60% rename from bubble.png.import rename to enemies/boss/bubble.png.import index 06b2c38..a186880 100644 --- a/bubble.png.import +++ b/enemies/boss/bubble.png.import @@ -3,23 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://dvlvu37up72gt" -path="res://.godot/imported/bubble.png-3dc4d46c6bed7b70ac6f4b3bfb630a9b.ctex" +path="res://.godot/imported/bubble.png-0c7e5ecd706b98b1fc89ca0c332b8765.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://bubble.png" -dest_files=["res://.godot/imported/bubble.png-3dc4d46c6bed7b70ac6f4b3bfb630a9b.ctex"] +source_file="res://enemies/boss/bubble.png" +dest_files=["res://.godot/imported/bubble.png-0c7e5ecd706b98b1fc89ca0c332b8765.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 @@ -27,10 +25,6 @@ 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 diff --git a/destroy_area.gd b/enemies/boss/destroy_area.gd similarity index 100% rename from destroy_area.gd rename to enemies/boss/destroy_area.gd diff --git a/destroy_area.gd.uid b/enemies/boss/destroy_area.gd.uid similarity index 100% rename from destroy_area.gd.uid rename to enemies/boss/destroy_area.gd.uid diff --git a/enemies/ghost animation/Ghost 0.png b/enemies/ghost/ghost animation/Ghost 0.png similarity index 100% rename from enemies/ghost animation/Ghost 0.png rename to enemies/ghost/ghost animation/Ghost 0.png diff --git a/enemies/ghost animation/Ghost 0.png.import b/enemies/ghost/ghost animation/Ghost 0.png.import similarity index 58% rename from enemies/ghost animation/Ghost 0.png.import rename to enemies/ghost/ghost animation/Ghost 0.png.import index 9aa9c33..e686ef7 100644 --- a/enemies/ghost animation/Ghost 0.png.import +++ b/enemies/ghost/ghost animation/Ghost 0.png.import @@ -3,23 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://b8732t0313bqs" -path="res://.godot/imported/Ghost 0.png-54508e305bb055698e5019e1d53e16ab.ctex" +path="res://.godot/imported/Ghost 0.png-8d937675f5ab76800df31b7061627c3a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemies/ghost animation/Ghost 0.png" -dest_files=["res://.godot/imported/Ghost 0.png-54508e305bb055698e5019e1d53e16ab.ctex"] +source_file="res://enemies/ghost/ghost animation/Ghost 0.png" +dest_files=["res://.godot/imported/Ghost 0.png-8d937675f5ab76800df31b7061627c3a.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 @@ -27,10 +25,6 @@ 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 diff --git a/enemies/ghost animation/Ghost 1.png b/enemies/ghost/ghost animation/Ghost 1.png similarity index 100% rename from enemies/ghost animation/Ghost 1.png rename to enemies/ghost/ghost animation/Ghost 1.png diff --git a/enemies/ghost animation/Ghost 1.png.import b/enemies/ghost/ghost animation/Ghost 1.png.import similarity index 58% rename from enemies/ghost animation/Ghost 1.png.import rename to enemies/ghost/ghost animation/Ghost 1.png.import index b1d0f88..d3fa17a 100644 --- a/enemies/ghost animation/Ghost 1.png.import +++ b/enemies/ghost/ghost animation/Ghost 1.png.import @@ -3,23 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3b5hmhjw2jyc" -path="res://.godot/imported/Ghost 1.png-43131954ed622829dc5453ddf6a96b4c.ctex" +path="res://.godot/imported/Ghost 1.png-995481976799d0dbea8151c0e6c4911f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemies/ghost animation/Ghost 1.png" -dest_files=["res://.godot/imported/Ghost 1.png-43131954ed622829dc5453ddf6a96b4c.ctex"] +source_file="res://enemies/ghost/ghost animation/Ghost 1.png" +dest_files=["res://.godot/imported/Ghost 1.png-995481976799d0dbea8151c0e6c4911f.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 @@ -27,10 +25,6 @@ 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 diff --git a/enemies/ghost animation/Ghost 2.png b/enemies/ghost/ghost animation/Ghost 2.png similarity index 100% rename from enemies/ghost animation/Ghost 2.png rename to enemies/ghost/ghost animation/Ghost 2.png diff --git a/enemies/ghost animation/Ghost 2.png.import b/enemies/ghost/ghost animation/Ghost 2.png.import similarity index 58% rename from enemies/ghost animation/Ghost 2.png.import rename to enemies/ghost/ghost animation/Ghost 2.png.import index 87f2b9b..a248efe 100644 --- a/enemies/ghost animation/Ghost 2.png.import +++ b/enemies/ghost/ghost animation/Ghost 2.png.import @@ -3,23 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://dfhxhum8lek56" -path="res://.godot/imported/Ghost 2.png-67077adaa01a71a5c0b85fac254bdf8e.ctex" +path="res://.godot/imported/Ghost 2.png-e2649e9d2a684ce9a917daf95b933483.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemies/ghost animation/Ghost 2.png" -dest_files=["res://.godot/imported/Ghost 2.png-67077adaa01a71a5c0b85fac254bdf8e.ctex"] +source_file="res://enemies/ghost/ghost animation/Ghost 2.png" +dest_files=["res://.godot/imported/Ghost 2.png-e2649e9d2a684ce9a917daf95b933483.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 @@ -27,10 +25,6 @@ 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 diff --git a/enemies/ghost animation/Ghost 3.png b/enemies/ghost/ghost animation/Ghost 3.png similarity index 100% rename from enemies/ghost animation/Ghost 3.png rename to enemies/ghost/ghost animation/Ghost 3.png diff --git a/enemies/ghost animation/Ghost 3.png.import b/enemies/ghost/ghost animation/Ghost 3.png.import similarity index 58% rename from enemies/ghost animation/Ghost 3.png.import rename to enemies/ghost/ghost animation/Ghost 3.png.import index 5d4f743..d15be45 100644 --- a/enemies/ghost animation/Ghost 3.png.import +++ b/enemies/ghost/ghost animation/Ghost 3.png.import @@ -3,23 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://ve5px6ib45g" -path="res://.godot/imported/Ghost 3.png-18da238556f83c92715d2db31a14d159.ctex" +path="res://.godot/imported/Ghost 3.png-06caad1192823e1dd881b7bd273e8aff.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemies/ghost animation/Ghost 3.png" -dest_files=["res://.godot/imported/Ghost 3.png-18da238556f83c92715d2db31a14d159.ctex"] +source_file="res://enemies/ghost/ghost animation/Ghost 3.png" +dest_files=["res://.godot/imported/Ghost 3.png-06caad1192823e1dd881b7bd273e8aff.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 @@ -27,10 +25,6 @@ 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 diff --git a/enemies/ghost animation/Ghost 4.png b/enemies/ghost/ghost animation/Ghost 4.png similarity index 100% rename from enemies/ghost animation/Ghost 4.png rename to enemies/ghost/ghost animation/Ghost 4.png diff --git a/enemies/ghost animation/Ghost 4.png.import b/enemies/ghost/ghost animation/Ghost 4.png.import similarity index 58% rename from enemies/ghost animation/Ghost 4.png.import rename to enemies/ghost/ghost animation/Ghost 4.png.import index 1ac4e37..c1d6dfc 100644 --- a/enemies/ghost animation/Ghost 4.png.import +++ b/enemies/ghost/ghost animation/Ghost 4.png.import @@ -3,23 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://cmg8yws3gwx6u" -path="res://.godot/imported/Ghost 4.png-45ba6df3ef207a5eff72f5f0036139d6.ctex" +path="res://.godot/imported/Ghost 4.png-5beda85c6f5331ee251ae12d3489921c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemies/ghost animation/Ghost 4.png" -dest_files=["res://.godot/imported/Ghost 4.png-45ba6df3ef207a5eff72f5f0036139d6.ctex"] +source_file="res://enemies/ghost/ghost animation/Ghost 4.png" +dest_files=["res://.godot/imported/Ghost 4.png-5beda85c6f5331ee251ae12d3489921c.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 @@ -27,10 +25,6 @@ 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 diff --git a/enemies/ghost animation/Ghost 5.png b/enemies/ghost/ghost animation/Ghost 5.png similarity index 100% rename from enemies/ghost animation/Ghost 5.png rename to enemies/ghost/ghost animation/Ghost 5.png diff --git a/enemies/ghost animation/Ghost 5.png.import b/enemies/ghost/ghost animation/Ghost 5.png.import similarity index 58% rename from enemies/ghost animation/Ghost 5.png.import rename to enemies/ghost/ghost animation/Ghost 5.png.import index c47e6e7..44ea75c 100644 --- a/enemies/ghost animation/Ghost 5.png.import +++ b/enemies/ghost/ghost animation/Ghost 5.png.import @@ -3,23 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://bs3lt13umfxu8" -path="res://.godot/imported/Ghost 5.png-08f0125e59cfd0173a5d36d75efeae60.ctex" +path="res://.godot/imported/Ghost 5.png-0726806101c6863f92a162d2ee5e7de2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemies/ghost animation/Ghost 5.png" -dest_files=["res://.godot/imported/Ghost 5.png-08f0125e59cfd0173a5d36d75efeae60.ctex"] +source_file="res://enemies/ghost/ghost animation/Ghost 5.png" +dest_files=["res://.godot/imported/Ghost 5.png-0726806101c6863f92a162d2ee5e7de2.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 @@ -27,10 +25,6 @@ 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 diff --git a/enemies/ghost.gd b/enemies/ghost/ghost.gd similarity index 100% rename from enemies/ghost.gd rename to enemies/ghost/ghost.gd diff --git a/enemies/ghost.gd.uid b/enemies/ghost/ghost.gd.uid similarity index 100% rename from enemies/ghost.gd.uid rename to enemies/ghost/ghost.gd.uid diff --git a/enemies/ghost.tscn b/enemies/ghost/ghost.tscn similarity index 89% rename from enemies/ghost.tscn rename to enemies/ghost/ghost.tscn index 25223b0..e6a342e 100644 --- a/enemies/ghost.tscn +++ b/enemies/ghost/ghost.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=9 format=3 uid="uid://chu67ci7sl488"] -[ext_resource type="Script" uid="uid://12jns4dppxxj" path="res://enemies/ghost.gd" id="1_6attn"] +[ext_resource type="Script" uid="uid://12jns4dppxxj" path="res://enemies/ghost/ghost.gd" id="1_6attn"] [ext_resource type="PackedScene" uid="uid://mtfsdd4cdf3a" path="res://utils/enemy_hurtbox.tscn" id="2_34o1m"] -[ext_resource type="Texture2D" uid="uid://d3b5hmhjw2jyc" path="res://enemies/ghost animation/Ghost 1.png" id="3_34o1m"] +[ext_resource type="Texture2D" uid="uid://d3b5hmhjw2jyc" path="res://enemies/ghost/ghost animation/Ghost 1.png" id="3_34o1m"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_obmiq"] -[ext_resource type="Texture2D" uid="uid://b8732t0313bqs" path="res://enemies/ghost animation/Ghost 0.png" id="3_rbwoc"] -[ext_resource type="Texture2D" uid="uid://dfhxhum8lek56" path="res://enemies/ghost animation/Ghost 2.png" id="4_4awot"] +[ext_resource type="Texture2D" uid="uid://b8732t0313bqs" path="res://enemies/ghost/ghost animation/Ghost 0.png" id="3_rbwoc"] +[ext_resource type="Texture2D" uid="uid://dfhxhum8lek56" path="res://enemies/ghost/ghost animation/Ghost 2.png" id="4_4awot"] [sub_resource type="CircleShape2D" id="CircleShape2D_6attn"] diff --git a/enemies/giant_leech.tscn b/enemies/leech/giant_leech.tscn similarity index 95% rename from enemies/giant_leech.tscn rename to enemies/leech/giant_leech.tscn index b6fe2ad..9c364a3 100644 --- a/enemies/giant_leech.tscn +++ b/enemies/leech/giant_leech.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://5nb7pf8g1ck"] -[ext_resource type="Script" uid="uid://b70f2ylbb3btt" path="res://enemies/leech.gd" id="1_wfsrb"] -[ext_resource type="PackedScene" uid="uid://cvoicwo2xnf7e" path="res://segment.tscn" id="2_7ngsb"] +[ext_resource type="Script" uid="uid://b70f2ylbb3btt" path="res://enemies/leech/leech.gd" id="1_wfsrb"] +[ext_resource type="PackedScene" uid="uid://cvoicwo2xnf7e" path="res://enemies/leech/segment.tscn" id="2_7ngsb"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_vk62e"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_cq6dk"] diff --git a/enemies/leech.gd b/enemies/leech/leech.gd similarity index 100% rename from enemies/leech.gd rename to enemies/leech/leech.gd diff --git a/enemies/leech.gd.uid b/enemies/leech/leech.gd.uid similarity index 100% rename from enemies/leech.gd.uid rename to enemies/leech/leech.gd.uid diff --git a/enemies/leech.tscn b/enemies/leech/leech.tscn similarity index 95% rename from enemies/leech.tscn rename to enemies/leech/leech.tscn index 7dfb6a1..8fd311d 100644 --- a/enemies/leech.tscn +++ b/enemies/leech/leech.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://b62xcg0dd3vct"] -[ext_resource type="Script" uid="uid://b70f2ylbb3btt" path="res://enemies/leech.gd" id="1_6u582"] -[ext_resource type="PackedScene" uid="uid://cvoicwo2xnf7e" path="res://segment.tscn" id="2_oqch2"] +[ext_resource type="Script" uid="uid://b70f2ylbb3btt" path="res://enemies/leech/leech.gd" id="1_6u582"] +[ext_resource type="PackedScene" uid="uid://cvoicwo2xnf7e" path="res://enemies/leech/segment.tscn" id="2_oqch2"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_0r7dp"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_cq6dk"] diff --git a/segment.gd b/enemies/leech/segment.gd similarity index 100% rename from segment.gd rename to enemies/leech/segment.gd diff --git a/segment.gd.uid b/enemies/leech/segment.gd.uid similarity index 100% rename from segment.gd.uid rename to enemies/leech/segment.gd.uid diff --git a/segment.tscn b/enemies/leech/segment.tscn similarity index 96% rename from segment.tscn rename to enemies/leech/segment.tscn index 4317f55..85a8274 100644 --- a/segment.tscn +++ b/enemies/leech/segment.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://cvoicwo2xnf7e"] -[ext_resource type="Script" uid="uid://b3q5khoqnnicx" path="res://segment.gd" id="1_o43lr"] +[ext_resource type="Script" uid="uid://b3q5khoqnnicx" path="res://enemies/leech/segment.gd" id="1_o43lr"] [ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="2_sa5vt"] [ext_resource type="PackedScene" uid="uid://mtfsdd4cdf3a" path="res://utils/enemy_hurtbox.tscn" id="3_sa5vt"] diff --git a/main.tscn b/main.tscn index 639ad8d..5915eb6 100644 --- a/main.tscn +++ b/main.tscn @@ -1,16 +1,15 @@ -[gd_scene load_steps=12 format=3 uid="uid://cxo6bq26huau7"] +[gd_scene load_steps=11 format=3 uid="uid://cxo6bq26huau7"] [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"] [ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"] [ext_resource type="PackedScene" uid="uid://jjoyj1ldafkf" path="res://world/earth.tscn" id="3_lquwl"] [ext_resource type="Script" uid="uid://colvx6wq0e8n7" path="res://world/building_generator.gd" id="4_1bvp3"] -[ext_resource type="PackedScene" uid="uid://73g8y37skebh" path="res://item_ui/item_ui.tscn" id="6_4c57u"] -[ext_resource type="PackedScene" uid="uid://cjsrtswk4vgf2" path="res://healthbar/healthbar.tscn" id="6_7mycd"] -[ext_resource type="PackedScene" uid="uid://dpdn2php3ydsv" path="res://death_screen/death_screen.tscn" id="7_5vw27"] -[ext_resource type="Script" uid="uid://3k6r3jnko4hg" path="res://show_fps.gd" id="8_5vw27"] -[ext_resource type="PackedScene" uid="uid://b62xcg0dd3vct" path="res://enemies/leech.tscn" id="9_kek77"] +[ext_resource type="PackedScene" uid="uid://73g8y37skebh" path="res://ui/item_ui/item_ui.tscn" id="6_4c57u"] +[ext_resource type="PackedScene" uid="uid://cjsrtswk4vgf2" path="res://ui/healthbar/healthbar.tscn" id="6_7mycd"] +[ext_resource type="PackedScene" uid="uid://dpdn2php3ydsv" path="res://ui/death_screen/death_screen.tscn" id="7_5vw27"] +[ext_resource type="Script" uid="uid://3k6r3jnko4hg" path="res://utils/show_fps.gd" id="8_5vw27"] +[ext_resource type="PackedScene" uid="uid://b62xcg0dd3vct" path="res://enemies/leech/leech.tscn" id="9_kek77"] [ext_resource type="PackedScene" uid="uid://ca5ndobertnp4" path="res://water/water.tscn" id="10_4c57u"] -[ext_resource type="PackedScene" uid="uid://cpe4s6vsn0ujd" path="res://boss.tscn" id="11_efxa6"] [node name="main" type="Node2D"] @@ -84,9 +83,6 @@ grow_horizontal = 2 grow_vertical = 2 texture = ExtResource("3_kek77") -[node name="Boss" parent="." instance=ExtResource("11_efxa6")] -position = Vector2(0, -3500) - [connection signal="active_item_changed" from="Player" to="CanvasLayer1/ItemUI" method="_on_player_active_item_changed"] [connection signal="health_changed" from="Player" to="CanvasLayer1/Healthbar" method="_on_player_health_changed"] [connection signal="max_hp_changed" from="Player" to="CanvasLayer1/Healthbar" method="_on_player_max_hp_changed"] diff --git a/player/Heart Grey.png.import b/player/Heart Grey.png.import index 4913ba6..4683b68 100644 --- a/player/Heart Grey.png.import +++ b/player/Heart Grey.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Heart Grey.png-6b86b8edc4802c3a483d9a14eb7ce1 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Heart.png.import b/player/Heart.png.import index dc7cbcd..38455ee 100644 --- a/player/Heart.png.import +++ b/player/Heart.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Heart.png-33902e9ff8206d83f93ea6d088b4a1bc.ct 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Heart_cut Grey.png.import b/player/Heart_cut Grey.png.import index be70c9d..31c6ef0 100644 --- a/player/Heart_cut Grey.png.import +++ b/player/Heart_cut Grey.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Heart_cut Grey.png-b4b9be15b5a8a36395d31eba43 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Heart_cut.png.import b/player/Heart_cut.png.import index fdc244b..1646dfd 100644 --- a/player/Heart_cut.png.import +++ b/player/Heart_cut.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Heart_cut.png-f11ef12fc6c55a0077b5ba659ce17ad 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Player_Walk/Walk 1.png.import b/player/Player_Walk/Walk 1.png.import index 7803358..97cf918 100644 --- a/player/Player_Walk/Walk 1.png.import +++ b/player/Player_Walk/Walk 1.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 1.png-47c623e9d3540b4a00d2bddf52ae0b2a.c 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Player_Walk/Walk 2.png.import b/player/Player_Walk/Walk 2.png.import index 3fac54f..48f18ef 100644 --- a/player/Player_Walk/Walk 2.png.import +++ b/player/Player_Walk/Walk 2.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 2.png-5dea4fdec55fa43e26680e08090fd654.c 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Player_Walk/Walk 3.png.import b/player/Player_Walk/Walk 3.png.import index c65053d..285ace3 100644 --- a/player/Player_Walk/Walk 3.png.import +++ b/player/Player_Walk/Walk 3.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 3.png-27890c0cb512383b8ecbd848c73efee1.c 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Player_Walk/Walk 4.png.import b/player/Player_Walk/Walk 4.png.import index c12f6b8..03aa90d 100644 --- a/player/Player_Walk/Walk 4.png.import +++ b/player/Player_Walk/Walk 4.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 4.png-232b1eae2acf3ad82130431014262cde.c 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Player_Walk/Walk 5.png.import b/player/Player_Walk/Walk 5.png.import index 47122be..fe3ebef 100644 --- a/player/Player_Walk/Walk 5.png.import +++ b/player/Player_Walk/Walk 5.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 5.png-cfb8eb15ace876127c083283fe74cdc0.c 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/Player_Walk/Walk 6.png.import b/player/Player_Walk/Walk 6.png.import index 5b2bdef..22d7868 100644 --- a/player/Player_Walk/Walk 6.png.import +++ b/player/Player_Walk/Walk 6.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 6.png-f243f98e182be67eb8681a11d34ee554.c 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/attack_animation/Attack Animation 0.png.import b/player/attack_animation/Attack Animation 0.png.import index a1cb9cd..96e2c41 100644 --- a/player/attack_animation/Attack Animation 0.png.import +++ b/player/attack_animation/Attack Animation 0.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Attack Animation 0.png-489acc9ce1151ab08e3e3b 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/attack_animation/Attack Animation 1.png.import b/player/attack_animation/Attack Animation 1.png.import index d3c1bc7..3d443df 100644 --- a/player/attack_animation/Attack Animation 1.png.import +++ b/player/attack_animation/Attack Animation 1.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Attack Animation 1.png-ee24e1daff1b2693d0a213 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/attack_animation/Attack Animation 2.png.import b/player/attack_animation/Attack Animation 2.png.import index 9fb632f..8b1592c 100644 --- a/player/attack_animation/Attack Animation 2.png.import +++ b/player/attack_animation/Attack Animation 2.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Attack Animation 2.png-d547f6c17bbb65420b4918 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/attack_animation/Attack Animation 3.png.import b/player/attack_animation/Attack Animation 3.png.import index 0cc27c5..b0b138f 100644 --- a/player/attack_animation/Attack Animation 3.png.import +++ b/player/attack_animation/Attack Animation 3.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Attack Animation 3.png-d741f7f68a27aab201a287 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/double_jump/Double Jump 0.png.import b/player/double_jump/Double Jump 0.png.import index 40436aa..c685386 100644 --- a/player/double_jump/Double Jump 0.png.import +++ b/player/double_jump/Double Jump 0.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Double Jump 0.png-e1ba562e6b13c8446a336c30d2d 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/double_jump/Double Jump 1.png.import b/player/double_jump/Double Jump 1.png.import index 87b6af1..04b02df 100644 --- a/player/double_jump/Double Jump 1.png.import +++ b/player/double_jump/Double Jump 1.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Double Jump 1.png-69539f806c4752d0093ea6a956b 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/double_jump/Double Jump 2.png.import b/player/double_jump/Double Jump 2.png.import index 4818254..75d6760 100644 --- a/player/double_jump/Double Jump 2.png.import +++ b/player/double_jump/Double Jump 2.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Double Jump 2.png-f1a820e0078cf2a6b005cbe59b4 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/double_jump/Double Jump 3.png.import b/player/double_jump/Double Jump 3.png.import index 29d7306..ff6783f 100644 --- a/player/double_jump/Double Jump 3.png.import +++ b/player/double_jump/Double Jump 3.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Double Jump 3.png-4cfca0f35700bb4d12354620aff 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 @@ -27,10 +25,6 @@ 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 diff --git a/player/double_jump/Double Jump 4.png.import b/player/double_jump/Double Jump 4.png.import index 2b6dfa0..cb7dc72 100644 --- a/player/double_jump/Double Jump 4.png.import +++ b/player/double_jump/Double Jump 4.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Double Jump 4.png-3e8f9f85498209cd3a65d2e632f 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 @@ -27,10 +25,6 @@ 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 diff --git a/project.godot b/project.godot index 74ca773..73df7ee 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="The Dark Side of Earth" run/main_scene="uid://cxo6bq26huau7" -config/features=PackedStringArray("4.5", "Forward Plus") +config/features=PackedStringArray("4.4", "Forward Plus") config/icon="res://icon.svg" [display] diff --git a/sounds/686321__cjspellsfish__punch-land-soft.wav b/sounds/686321__cjspellsfish__punch-land-soft.wav new file mode 100644 index 0000000..814d2da Binary files /dev/null and b/sounds/686321__cjspellsfish__punch-land-soft.wav differ diff --git a/sounds/686321__cjspellsfish__punch-land-soft.wav.import b/sounds/686321__cjspellsfish__punch-land-soft.wav.import new file mode 100644 index 0000000..70b7168 --- /dev/null +++ b/sounds/686321__cjspellsfish__punch-land-soft.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://co07360hqn6fk" +path="res://.godot/imported/686321__cjspellsfish__punch-land-soft.wav-a4d09209aaf75a0f30c48baa4cf3044d.sample" + +[deps] + +source_file="res://sounds/686321__cjspellsfish__punch-land-soft.wav" +dest_files=["res://.godot/imported/686321__cjspellsfish__punch-land-soft.wav-a4d09209aaf75a0f30c48baa4cf3044d.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/traps/Morning Star.png.import b/traps/Morning Star.png.import index 27c6bc9..5f48a13 100644 --- a/traps/Morning Star.png.import +++ b/traps/Morning Star.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Morning Star.png-5c8aa4aef917e837888eb86be042 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 @@ -27,10 +25,6 @@ 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 diff --git a/death_screen/death_screen.gd b/ui/death_screen/death_screen.gd similarity index 100% rename from death_screen/death_screen.gd rename to ui/death_screen/death_screen.gd diff --git a/death_screen/death_screen.gd.uid b/ui/death_screen/death_screen.gd.uid similarity index 100% rename from death_screen/death_screen.gd.uid rename to ui/death_screen/death_screen.gd.uid diff --git a/death_screen/death_screen.tscn b/ui/death_screen/death_screen.tscn similarity index 98% rename from death_screen/death_screen.tscn rename to ui/death_screen/death_screen.tscn index 035f2f1..df440b2 100644 --- a/death_screen/death_screen.tscn +++ b/ui/death_screen/death_screen.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://dpdn2php3ydsv"] -[ext_resource type="Script" uid="uid://cnulh0nwvoro3" path="res://death_screen/death_screen.gd" id="1_03nxu"] +[ext_resource type="Script" uid="uid://cnulh0nwvoro3" path="res://ui/death_screen/death_screen.gd" id="1_03nxu"] [ext_resource type="Theme" uid="uid://dwlus1hjwtch4" path="res://large_theme.tres" id="1_nk1bp"] [ext_resource type="Theme" uid="uid://bn4i5ordp2chs" path="res://small_theme.tres" id="2_03nxu"] diff --git a/healthbar/healthbar.gd b/ui/healthbar/healthbar.gd similarity index 100% rename from healthbar/healthbar.gd rename to ui/healthbar/healthbar.gd diff --git a/healthbar/healthbar.gd.uid b/ui/healthbar/healthbar.gd.uid similarity index 100% rename from healthbar/healthbar.gd.uid rename to ui/healthbar/healthbar.gd.uid diff --git a/healthbar/healthbar.tscn b/ui/healthbar/healthbar.tscn similarity index 82% rename from healthbar/healthbar.tscn rename to ui/healthbar/healthbar.tscn index 664493c..7017aac 100644 --- a/healthbar/healthbar.tscn +++ b/ui/healthbar/healthbar.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cjsrtswk4vgf2"] -[ext_resource type="Script" uid="uid://b3fncqgyodcjc" path="res://healthbar/healthbar.gd" id="1_ubhit"] -[ext_resource type="PackedScene" uid="uid://em0xambhywfv" path="res://healthbar/heart.tscn" id="2_y66kq"] +[ext_resource type="Script" uid="uid://b3fncqgyodcjc" path="res://ui/healthbar/healthbar.gd" id="1_ubhit"] +[ext_resource type="PackedScene" uid="uid://em0xambhywfv" path="res://ui/healthbar/heart.tscn" id="2_y66kq"] [node name="Healthbar" type="HBoxContainer"] offset_right = 40.0 diff --git a/healthbar/heart.gd b/ui/healthbar/heart.gd similarity index 100% rename from healthbar/heart.gd rename to ui/healthbar/heart.gd diff --git a/healthbar/heart.gd.uid b/ui/healthbar/heart.gd.uid similarity index 100% rename from healthbar/heart.gd.uid rename to ui/healthbar/heart.gd.uid diff --git a/healthbar/heart.tscn b/ui/healthbar/heart.tscn similarity index 94% rename from healthbar/heart.tscn rename to ui/healthbar/heart.tscn index 367314b..aa2b88f 100644 --- a/healthbar/heart.tscn +++ b/ui/healthbar/heart.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://em0xambhywfv"] -[ext_resource type="Script" uid="uid://c60wm212fu1ti" path="res://healthbar/heart.gd" id="1_c17c5"] +[ext_resource type="Script" uid="uid://c60wm212fu1ti" path="res://ui/healthbar/heart.gd" id="1_c17c5"] [ext_resource type="Texture2D" uid="uid://djfc7sdc8wxp6" path="res://player/Heart_cut.png" id="2_885dn"] [ext_resource type="Texture2D" uid="uid://ctwu08w867gax" path="res://player/Heart_cut Grey.png" id="3_4yb2p"] diff --git a/item_ui/cooldown.gdshader b/ui/item_ui/cooldown.gdshader similarity index 100% rename from item_ui/cooldown.gdshader rename to ui/item_ui/cooldown.gdshader diff --git a/item_ui/cooldown.gdshader.uid b/ui/item_ui/cooldown.gdshader.uid similarity index 100% rename from item_ui/cooldown.gdshader.uid rename to ui/item_ui/cooldown.gdshader.uid diff --git a/item_ui/item_ui.gd b/ui/item_ui/item_ui.gd similarity index 100% rename from item_ui/item_ui.gd rename to ui/item_ui/item_ui.gd diff --git a/item_ui/item_ui.gd.uid b/ui/item_ui/item_ui.gd.uid similarity index 100% rename from item_ui/item_ui.gd.uid rename to ui/item_ui/item_ui.gd.uid diff --git a/item_ui/item_ui.tscn b/ui/item_ui/item_ui.tscn similarity index 94% rename from item_ui/item_ui.tscn rename to ui/item_ui/item_ui.tscn index 2fa82b3..ad31230 100644 --- a/item_ui/item_ui.tscn +++ b/ui/item_ui/item_ui.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://73g8y37skebh"] -[ext_resource type="Script" uid="uid://eusti457vwq1" path="res://item_ui/item_ui.gd" id="1_lfuq2"] -[ext_resource type="Shader" uid="uid://d0a7tk6dh1xq1" path="res://item_ui/cooldown.gdshader" id="2_60pal"] +[ext_resource type="Script" uid="uid://eusti457vwq1" path="res://ui/item_ui/item_ui.gd" id="1_lfuq2"] +[ext_resource type="Shader" uid="uid://d0a7tk6dh1xq1" path="res://ui/item_ui/cooldown.gdshader" id="2_60pal"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8oq0s"] draw_center = false diff --git a/main_menu/main_menu.gd b/ui/main_menu/main_menu.gd similarity index 100% rename from main_menu/main_menu.gd rename to ui/main_menu/main_menu.gd diff --git a/main_menu/main_menu.gd.uid b/ui/main_menu/main_menu.gd.uid similarity index 100% rename from main_menu/main_menu.gd.uid rename to ui/main_menu/main_menu.gd.uid diff --git a/main_menu/main_menu.tscn b/ui/main_menu/main_menu.tscn similarity index 98% rename from main_menu/main_menu.tscn rename to ui/main_menu/main_menu.tscn index 349f20d..c707474 100644 --- a/main_menu/main_menu.tscn +++ b/ui/main_menu/main_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=10 format=3 uid="uid://dpkr8yoobtej6"] -[ext_resource type="Script" uid="uid://bg4qx85we014d" path="res://main_menu/main_menu.gd" id="1_bws42"] +[ext_resource type="Script" uid="uid://bg4qx85we014d" path="res://ui/main_menu/main_menu.gd" id="1_bws42"] [ext_resource type="PackedScene" uid="uid://jjoyj1ldafkf" path="res://world/earth.tscn" id="1_oa53l"] [ext_resource type="Script" uid="uid://colvx6wq0e8n7" path="res://world/building_generator.gd" id="2_d3a7t"] [ext_resource type="Theme" uid="uid://dwlus1hjwtch4" path="res://large_theme.tres" id="3_3shxk"] diff --git a/show_fps.gd b/utils/show_fps.gd similarity index 100% rename from show_fps.gd rename to utils/show_fps.gd diff --git a/show_fps.gd.uid b/utils/show_fps.gd.uid similarity index 100% rename from show_fps.gd.uid rename to utils/show_fps.gd.uid diff --git a/water/Warning_particle_emmission_shape.png.import b/water/Warning_particle_emmission_shape.png.import index 5b1d8aa..28ea240 100644 --- a/water/Warning_particle_emmission_shape.png.import +++ b/water/Warning_particle_emmission_shape.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Warning_particle_emmission_shape.png-dcaecf9f 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 @@ -27,10 +25,6 @@ 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 diff --git a/water/water.tscn b/water/water.tscn index 0fc91ec..960335c 100644 --- a/water/water.tscn +++ b/water/water.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://chcxmo2uqvjbm" path="res://water/water.gd" id="1_m8een"] [ext_resource type="Shader" uid="uid://dg6cmhincvxua" path="res://water/water.gdshader" id="1_wjap7"] [ext_resource type="Animation" uid="uid://y1u85w0ew7uj" path="res://water/tsunami.res" id="3_6c1kg"] -[ext_resource type="Texture2D" uid="uid://dvlvu37up72gt" path="res://bubble.png" id="4_o7pku"] +[ext_resource type="Texture2D" uid="uid://dvlvu37up72gt" path="res://enemies/boss/bubble.png" id="4_o7pku"] [sub_resource type="Image" id="Image_u7vlg"] data = { diff --git a/world/Background Prototype/Background Prototype Layer 1.png.import b/world/Background Prototype/Background Prototype Layer 1.png.import index 2b3265d..3291c4a 100644 --- a/world/Background Prototype/Background Prototype Layer 1.png.import +++ b/world/Background Prototype/Background Prototype Layer 1.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Background Prototype Layer 1.png-47bb54b6d20a 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 @@ -27,10 +25,6 @@ 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 diff --git a/world/Background Prototype/Background Prototype Layer 2.png.import b/world/Background Prototype/Background Prototype Layer 2.png.import index f18ed3b..7415d89 100644 --- a/world/Background Prototype/Background Prototype Layer 2.png.import +++ b/world/Background Prototype/Background Prototype Layer 2.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Background Prototype Layer 2.png-ab86220f0fff 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 @@ -27,10 +25,6 @@ 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 diff --git a/world/Background Prototype/Background Prototype Layer 3.png.import b/world/Background Prototype/Background Prototype Layer 3.png.import index 816fbed..7399a52 100644 --- a/world/Background Prototype/Background Prototype Layer 3.png.import +++ b/world/Background Prototype/Background Prototype Layer 3.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Background Prototype Layer 3.png-5a49ea16a5dc 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 @@ -27,10 +25,6 @@ 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 diff --git a/world/Background Prototype/Background Prototype Layer 4.png.import b/world/Background Prototype/Background Prototype Layer 4.png.import index b465008..6ff53ad 100644 --- a/world/Background Prototype/Background Prototype Layer 4.png.import +++ b/world/Background Prototype/Background Prototype Layer 4.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Background Prototype Layer 4.png-ee5791549e67 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 @@ -27,10 +25,6 @@ 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 diff --git a/world/Background Prototype/Background prototype.png.import b/world/Background Prototype/Background prototype.png.import index ebf7d0f..c7895b7 100644 --- a/world/Background Prototype/Background prototype.png.import +++ b/world/Background Prototype/Background prototype.png.import @@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Background prototype.png-3a0b707a19d2bad45954 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 @@ -27,10 +25,6 @@ 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