From 34e5eaf7b862a024a09a1a7a6a8e31d75ab24505 Mon Sep 17 00:00:00 2001 From: Sofia Date: Fri, 24 Jul 2026 01:05:28 +0300 Subject: [PATCH] Reordanize assets --- CREDITS.md | 8 ++++---- godot/assets/Hit.mp3.import | 19 ------------------ godot/assets/LaserFast.mp3.import | 19 ------------------ godot/assets/LaserShot.ogg.import | 19 ------------------ godot/assets/LaserWithRecovery.mp3.import | 19 ------------------ .../assets/LaserWithRecoveryEdited.ogg.import | 19 ------------------ .../McGuffin/Telly.blend | Bin .../Soldier/Drone.blend | Bin .../Soldier/SniperRifle.blend | Bin .../Soldier/SoldierF.blend | Bin .../Soldier/SoldierM.blend | Bin .../Soldier/SoldierM.blend1 | Bin .../Stardust/Stardust.blend | Bin godot/{RawAssets => raw_assets/ping}/Ping.xcf | Bin .../{assets => raw_assets/ping}/Ping_high.png | Bin .../ping}/Ping_high.png.import | 6 +++--- .../{assets => raw_assets/ping}/Ping_low.png | Bin .../ping}/Ping_low.png.import | 6 +++--- .../ping}/Ping_medium.png | Bin .../ping}/Ping_medium.png.import | 6 +++--- godot/raw_assets/sfx/Hit.mp3.import | 19 ++++++++++++++++++ godot/raw_assets/sfx/LaserFast.mp3.import | 19 ++++++++++++++++++ .../{assets => raw_assets/sfx}/LaserShot.ogg | Bin godot/raw_assets/sfx/LaserShot.ogg.import | 19 ++++++++++++++++++ .../sfx/LaserWithRecovery.mp3.import | 19 ++++++++++++++++++ .../sfx}/LaserWithRecoveryEdited.ogg | Bin .../sfx/LaserWithRecoveryEdited.ogg.import | 19 ++++++++++++++++++ godot/scenes/player/raygun.tscn | 2 +- godot/scenes/player/splorch.tscn | 2 +- godot/scenes/ui/player_listing.tscn | 6 +++--- 30 files changed, 113 insertions(+), 113 deletions(-) delete mode 100644 godot/assets/Hit.mp3.import delete mode 100644 godot/assets/LaserFast.mp3.import delete mode 100644 godot/assets/LaserShot.ogg.import delete mode 100644 godot/assets/LaserWithRecovery.mp3.import delete mode 100644 godot/assets/LaserWithRecoveryEdited.ogg.import rename godot/{RawAssets => raw_assets}/McGuffin/Telly.blend (100%) rename godot/{RawAssets => raw_assets}/Soldier/Drone.blend (100%) rename godot/{RawAssets => raw_assets}/Soldier/SniperRifle.blend (100%) rename godot/{RawAssets => raw_assets}/Soldier/SoldierF.blend (100%) rename godot/{RawAssets => raw_assets}/Soldier/SoldierM.blend (100%) rename godot/{RawAssets => raw_assets}/Soldier/SoldierM.blend1 (100%) rename godot/{RawAssets => raw_assets}/Stardust/Stardust.blend (100%) rename godot/{RawAssets => raw_assets/ping}/Ping.xcf (100%) rename godot/{assets => raw_assets/ping}/Ping_high.png (100%) rename godot/{assets => raw_assets/ping}/Ping_high.png.import (76%) rename godot/{assets => raw_assets/ping}/Ping_low.png (100%) rename godot/{assets => raw_assets/ping}/Ping_low.png.import (77%) rename godot/{assets => raw_assets/ping}/Ping_medium.png (100%) rename godot/{assets => raw_assets/ping}/Ping_medium.png.import (76%) create mode 100644 godot/raw_assets/sfx/Hit.mp3.import create mode 100644 godot/raw_assets/sfx/LaserFast.mp3.import rename godot/{assets => raw_assets/sfx}/LaserShot.ogg (100%) create mode 100644 godot/raw_assets/sfx/LaserShot.ogg.import create mode 100644 godot/raw_assets/sfx/LaserWithRecovery.mp3.import rename godot/{assets => raw_assets/sfx}/LaserWithRecoveryEdited.ogg (100%) create mode 100644 godot/raw_assets/sfx/LaserWithRecoveryEdited.ogg.import diff --git a/CREDITS.md b/CREDITS.md index bc8a148..93f4d40 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,5 +1,5 @@ -- [Sound effects](Assets/Audio/Sfx/ZapSplat) from [zapsplat.com](https://www.zapsplat.com/) - - [LaserFast and LaserWithRecovery](godot/assets/) - - [Hit](godot/assets/Hit.mp3) -- [Soldier model and rig](godot/RawAssets/Soldier/) by [Casti_131](https://opengameart.org/content/low-poly-soldier-with-weapons) +- [Sound effects](godot/raw_assets/sfx/) from [zapsplat.com](https://www.zapsplat.com/) + - [LaserFast and LaserWithRecovery](godot/raw_assets/sfx/) + - [Hit](godot/raw_assets/sfx/Hit.mp3) +- [Soldier model and rig](godot/raw_assets/Soldier/) by [Casti_131](https://opengameart.org/content/low-poly-soldier-with-weapons) - [Torment Textures](godot/maps/textures) (`str_*` files) by [Bradley D. (strideh.itch.io)](https://strideh.itch.io) diff --git a/godot/assets/Hit.mp3.import b/godot/assets/Hit.mp3.import deleted file mode 100644 index 420593b..0000000 --- a/godot/assets/Hit.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://bfg31e3s4jv8c" -path="res://.godot/imported/Hit.mp3-1e43ad11df7f4d135dfebfbf61e21305.mp3str" - -[deps] - -source_file="res://assets/Hit.mp3" -dest_files=["res://.godot/imported/Hit.mp3-1e43ad11df7f4d135dfebfbf61e21305.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/godot/assets/LaserFast.mp3.import b/godot/assets/LaserFast.mp3.import deleted file mode 100644 index ba84adc..0000000 --- a/godot/assets/LaserFast.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://dw5vleoexlhwx" -path="res://.godot/imported/LaserFast.mp3-7950076d801cb865e24808499aec09df.mp3str" - -[deps] - -source_file="res://assets/LaserFast.mp3" -dest_files=["res://.godot/imported/LaserFast.mp3-7950076d801cb865e24808499aec09df.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/godot/assets/LaserShot.ogg.import b/godot/assets/LaserShot.ogg.import deleted file mode 100644 index dc78d1b..0000000 --- a/godot/assets/LaserShot.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dlsto2l7tudif" -path="res://.godot/imported/LaserShot.ogg-6aac68be79c568543c2853d102341790.oggvorbisstr" - -[deps] - -source_file="res://assets/LaserShot.ogg" -dest_files=["res://.godot/imported/LaserShot.ogg-6aac68be79c568543c2853d102341790.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/godot/assets/LaserWithRecovery.mp3.import b/godot/assets/LaserWithRecovery.mp3.import deleted file mode 100644 index 2c2bc02..0000000 --- a/godot/assets/LaserWithRecovery.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://cqboecwvt1cp8" -path="res://.godot/imported/LaserWithRecovery.mp3-10fbe4c1e5d75ceb94f91b483f19f811.mp3str" - -[deps] - -source_file="res://assets/LaserWithRecovery.mp3" -dest_files=["res://.godot/imported/LaserWithRecovery.mp3-10fbe4c1e5d75ceb94f91b483f19f811.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/godot/assets/LaserWithRecoveryEdited.ogg.import b/godot/assets/LaserWithRecoveryEdited.ogg.import deleted file mode 100644 index 5599227..0000000 --- a/godot/assets/LaserWithRecoveryEdited.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://xxpkjhaovyd" -path="res://.godot/imported/LaserWithRecoveryEdited.ogg-7b52758d22998fcb799b2fc8da1b30b1.oggvorbisstr" - -[deps] - -source_file="res://assets/LaserWithRecoveryEdited.ogg" -dest_files=["res://.godot/imported/LaserWithRecoveryEdited.ogg-7b52758d22998fcb799b2fc8da1b30b1.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/godot/RawAssets/McGuffin/Telly.blend b/godot/raw_assets/McGuffin/Telly.blend similarity index 100% rename from godot/RawAssets/McGuffin/Telly.blend rename to godot/raw_assets/McGuffin/Telly.blend diff --git a/godot/RawAssets/Soldier/Drone.blend b/godot/raw_assets/Soldier/Drone.blend similarity index 100% rename from godot/RawAssets/Soldier/Drone.blend rename to godot/raw_assets/Soldier/Drone.blend diff --git a/godot/RawAssets/Soldier/SniperRifle.blend b/godot/raw_assets/Soldier/SniperRifle.blend similarity index 100% rename from godot/RawAssets/Soldier/SniperRifle.blend rename to godot/raw_assets/Soldier/SniperRifle.blend diff --git a/godot/RawAssets/Soldier/SoldierF.blend b/godot/raw_assets/Soldier/SoldierF.blend similarity index 100% rename from godot/RawAssets/Soldier/SoldierF.blend rename to godot/raw_assets/Soldier/SoldierF.blend diff --git a/godot/RawAssets/Soldier/SoldierM.blend b/godot/raw_assets/Soldier/SoldierM.blend similarity index 100% rename from godot/RawAssets/Soldier/SoldierM.blend rename to godot/raw_assets/Soldier/SoldierM.blend diff --git a/godot/RawAssets/Soldier/SoldierM.blend1 b/godot/raw_assets/Soldier/SoldierM.blend1 similarity index 100% rename from godot/RawAssets/Soldier/SoldierM.blend1 rename to godot/raw_assets/Soldier/SoldierM.blend1 diff --git a/godot/RawAssets/Stardust/Stardust.blend b/godot/raw_assets/Stardust/Stardust.blend similarity index 100% rename from godot/RawAssets/Stardust/Stardust.blend rename to godot/raw_assets/Stardust/Stardust.blend diff --git a/godot/RawAssets/Ping.xcf b/godot/raw_assets/ping/Ping.xcf similarity index 100% rename from godot/RawAssets/Ping.xcf rename to godot/raw_assets/ping/Ping.xcf diff --git a/godot/assets/Ping_high.png b/godot/raw_assets/ping/Ping_high.png similarity index 100% rename from godot/assets/Ping_high.png rename to godot/raw_assets/ping/Ping_high.png diff --git a/godot/assets/Ping_high.png.import b/godot/raw_assets/ping/Ping_high.png.import similarity index 76% rename from godot/assets/Ping_high.png.import rename to godot/raw_assets/ping/Ping_high.png.import index 3803863..7d8cd84 100644 --- a/godot/assets/Ping_high.png.import +++ b/godot/raw_assets/ping/Ping_high.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c0n5ugd867e2k" -path="res://.godot/imported/Ping_high.png-78b5667ceb93c91e9ec1243749341ac5.ctex" +path="res://.godot/imported/Ping_high.png-4171ce82a5b496dca61cedfb51b965f4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/Ping_high.png" -dest_files=["res://.godot/imported/Ping_high.png-78b5667ceb93c91e9ec1243749341ac5.ctex"] +source_file="res://raw_assets/ping/Ping_high.png" +dest_files=["res://.godot/imported/Ping_high.png-4171ce82a5b496dca61cedfb51b965f4.ctex"] [params] diff --git a/godot/assets/Ping_low.png b/godot/raw_assets/ping/Ping_low.png similarity index 100% rename from godot/assets/Ping_low.png rename to godot/raw_assets/ping/Ping_low.png diff --git a/godot/assets/Ping_low.png.import b/godot/raw_assets/ping/Ping_low.png.import similarity index 77% rename from godot/assets/Ping_low.png.import rename to godot/raw_assets/ping/Ping_low.png.import index 490d896..1af49f7 100644 --- a/godot/assets/Ping_low.png.import +++ b/godot/raw_assets/ping/Ping_low.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bhrbrc725q0yd" -path="res://.godot/imported/Ping_low.png-607d26045b7085e3f2b980d8e4623f1d.ctex" +path="res://.godot/imported/Ping_low.png-4883834ae4f75c9ab0c9cdbe3e53e0a5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/Ping_low.png" -dest_files=["res://.godot/imported/Ping_low.png-607d26045b7085e3f2b980d8e4623f1d.ctex"] +source_file="res://raw_assets/ping/Ping_low.png" +dest_files=["res://.godot/imported/Ping_low.png-4883834ae4f75c9ab0c9cdbe3e53e0a5.ctex"] [params] diff --git a/godot/assets/Ping_medium.png b/godot/raw_assets/ping/Ping_medium.png similarity index 100% rename from godot/assets/Ping_medium.png rename to godot/raw_assets/ping/Ping_medium.png diff --git a/godot/assets/Ping_medium.png.import b/godot/raw_assets/ping/Ping_medium.png.import similarity index 76% rename from godot/assets/Ping_medium.png.import rename to godot/raw_assets/ping/Ping_medium.png.import index c1de186..15eae5a 100644 --- a/godot/assets/Ping_medium.png.import +++ b/godot/raw_assets/ping/Ping_medium.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://7u2jx45bwejo" -path="res://.godot/imported/Ping_medium.png-ef65cc30e3ffdd76332aa788d0be7a4a.ctex" +path="res://.godot/imported/Ping_medium.png-b7f179a8a21601cb8b138817ea5e6fa5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/Ping_medium.png" -dest_files=["res://.godot/imported/Ping_medium.png-ef65cc30e3ffdd76332aa788d0be7a4a.ctex"] +source_file="res://raw_assets/ping/Ping_medium.png" +dest_files=["res://.godot/imported/Ping_medium.png-b7f179a8a21601cb8b138817ea5e6fa5.ctex"] [params] diff --git a/godot/raw_assets/sfx/Hit.mp3.import b/godot/raw_assets/sfx/Hit.mp3.import new file mode 100644 index 0000000..a36364d --- /dev/null +++ b/godot/raw_assets/sfx/Hit.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bfg31e3s4jv8c" +path="res://.godot/imported/Hit.mp3-b50a5457f485168cfa626bcc00cdb742.mp3str" + +[deps] + +source_file="res://raw_assets/sfx/Hit.mp3" +dest_files=["res://.godot/imported/Hit.mp3-b50a5457f485168cfa626bcc00cdb742.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/raw_assets/sfx/LaserFast.mp3.import b/godot/raw_assets/sfx/LaserFast.mp3.import new file mode 100644 index 0000000..195d9de --- /dev/null +++ b/godot/raw_assets/sfx/LaserFast.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dw5vleoexlhwx" +path="res://.godot/imported/LaserFast.mp3-7a5f2d27e19fd540b0aa06664fb56e7a.mp3str" + +[deps] + +source_file="res://raw_assets/sfx/LaserFast.mp3" +dest_files=["res://.godot/imported/LaserFast.mp3-7a5f2d27e19fd540b0aa06664fb56e7a.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/assets/LaserShot.ogg b/godot/raw_assets/sfx/LaserShot.ogg similarity index 100% rename from godot/assets/LaserShot.ogg rename to godot/raw_assets/sfx/LaserShot.ogg diff --git a/godot/raw_assets/sfx/LaserShot.ogg.import b/godot/raw_assets/sfx/LaserShot.ogg.import new file mode 100644 index 0000000..e78aa54 --- /dev/null +++ b/godot/raw_assets/sfx/LaserShot.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dlsto2l7tudif" +path="res://.godot/imported/LaserShot.ogg-1e741e70a3f9fb490bfd6b6627f20ad9.oggvorbisstr" + +[deps] + +source_file="res://raw_assets/sfx/LaserShot.ogg" +dest_files=["res://.godot/imported/LaserShot.ogg-1e741e70a3f9fb490bfd6b6627f20ad9.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/raw_assets/sfx/LaserWithRecovery.mp3.import b/godot/raw_assets/sfx/LaserWithRecovery.mp3.import new file mode 100644 index 0000000..0c3899b --- /dev/null +++ b/godot/raw_assets/sfx/LaserWithRecovery.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cqboecwvt1cp8" +path="res://.godot/imported/LaserWithRecovery.mp3-4943397bd8de5ccff649463864369cf1.mp3str" + +[deps] + +source_file="res://raw_assets/sfx/LaserWithRecovery.mp3" +dest_files=["res://.godot/imported/LaserWithRecovery.mp3-4943397bd8de5ccff649463864369cf1.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/assets/LaserWithRecoveryEdited.ogg b/godot/raw_assets/sfx/LaserWithRecoveryEdited.ogg similarity index 100% rename from godot/assets/LaserWithRecoveryEdited.ogg rename to godot/raw_assets/sfx/LaserWithRecoveryEdited.ogg diff --git a/godot/raw_assets/sfx/LaserWithRecoveryEdited.ogg.import b/godot/raw_assets/sfx/LaserWithRecoveryEdited.ogg.import new file mode 100644 index 0000000..d89a816 --- /dev/null +++ b/godot/raw_assets/sfx/LaserWithRecoveryEdited.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://xxpkjhaovyd" +path="res://.godot/imported/LaserWithRecoveryEdited.ogg-6aacfe5dbf525a7dc1cd26fd76971753.oggvorbisstr" + +[deps] + +source_file="res://raw_assets/sfx/LaserWithRecoveryEdited.ogg" +dest_files=["res://.godot/imported/LaserWithRecoveryEdited.ogg-6aacfe5dbf525a7dc1cd26fd76971753.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/scenes/player/raygun.tscn b/godot/scenes/player/raygun.tscn index 5bf339d..fbb00e9 100644 --- a/godot/scenes/player/raygun.tscn +++ b/godot/scenes/player/raygun.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://cg81784ct8gf5" path="res://mesh/raygun.tscn" id="1_ckadf"] [ext_resource type="PackedScene" uid="uid://ctslratcr8h6v" path="res://scenes/player/raygun_beam.tscn" id="1_m84jv"] -[ext_resource type="AudioStream" uid="uid://xxpkjhaovyd" path="res://assets/LaserWithRecoveryEdited.ogg" id="2_lxble"] +[ext_resource type="AudioStream" uid="uid://xxpkjhaovyd" path="res://raw_assets/sfx/LaserWithRecoveryEdited.ogg" id="2_lxble"] [node name="raygun" type="Raygun" unique_id=573018429 node_paths=PackedStringArray("sound_emitter", "bullet_source")] sound_emitter = NodePath("sound_emitter") diff --git a/godot/scenes/player/splorch.tscn b/godot/scenes/player/splorch.tscn index e0d4649..68b6e63 100644 --- a/godot/scenes/player/splorch.tscn +++ b/godot/scenes/player/splorch.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://cl66unms2gim0"] -[ext_resource type="AudioStream" uid="uid://bfg31e3s4jv8c" path="res://assets/Hit.mp3" id="1_2hdmt"] +[ext_resource type="AudioStream" uid="uid://bfg31e3s4jv8c" path="res://raw_assets/sfx/Hit.mp3" id="1_2hdmt"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_1cgct"] particle_flag_align_y = true diff --git a/godot/scenes/ui/player_listing.tscn b/godot/scenes/ui/player_listing.tscn index eff2921..8e5e873 100644 --- a/godot/scenes/ui/player_listing.tscn +++ b/godot/scenes/ui/player_listing.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://2sfy0vq0fqt3"] -[ext_resource type="Texture2D" uid="uid://bhrbrc725q0yd" path="res://assets/Ping_low.png" id="1_3pnyb"] -[ext_resource type="Texture2D" uid="uid://7u2jx45bwejo" path="res://assets/Ping_medium.png" id="2_h6por"] -[ext_resource type="Texture2D" uid="uid://c0n5ugd867e2k" path="res://assets/Ping_high.png" id="3_kx1on"] +[ext_resource type="Texture2D" uid="uid://bhrbrc725q0yd" path="res://raw_assets/ping/Ping_low.png" id="1_3pnyb"] +[ext_resource type="Texture2D" uid="uid://7u2jx45bwejo" path="res://raw_assets/ping/Ping_medium.png" id="2_h6por"] +[ext_resource type="Texture2D" uid="uid://c0n5ugd867e2k" path="res://raw_assets/ping/Ping_high.png" id="3_kx1on"] [node name="player_listing" type="PlayerListing" unique_id=965142972 node_paths=PackedStringArray("name_label", "kills_label", "deaths_label", "ping_label", "ping_icon")] name_label = NodePath("name")