diff --git a/graphics/animations/Player Jab 48x48.png b/assets/graphics/animations/Player Jab 48x48.png similarity index 100% rename from graphics/animations/Player Jab 48x48.png rename to assets/graphics/animations/Player Jab 48x48.png diff --git a/graphics/animations/Player Jab 48x48.png.import b/assets/graphics/animations/Player Jab 48x48.png.import similarity index 56% rename from graphics/animations/Player Jab 48x48.png.import rename to assets/graphics/animations/Player Jab 48x48.png.import index 22452ae..8102942 100644 --- a/graphics/animations/Player Jab 48x48.png.import +++ b/assets/graphics/animations/Player Jab 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://b27fd4xvrp2ov" -path="res://.godot/imported/Player Jab 48x48.png-a092fdd9a110293df667baca50431cc7.ctex" +path="res://.godot/imported/Player Jab 48x48.png-209b6dee05f38c9c501270260f1e13ae.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/Player Jab 48x48.png" -dest_files=["res://.godot/imported/Player Jab 48x48.png-a092fdd9a110293df667baca50431cc7.ctex"] +source_file="res://assets/graphics/animations/Player Jab 48x48.png" +dest_files=["res://.godot/imported/Player Jab 48x48.png-209b6dee05f38c9c501270260f1e13ae.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_death/Player Death 64x64.png b/assets/graphics/animations/player_death/Player Death 64x64.png similarity index 100% rename from graphics/animations/player_death/Player Death 64x64.png rename to assets/graphics/animations/player_death/Player Death 64x64.png diff --git a/graphics/animations/player_death/Player Death 64x64.png.import b/assets/graphics/animations/player_death/Player Death 64x64.png.import similarity index 55% rename from graphics/animations/player_death/Player Death 64x64.png.import rename to assets/graphics/animations/player_death/Player Death 64x64.png.import index dffc14e..1969ccd 100644 --- a/graphics/animations/player_death/Player Death 64x64.png.import +++ b/assets/graphics/animations/player_death/Player Death 64x64.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://dcrb23f006glc" -path="res://.godot/imported/Player Death 64x64.png-dc6feffe3d49162e73ed5293fec16099.ctex" +path="res://.godot/imported/Player Death 64x64.png-3ced7a0547a0c82d5e3c6c2e7688b326.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_death/Player Death 64x64.png" -dest_files=["res://.godot/imported/Player Death 64x64.png-dc6feffe3d49162e73ed5293fec16099.ctex"] +source_file="res://assets/graphics/animations/player_death/Player Death 64x64.png" +dest_files=["res://.godot/imported/Player Death 64x64.png-3ced7a0547a0c82d5e3c6c2e7688b326.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_hurt/Player Hurt 48x48.png b/assets/graphics/animations/player_hurt/Player Hurt 48x48.png similarity index 100% rename from graphics/animations/player_hurt/Player Hurt 48x48.png rename to assets/graphics/animations/player_hurt/Player Hurt 48x48.png diff --git a/graphics/animations/player_hurt/Player Hurt 48x48.png.import b/assets/graphics/animations/player_hurt/Player Hurt 48x48.png.import similarity index 56% rename from graphics/animations/player_hurt/Player Hurt 48x48.png.import rename to assets/graphics/animations/player_hurt/Player Hurt 48x48.png.import index c3f1360..3ec5ef0 100644 --- a/graphics/animations/player_hurt/Player Hurt 48x48.png.import +++ b/assets/graphics/animations/player_hurt/Player Hurt 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://cr8wqcakbcjnl" -path="res://.godot/imported/Player Hurt 48x48.png-0ab10aebe76670b2993b2e5f07f8ac84.ctex" +path="res://.godot/imported/Player Hurt 48x48.png-1f9c49d10d4f7d0c9be2c8d01bd8b83e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_hurt/Player Hurt 48x48.png" -dest_files=["res://.godot/imported/Player Hurt 48x48.png-0ab10aebe76670b2993b2e5f07f8ac84.ctex"] +source_file="res://assets/graphics/animations/player_hurt/Player Hurt 48x48.png" +dest_files=["res://.godot/imported/Player Hurt 48x48.png-1f9c49d10d4f7d0c9be2c8d01bd8b83e.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_idle/Player Idle 48x48.png b/assets/graphics/animations/player_idle/Player Idle 48x48.png similarity index 100% rename from graphics/animations/player_idle/Player Idle 48x48.png rename to assets/graphics/animations/player_idle/Player Idle 48x48.png diff --git a/graphics/animations/player_idle/Player Idle 48x48.png.import b/assets/graphics/animations/player_idle/Player Idle 48x48.png.import similarity index 56% rename from graphics/animations/player_idle/Player Idle 48x48.png.import rename to assets/graphics/animations/player_idle/Player Idle 48x48.png.import index 67546c9..668f328 100644 --- a/graphics/animations/player_idle/Player Idle 48x48.png.import +++ b/assets/graphics/animations/player_idle/Player Idle 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://dr3rp5hv7rexv" -path="res://.godot/imported/Player Idle 48x48.png-febc6ee73b16c6ae56feb25eebf8110d.ctex" +path="res://.godot/imported/Player Idle 48x48.png-ce364c251291af8d74a9d090870933db.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_idle/Player Idle 48x48.png" -dest_files=["res://.godot/imported/Player Idle 48x48.png-febc6ee73b16c6ae56feb25eebf8110d.ctex"] +source_file="res://assets/graphics/animations/player_idle/Player Idle 48x48.png" +dest_files=["res://.godot/imported/Player Idle 48x48.png-ce364c251291af8d74a9d090870933db.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_jump/player jump 48x48.png b/assets/graphics/animations/player_jump/player jump 48x48.png similarity index 100% rename from graphics/animations/player_jump/player jump 48x48.png rename to assets/graphics/animations/player_jump/player jump 48x48.png diff --git a/graphics/animations/player_jump/player jump 48x48.png.import b/assets/graphics/animations/player_jump/player jump 48x48.png.import similarity index 55% rename from graphics/animations/player_jump/player jump 48x48.png.import rename to assets/graphics/animations/player_jump/player jump 48x48.png.import index 914725d..bc40e3c 100644 --- a/graphics/animations/player_jump/player jump 48x48.png.import +++ b/assets/graphics/animations/player_jump/player jump 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://uxdt2cgxicmt" -path="res://.godot/imported/player jump 48x48.png-53153cc022c0f5f1a72bef88bb5e05df.ctex" +path="res://.godot/imported/player jump 48x48.png-860e6d4e475038c941b8060a67a2fe2c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_jump/player jump 48x48.png" -dest_files=["res://.godot/imported/player jump 48x48.png-53153cc022c0f5f1a72bef88bb5e05df.ctex"] +source_file="res://assets/graphics/animations/player_jump/player jump 48x48.png" +dest_files=["res://.godot/imported/player jump 48x48.png-860e6d4e475038c941b8060a67a2fe2c.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_jump/player new jump 48x48.png b/assets/graphics/animations/player_jump/player new jump 48x48.png similarity index 100% rename from graphics/animations/player_jump/player new jump 48x48.png rename to assets/graphics/animations/player_jump/player new jump 48x48.png diff --git a/graphics/animations/player_jump/player new jump 48x48.png.import b/assets/graphics/animations/player_jump/player new jump 48x48.png.import similarity index 55% rename from graphics/animations/player_jump/player new jump 48x48.png.import rename to assets/graphics/animations/player_jump/player new jump 48x48.png.import index 7d06955..ea37ef5 100644 --- a/graphics/animations/player_jump/player new jump 48x48.png.import +++ b/assets/graphics/animations/player_jump/player new jump 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://cmng5hu2bk4v6" -path="res://.godot/imported/player new jump 48x48.png-085528a4cee6917e773b178651dd57ae.ctex" +path="res://.godot/imported/player new jump 48x48.png-9576695c05f6dc27164583cbb76bf6b6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_jump/player new jump 48x48.png" -dest_files=["res://.godot/imported/player new jump 48x48.png-085528a4cee6917e773b178651dd57ae.ctex"] +source_file="res://assets/graphics/animations/player_jump/player new jump 48x48.png" +dest_files=["res://.godot/imported/player new jump 48x48.png-9576695c05f6dc27164583cbb76bf6b6.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_land/player land 48x48.png b/assets/graphics/animations/player_land/player land 48x48.png similarity index 100% rename from graphics/animations/player_land/player land 48x48.png rename to assets/graphics/animations/player_land/player land 48x48.png diff --git a/graphics/animations/player_land/player land 48x48.png.import b/assets/graphics/animations/player_land/player land 48x48.png.import similarity index 55% rename from graphics/animations/player_land/player land 48x48.png.import rename to assets/graphics/animations/player_land/player land 48x48.png.import index 4f3fcf0..fc1e9de 100644 --- a/graphics/animations/player_land/player land 48x48.png.import +++ b/assets/graphics/animations/player_land/player land 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://8esdepvbc2c6" -path="res://.godot/imported/player land 48x48.png-73bf83889efcd0c346ed73018c7c0f6a.ctex" +path="res://.godot/imported/player land 48x48.png-e731ec47c86ee7e3aba956810beee3d3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_land/player land 48x48.png" -dest_files=["res://.godot/imported/player land 48x48.png-73bf83889efcd0c346ed73018c7c0f6a.ctex"] +source_file="res://assets/graphics/animations/player_land/player land 48x48.png" +dest_files=["res://.godot/imported/player land 48x48.png-e731ec47c86ee7e3aba956810beee3d3.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_punch/Player Punch 64x64(1).png b/assets/graphics/animations/player_punch/Player Punch 64x64(1).png similarity index 100% rename from graphics/animations/player_punch/Player Punch 64x64(1).png rename to assets/graphics/animations/player_punch/Player Punch 64x64(1).png diff --git a/graphics/animations/player_punch/Player Punch 64x64(1).png.import b/assets/graphics/animations/player_punch/Player Punch 64x64(1).png.import similarity index 55% rename from graphics/animations/player_punch/Player Punch 64x64(1).png.import rename to assets/graphics/animations/player_punch/Player Punch 64x64(1).png.import index 54e35f4..20c97b1 100644 --- a/graphics/animations/player_punch/Player Punch 64x64(1).png.import +++ b/assets/graphics/animations/player_punch/Player Punch 64x64(1).png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://bnnj3lw3souky" -path="res://.godot/imported/Player Punch 64x64(1).png-30d66d61ef3a1f371d6375dad7a62029.ctex" +path="res://.godot/imported/Player Punch 64x64(1).png-21e9b35df29fd6c8a7a80d12959ef6f1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_punch/Player Punch 64x64(1).png" -dest_files=["res://.godot/imported/Player Punch 64x64(1).png-30d66d61ef3a1f371d6375dad7a62029.ctex"] +source_file="res://assets/graphics/animations/player_punch/Player Punch 64x64(1).png" +dest_files=["res://.godot/imported/Player Punch 64x64(1).png-21e9b35df29fd6c8a7a80d12959ef6f1.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_run/player run 48x48.png b/assets/graphics/animations/player_run/player run 48x48.png similarity index 100% rename from graphics/animations/player_run/player run 48x48.png rename to assets/graphics/animations/player_run/player run 48x48.png diff --git a/graphics/animations/player_run/player run 48x48.png.import b/assets/graphics/animations/player_run/player run 48x48.png.import similarity index 56% rename from graphics/animations/player_run/player run 48x48.png.import rename to assets/graphics/animations/player_run/player run 48x48.png.import index dd2077d..d648aa0 100644 --- a/graphics/animations/player_run/player run 48x48.png.import +++ b/assets/graphics/animations/player_run/player run 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://bgp8oow6hgh5o" -path="res://.godot/imported/player run 48x48.png-e4bb17293a9ce0c0c03376a7369aee02.ctex" +path="res://.godot/imported/player run 48x48.png-11b1fb3ada55354e6bf57b808f569dbf.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_run/player run 48x48.png" -dest_files=["res://.godot/imported/player run 48x48.png-e4bb17293a9ce0c0c03376a7369aee02.ctex"] +source_file="res://assets/graphics/animations/player_run/player run 48x48.png" +dest_files=["res://.godot/imported/player run 48x48.png-11b1fb3ada55354e6bf57b808f569dbf.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_shoot/Player Running Shooting 48x48.png b/assets/graphics/animations/player_shoot/Player Running Shooting 48x48.png similarity index 100% rename from graphics/animations/player_shoot/Player Running Shooting 48x48.png rename to assets/graphics/animations/player_shoot/Player Running Shooting 48x48.png diff --git a/graphics/animations/player_shoot/Player Running Shooting 48x48.png.import b/assets/graphics/animations/player_shoot/Player Running Shooting 48x48.png.import similarity index 60% rename from graphics/animations/player_shoot/Player Running Shooting 48x48.png.import rename to assets/graphics/animations/player_shoot/Player Running Shooting 48x48.png.import index 5334a01..9075c53 100644 --- a/graphics/animations/player_shoot/Player Running Shooting 48x48.png.import +++ b/assets/graphics/animations/player_shoot/Player Running Shooting 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://dadvc8tsvmkb6" -path="res://.godot/imported/Player Running Shooting 48x48.png-3d2df69d2a49613816850d2eb5e6129a.ctex" +path="res://.godot/imported/Player Running Shooting 48x48.png-68f72d81718d4b85ab3a5c6086bbc4ac.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_shoot/Player Running Shooting 48x48.png" -dest_files=["res://.godot/imported/Player Running Shooting 48x48.png-3d2df69d2a49613816850d2eb5e6129a.ctex"] +source_file="res://assets/graphics/animations/player_shoot/Player Running Shooting 48x48.png" +dest_files=["res://.godot/imported/Player Running Shooting 48x48.png-68f72d81718d4b85ab3a5c6086bbc4ac.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 @@ -25,6 +27,10 @@ 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/graphics/animations/player_shoot/player shoot 2H 48x48.png b/assets/graphics/animations/player_shoot/player shoot 2H 48x48.png similarity index 100% rename from graphics/animations/player_shoot/player shoot 2H 48x48.png rename to assets/graphics/animations/player_shoot/player shoot 2H 48x48.png diff --git a/graphics/animations/player_shoot/player shoot 2H 48x48.png.import b/assets/graphics/animations/player_shoot/player shoot 2H 48x48.png.import similarity index 55% rename from graphics/animations/player_shoot/player shoot 2H 48x48.png.import rename to assets/graphics/animations/player_shoot/player shoot 2H 48x48.png.import index f0a4deb..417fb62 100644 --- a/graphics/animations/player_shoot/player shoot 2H 48x48.png.import +++ b/assets/graphics/animations/player_shoot/player shoot 2H 48x48.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://crll0t2wjtsly" -path="res://.godot/imported/player shoot 2H 48x48.png-6d3782d73196ec488a7fe7b78e5f5532.ctex" +path="res://.godot/imported/player shoot 2H 48x48.png-f44ee215894e9efb0ebe089c14b9f0c6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/animations/player_shoot/player shoot 2H 48x48.png" -dest_files=["res://.godot/imported/player shoot 2H 48x48.png-6d3782d73196ec488a7fe7b78e5f5532.ctex"] +source_file="res://assets/graphics/animations/player_shoot/player shoot 2H 48x48.png" +dest_files=["res://.godot/imported/player shoot 2H 48x48.png-f44ee215894e9efb0ebe089c14b9f0c6.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 @@ -25,6 +27,10 @@ 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/graphics/backgrounds/25-10-17-sky-background-godot-course-.png b/assets/graphics/backgrounds/25-10-17-sky-background-godot-course-.png similarity index 100% rename from graphics/backgrounds/25-10-17-sky-background-godot-course-.png rename to assets/graphics/backgrounds/25-10-17-sky-background-godot-course-.png diff --git a/graphics/backgrounds/25-10-17-sky-background-godot-course-.png.import b/assets/graphics/backgrounds/25-10-17-sky-background-godot-course-.png.import similarity index 65% rename from graphics/backgrounds/25-10-17-sky-background-godot-course-.png.import rename to assets/graphics/backgrounds/25-10-17-sky-background-godot-course-.png.import index 60668ce..3d3c2c2 100644 --- a/graphics/backgrounds/25-10-17-sky-background-godot-course-.png.import +++ b/assets/graphics/backgrounds/25-10-17-sky-background-godot-course-.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://cxhbqd7yunb5o" -path="res://.godot/imported/25-10-17-sky-background-godot-course-.png-685fa7996ddecb251040f01e513b1230.ctex" +path="res://.godot/imported/25-10-17-sky-background-godot-course-.png-eaa5202c6ae16384f3b1b249edc79b83.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/backgrounds/25-10-17-sky-background-godot-course-.png" -dest_files=["res://.godot/imported/25-10-17-sky-background-godot-course-.png-685fa7996ddecb251040f01e513b1230.ctex"] +source_file="res://assets/graphics/backgrounds/25-10-17-sky-background-godot-course-.png" +dest_files=["res://.godot/imported/25-10-17-sky-background-godot-course-.png-eaa5202c6ae16384f3b1b249edc79b83.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 @@ -25,6 +27,10 @@ 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/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png b/assets/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png similarity index 100% rename from graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png rename to assets/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png diff --git a/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png.import b/assets/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png.import similarity index 64% rename from graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png.import rename to assets/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png.import index 9999ab1..2527b96 100644 --- a/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png.import +++ b/assets/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://kos0kjk46ooe" -path="res://.godot/imported/25-10-17-trees-background-godot-course-v1.png-e24962b00bc87724fb0949f83ef73b02.ctex" +path="res://.godot/imported/25-10-17-trees-background-godot-course-v1.png-86a3f2fed3952417fbf9b831338c8b07.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png" -dest_files=["res://.godot/imported/25-10-17-trees-background-godot-course-v1.png-e24962b00bc87724fb0949f83ef73b02.ctex"] +source_file="res://assets/graphics/backgrounds/25-10-17-trees-background-godot-course-v1.png" +dest_files=["res://.godot/imported/25-10-17-trees-background-godot-course-v1.png-86a3f2fed3952417fbf9b831338c8b07.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 @@ -25,6 +27,10 @@ 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/graphics/backgrounds/forestbackground.png b/assets/graphics/backgrounds/forestbackground.png similarity index 100% rename from graphics/backgrounds/forestbackground.png rename to assets/graphics/backgrounds/forestbackground.png diff --git a/graphics/backgrounds/forestbackground.png.import b/assets/graphics/backgrounds/forestbackground.png.import similarity index 56% rename from graphics/backgrounds/forestbackground.png.import rename to assets/graphics/backgrounds/forestbackground.png.import index 3a99dc8..cbc83bb 100644 --- a/graphics/backgrounds/forestbackground.png.import +++ b/assets/graphics/backgrounds/forestbackground.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://bxx6s82ck7kch" -path="res://.godot/imported/forestbackground.png-c62d472b3b61aefff531c569ed496c04.ctex" +path="res://.godot/imported/forestbackground.png-f84b590d20143b6e2c8a82165c029463.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/backgrounds/forestbackground.png" -dest_files=["res://.godot/imported/forestbackground.png-c62d472b3b61aefff531c569ed496c04.ctex"] +source_file="res://assets/graphics/backgrounds/forestbackground.png" +dest_files=["res://.godot/imported/forestbackground.png-f84b590d20143b6e2c8a82165c029463.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 @@ -25,6 +27,10 @@ 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/graphics/effects/14.png b/assets/graphics/effects/14.png similarity index 100% rename from graphics/effects/14.png rename to assets/graphics/effects/14.png diff --git a/graphics/effects/14.png.import b/assets/graphics/effects/14.png.import similarity index 59% rename from graphics/effects/14.png.import rename to assets/graphics/effects/14.png.import index 26f4d98..d9f9c7f 100644 --- a/graphics/effects/14.png.import +++ b/assets/graphics/effects/14.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://rejfd2gqjk7w" -path="res://.godot/imported/14.png-b80bda9481eb03b9296615b658f23b86.ctex" +path="res://.godot/imported/14.png-a19bb542931254ce1789d15b7e2b57a0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/effects/14.png" -dest_files=["res://.godot/imported/14.png-b80bda9481eb03b9296615b658f23b86.ctex"] +source_file="res://assets/graphics/effects/14.png" +dest_files=["res://.godot/imported/14.png-a19bb542931254ce1789d15b7e2b57a0.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 @@ -25,6 +27,10 @@ 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/graphics/effects/explosion.png b/assets/graphics/effects/explosion.png similarity index 100% rename from graphics/effects/explosion.png rename to assets/graphics/effects/explosion.png diff --git a/graphics/effects/explosion.png.import b/assets/graphics/effects/explosion.png.import similarity index 58% rename from graphics/effects/explosion.png.import rename to assets/graphics/effects/explosion.png.import index 8cd9613..3580fdc 100644 --- a/graphics/effects/explosion.png.import +++ b/assets/graphics/effects/explosion.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://dnhgsb5qqmrmr" -path="res://.godot/imported/explosion.png-67838f4909472368e8b1165eafa79d8a.ctex" +path="res://.godot/imported/explosion.png-74059f1463ea3a3c344e1493e2e54c7a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/effects/explosion.png" -dest_files=["res://.godot/imported/explosion.png-67838f4909472368e8b1165eafa79d8a.ctex"] +source_file="res://assets/graphics/effects/explosion.png" +dest_files=["res://.godot/imported/explosion.png-74059f1463ea3a3c344e1493e2e54c7a.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 @@ -25,6 +27,10 @@ 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/graphics/effects/orb_red.png b/assets/graphics/effects/orb_red.png similarity index 100% rename from graphics/effects/orb_red.png rename to assets/graphics/effects/orb_red.png diff --git a/graphics/effects/orb_red.png.import b/assets/graphics/effects/orb_red.png.import similarity index 58% rename from graphics/effects/orb_red.png.import rename to assets/graphics/effects/orb_red.png.import index 680c1f0..6227238 100644 --- a/graphics/effects/orb_red.png.import +++ b/assets/graphics/effects/orb_red.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://b8g3n1anbx0j" -path="res://.godot/imported/orb_red.png-96d2144e68a7a46da9f571d0443165d8.ctex" +path="res://.godot/imported/orb_red.png-c4b55d2a0c0b918a628a3d6c2f938a7a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/effects/orb_red.png" -dest_files=["res://.godot/imported/orb_red.png-96d2144e68a7a46da9f571d0443165d8.ctex"] +source_file="res://assets/graphics/effects/orb_red.png" +dest_files=["res://.godot/imported/orb_red.png-c4b55d2a0c0b918a628a3d6c2f938a7a.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 @@ -25,6 +27,10 @@ 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/graphics/enemies/slime_green(1).png b/assets/graphics/enemies/slime_green(1).png similarity index 100% rename from graphics/enemies/slime_green(1).png rename to assets/graphics/enemies/slime_green(1).png diff --git a/graphics/enemies/slime_green(1).png.import b/assets/graphics/enemies/slime_green(1).png.import similarity index 57% rename from graphics/enemies/slime_green(1).png.import rename to assets/graphics/enemies/slime_green(1).png.import index da659be..9a99562 100644 --- a/graphics/enemies/slime_green(1).png.import +++ b/assets/graphics/enemies/slime_green(1).png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://wgf50h6hbeib" -path="res://.godot/imported/slime_green(1).png-681a56605c941b0b260c890dc1e66a86.ctex" +path="res://.godot/imported/slime_green(1).png-498dde7686bcfa571faf15d7e1143a1d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/enemies/slime_green(1).png" -dest_files=["res://.godot/imported/slime_green(1).png-681a56605c941b0b260c890dc1e66a86.ctex"] +source_file="res://assets/graphics/enemies/slime_green(1).png" +dest_files=["res://.godot/imported/slime_green(1).png-498dde7686bcfa571faf15d7e1143a1d.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 @@ -25,6 +27,10 @@ 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/graphics/objects/25-10-27-small-crate.png b/assets/graphics/objects/25-10-27-small-crate.png similarity index 100% rename from graphics/objects/25-10-27-small-crate.png rename to assets/graphics/objects/25-10-27-small-crate.png diff --git a/graphics/objects/25-10-27-small-crate.png.import b/assets/graphics/objects/25-10-27-small-crate.png.import similarity index 56% rename from graphics/objects/25-10-27-small-crate.png.import rename to assets/graphics/objects/25-10-27-small-crate.png.import index 34440bc..8b60dbd 100644 --- a/graphics/objects/25-10-27-small-crate.png.import +++ b/assets/graphics/objects/25-10-27-small-crate.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://d1tnil82cldxk" -path="res://.godot/imported/25-10-27-small-crate.png-2ac8da16d97759b258fcf96245f3d88c.ctex" +path="res://.godot/imported/25-10-27-small-crate.png-c2a6b3f0b5dba0666d23950c2f72fb4d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/objects/25-10-27-small-crate.png" -dest_files=["res://.godot/imported/25-10-27-small-crate.png-2ac8da16d97759b258fcf96245f3d88c.ctex"] +source_file="res://assets/graphics/objects/25-10-27-small-crate.png" +dest_files=["res://.godot/imported/25-10-27-small-crate.png-c2a6b3f0b5dba0666d23950c2f72fb4d.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 @@ -25,6 +27,10 @@ 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/graphics/objects/mushroom_32x64.png b/assets/graphics/objects/mushroom_32x64.png similarity index 100% rename from graphics/objects/mushroom_32x64.png rename to assets/graphics/objects/mushroom_32x64.png diff --git a/graphics/objects/mushroom_32x64.png.import b/assets/graphics/objects/mushroom_32x64.png.import similarity index 57% rename from graphics/objects/mushroom_32x64.png.import rename to assets/graphics/objects/mushroom_32x64.png.import index 082e10d..397e4aa 100644 --- a/graphics/objects/mushroom_32x64.png.import +++ b/assets/graphics/objects/mushroom_32x64.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://ctrmx80fc52bt" -path="res://.godot/imported/mushroom_32x64.png-ae0508fa0fd752d4aa1446b33c7066d4.ctex" +path="res://.godot/imported/mushroom_32x64.png-7731b65b1dc54e5863304a957e8ec2b4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/objects/mushroom_32x64.png" -dest_files=["res://.godot/imported/mushroom_32x64.png-ae0508fa0fd752d4aa1446b33c7066d4.ctex"] +source_file="res://assets/graphics/objects/mushroom_32x64.png" +dest_files=["res://.godot/imported/mushroom_32x64.png-7731b65b1dc54e5863304a957e8ec2b4.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 @@ -25,6 +27,10 @@ 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/graphics/objects/veg_32x32.png b/assets/graphics/objects/veg_32x32.png similarity index 100% rename from graphics/objects/veg_32x32.png rename to assets/graphics/objects/veg_32x32.png diff --git a/graphics/objects/veg_32x32.png.import b/assets/graphics/objects/veg_32x32.png.import similarity index 58% rename from graphics/objects/veg_32x32.png.import rename to assets/graphics/objects/veg_32x32.png.import index 9a7b2a7..adc2aa1 100644 --- a/graphics/objects/veg_32x32.png.import +++ b/assets/graphics/objects/veg_32x32.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://bpf0sbb3o6rch" -path="res://.godot/imported/veg_32x32.png-742a28d4fd61b9f915a41209e1c74506.ctex" +path="res://.godot/imported/veg_32x32.png-f210a94dadf52a8e7bdd0836116d4949.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/objects/veg_32x32.png" -dest_files=["res://.godot/imported/veg_32x32.png-742a28d4fd61b9f915a41209e1c74506.ctex"] +source_file="res://assets/graphics/objects/veg_32x32.png" +dest_files=["res://.godot/imported/veg_32x32.png-f210a94dadf52a8e7bdd0836116d4949.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 @@ -25,6 +27,10 @@ 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/graphics/pickups/coin(1).png b/assets/graphics/pickups/coin(1).png similarity index 100% rename from graphics/pickups/coin(1).png rename to assets/graphics/pickups/coin(1).png diff --git a/graphics/pickups/coin(1).png.import b/assets/graphics/pickups/coin(1).png.import similarity index 58% rename from graphics/pickups/coin(1).png.import rename to assets/graphics/pickups/coin(1).png.import index 893111f..24423ae 100644 --- a/graphics/pickups/coin(1).png.import +++ b/assets/graphics/pickups/coin(1).png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://b3i7e40h88wh0" -path="res://.godot/imported/coin(1).png-19d802c455c83c490b6727491bcbe9e7.ctex" +path="res://.godot/imported/coin(1).png-4e17ac56b4a7efad58e8429a46970c4b.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/pickups/coin(1).png" -dest_files=["res://.godot/imported/coin(1).png-19d802c455c83c490b6727491bcbe9e7.ctex"] +source_file="res://assets/graphics/pickups/coin(1).png" +dest_files=["res://.godot/imported/coin(1).png-4e17ac56b4a7efad58e8429a46970c4b.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 @@ -25,6 +27,10 @@ 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/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png b/assets/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png similarity index 100% rename from graphics/tiles/25-10-18-godot-course-Terrain (32x32).png rename to assets/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png diff --git a/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png.import b/assets/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png.import similarity index 66% rename from graphics/tiles/25-10-18-godot-course-Terrain (32x32).png.import rename to assets/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png.import index 49aee0d..996b8ef 100644 --- a/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png.import +++ b/assets/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://cf3dxavo2u8yg" -path="res://.godot/imported/25-10-18-godot-course-Terrain (32x32).png-1eca331acd097d05bf84af75ec5522af.ctex" +path="res://.godot/imported/25-10-18-godot-course-Terrain (32x32).png-08aa6c4b4e90f7173ebf8ae7542815de.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/tiles/25-10-18-godot-course-Terrain (32x32).png" -dest_files=["res://.godot/imported/25-10-18-godot-course-Terrain (32x32).png-1eca331acd097d05bf84af75ec5522af.ctex"] +source_file="res://assets/graphics/tiles/25-10-18-godot-course-Terrain (32x32).png" +dest_files=["res://.godot/imported/25-10-18-godot-course-Terrain (32x32).png-08aa6c4b4e90f7173ebf8ae7542815de.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 @@ -25,6 +27,10 @@ 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/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png b/assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png similarity index 100% rename from graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png rename to assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png diff --git a/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import b/assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import similarity index 63% rename from graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import rename to assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import index 09da4fb..d889602 100644 --- a/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import +++ b/assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://dkco6bp2yelei" -path="res://.godot/imported/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png-a7f4ab763f4d056bc60508fae2c91a2e.ctex" +path="res://.godot/imported/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png-c54060a49ca0aab57967ba22422c82ca.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" -dest_files=["res://.godot/imported/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png-a7f4ab763f4d056bc60508fae2c91a2e.ctex"] +source_file="res://assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" +dest_files=["res://.godot/imported/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png-c54060a49ca0aab57967ba22422c82ca.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 @@ -25,6 +27,10 @@ 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/graphics/tiles/crate-100-custom.png b/assets/graphics/tiles/crate-100-custom.png similarity index 100% rename from graphics/tiles/crate-100-custom.png rename to assets/graphics/tiles/crate-100-custom.png diff --git a/graphics/tiles/crate-100-custom.png.import b/assets/graphics/tiles/crate-100-custom.png.import similarity index 57% rename from graphics/tiles/crate-100-custom.png.import rename to assets/graphics/tiles/crate-100-custom.png.import index b78e042..2c4065c 100644 --- a/graphics/tiles/crate-100-custom.png.import +++ b/assets/graphics/tiles/crate-100-custom.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://7jy7xuy24fug" -path="res://.godot/imported/crate-100-custom.png-5420ee27cb0ee861df6e762945a123b6.ctex" +path="res://.godot/imported/crate-100-custom.png-58001ae2c569374c77eb17b4d3a5451c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/tiles/crate-100-custom.png" -dest_files=["res://.godot/imported/crate-100-custom.png-5420ee27cb0ee861df6e762945a123b6.ctex"] +source_file="res://assets/graphics/tiles/crate-100-custom.png" +dest_files=["res://.godot/imported/crate-100-custom.png-58001ae2c569374c77eb17b4d3a5451c.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 @@ -25,6 +27,10 @@ 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/icon.svg.import b/icon.svg.import index 80ea586..6cd956b 100644 --- a/icon.svg.import +++ b/icon.svg.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.cte 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 @@ -25,6 +27,10 @@ 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 b92d2f7..94815c1 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="September Game AB" config/tags=PackedStringArray("2d", "lesson", "platformer") run/main_scene="uid://cueixogtk70go" -config/features=PackedStringArray("4.4", "Forward Plus") +config/features=PackedStringArray("4.5", "Forward Plus") config/icon="res://icon.svg" [autoload] @@ -31,12 +31,19 @@ window/stretch/mode="viewport" [file_customization] folder_colors={ -"res://graphics/": "green", -"res://resources/": "yellow", -"res://scenes/": "pink", -"res://scripts/": "orange" +"res://assets/": "red", +"res://assets/graphics/": "green", +"res://resources/": "orange", +"res://scenes/": "gray", +"res://scenes/levels/": "teal", +"res://scripts/": "purple" } +[global_group] + +Destructable="Objects in the environment that can be destroyed" +Movable="Objects in the environment that can be moved" + [input] move_left={ @@ -63,7 +70,7 @@ jump={ } punch={ "deadzone": 0.2, -"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":true,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194306,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } @@ -75,7 +82,7 @@ shoot={ } throw={ "deadzone": 0.2, -"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":4,"pressure":0.0,"pressed":true,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":84,"key_label":0,"unicode":116,"location":0,"echo":false,"script":null) ] } diff --git a/scenes/bullet.tscn b/scenes/bullet.tscn index 3dab082..55a1988 100644 --- a/scenes/bullet.tscn +++ b/scenes/bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://cyy6jr7mxu0jl"] [ext_resource type="Script" uid="uid://cb874g2gkrukb" path="res://scripts/bullet.gd" id="1_mkf8s"] -[ext_resource type="Texture2D" uid="uid://rejfd2gqjk7w" path="res://graphics/effects/14.png" id="2_y25gk"] +[ext_resource type="Texture2D" uid="uid://rejfd2gqjk7w" path="res://assets/graphics/effects/14.png" id="2_y25gk"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_h1aey"] size = Vector2(16, 20) diff --git a/scenes/coin.tscn b/scenes/coin.tscn index 4fdeeaf..0129547 100644 --- a/scenes/coin.tscn +++ b/scenes/coin.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=17 format=3 uid="uid://31idmjadvk3t"] [ext_resource type="Script" uid="uid://dpcuif8u6kqj5" path="res://scripts/coin.gd" id="1_i64fm"] -[ext_resource type="Texture2D" uid="uid://b3i7e40h88wh0" path="res://graphics/pickups/coin(1).png" id="1_rwqht"] +[ext_resource type="Texture2D" uid="uid://b3i7e40h88wh0" path="res://assets/graphics/pickups/coin(1).png" id="1_rwqht"] [sub_resource type="AtlasTexture" id="AtlasTexture_i64fm"] atlas = ExtResource("1_rwqht") diff --git a/scenes/crate.tscn b/scenes/crate.tscn index eaeba98..6b9ab70 100644 --- a/scenes/crate.tscn +++ b/scenes/crate.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://dnarbab7jjqmk"] -[ext_resource type="Texture2D" uid="uid://7jy7xuy24fug" path="res://graphics/tiles/crate-100-custom.png" id="1_b66cd"] +[ext_resource type="Texture2D" uid="uid://7jy7xuy24fug" path="res://assets/graphics/tiles/crate-100-custom.png" id="1_b66cd"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_uwrxv"] size = Vector2(100, 100) diff --git a/scenes/grenade.tscn b/scenes/grenade.tscn index c8c8b98..5baa8b1 100644 --- a/scenes/grenade.tscn +++ b/scenes/grenade.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=46 format=3 uid="uid://x8y4fkj6fc2e"] [ext_resource type="Script" uid="uid://cevjj6wpr5f8f" path="res://scripts/grenade.gd" id="1_cvyik"] -[ext_resource type="Texture2D" uid="uid://b8g3n1anbx0j" path="res://graphics/effects/orb_red.png" id="2_wxtds"] -[ext_resource type="Texture2D" uid="uid://dnhgsb5qqmrmr" path="res://graphics/effects/explosion.png" id="3_vhiwl"] +[ext_resource type="Texture2D" uid="uid://b8g3n1anbx0j" path="res://assets/graphics/effects/orb_red.png" id="2_wxtds"] +[ext_resource type="Texture2D" uid="uid://dnhgsb5qqmrmr" path="res://assets/graphics/effects/explosion.png" id="3_vhiwl"] [sub_resource type="CircleShape2D" id="CircleShape2D_1xt3t"] radius = 12.0 diff --git a/scenes/level_1.tscn b/scenes/levels/level_1.tscn similarity index 97% rename from scenes/level_1.tscn rename to scenes/levels/level_1.tscn index ae62bac..d1c465a 100644 --- a/scenes/level_1.tscn +++ b/scenes/levels/level_1.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=22 format=4 uid="uid://cueixogtk70go"] +[gd_scene load_steps=23 format=4 uid="uid://cueixogtk70go"] +[ext_resource type="Script" uid="uid://djv8gud535in5" path="res://scripts/level.gd" id="1_excbq"] [ext_resource type="Script" uid="uid://b84pdw14l6gb6" path="res://scripts/scene_manager.gd" id="2_iywne"] [ext_resource type="PackedScene" uid="uid://2pp1gtlflav8" path="res://scenes/trigger.tscn" id="2_yqjtg"] [ext_resource type="PackedScene" uid="uid://d3y1iqmpknpyo" path="res://scenes/player.tscn" id="3_lnu2h"] -[ext_resource type="Texture2D" uid="uid://dkco6bp2yelei" path="res://graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" id="3_u5sy4"] -[ext_resource type="Texture2D" uid="uid://bpf0sbb3o6rch" path="res://graphics/objects/veg_32x32.png" id="4_gee14"] -[ext_resource type="Texture2D" uid="uid://ctrmx80fc52bt" path="res://graphics/objects/mushroom_32x64.png" id="5_0tnpc"] +[ext_resource type="Texture2D" uid="uid://dkco6bp2yelei" path="res://assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" id="3_u5sy4"] +[ext_resource type="Texture2D" uid="uid://bpf0sbb3o6rch" path="res://assets/graphics/objects/veg_32x32.png" id="4_gee14"] +[ext_resource type="Texture2D" uid="uid://ctrmx80fc52bt" path="res://assets/graphics/objects/mushroom_32x64.png" id="5_0tnpc"] [ext_resource type="PackedScene" uid="uid://yr1iqtid2ihb" path="res://scenes/small_crate.tscn" id="7_u5sy4"] [ext_resource type="PackedScene" uid="uid://31idmjadvk3t" path="res://scenes/coin.tscn" id="9_0tnpc"] [ext_resource type="PackedScene" uid="uid://bcybxyumd2qwf" path="res://scenes/ui.tscn" id="10_2y5yt"] @@ -432,10 +433,10 @@ cellular_return_type = 0 domain_warp_enabled = true [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_u5sy4"] -in_3d_space = true -seamless = true -color_ramp = SubResource("Gradient_iywne") noise = SubResource("FastNoiseLite_p57ef") +color_ramp = SubResource("Gradient_iywne") +seamless = true +in_3d_space = true [sub_resource type="Gradient" id="Gradient_p57ef"] offsets = PackedFloat32Array(0.513333, 0.846667, 0.926667) @@ -446,13 +447,14 @@ noise_type = 5 frequency = 0.02 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_iywne"] -seamless = true -color_ramp = SubResource("Gradient_p57ef") noise = SubResource("FastNoiseLite_u5sy4") +color_ramp = SubResource("Gradient_p57ef") +seamless = true [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_8cj0n"] -[node name="Game" type="Node2D"] +[node name="Level1" type="Node2D"] +script = ExtResource("1_excbq") [node name="SceneManager" type="Node2D" parent="."] unique_name_in_owner = true @@ -546,9 +548,9 @@ position = Vector2(-123, 85) [node name="Slimer2" parent="Enemies" instance=ExtResource("10_vtaks")] position = Vector2(53, 86) -[node name="CanvasLayer" type="CanvasLayer" parent="."] +[node name="UILayer" type="CanvasLayer" parent="."] -[node name="UI" parent="CanvasLayer" instance=ExtResource("10_2y5yt")] +[node name="UI" parent="UILayer" instance=ExtResource("10_2y5yt")] [connection signal="body_entered" from="WorldBoundary" to="SceneManager" method="_on_world_boundary_body_entered"] [connection signal="trigger_fired" from="Triggers/Trigger" to="." method="_on_trigger_fired"] diff --git a/scenes/level_2.tscn b/scenes/levels/level_2.tscn similarity index 97% rename from scenes/level_2.tscn rename to scenes/levels/level_2.tscn index b20afb0..8407dea 100644 --- a/scenes/level_2.tscn +++ b/scenes/levels/level_2.tscn @@ -1,15 +1,17 @@ -[gd_scene load_steps=25 format=4 uid="uid://y34miorfoath"] +[gd_scene load_steps=27 format=4 uid="uid://y34miorfoath"] [ext_resource type="Script" uid="uid://b84pdw14l6gb6" path="res://scripts/scene_manager.gd" id="1_6cvei"] +[ext_resource type="Script" uid="uid://djv8gud535in5" path="res://scripts/level.gd" id="1_nt80m"] [ext_resource type="Shader" uid="uid://cscv7pfpe58i3" path="res://resources/level_2.gdshader" id="2_hey2k"] -[ext_resource type="Texture2D" uid="uid://dkco6bp2yelei" path="res://graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" id="2_que50"] -[ext_resource type="Texture2D" uid="uid://bpf0sbb3o6rch" path="res://graphics/objects/veg_32x32.png" id="3_hey2k"] -[ext_resource type="Texture2D" uid="uid://ctrmx80fc52bt" path="res://graphics/objects/mushroom_32x64.png" id="4_172wr"] +[ext_resource type="Texture2D" uid="uid://dkco6bp2yelei" path="res://assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" id="2_que50"] +[ext_resource type="Texture2D" uid="uid://bpf0sbb3o6rch" path="res://assets/graphics/objects/veg_32x32.png" id="3_hey2k"] +[ext_resource type="Texture2D" uid="uid://ctrmx80fc52bt" path="res://assets/graphics/objects/mushroom_32x64.png" id="4_172wr"] [ext_resource type="PackedScene" uid="uid://d3y1iqmpknpyo" path="res://scenes/player.tscn" id="5_g2hoc"] [ext_resource type="PackedScene" uid="uid://2pp1gtlflav8" path="res://scenes/trigger.tscn" id="6_fldb1"] [ext_resource type="PackedScene" uid="uid://yr1iqtid2ihb" path="res://scenes/small_crate.tscn" id="7_guvtl"] [ext_resource type="PackedScene" uid="uid://31idmjadvk3t" path="res://scenes/coin.tscn" id="8_igmy8"] [ext_resource type="PackedScene" uid="uid://bts74sqcd7k7h" path="res://scenes/slimer.tscn" id="9_wdtqu"] +[ext_resource type="PackedScene" uid="uid://bcybxyumd2qwf" path="res://scenes/ui.tscn" id="12_brxtv"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_172wr"] shader = ExtResource("2_hey2k") @@ -438,10 +440,10 @@ cellular_return_type = 0 domain_warp_enabled = true [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_u5sy4"] -in_3d_space = true -seamless = true -color_ramp = SubResource("Gradient_iywne") noise = SubResource("FastNoiseLite_p57ef") +color_ramp = SubResource("Gradient_iywne") +seamless = true +in_3d_space = true [sub_resource type="ShaderMaterial" id="ShaderMaterial_hey2k"] shader = ExtResource("2_hey2k") @@ -455,13 +457,14 @@ noise_type = 5 frequency = 0.02 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_iywne"] -seamless = true -color_ramp = SubResource("Gradient_p57ef") noise = SubResource("FastNoiseLite_u5sy4") +color_ramp = SubResource("Gradient_p57ef") +seamless = true [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_8cj0n"] -[node name="Game" type="Node2D"] +[node name="Level2" type="Node2D"] +script = ExtResource("1_nt80m") [node name="SceneManager" type="Node2D" parent="."] unique_name_in_owner = true @@ -562,6 +565,10 @@ position = Vector2(-123, 85) [node name="Slimer2" parent="Enemies" instance=ExtResource("9_wdtqu")] position = Vector2(53, 86) +[node name="UILayer" type="CanvasLayer" parent="."] + +[node name="UI" parent="UILayer" instance=ExtResource("12_brxtv")] + [connection signal="body_entered" from="WorldBoundary" to="SceneManager" method="_on_world_boundary_body_entered"] [connection signal="trigger_fired" from="Triggers/Trigger" to="." method="_on_trigger_fired"] [connection signal="trigger_fired" from="Triggers/Trigger2" to="." method="_on_trigger_fired"] diff --git a/scenes/level_3.tscn b/scenes/levels/level_3.tscn similarity index 97% rename from scenes/level_3.tscn rename to scenes/levels/level_3.tscn index 4556659..58427eb 100644 --- a/scenes/level_3.tscn +++ b/scenes/levels/level_3.tscn @@ -1,15 +1,17 @@ -[gd_scene load_steps=30 format=4 uid="uid://csmari5rsi31l"] +[gd_scene load_steps=32 format=4 uid="uid://csmari5rsi31l"] [ext_resource type="Script" uid="uid://b84pdw14l6gb6" path="res://scripts/scene_manager.gd" id="1_ha73p"] +[ext_resource type="Script" uid="uid://djv8gud535in5" path="res://scripts/level.gd" id="1_n6eey"] [ext_resource type="Shader" uid="uid://dy7od6pkkn6xp" path="res://resources/level_3.gdshader" id="2_56dhn"] -[ext_resource type="Texture2D" uid="uid://dkco6bp2yelei" path="res://graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" id="2_vcx5n"] -[ext_resource type="Texture2D" uid="uid://bpf0sbb3o6rch" path="res://graphics/objects/veg_32x32.png" id="3_56dhn"] -[ext_resource type="Texture2D" uid="uid://ctrmx80fc52bt" path="res://graphics/objects/mushroom_32x64.png" id="4_ax3dk"] +[ext_resource type="Texture2D" uid="uid://dkco6bp2yelei" path="res://assets/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" id="2_vcx5n"] +[ext_resource type="Texture2D" uid="uid://bpf0sbb3o6rch" path="res://assets/graphics/objects/veg_32x32.png" id="3_56dhn"] +[ext_resource type="Texture2D" uid="uid://ctrmx80fc52bt" path="res://assets/graphics/objects/mushroom_32x64.png" id="4_ax3dk"] [ext_resource type="PackedScene" uid="uid://d3y1iqmpknpyo" path="res://scenes/player.tscn" id="5_q2dsb"] [ext_resource type="PackedScene" uid="uid://2pp1gtlflav8" path="res://scenes/trigger.tscn" id="6_p3r0x"] [ext_resource type="PackedScene" uid="uid://yr1iqtid2ihb" path="res://scenes/small_crate.tscn" id="7_5xqnf"] [ext_resource type="PackedScene" uid="uid://31idmjadvk3t" path="res://scenes/coin.tscn" id="8_una4e"] [ext_resource type="PackedScene" uid="uid://bts74sqcd7k7h" path="res://scenes/slimer.tscn" id="9_ema3p"] +[ext_resource type="PackedScene" uid="uid://bcybxyumd2qwf" path="res://scenes/ui.tscn" id="12_qi5uv"] [sub_resource type="Gradient" id="Gradient_vcx5n"] interpolation_mode = 1 @@ -480,10 +482,10 @@ cellular_return_type = 0 domain_warp_enabled = true [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_u5sy4"] -in_3d_space = true -seamless = true -color_ramp = SubResource("Gradient_iywne") noise = SubResource("FastNoiseLite_p57ef") +color_ramp = SubResource("Gradient_iywne") +seamless = true +in_3d_space = true [sub_resource type="Gradient" id="Gradient_p57ef"] offsets = PackedFloat32Array(0.513333, 0.846667, 0.926667) @@ -494,13 +496,14 @@ noise_type = 5 frequency = 0.02 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_iywne"] -seamless = true -color_ramp = SubResource("Gradient_p57ef") noise = SubResource("FastNoiseLite_u5sy4") +color_ramp = SubResource("Gradient_p57ef") +seamless = true [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_8cj0n"] -[node name="Game" type="Node2D"] +[node name="Level3" type="Node2D"] +script = ExtResource("1_n6eey") [node name="SceneManager" type="Node2D" parent="."] unique_name_in_owner = true @@ -612,6 +615,10 @@ position = Vector2(-123, 85) [node name="Slimer2" parent="Enemies" instance=ExtResource("9_ema3p")] position = Vector2(53, 86) +[node name="UILayer" type="CanvasLayer" parent="."] + +[node name="UI" parent="UILayer" instance=ExtResource("12_qi5uv")] + [connection signal="body_entered" from="WorldBoundary" to="SceneManager" method="_on_world_boundary_body_entered"] [connection signal="trigger_fired" from="Triggers/Trigger" to="." method="_on_trigger_fired"] [connection signal="trigger_fired" from="Triggers/Trigger2" to="." method="_on_trigger_fired"] diff --git a/scenes/player.tscn b/scenes/player.tscn index 8eb88b4..8d5ea8b 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=76 format=3 uid="uid://d3y1iqmpknpyo"] [ext_resource type="Script" uid="uid://d3hp5rjoph7hg" path="res://scripts/player.gd" id="1_3vyb7"] -[ext_resource type="Texture2D" uid="uid://dr3rp5hv7rexv" path="res://graphics/animations/player_idle/Player Idle 48x48.png" id="2_g2els"] -[ext_resource type="Texture2D" uid="uid://dcrb23f006glc" path="res://graphics/animations/player_death/Player Death 64x64.png" id="2_ur7pv"] -[ext_resource type="Texture2D" uid="uid://uxdt2cgxicmt" path="res://graphics/animations/player_jump/player jump 48x48.png" id="3_dqkch"] -[ext_resource type="Texture2D" uid="uid://cr8wqcakbcjnl" path="res://graphics/animations/player_hurt/Player Hurt 48x48.png" id="3_smehm"] -[ext_resource type="Texture2D" uid="uid://b27fd4xvrp2ov" path="res://graphics/animations/Player Jab 48x48.png" id="4_fjrip"] -[ext_resource type="Texture2D" uid="uid://bgp8oow6hgh5o" path="res://graphics/animations/player_run/player run 48x48.png" id="4_qlg0r"] -[ext_resource type="Texture2D" uid="uid://dadvc8tsvmkb6" path="res://graphics/animations/player_shoot/Player Running Shooting 48x48.png" id="5_tuyoq"] -[ext_resource type="Texture2D" uid="uid://crll0t2wjtsly" path="res://graphics/animations/player_shoot/player shoot 2H 48x48.png" id="6_fjrip"] +[ext_resource type="Texture2D" uid="uid://dr3rp5hv7rexv" path="res://assets/graphics/animations/player_idle/Player Idle 48x48.png" id="2_g2els"] +[ext_resource type="Texture2D" uid="uid://dcrb23f006glc" path="res://assets/graphics/animations/player_death/Player Death 64x64.png" id="2_ur7pv"] +[ext_resource type="Texture2D" uid="uid://uxdt2cgxicmt" path="res://assets/graphics/animations/player_jump/player jump 48x48.png" id="3_dqkch"] +[ext_resource type="Texture2D" uid="uid://cr8wqcakbcjnl" path="res://assets/graphics/animations/player_hurt/Player Hurt 48x48.png" id="3_smehm"] +[ext_resource type="Texture2D" uid="uid://b27fd4xvrp2ov" path="res://assets/graphics/animations/Player Jab 48x48.png" id="4_fjrip"] +[ext_resource type="Texture2D" uid="uid://bgp8oow6hgh5o" path="res://assets/graphics/animations/player_run/player run 48x48.png" id="4_qlg0r"] +[ext_resource type="Texture2D" uid="uid://dadvc8tsvmkb6" path="res://assets/graphics/animations/player_shoot/Player Running Shooting 48x48.png" id="5_tuyoq"] +[ext_resource type="Texture2D" uid="uid://crll0t2wjtsly" path="res://assets/graphics/animations/player_shoot/player shoot 2H 48x48.png" id="6_fjrip"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_3vyb7"] radius = 6.0 diff --git a/scenes/slimer.tscn b/scenes/slimer.tscn index 94c9d1d..b205d3a 100644 --- a/scenes/slimer.tscn +++ b/scenes/slimer.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://bts74sqcd7k7h"] -[ext_resource type="Texture2D" uid="uid://wgf50h6hbeib" path="res://graphics/enemies/slime_green(1).png" id="1_02r3y"] +[ext_resource type="Texture2D" uid="uid://wgf50h6hbeib" path="res://assets/graphics/enemies/slime_green(1).png" id="1_02r3y"] [ext_resource type="Script" uid="uid://bcxorf6dwnwbv" path="res://scripts/slimer.gd" id="1_4oill"] [sub_resource type="AtlasTexture" id="AtlasTexture_4oill"] diff --git a/scenes/small_crate.tscn b/scenes/small_crate.tscn index bfd69e5..582d02a 100644 --- a/scenes/small_crate.tscn +++ b/scenes/small_crate.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://yr1iqtid2ihb"] -[ext_resource type="Texture2D" uid="uid://d1tnil82cldxk" path="res://graphics/objects/25-10-27-small-crate.png" id="2_8vkwr"] +[ext_resource type="Texture2D" uid="uid://d1tnil82cldxk" path="res://assets/graphics/objects/25-10-27-small-crate.png" id="2_8vkwr"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_hy8m8"] size = Vector2(46, 48) diff --git a/scripts/game_controller.gd b/scripts/game_controller.gd index 9504fcd..128ed47 100644 --- a/scripts/game_controller.gd +++ b/scripts/game_controller.gd @@ -1,30 +1,46 @@ extends Node2D - -var coins_collected : int = 0 -var total_coins : int = 0 -var levels = ["res://scenes/level_1.tscn", "res://scenes/level_2.tscn", "res://scenes/level_3.tscn"] -var timers = [10, 15, 20] -var time_available : int = 0 -var current_level = 0 -var timer = Timer.new() +## Autoload GameController object for handling game logic ## Signals -signal level_changed(level) -signal destroyed(body) -signal player_damaged(health, max_health) -signal player_death +# Save/load signal game_loaded(stashed_data) signal game_saved(level, time_remaining, player_health, enemies_dictionary) -signal timer_updated(time_remaining) +# Player health +signal player_damaged(health, max_health) +signal player_death +# Other signal coin_collected(coins_remaining) +signal destroyed(body) +signal level_changed(level) +signal timer_updated(time_remaining) +## Member variables +# Coins +var coins_collected : int = 0 +var total_coins : int = 0 +# Levels +var level_names : Array = DirAccess.open("res://scenes/levels").get_files() +var levels : Array +var current_level = 0 +# Save/load +var stash_data : Dictionary = {} +# Timers +var timers = [10, 15, 20] +var time_available : int = 0 +var timer = Timer.new() +# Characters var enemy_stats : CharacterStats var player_stats : CharacterStats var enemies_dict : Dictionary = {} var player_current_health : int = 0 -var stash_data : Dictionary = {} func _ready() -> void: + # test file loading from folder + print_debug("Raw level names: " + str(level_names)) + for level_name in level_names: + var level_path = "res://scenes/levels/" + level_name + levels.append(level_path) + print_debug("Adjusted level names: " + str(levels)) # load in characters enemy_stats = load("res://resources/slime_stats.tres") player_stats = load("res://resources/player_stats.tres") @@ -48,8 +64,6 @@ func second_counter() -> void: timer_updated.emit(time_available) if time_available <= 0: print_debug("You ran out of time! Emitting level_changed signal") - #get_tree().call_deferred("change_scene_to_file", levels[current_level]) - #await get_tree().create_timer(1.0).timeout level_changed.emit(levels[current_level]) func reset() -> void: @@ -57,17 +71,7 @@ func reset() -> void: enemies_dict.clear() player_current_health = player_stats["starting_health"] time_available = timers[current_level] - print_debug("You have %s seconds to find all the coins" % str(time_available)) -func _on_trigger_fired(intent: Variant, body: PhysicsBody2D) -> void: - print("Game controller knows %s trigger fired " % intent) - match intent: - "destroy": - print("Destroy this thing!") - if body is RigidBody2D: - destroyed.emit(body) - "powerup": - print("Power this thing up!") func on_coin_collected(_body, coin) -> void: print_debug("GC knows coin collected") @@ -80,13 +84,11 @@ func set_total_coins(value) -> void: coin_collected.emit(value) print_debug("Setting coin total to %s" % str(value)) if value == 0: - # You won! + print_debug("You beat Level %s!" % levels[current_level]) current_level += 1 if current_level >= levels.size(): current_level = 0 - #await get_tree().create_timer(1.0).timeout level_changed.emit(levels[current_level]) - #total_coins = value print_debug("There are %s coins in the level" % str(value)) func on_player_slimed(_body, slime) -> void: @@ -152,3 +154,13 @@ func stash_game(stash) -> void: func set_player_health(value: int) -> void: print_debug("Setting player health to %s" % str(value)) player_current_health = value + +#func _on_trigger_fired(intent: Variant, body: PhysicsBody2D) -> void: + #print("Game controller knows %s trigger fired "change_scene % intent) + #match intent: + #"destroy": + #print("Destroy this thing!") + #if body is RigidBody2D: + #destroyed.emit(body) + #"powerup": + #print("Power this thing up!") diff --git a/scripts/level.gd b/scripts/level.gd new file mode 100644 index 0000000..aaf59c7 --- /dev/null +++ b/scripts/level.gd @@ -0,0 +1,21 @@ +class_name Level +extends Node2D +## Documentation comments + +## Signals +## Enums +## Constants +## @export variables +## Regular variables +## @onready variables + +## Overridden built-in virtual methods +#func _init() -> void: +#func _enter_tree() -> void: +#func _ready() -> void: +#func _process(delta: float) -> void: +#func _physics_process(delta: float) -> void: +## Remaining virtual methods +## Overridden custom methods +## Remaining methods +## Subclasses diff --git a/scripts/level.gd.uid b/scripts/level.gd.uid new file mode 100644 index 0000000..7b54c83 --- /dev/null +++ b/scripts/level.gd.uid @@ -0,0 +1 @@ +uid://djv8gud535in5 diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index 0c018b3..9182ab3 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -1,5 +1,6 @@ class_name SceneManager extends Node2D +## Handles adding and removing scenes, building levels var bullet = preload("res://scenes/bullet.tscn") var coin_scene = preload("res://scenes/coin.tscn") @@ -13,12 +14,18 @@ var total_allowed_bullets : int = 7 @onready var crates: Node = $"../Crates" @onready var enemies: Node = $"../Enemies" @onready var player: Player = $"../Player" -@onready var ui: UI = $"../CanvasLayer/UI" +@onready var ui: UI = $"../UILayer/UI" func _ready() -> void: GameController.reset() build_level() + +func _on_world_boundary_body_entered(body: Node2D) -> void: + if body is Player: + var current_scene = get_tree() + current_scene.call_deferred("reload_current_scene") + func build_level() -> void: if coins: update_coins() @@ -26,7 +33,8 @@ func build_level() -> void: var _total_enemies : int = 0 if enemies: update_enemies() - # Wire up signals from GameController + # Wire up signals + # GameController GameController.level_changed.connect(change_scene) GameController.destroyed.connect(destroy) GameController.game_saved.connect(on_game_saved) @@ -34,9 +42,11 @@ func build_level() -> void: GameController.player_damaged.connect(player.handle_damage) GameController.player_damaged.connect(ui.update_health) GameController.player_death.connect(player.handle_death) - player.player_died.connect(GameController.handle_player_death) GameController.timer_updated.connect(ui.update_timer) GameController.coin_collected.connect(ui.update_coins) + # Player + player.player_died.connect(GameController.handle_player_death) + func update_enemies() -> void: var total_enemies : int = 0 @@ -85,10 +95,6 @@ func bullet_factory() -> Bullet: bullet_array.push_front(my_bullet) return my_bullet -func _on_world_boundary_body_entered(body: Node2D) -> void: - if body is Player: - var current_scene = get_tree() - current_scene.call_deferred("reload_current_scene") func change_scene(level) -> void: print_debug("Changing scene to level %s" % level)