From 3c9763ff6a5c571afe167a07c52fb2d81b90a52d Mon Sep 17 00:00:00 2001 From: Rendo Date: Sun, 20 Jul 2025 23:00:30 +0500 Subject: [PATCH] sprites folder --- .../assets/guns/placeholder/shoot1.png.import | 34 -------------- .../guns/placeholder/placeholder.tres | 42 +++++++++--------- .../guns/placeholder/reload1.png | Bin .../guns/placeholder/reload1.png.import | 6 +-- .../guns/placeholder/reload2.png | Bin .../guns/placeholder/reload2.png.import | 6 +-- .../guns/placeholder/reload3.png | Bin .../guns/placeholder/reload3.png.import | 6 +-- .../guns/placeholder/reload4.png | Bin .../guns/placeholder/reload4.png.import | 6 +-- .../guns/placeholder/reload5.png | Bin .../guns/placeholder/reload5.png.import | 6 +-- .../guns/placeholder/reload6.png | Bin .../guns/placeholder/reload6.png.import | 6 +-- .../guns/placeholder/reload7.png | Bin .../guns/placeholder/reload7.png.import | 6 +-- .../{ => sprites}/guns/placeholder/shoot1.png | Bin .../guns/placeholder/shoot1.png.import} | 8 ++-- .../{ => sprites}/guns/placeholder/shoot2.png | Bin .../guns/placeholder/shoot2.png.import | 6 +-- .../{ => sprites}/guns/placeholder/shoot3.png | Bin .../guns/placeholder/shoot3.png.import | 34 ++++++++++++++ .../{ => sprites}/guns/placeholder/static.png | Bin .../guns/placeholder/static.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0000.png | Bin .../{ => sprites}/test_enemy/0000.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0001.png | Bin .../{ => sprites}/test_enemy/0001.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0002.png | Bin .../{ => sprites}/test_enemy/0002.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0003.png | Bin .../{ => sprites}/test_enemy/0003.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0004.png | Bin .../{ => sprites}/test_enemy/0004.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0005.png | Bin .../{ => sprites}/test_enemy/0005.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0006.png | Bin .../{ => sprites}/test_enemy/0006.png.import | 6 +-- base/assets/{ => sprites}/test_enemy/0007.png | Bin .../{ => sprites}/test_enemy/0007.png.import | 6 +-- base/scenes/enemies/test_enemy.tscn | 16 +++---- base/scenes/player.tscn | 3 +- base/scenes/weapons/weapon_base.tscn | 3 +- 43 files changed, 122 insertions(+), 120 deletions(-) delete mode 100644 base/assets/guns/placeholder/shoot1.png.import rename base/assets/{ => sprites}/guns/placeholder/placeholder.tres (88%) rename base/assets/{ => sprites}/guns/placeholder/reload1.png (100%) rename base/assets/{ => sprites}/guns/placeholder/reload1.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/reload2.png (100%) rename base/assets/{ => sprites}/guns/placeholder/reload2.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/reload3.png (100%) rename base/assets/{ => sprites}/guns/placeholder/reload3.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/reload4.png (100%) rename base/assets/{ => sprites}/guns/placeholder/reload4.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/reload5.png (100%) rename base/assets/{ => sprites}/guns/placeholder/reload5.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/reload6.png (100%) rename base/assets/{ => sprites}/guns/placeholder/reload6.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/reload7.png (100%) rename base/assets/{ => sprites}/guns/placeholder/reload7.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/shoot1.png (100%) rename base/assets/{guns/placeholder/shoot3.png.import => sprites/guns/placeholder/shoot1.png.import} (74%) rename base/assets/{ => sprites}/guns/placeholder/shoot2.png (100%) rename base/assets/{ => sprites}/guns/placeholder/shoot2.png.import (70%) rename base/assets/{ => sprites}/guns/placeholder/shoot3.png (100%) create mode 100644 base/assets/sprites/guns/placeholder/shoot3.png.import rename base/assets/{ => sprites}/guns/placeholder/static.png (100%) rename base/assets/{ => sprites}/guns/placeholder/static.png.import (70%) rename base/assets/{ => sprites}/test_enemy/0000.png (100%) rename base/assets/{ => sprites}/test_enemy/0000.png.import (71%) rename base/assets/{ => sprites}/test_enemy/0001.png (100%) rename base/assets/{ => sprites}/test_enemy/0001.png.import (71%) rename base/assets/{ => sprites}/test_enemy/0002.png (100%) rename base/assets/{ => sprites}/test_enemy/0002.png.import (71%) rename base/assets/{ => sprites}/test_enemy/0003.png (100%) rename base/assets/{ => sprites}/test_enemy/0003.png.import (71%) rename base/assets/{ => sprites}/test_enemy/0004.png (100%) rename base/assets/{ => sprites}/test_enemy/0004.png.import (71%) rename base/assets/{ => sprites}/test_enemy/0005.png (100%) rename base/assets/{ => sprites}/test_enemy/0005.png.import (71%) rename base/assets/{ => sprites}/test_enemy/0006.png (100%) rename base/assets/{ => sprites}/test_enemy/0006.png.import (71%) rename base/assets/{ => sprites}/test_enemy/0007.png (100%) rename base/assets/{ => sprites}/test_enemy/0007.png.import (71%) diff --git a/base/assets/guns/placeholder/shoot1.png.import b/base/assets/guns/placeholder/shoot1.png.import deleted file mode 100644 index 8a00285..0000000 --- a/base/assets/guns/placeholder/shoot1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cfw6p5g680c55" -path="res://.godot/imported/shoot1.png-d7e01309f7789bc502a8792fcea76fb2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://base/assets/guns/placeholder/shoot1.png" -dest_files=["res://.godot/imported/shoot1.png-d7e01309f7789bc502a8792fcea76fb2.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/base/assets/guns/placeholder/placeholder.tres b/base/assets/sprites/guns/placeholder/placeholder.tres similarity index 88% rename from base/assets/guns/placeholder/placeholder.tres rename to base/assets/sprites/guns/placeholder/placeholder.tres index 53cf61c..e165676 100644 --- a/base/assets/guns/placeholder/placeholder.tres +++ b/base/assets/sprites/guns/placeholder/placeholder.tres @@ -1,9 +1,9 @@ [gd_resource type="AnimationLibrary" load_steps=8 format=3 uid="uid://cw8bt4hqxpk55"] -[ext_resource type="Texture2D" uid="uid://cf7avgppv4kfk" path="res://base/assets/guns/placeholder/static.png" id="1_yheqn"] -[ext_resource type="Texture2D" uid="uid://cfw6p5g680c55" path="res://base/assets/guns/placeholder/shoot1.png" id="9_6fi3a"] -[ext_resource type="Texture2D" uid="uid://bwfkjfpk4dwx0" path="res://base/assets/guns/placeholder/shoot2.png" id="10_mjqfp"] -[ext_resource type="Texture2D" uid="uid://bp1frp3sm8bic" path="res://base/assets/guns/placeholder/shoot3.png" id="11_0d256"] +[ext_resource type="Texture2D" uid="uid://cf7avgppv4kfk" path="res://base/assets/sprites/guns/placeholder/static.png" id="1_yheqn"] +[ext_resource type="Texture2D" uid="uid://cfw6p5g680c55" path="res://base/assets/sprites/guns/placeholder/shoot1.png" id="9_6fi3a"] +[ext_resource type="Texture2D" uid="uid://bwfkjfpk4dwx0" path="res://base/assets/sprites/guns/placeholder/shoot2.png" id="10_mjqfp"] +[ext_resource type="Texture2D" uid="uid://bp1frp3sm8bic" path="res://base/assets/sprites/guns/placeholder/shoot3.png" id="11_0d256"] [sub_resource type="Animation" id="Animation_i1xqq"] length = 0.001 @@ -20,23 +20,6 @@ tracks/0/keys = { "values": [null] } -[sub_resource type="Animation" id="Animation_ma1q3"] -resource_name = "static" -length = 0.001 -step = 0.0 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:texture") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [ExtResource("1_yheqn")] -} - [sub_resource type="Animation" id="Animation_8sdfx"] resource_name = "shoot" length = 0.30001 @@ -71,6 +54,23 @@ tracks/1/keys = { }] } +[sub_resource type="Animation" id="Animation_ma1q3"] +resource_name = "static" +length = 0.001 +step = 0.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("1_yheqn")] +} + [resource] _data = { &"RESET": SubResource("Animation_i1xqq"), diff --git a/base/assets/guns/placeholder/reload1.png b/base/assets/sprites/guns/placeholder/reload1.png similarity index 100% rename from base/assets/guns/placeholder/reload1.png rename to base/assets/sprites/guns/placeholder/reload1.png diff --git a/base/assets/guns/placeholder/reload1.png.import b/base/assets/sprites/guns/placeholder/reload1.png.import similarity index 70% rename from base/assets/guns/placeholder/reload1.png.import rename to base/assets/sprites/guns/placeholder/reload1.png.import index 08fc073..7ee72a4 100644 --- a/base/assets/guns/placeholder/reload1.png.import +++ b/base/assets/sprites/guns/placeholder/reload1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://ij02cx0xdckw" -path="res://.godot/imported/reload1.png-fc63c943a43e2b598d88c4bf9d75345e.ctex" +path="res://.godot/imported/reload1.png-351eff18b377b581fe563ffc7ac7d2b2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/reload1.png" -dest_files=["res://.godot/imported/reload1.png-fc63c943a43e2b598d88c4bf9d75345e.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/reload1.png" +dest_files=["res://.godot/imported/reload1.png-351eff18b377b581fe563ffc7ac7d2b2.ctex"] [params] diff --git a/base/assets/guns/placeholder/reload2.png b/base/assets/sprites/guns/placeholder/reload2.png similarity index 100% rename from base/assets/guns/placeholder/reload2.png rename to base/assets/sprites/guns/placeholder/reload2.png diff --git a/base/assets/guns/placeholder/reload2.png.import b/base/assets/sprites/guns/placeholder/reload2.png.import similarity index 70% rename from base/assets/guns/placeholder/reload2.png.import rename to base/assets/sprites/guns/placeholder/reload2.png.import index 3e0e8ec..fa727f8 100644 --- a/base/assets/guns/placeholder/reload2.png.import +++ b/base/assets/sprites/guns/placeholder/reload2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://baptu307a0dw5" -path="res://.godot/imported/reload2.png-be4ae6f4ef3573cf582a4e28c456bbb6.ctex" +path="res://.godot/imported/reload2.png-d81251c2365ca1f7ecc5e5ef522c6542.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/reload2.png" -dest_files=["res://.godot/imported/reload2.png-be4ae6f4ef3573cf582a4e28c456bbb6.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/reload2.png" +dest_files=["res://.godot/imported/reload2.png-d81251c2365ca1f7ecc5e5ef522c6542.ctex"] [params] diff --git a/base/assets/guns/placeholder/reload3.png b/base/assets/sprites/guns/placeholder/reload3.png similarity index 100% rename from base/assets/guns/placeholder/reload3.png rename to base/assets/sprites/guns/placeholder/reload3.png diff --git a/base/assets/guns/placeholder/reload3.png.import b/base/assets/sprites/guns/placeholder/reload3.png.import similarity index 70% rename from base/assets/guns/placeholder/reload3.png.import rename to base/assets/sprites/guns/placeholder/reload3.png.import index a29ddc2..7e7edfb 100644 --- a/base/assets/guns/placeholder/reload3.png.import +++ b/base/assets/sprites/guns/placeholder/reload3.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://pb6jybpwasxj" -path="res://.godot/imported/reload3.png-2b7a82eb11767cd996098aa2ce3f1da3.ctex" +path="res://.godot/imported/reload3.png-62a8b45a09d17e2815ce0063bc490ba2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/reload3.png" -dest_files=["res://.godot/imported/reload3.png-2b7a82eb11767cd996098aa2ce3f1da3.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/reload3.png" +dest_files=["res://.godot/imported/reload3.png-62a8b45a09d17e2815ce0063bc490ba2.ctex"] [params] diff --git a/base/assets/guns/placeholder/reload4.png b/base/assets/sprites/guns/placeholder/reload4.png similarity index 100% rename from base/assets/guns/placeholder/reload4.png rename to base/assets/sprites/guns/placeholder/reload4.png diff --git a/base/assets/guns/placeholder/reload4.png.import b/base/assets/sprites/guns/placeholder/reload4.png.import similarity index 70% rename from base/assets/guns/placeholder/reload4.png.import rename to base/assets/sprites/guns/placeholder/reload4.png.import index 062722a..c050977 100644 --- a/base/assets/guns/placeholder/reload4.png.import +++ b/base/assets/sprites/guns/placeholder/reload4.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://v2m8ikar64o5" -path="res://.godot/imported/reload4.png-3eb8a3a1264cbe73b4bac8a3020225cd.ctex" +path="res://.godot/imported/reload4.png-8e8974c0d7fc8df0927a6ccb74ef94b6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/reload4.png" -dest_files=["res://.godot/imported/reload4.png-3eb8a3a1264cbe73b4bac8a3020225cd.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/reload4.png" +dest_files=["res://.godot/imported/reload4.png-8e8974c0d7fc8df0927a6ccb74ef94b6.ctex"] [params] diff --git a/base/assets/guns/placeholder/reload5.png b/base/assets/sprites/guns/placeholder/reload5.png similarity index 100% rename from base/assets/guns/placeholder/reload5.png rename to base/assets/sprites/guns/placeholder/reload5.png diff --git a/base/assets/guns/placeholder/reload5.png.import b/base/assets/sprites/guns/placeholder/reload5.png.import similarity index 70% rename from base/assets/guns/placeholder/reload5.png.import rename to base/assets/sprites/guns/placeholder/reload5.png.import index 2f96ffd..90f8d09 100644 --- a/base/assets/guns/placeholder/reload5.png.import +++ b/base/assets/sprites/guns/placeholder/reload5.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b40b8l3yctlax" -path="res://.godot/imported/reload5.png-476365f7529297f8e145a9eddf2eb06f.ctex" +path="res://.godot/imported/reload5.png-7588d79119f6155fedad39fefa50e39a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/reload5.png" -dest_files=["res://.godot/imported/reload5.png-476365f7529297f8e145a9eddf2eb06f.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/reload5.png" +dest_files=["res://.godot/imported/reload5.png-7588d79119f6155fedad39fefa50e39a.ctex"] [params] diff --git a/base/assets/guns/placeholder/reload6.png b/base/assets/sprites/guns/placeholder/reload6.png similarity index 100% rename from base/assets/guns/placeholder/reload6.png rename to base/assets/sprites/guns/placeholder/reload6.png diff --git a/base/assets/guns/placeholder/reload6.png.import b/base/assets/sprites/guns/placeholder/reload6.png.import similarity index 70% rename from base/assets/guns/placeholder/reload6.png.import rename to base/assets/sprites/guns/placeholder/reload6.png.import index d09cb9c..20d0351 100644 --- a/base/assets/guns/placeholder/reload6.png.import +++ b/base/assets/sprites/guns/placeholder/reload6.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b55h6w4km2c3u" -path="res://.godot/imported/reload6.png-247e9d89a656ae3ab1d2d686b43e4004.ctex" +path="res://.godot/imported/reload6.png-f19e90f4adb5e2730fa697c1052b7d6c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/reload6.png" -dest_files=["res://.godot/imported/reload6.png-247e9d89a656ae3ab1d2d686b43e4004.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/reload6.png" +dest_files=["res://.godot/imported/reload6.png-f19e90f4adb5e2730fa697c1052b7d6c.ctex"] [params] diff --git a/base/assets/guns/placeholder/reload7.png b/base/assets/sprites/guns/placeholder/reload7.png similarity index 100% rename from base/assets/guns/placeholder/reload7.png rename to base/assets/sprites/guns/placeholder/reload7.png diff --git a/base/assets/guns/placeholder/reload7.png.import b/base/assets/sprites/guns/placeholder/reload7.png.import similarity index 70% rename from base/assets/guns/placeholder/reload7.png.import rename to base/assets/sprites/guns/placeholder/reload7.png.import index a1482f7..09e814e 100644 --- a/base/assets/guns/placeholder/reload7.png.import +++ b/base/assets/sprites/guns/placeholder/reload7.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b4fp0oo8qcino" -path="res://.godot/imported/reload7.png-7cba8901bd110b68342d367e35d81972.ctex" +path="res://.godot/imported/reload7.png-74ab4fec5ee82f4e5b8f672312c14908.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/reload7.png" -dest_files=["res://.godot/imported/reload7.png-7cba8901bd110b68342d367e35d81972.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/reload7.png" +dest_files=["res://.godot/imported/reload7.png-74ab4fec5ee82f4e5b8f672312c14908.ctex"] [params] diff --git a/base/assets/guns/placeholder/shoot1.png b/base/assets/sprites/guns/placeholder/shoot1.png similarity index 100% rename from base/assets/guns/placeholder/shoot1.png rename to base/assets/sprites/guns/placeholder/shoot1.png diff --git a/base/assets/guns/placeholder/shoot3.png.import b/base/assets/sprites/guns/placeholder/shoot1.png.import similarity index 74% rename from base/assets/guns/placeholder/shoot3.png.import rename to base/assets/sprites/guns/placeholder/shoot1.png.import index 44ebf3f..cc90dea 100644 --- a/base/assets/guns/placeholder/shoot3.png.import +++ b/base/assets/sprites/guns/placeholder/shoot1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bp1frp3sm8bic" -path="res://.godot/imported/shoot3.png-ca1e09cba6f93f4891595edc65eea2af.ctex" +uid="uid://cfw6p5g680c55" +path="res://.godot/imported/shoot1.png-03d73b1e78f079388e694a366cd41a41.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/shoot3.png" -dest_files=["res://.godot/imported/shoot3.png-ca1e09cba6f93f4891595edc65eea2af.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/shoot1.png" +dest_files=["res://.godot/imported/shoot1.png-03d73b1e78f079388e694a366cd41a41.ctex"] [params] diff --git a/base/assets/guns/placeholder/shoot2.png b/base/assets/sprites/guns/placeholder/shoot2.png similarity index 100% rename from base/assets/guns/placeholder/shoot2.png rename to base/assets/sprites/guns/placeholder/shoot2.png diff --git a/base/assets/guns/placeholder/shoot2.png.import b/base/assets/sprites/guns/placeholder/shoot2.png.import similarity index 70% rename from base/assets/guns/placeholder/shoot2.png.import rename to base/assets/sprites/guns/placeholder/shoot2.png.import index 66ad62f..5e9d670 100644 --- a/base/assets/guns/placeholder/shoot2.png.import +++ b/base/assets/sprites/guns/placeholder/shoot2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bwfkjfpk4dwx0" -path="res://.godot/imported/shoot2.png-4619169acad0ee3ce59878e69afb0918.ctex" +path="res://.godot/imported/shoot2.png-ec54a9f80d6f34efce8b90340e78f783.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/shoot2.png" -dest_files=["res://.godot/imported/shoot2.png-4619169acad0ee3ce59878e69afb0918.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/shoot2.png" +dest_files=["res://.godot/imported/shoot2.png-ec54a9f80d6f34efce8b90340e78f783.ctex"] [params] diff --git a/base/assets/guns/placeholder/shoot3.png b/base/assets/sprites/guns/placeholder/shoot3.png similarity index 100% rename from base/assets/guns/placeholder/shoot3.png rename to base/assets/sprites/guns/placeholder/shoot3.png diff --git a/base/assets/sprites/guns/placeholder/shoot3.png.import b/base/assets/sprites/guns/placeholder/shoot3.png.import new file mode 100644 index 0000000..5b6ecf4 --- /dev/null +++ b/base/assets/sprites/guns/placeholder/shoot3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bp1frp3sm8bic" +path="res://.godot/imported/shoot3.png-f444840c17365f116a9805902e5daf69.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base/assets/sprites/guns/placeholder/shoot3.png" +dest_files=["res://.godot/imported/shoot3.png-f444840c17365f116a9805902e5daf69.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/base/assets/guns/placeholder/static.png b/base/assets/sprites/guns/placeholder/static.png similarity index 100% rename from base/assets/guns/placeholder/static.png rename to base/assets/sprites/guns/placeholder/static.png diff --git a/base/assets/guns/placeholder/static.png.import b/base/assets/sprites/guns/placeholder/static.png.import similarity index 70% rename from base/assets/guns/placeholder/static.png.import rename to base/assets/sprites/guns/placeholder/static.png.import index a63c1ba..07e7f5b 100644 --- a/base/assets/guns/placeholder/static.png.import +++ b/base/assets/sprites/guns/placeholder/static.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cf7avgppv4kfk" -path="res://.godot/imported/static.png-0c663493d3d93aee02918b4caa824f2d.ctex" +path="res://.godot/imported/static.png-c3586ccd38f1b4d4a44d338c9680c273.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/guns/placeholder/static.png" -dest_files=["res://.godot/imported/static.png-0c663493d3d93aee02918b4caa824f2d.ctex"] +source_file="res://base/assets/sprites/guns/placeholder/static.png" +dest_files=["res://.godot/imported/static.png-c3586ccd38f1b4d4a44d338c9680c273.ctex"] [params] diff --git a/base/assets/test_enemy/0000.png b/base/assets/sprites/test_enemy/0000.png similarity index 100% rename from base/assets/test_enemy/0000.png rename to base/assets/sprites/test_enemy/0000.png diff --git a/base/assets/test_enemy/0000.png.import b/base/assets/sprites/test_enemy/0000.png.import similarity index 71% rename from base/assets/test_enemy/0000.png.import rename to base/assets/sprites/test_enemy/0000.png.import index 0bf5101..263aa06 100644 --- a/base/assets/test_enemy/0000.png.import +++ b/base/assets/sprites/test_enemy/0000.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b0gyyb6xwfjex" -path="res://.godot/imported/0000.png-b903af487efa2fbcc832611e33cbf454.ctex" +path="res://.godot/imported/0000.png-f5719a7bd5a11518aed39566af9046a2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base/assets/test_enemy/0000.png" -dest_files=["res://.godot/imported/0000.png-b903af487efa2fbcc832611e33cbf454.ctex"] +source_file="res://base/assets/sprites/test_enemy/0000.png" +dest_files=["res://.godot/imported/0000.png-f5719a7bd5a11518aed39566af9046a2.ctex"] [params] diff --git a/base/assets/test_enemy/0001.png b/base/assets/sprites/test_enemy/0001.png similarity index 100% rename from base/assets/test_enemy/0001.png rename to base/assets/sprites/test_enemy/0001.png diff --git a/base/assets/test_enemy/0001.png.import b/base/assets/sprites/test_enemy/0001.png.import similarity index 71% rename from base/assets/test_enemy/0001.png.import rename to base/assets/sprites/test_enemy/0001.png.import index c00daad..1f210fa 100644 --- a/base/assets/test_enemy/0001.png.import +++ b/base/assets/sprites/test_enemy/0001.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://bp7iec52kc0ko" -path.s3tc="res://.godot/imported/0001.png-b37bf2a8d5a87496e9149209ad9d9645.s3tc.ctex" +path.s3tc="res://.godot/imported/0001.png-0d540b46b2d931313de29f570b2d9470.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://base/assets/test_enemy/0001.png" -dest_files=["res://.godot/imported/0001.png-b37bf2a8d5a87496e9149209ad9d9645.s3tc.ctex"] +source_file="res://base/assets/sprites/test_enemy/0001.png" +dest_files=["res://.godot/imported/0001.png-0d540b46b2d931313de29f570b2d9470.s3tc.ctex"] [params] diff --git a/base/assets/test_enemy/0002.png b/base/assets/sprites/test_enemy/0002.png similarity index 100% rename from base/assets/test_enemy/0002.png rename to base/assets/sprites/test_enemy/0002.png diff --git a/base/assets/test_enemy/0002.png.import b/base/assets/sprites/test_enemy/0002.png.import similarity index 71% rename from base/assets/test_enemy/0002.png.import rename to base/assets/sprites/test_enemy/0002.png.import index 999c6a6..b62fd67 100644 --- a/base/assets/test_enemy/0002.png.import +++ b/base/assets/sprites/test_enemy/0002.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://bmjanur1y65ut" -path.s3tc="res://.godot/imported/0002.png-9b12b65d0c4a70fdde18f69d2bbccc91.s3tc.ctex" +path.s3tc="res://.godot/imported/0002.png-70ec74fad4c7e591a88a7d562e552f9e.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://base/assets/test_enemy/0002.png" -dest_files=["res://.godot/imported/0002.png-9b12b65d0c4a70fdde18f69d2bbccc91.s3tc.ctex"] +source_file="res://base/assets/sprites/test_enemy/0002.png" +dest_files=["res://.godot/imported/0002.png-70ec74fad4c7e591a88a7d562e552f9e.s3tc.ctex"] [params] diff --git a/base/assets/test_enemy/0003.png b/base/assets/sprites/test_enemy/0003.png similarity index 100% rename from base/assets/test_enemy/0003.png rename to base/assets/sprites/test_enemy/0003.png diff --git a/base/assets/test_enemy/0003.png.import b/base/assets/sprites/test_enemy/0003.png.import similarity index 71% rename from base/assets/test_enemy/0003.png.import rename to base/assets/sprites/test_enemy/0003.png.import index 5e17830..ad8cc7e 100644 --- a/base/assets/test_enemy/0003.png.import +++ b/base/assets/sprites/test_enemy/0003.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://csyoosmr6c251" -path.s3tc="res://.godot/imported/0003.png-1f669fd5f649d54756b5d5cbb6d54ede.s3tc.ctex" +path.s3tc="res://.godot/imported/0003.png-dfa1309c182fb30a8f70c8198926ab60.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://base/assets/test_enemy/0003.png" -dest_files=["res://.godot/imported/0003.png-1f669fd5f649d54756b5d5cbb6d54ede.s3tc.ctex"] +source_file="res://base/assets/sprites/test_enemy/0003.png" +dest_files=["res://.godot/imported/0003.png-dfa1309c182fb30a8f70c8198926ab60.s3tc.ctex"] [params] diff --git a/base/assets/test_enemy/0004.png b/base/assets/sprites/test_enemy/0004.png similarity index 100% rename from base/assets/test_enemy/0004.png rename to base/assets/sprites/test_enemy/0004.png diff --git a/base/assets/test_enemy/0004.png.import b/base/assets/sprites/test_enemy/0004.png.import similarity index 71% rename from base/assets/test_enemy/0004.png.import rename to base/assets/sprites/test_enemy/0004.png.import index 2f8abf1..495c56b 100644 --- a/base/assets/test_enemy/0004.png.import +++ b/base/assets/sprites/test_enemy/0004.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://8ijiv8ly74jg" -path.s3tc="res://.godot/imported/0004.png-2fc0af59b10bb4de39b70e455e5a56ba.s3tc.ctex" +path.s3tc="res://.godot/imported/0004.png-49dbcd34419aa1df11249b674de46794.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://base/assets/test_enemy/0004.png" -dest_files=["res://.godot/imported/0004.png-2fc0af59b10bb4de39b70e455e5a56ba.s3tc.ctex"] +source_file="res://base/assets/sprites/test_enemy/0004.png" +dest_files=["res://.godot/imported/0004.png-49dbcd34419aa1df11249b674de46794.s3tc.ctex"] [params] diff --git a/base/assets/test_enemy/0005.png b/base/assets/sprites/test_enemy/0005.png similarity index 100% rename from base/assets/test_enemy/0005.png rename to base/assets/sprites/test_enemy/0005.png diff --git a/base/assets/test_enemy/0005.png.import b/base/assets/sprites/test_enemy/0005.png.import similarity index 71% rename from base/assets/test_enemy/0005.png.import rename to base/assets/sprites/test_enemy/0005.png.import index 9473853..bd320dc 100644 --- a/base/assets/test_enemy/0005.png.import +++ b/base/assets/sprites/test_enemy/0005.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://lbo6ygri22or" -path.s3tc="res://.godot/imported/0005.png-ea4e5800e69dcb3db9c74e0d36f7dada.s3tc.ctex" +path.s3tc="res://.godot/imported/0005.png-ab93ac78c8e7b0d8ab4c738da0658d7a.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://base/assets/test_enemy/0005.png" -dest_files=["res://.godot/imported/0005.png-ea4e5800e69dcb3db9c74e0d36f7dada.s3tc.ctex"] +source_file="res://base/assets/sprites/test_enemy/0005.png" +dest_files=["res://.godot/imported/0005.png-ab93ac78c8e7b0d8ab4c738da0658d7a.s3tc.ctex"] [params] diff --git a/base/assets/test_enemy/0006.png b/base/assets/sprites/test_enemy/0006.png similarity index 100% rename from base/assets/test_enemy/0006.png rename to base/assets/sprites/test_enemy/0006.png diff --git a/base/assets/test_enemy/0006.png.import b/base/assets/sprites/test_enemy/0006.png.import similarity index 71% rename from base/assets/test_enemy/0006.png.import rename to base/assets/sprites/test_enemy/0006.png.import index 5cc4ffc..3dc3710 100644 --- a/base/assets/test_enemy/0006.png.import +++ b/base/assets/sprites/test_enemy/0006.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://bu54h8g5r50qp" -path.s3tc="res://.godot/imported/0006.png-5ea93347fb4075fdeb67e91f967d8081.s3tc.ctex" +path.s3tc="res://.godot/imported/0006.png-b3df8c5db64e3e52b1b57db9972538ef.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://base/assets/test_enemy/0006.png" -dest_files=["res://.godot/imported/0006.png-5ea93347fb4075fdeb67e91f967d8081.s3tc.ctex"] +source_file="res://base/assets/sprites/test_enemy/0006.png" +dest_files=["res://.godot/imported/0006.png-b3df8c5db64e3e52b1b57db9972538ef.s3tc.ctex"] [params] diff --git a/base/assets/test_enemy/0007.png b/base/assets/sprites/test_enemy/0007.png similarity index 100% rename from base/assets/test_enemy/0007.png rename to base/assets/sprites/test_enemy/0007.png diff --git a/base/assets/test_enemy/0007.png.import b/base/assets/sprites/test_enemy/0007.png.import similarity index 71% rename from base/assets/test_enemy/0007.png.import rename to base/assets/sprites/test_enemy/0007.png.import index 10e9944..b4b5f54 100644 --- a/base/assets/test_enemy/0007.png.import +++ b/base/assets/sprites/test_enemy/0007.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://c57drlhnuicu5" -path.s3tc="res://.godot/imported/0007.png-c700fd2bc75a43d8fec1237ad0c34562.s3tc.ctex" +path.s3tc="res://.godot/imported/0007.png-6d6f16473a74c216b280d96e226d031a.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://base/assets/test_enemy/0007.png" -dest_files=["res://.godot/imported/0007.png-c700fd2bc75a43d8fec1237ad0c34562.s3tc.ctex"] +source_file="res://base/assets/sprites/test_enemy/0007.png" +dest_files=["res://.godot/imported/0007.png-6d6f16473a74c216b280d96e226d031a.s3tc.ctex"] [params] diff --git a/base/scenes/enemies/test_enemy.tscn b/base/scenes/enemies/test_enemy.tscn index c103c9a..1cc586e 100644 --- a/base/scenes/enemies/test_enemy.tscn +++ b/base/scenes/enemies/test_enemy.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=10 format=3 uid="uid://twqkevpn0q1a"] -[ext_resource type="Texture2D" uid="uid://b0gyyb6xwfjex" path="res://base/assets/test_enemy/0000.png" id="1_7qny8"] +[ext_resource type="Texture2D" uid="uid://b0gyyb6xwfjex" path="res://base/assets/sprites/test_enemy/0000.png" id="1_7qny8"] [ext_resource type="Script" uid="uid://j0w37fjl13ox" path="res://base/scripts/enemies/directional_sprite3d.gd" id="2_hmq60"] -[ext_resource type="Texture2D" uid="uid://bp7iec52kc0ko" path="res://base/assets/test_enemy/0001.png" id="3_rvsun"] -[ext_resource type="Texture2D" uid="uid://bmjanur1y65ut" path="res://base/assets/test_enemy/0002.png" id="4_ajcop"] -[ext_resource type="Texture2D" uid="uid://csyoosmr6c251" path="res://base/assets/test_enemy/0003.png" id="5_xto1v"] -[ext_resource type="Texture2D" uid="uid://8ijiv8ly74jg" path="res://base/assets/test_enemy/0004.png" id="6_d1vpv"] -[ext_resource type="Texture2D" uid="uid://lbo6ygri22or" path="res://base/assets/test_enemy/0005.png" id="7_yln7d"] -[ext_resource type="Texture2D" uid="uid://bu54h8g5r50qp" path="res://base/assets/test_enemy/0006.png" id="8_snoby"] -[ext_resource type="Texture2D" uid="uid://c57drlhnuicu5" path="res://base/assets/test_enemy/0007.png" id="9_83myg"] +[ext_resource type="Texture2D" uid="uid://bp7iec52kc0ko" path="res://base/assets/sprites/test_enemy/0001.png" id="3_rvsun"] +[ext_resource type="Texture2D" uid="uid://bmjanur1y65ut" path="res://base/assets/sprites/test_enemy/0002.png" id="4_ajcop"] +[ext_resource type="Texture2D" uid="uid://csyoosmr6c251" path="res://base/assets/sprites/test_enemy/0003.png" id="5_xto1v"] +[ext_resource type="Texture2D" uid="uid://8ijiv8ly74jg" path="res://base/assets/sprites/test_enemy/0004.png" id="6_d1vpv"] +[ext_resource type="Texture2D" uid="uid://lbo6ygri22or" path="res://base/assets/sprites/test_enemy/0005.png" id="7_yln7d"] +[ext_resource type="Texture2D" uid="uid://bu54h8g5r50qp" path="res://base/assets/sprites/test_enemy/0006.png" id="8_snoby"] +[ext_resource type="Texture2D" uid="uid://c57drlhnuicu5" path="res://base/assets/sprites/test_enemy/0007.png" id="9_83myg"] [node name="TestEnemy" type="Node3D"] diff --git a/base/scenes/player.tscn b/base/scenes/player.tscn index ee2e42b..729ff47 100644 --- a/base/scenes/player.tscn +++ b/base/scenes/player.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=5 format=3 uid="uid://dwx5tcatj35gu"] [ext_resource type="Script" uid="uid://dts8lbivkgsmj" path="res://base/scripts/player/player.gd" id="1_1w3ab"] -[ext_resource type="Texture2D" uid="uid://cfw6p5g680c55" path="res://base/assets/guns/placeholder/shoot1.png" id="2_i1xqq"] +[ext_resource type="Texture2D" uid="uid://cfw6p5g680c55" path="res://base/assets/sprites/guns/placeholder/shoot1.png" id="2_i1xqq"] [ext_resource type="PackedScene" uid="uid://bb6ovrbusyxpi" path="res://base/scenes/weapons/weapon_base.tscn" id="2_ma1q3"] + [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_jjqxs"] [node name="Player" type="CharacterBody3D"] diff --git a/base/scenes/weapons/weapon_base.tscn b/base/scenes/weapons/weapon_base.tscn index 3688354..279e72b 100644 --- a/base/scenes/weapons/weapon_base.tscn +++ b/base/scenes/weapons/weapon_base.tscn @@ -3,7 +3,8 @@ [ext_resource type="Script" uid="uid://bf0q3xe6oavqa" path="res://base/scripts/weapons/weapon_base.gd" id="1_rwatx"] [ext_resource type="Script" uid="uid://ckexgw71dd5jc" path="res://base/scripts/weapons/fire_mode/single_fire_mode.gd" id="2_bt0tf"] [ext_resource type="Script" uid="uid://bvurg687pt06s" path="res://base/scripts/weapons/barrel.gd" id="2_n0n7m"] -[ext_resource type="AnimationLibrary" uid="uid://cw8bt4hqxpk55" path="res://base/assets/guns/placeholder/placeholder.tres" id="2_p83j3"] +[ext_resource type="AnimationLibrary" uid="uid://cw8bt4hqxpk55" path="res://base/assets/sprites/guns/placeholder/placeholder.tres" id="2_p83j3"] + [sub_resource type="Resource" id="Resource_ij06d"] script = ExtResource("2_bt0tf")