From 7213716e8ad2239f3df6fc232cf8166f9701f694 Mon Sep 17 00:00:00 2001 From: anyreso Date: Wed, 1 May 2024 10:28:47 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20reorganize=20into=20`as?= =?UTF-8?q?sets`=20and=20`src`=20folders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/dummy_target/dummy_target.glb | Bin .../dummy_target/dummy_target.glb.import | 6 ++-- .../entities/dummy_target}/models/.gdignore | 0 .../dummy_target}/models/player_mesh.blend | Bin .../assets => assets/entities/flag}/flag.glb | Bin .../entities/flag}/flag.glb.import | 6 ++-- .../entities/player}/jetpackfx/Particle01.png | Bin .../player}/jetpackfx/Particle01.png.import | 6 ++-- .../entities/player}/jetpackfx/smoke_01.png | Bin .../player}/jetpackfx/smoke_01.png.import | 6 ++-- .../entities/player}/jetpackfx/smoke_02.png | Bin .../player}/jetpackfx/smoke_02.png.import | 6 ++-- .../entities/player}/jetpackfx/smoke_05.png | Bin .../player}/jetpackfx/smoke_05.png.import | 6 ++-- .../entities/player}/jetpackfx/smoke_06.png | Bin .../player}/jetpackfx/smoke_06.png.import | 6 ++-- .../entities/player}/vanguard.glb | Bin .../entities/player}/vanguard.glb.import | 6 ++-- .../entities/player}/vanguard_0.png | Bin .../entities/player}/vanguard_0.png.import | 6 ++-- .../entities/player}/vanguard_1.png | Bin .../entities/player}/vanguard_1.png.import | 6 ++-- .../entities/player}/vanguard_2.png | Bin .../entities/player}/vanguard_2.png.import | 6 ++-- .../skyboxes/kloppenheim_06_puresky_2k.exr | Bin .../kloppenheim_06_puresky_2k.exr.import | 6 ++-- .../assets => assets/maps/desert}/desert.r16 | Bin .../resources => assets/maps/desert}/env.tres | 0 .../maps/desert}/material.tres | 0 .../maps/desert}/storage.res | Bin .../maps/desert}/textures.tres | 16 ++++----- .../desert}/textures/ground054_alb_ht.png | Bin .../textures/ground054_alb_ht.png.import | 6 ++-- .../desert}/textures/ground054_nrm_rgh.png | Bin .../textures/ground054_nrm_rgh.png.import | 6 ++-- .../maps/desert}/textures/rock029_alb_ht.png | Bin .../textures/rock029_alb_ht.png.import | 6 ++-- .../maps/desert}/textures/rock029_nrm_rgh.png | Bin .../textures/rock029_nrm_rgh.png.import | 6 ++-- .../maps/genesis}/env.tres | 4 +-- .../maps/genesis}/material.res | Bin .../maps/genesis}/storage.res | Bin .../maps/genesis}/textures.res | Bin .../genesis}/textures/ground037_alb_ht.png | Bin .../textures/ground037_alb_ht.png.import | 6 ++-- .../genesis}/textures/ground037_nrm_rgh.png | Bin .../textures/ground037_nrm_rgh.png.import | 6 ++-- .../maps/genesis}/textures/rock030_alb_ht.png | Bin .../textures/rock030_alb_ht.png.import | 6 ++-- .../genesis}/textures/rock030_nrm_rgh.png | Bin .../textures/rock030_nrm_rgh.png.import | 6 ++-- .../assets => assets/maps/genesis}/vortex.r16 | Bin .../weapons/chaingun}/chaingun.blend | Bin .../weapons/chaingun}/chaingun.glb | Bin .../weapons/chaingun}/chaingun.glb.import | 6 ++-- .../weapons/chaingun}/tracer.blend | Bin .../grenade_launcher}/grenade_launcher.glb | Bin .../grenade_launcher.glb.import | 6 ++-- .../grenade_launcher}/grenadelauncher.blend | Bin .../weapons/spacegun}/disclauncher.glb | Bin .../weapons/spacegun}/disclauncher.glb.import | 6 ++-- .../weapons/spacegun}/models/.gdignore | 0 .../spacegun}/models/disclauncher.blend | Bin maps/genesis/resources/textures.res.depren | Bin 467 -> 0 bytes project.godot | 6 ++-- .../entities}/buildings/flag_stand.tscn | 0 .../components/explosive_damage_component.gd | 0 .../components/flag_carry_component.gd | 0 .../entities}/components/health_component.gd | 0 .../entities}/components/inventory.gd | 0 .../components/match_participant_component.gd | 0 .../entities}/dummy_target/dummy_target.gd | 0 .../entities}/dummy_target/dummy_target.tscn | 6 ++-- {entities => src/entities}/flag/flag.gd | 0 {entities => src/entities}/flag/flag.tscn | 6 ++-- {entities => src/entities}/flag/waypoint.gd | 0 {entities => src/entities}/flag/waypoint.tscn | 2 +- .../entities}/player/collision_shape.tres | 0 {entities => src/entities}/player/player.gd | 0 {entities => src/entities}/player/player.tscn | 34 +++++++++--------- .../entities}/player/player_input.gd | 0 {entities => src/entities}/player/vanguard.gd | 0 .../entities}/player/vanguard.tscn | 6 ++-- .../entities}/weapons/chaingun/chaingun.gd | 0 .../entities}/weapons/chaingun/chaingun.tscn | 4 +-- .../grenade_launcher/grenade_launcher.gd | 0 .../grenade_launcher/grenade_launcher.tscn | 6 ++-- .../grenade_launcher_projectile.gd | 0 .../grenade_launcher_projectile.tscn | 2 +- .../entities/weapons/spacegun}/projectile.gd | 0 .../weapons/spacegun}/projectile.tscn | 6 ++-- .../weapons/spacegun}/projectile_explosion.gd | 0 .../spacegun}/projectile_explosion.tscn | 4 +-- .../weapons/spacegun}/projectile_trail.gd | 0 .../entities/weapons/spacegun}/space_gun.gd | 0 .../entities/weapons/spacegun}/space_gun.tscn | 6 ++-- {entities => src/entities}/weapons/weapon.gd | 0 {interfaces => src/interfaces}/hud/hud.tscn | 4 +-- .../hud/iffs/health_foreground.tres | 0 .../interfaces}/hud/iffs/iff.gd | 0 .../interfaces}/hud/iffs/iff.tscn | 6 ++-- .../interfaces}/hud/vitals/background.tres | 0 .../hud/vitals/health_foreground.tres | 0 .../interfaces}/menus/boot/background.webp | Bin .../menus/boot/background.webp.import | 6 ++-- .../interfaces}/menus/boot/boot.tscn | 2 +- .../interfaces}/scoreboard/scoreboard.gd | 0 .../interfaces}/scoreboard/scoreboard.tscn | 2 +- main.tscn => src/main.tscn | 12 +++---- .../deathmatch_scoring_component.gd | 0 .../components/rabbit_scoring_component.gd | 0 {maps => src/maps}/desert/desert.tscn | 10 +++--- {maps => src/maps}/genesis/genesis.tscn | 10 +++--- {maps => src/maps}/maps.tres | 6 ++-- .../modes}/multiplayer/multiplayer.gd | 0 .../modes}/multiplayer/multiplayer.tscn | 12 +++---- {modes => src/modes}/singleplayer/demo.gd | 0 {modes => src/modes}/singleplayer/demo.tscn | 10 +++--- {systems => src/systems}/maps_manager.gd | 2 +- {systems => src/systems}/settings.gd | 0 {systems => src/systems}/teams.gd | 0 .../types}/resources/array_packed_scene.gd | 0 .../types}/resources/array_packed_scene.tres | 2 +- 123 files changed, 165 insertions(+), 165 deletions(-) rename entities/dummy_target/assets/player_mesh.glb => assets/entities/dummy_target/dummy_target.glb (100%) rename entities/dummy_target/assets/player_mesh.glb.import => assets/entities/dummy_target/dummy_target.glb.import (71%) rename {entities/dummy_target/assets => assets/entities/dummy_target}/models/.gdignore (100%) rename {entities/dummy_target/assets => assets/entities/dummy_target}/models/player_mesh.blend (100%) rename {entities/flag/assets => assets/entities/flag}/flag.glb (100%) rename {entities/flag/assets => assets/entities/flag}/flag.glb.import (74%) rename {entities/player/assets => assets/entities/player}/jetpackfx/Particle01.png (100%) rename {entities/player/assets => assets/entities/player}/jetpackfx/Particle01.png.import (70%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_01.png (100%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_01.png.import (70%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_02.png (100%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_02.png.import (70%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_05.png (100%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_05.png.import (70%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_06.png (100%) rename {entities/player/assets => assets/entities/player}/jetpackfx/smoke_06.png.import (70%) rename {entities/player/assets => assets/entities/player}/vanguard.glb (100%) rename {entities/player/assets => assets/entities/player}/vanguard.glb.import (99%) rename {entities/player/assets => assets/entities/player}/vanguard_0.png (100%) rename {entities/player/assets => assets/entities/player}/vanguard_0.png.import (71%) rename {entities/player/assets => assets/entities/player}/vanguard_1.png (100%) rename {entities/player/assets => assets/entities/player}/vanguard_1.png.import (72%) rename {entities/player/assets => assets/entities/player}/vanguard_2.png (100%) rename {entities/player/assets => assets/entities/player}/vanguard_2.png.import (72%) rename {environments => assets/environments}/skyboxes/kloppenheim_06_puresky_2k.exr (100%) rename {environments => assets/environments}/skyboxes/kloppenheim_06_puresky_2k.exr.import (73%) rename {maps/desert/assets => assets/maps/desert}/desert.r16 (100%) rename {maps/desert/resources => assets/maps/desert}/env.tres (100%) rename {maps/desert/resources => assets/maps/desert}/material.tres (100%) rename {maps/desert/resources => assets/maps/desert}/storage.res (100%) rename {maps/desert/resources => assets/maps/desert}/textures.tres (65%) rename {maps/desert/assets => assets/maps/desert}/textures/ground054_alb_ht.png (100%) rename {maps/desert/assets => assets/maps/desert}/textures/ground054_alb_ht.png.import (69%) rename {maps/desert/assets => assets/maps/desert}/textures/ground054_nrm_rgh.png (100%) rename {maps/desert/assets => assets/maps/desert}/textures/ground054_nrm_rgh.png.import (69%) rename {maps/desert/assets => assets/maps/desert}/textures/rock029_alb_ht.png (100%) rename {maps/desert/assets => assets/maps/desert}/textures/rock029_alb_ht.png.import (69%) rename {maps/desert/assets => assets/maps/desert}/textures/rock029_nrm_rgh.png (100%) rename {maps/desert/assets => assets/maps/desert}/textures/rock029_nrm_rgh.png.import (69%) rename {maps/genesis/resources => assets/maps/genesis}/env.tres (90%) rename {maps/genesis/resources => assets/maps/genesis}/material.res (100%) rename {maps/genesis/resources => assets/maps/genesis}/storage.res (100%) rename {maps/genesis/resources => assets/maps/genesis}/textures.res (100%) rename {maps/genesis/assets => assets/maps/genesis}/textures/ground037_alb_ht.png (100%) rename {maps/genesis/assets => assets/maps/genesis}/textures/ground037_alb_ht.png.import (69%) rename {maps/genesis/assets => assets/maps/genesis}/textures/ground037_nrm_rgh.png (100%) rename {maps/genesis/assets => assets/maps/genesis}/textures/ground037_nrm_rgh.png.import (69%) rename {maps/genesis/assets => assets/maps/genesis}/textures/rock030_alb_ht.png (100%) rename {maps/genesis/assets => assets/maps/genesis}/textures/rock030_alb_ht.png.import (69%) rename {maps/genesis/assets => assets/maps/genesis}/textures/rock030_nrm_rgh.png (100%) rename {maps/genesis/assets => assets/maps/genesis}/textures/rock030_nrm_rgh.png.import (69%) rename {maps/genesis/assets => assets/maps/genesis}/vortex.r16 (100%) rename {entities/weapons/chaingun/assets => assets/weapons/chaingun}/chaingun.blend (100%) rename {entities/weapons/chaingun/assets => assets/weapons/chaingun}/chaingun.glb (100%) rename {entities/weapons/chaingun/assets => assets/weapons/chaingun}/chaingun.glb.import (72%) rename {entities/weapons/chaingun/assets => assets/weapons/chaingun}/tracer.blend (100%) rename {entities/weapons/grenade_launcher/assets => assets/weapons/grenade_launcher}/grenade_launcher.glb (100%) rename {entities/weapons/grenade_launcher/assets => assets/weapons/grenade_launcher}/grenade_launcher.glb.import (69%) rename {entities/weapons/grenade_launcher/assets => assets/weapons/grenade_launcher}/grenadelauncher.blend (100%) rename {entities/weapons/space_gun/assets => assets/weapons/spacegun}/disclauncher.glb (100%) rename {entities/weapons/space_gun/assets => assets/weapons/spacegun}/disclauncher.glb.import (70%) rename {entities/weapons/space_gun/assets => assets/weapons/spacegun}/models/.gdignore (100%) rename {entities/weapons/space_gun/assets => assets/weapons/spacegun}/models/disclauncher.blend (100%) delete mode 100644 maps/genesis/resources/textures.res.depren rename {entities => src/entities}/buildings/flag_stand.tscn (100%) rename {entities => src/entities}/components/explosive_damage_component.gd (100%) rename {entities => src/entities}/components/flag_carry_component.gd (100%) rename {entities => src/entities}/components/health_component.gd (100%) rename {entities => src/entities}/components/inventory.gd (100%) rename {entities => src/entities}/components/match_participant_component.gd (100%) rename {entities => src/entities}/dummy_target/dummy_target.gd (100%) rename {entities => src/entities}/dummy_target/dummy_target.tscn (93%) rename {entities => src/entities}/flag/flag.gd (100%) rename {entities => src/entities}/flag/flag.tscn (91%) rename {entities => src/entities}/flag/waypoint.gd (100%) rename {entities => src/entities}/flag/waypoint.tscn (89%) rename {entities => src/entities}/player/collision_shape.tres (100%) rename {entities => src/entities}/player/player.gd (100%) rename {entities => src/entities}/player/player.tscn (90%) rename {entities => src/entities}/player/player_input.gd (100%) rename {entities => src/entities}/player/vanguard.gd (100%) rename {entities => src/entities}/player/vanguard.tscn (99%) rename {entities => src/entities}/weapons/chaingun/chaingun.gd (100%) rename {entities => src/entities}/weapons/chaingun/chaingun.tscn (88%) rename {entities => src/entities}/weapons/grenade_launcher/grenade_launcher.gd (100%) rename {entities => src/entities}/weapons/grenade_launcher/grenade_launcher.tscn (78%) rename {entities => src/entities}/weapons/grenade_launcher/grenade_launcher_projectile.gd (100%) rename {entities => src/entities}/weapons/grenade_launcher/grenade_launcher_projectile.tscn (88%) rename {entities/weapons/space_gun => src/entities/weapons/spacegun}/projectile.gd (100%) rename {entities/weapons/space_gun => src/entities/weapons/spacegun}/projectile.tscn (85%) rename {entities/weapons/space_gun => src/entities/weapons/spacegun}/projectile_explosion.gd (100%) rename {entities/weapons/space_gun => src/entities/weapons/spacegun}/projectile_explosion.tscn (87%) rename {entities/weapons/space_gun => src/entities/weapons/spacegun}/projectile_trail.gd (100%) rename {entities/weapons/space_gun => src/entities/weapons/spacegun}/space_gun.gd (100%) rename {entities/weapons/space_gun => src/entities/weapons/spacegun}/space_gun.tscn (88%) rename {entities => src/entities}/weapons/weapon.gd (100%) rename {interfaces => src/interfaces}/hud/hud.tscn (97%) rename {interfaces => src/interfaces}/hud/iffs/health_foreground.tres (100%) rename {interfaces => src/interfaces}/hud/iffs/iff.gd (100%) rename {interfaces => src/interfaces}/hud/iffs/iff.tscn (90%) rename {interfaces => src/interfaces}/hud/vitals/background.tres (100%) rename {interfaces => src/interfaces}/hud/vitals/health_foreground.tres (100%) rename {interfaces => src/interfaces}/menus/boot/background.webp (100%) rename {interfaces => src/interfaces}/menus/boot/background.webp.import (70%) rename {interfaces => src/interfaces}/menus/boot/boot.tscn (99%) rename {interfaces => src/interfaces}/scoreboard/scoreboard.gd (100%) rename {interfaces => src/interfaces}/scoreboard/scoreboard.tscn (94%) rename main.tscn => src/main.tscn (92%) rename {maps => src/maps}/components/deathmatch_scoring_component.gd (100%) rename {maps => src/maps}/components/rabbit_scoring_component.gd (100%) rename {maps => src/maps}/desert/desert.tscn (84%) rename {maps => src/maps}/genesis/genesis.tscn (84%) rename {maps => src/maps}/maps.tres (65%) rename {modes => src/modes}/multiplayer/multiplayer.gd (100%) rename {modes => src/modes}/multiplayer/multiplayer.tscn (77%) rename {modes => src/modes}/singleplayer/demo.gd (100%) rename {modes => src/modes}/singleplayer/demo.tscn (75%) rename {systems => src/systems}/maps_manager.gd (96%) rename {systems => src/systems}/settings.gd (100%) rename {systems => src/systems}/teams.gd (100%) rename {types => src/types}/resources/array_packed_scene.gd (100%) rename {types => src/types}/resources/array_packed_scene.tres (67%) diff --git a/entities/dummy_target/assets/player_mesh.glb b/assets/entities/dummy_target/dummy_target.glb similarity index 100% rename from entities/dummy_target/assets/player_mesh.glb rename to assets/entities/dummy_target/dummy_target.glb diff --git a/entities/dummy_target/assets/player_mesh.glb.import b/assets/entities/dummy_target/dummy_target.glb.import similarity index 71% rename from entities/dummy_target/assets/player_mesh.glb.import rename to assets/entities/dummy_target/dummy_target.glb.import index 60fb86e..5e50829 100644 --- a/entities/dummy_target/assets/player_mesh.glb.import +++ b/assets/entities/dummy_target/dummy_target.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://chuein4frnvwt" -path="res://.godot/imported/player_mesh.glb-8a1e1c6070971fc6184d85747185f28c.scn" +path="res://.godot/imported/dummy_target.glb-4961e906ee170cb41de81ee669fc8fdc.scn" [deps] -source_file="res://entities/dummy_target/assets/player_mesh.glb" -dest_files=["res://.godot/imported/player_mesh.glb-8a1e1c6070971fc6184d85747185f28c.scn"] +source_file="res://assets/entities/dummy_target/dummy_target.glb" +dest_files=["res://.godot/imported/dummy_target.glb-4961e906ee170cb41de81ee669fc8fdc.scn"] [params] diff --git a/entities/dummy_target/assets/models/.gdignore b/assets/entities/dummy_target/models/.gdignore similarity index 100% rename from entities/dummy_target/assets/models/.gdignore rename to assets/entities/dummy_target/models/.gdignore diff --git a/entities/dummy_target/assets/models/player_mesh.blend b/assets/entities/dummy_target/models/player_mesh.blend similarity index 100% rename from entities/dummy_target/assets/models/player_mesh.blend rename to assets/entities/dummy_target/models/player_mesh.blend diff --git a/entities/flag/assets/flag.glb b/assets/entities/flag/flag.glb similarity index 100% rename from entities/flag/assets/flag.glb rename to assets/entities/flag/flag.glb diff --git a/entities/flag/assets/flag.glb.import b/assets/entities/flag/flag.glb.import similarity index 74% rename from entities/flag/assets/flag.glb.import rename to assets/entities/flag/flag.glb.import index 6f3bf9d..67cc6db 100644 --- a/entities/flag/assets/flag.glb.import +++ b/assets/entities/flag/flag.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://d3l7fvbdg6m5g" -path="res://.godot/imported/flag.glb-0a51d316969707bbb012f3287265227f.scn" +path="res://.godot/imported/flag.glb-a751faa1bd0170a213db18fc61e8016d.scn" [deps] -source_file="res://entities/flag/assets/flag.glb" -dest_files=["res://.godot/imported/flag.glb-0a51d316969707bbb012f3287265227f.scn"] +source_file="res://assets/entities/flag/flag.glb" +dest_files=["res://.godot/imported/flag.glb-a751faa1bd0170a213db18fc61e8016d.scn"] [params] diff --git a/entities/player/assets/jetpackfx/Particle01.png b/assets/entities/player/jetpackfx/Particle01.png similarity index 100% rename from entities/player/assets/jetpackfx/Particle01.png rename to assets/entities/player/jetpackfx/Particle01.png diff --git a/entities/player/assets/jetpackfx/Particle01.png.import b/assets/entities/player/jetpackfx/Particle01.png.import similarity index 70% rename from entities/player/assets/jetpackfx/Particle01.png.import rename to assets/entities/player/jetpackfx/Particle01.png.import index edbb4dd..e159661 100644 --- a/entities/player/assets/jetpackfx/Particle01.png.import +++ b/assets/entities/player/jetpackfx/Particle01.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://dmf12llra7aq5" -path.s3tc="res://.godot/imported/Particle01.png-789728e4e363d58f11747b3cf3c5d5a3.s3tc.ctex" +path.s3tc="res://.godot/imported/Particle01.png-113d74cbd35c890bf7afe5a40d83af0c.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://entities/player/assets/jetpackfx/Particle01.png" -dest_files=["res://.godot/imported/Particle01.png-789728e4e363d58f11747b3cf3c5d5a3.s3tc.ctex"] +source_file="res://assets/entities/player/jetpackfx/Particle01.png" +dest_files=["res://.godot/imported/Particle01.png-113d74cbd35c890bf7afe5a40d83af0c.s3tc.ctex"] [params] diff --git a/entities/player/assets/jetpackfx/smoke_01.png b/assets/entities/player/jetpackfx/smoke_01.png similarity index 100% rename from entities/player/assets/jetpackfx/smoke_01.png rename to assets/entities/player/jetpackfx/smoke_01.png diff --git a/entities/player/assets/jetpackfx/smoke_01.png.import b/assets/entities/player/jetpackfx/smoke_01.png.import similarity index 70% rename from entities/player/assets/jetpackfx/smoke_01.png.import rename to assets/entities/player/jetpackfx/smoke_01.png.import index f895109..7931ed9 100644 --- a/entities/player/assets/jetpackfx/smoke_01.png.import +++ b/assets/entities/player/jetpackfx/smoke_01.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://ct1v5iadtpadm" -path.s3tc="res://.godot/imported/smoke_01.png-5c3d69bc74b2f317eac64d37cd67aed3.s3tc.ctex" +path.s3tc="res://.godot/imported/smoke_01.png-6529762712f3f7ce73f0cbc02eb3ae46.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://entities/player/assets/jetpackfx/smoke_01.png" -dest_files=["res://.godot/imported/smoke_01.png-5c3d69bc74b2f317eac64d37cd67aed3.s3tc.ctex"] +source_file="res://assets/entities/player/jetpackfx/smoke_01.png" +dest_files=["res://.godot/imported/smoke_01.png-6529762712f3f7ce73f0cbc02eb3ae46.s3tc.ctex"] [params] diff --git a/entities/player/assets/jetpackfx/smoke_02.png b/assets/entities/player/jetpackfx/smoke_02.png similarity index 100% rename from entities/player/assets/jetpackfx/smoke_02.png rename to assets/entities/player/jetpackfx/smoke_02.png diff --git a/entities/player/assets/jetpackfx/smoke_02.png.import b/assets/entities/player/jetpackfx/smoke_02.png.import similarity index 70% rename from entities/player/assets/jetpackfx/smoke_02.png.import rename to assets/entities/player/jetpackfx/smoke_02.png.import index b9e266f..357ec0c 100644 --- a/entities/player/assets/jetpackfx/smoke_02.png.import +++ b/assets/entities/player/jetpackfx/smoke_02.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://doxo4vfn0bjlp" -path.s3tc="res://.godot/imported/smoke_02.png-a5343a97ff1cefeebcd82e41218739ca.s3tc.ctex" +path.s3tc="res://.godot/imported/smoke_02.png-46bbe2b1a8c316f611cc532eb5b02de1.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://entities/player/assets/jetpackfx/smoke_02.png" -dest_files=["res://.godot/imported/smoke_02.png-a5343a97ff1cefeebcd82e41218739ca.s3tc.ctex"] +source_file="res://assets/entities/player/jetpackfx/smoke_02.png" +dest_files=["res://.godot/imported/smoke_02.png-46bbe2b1a8c316f611cc532eb5b02de1.s3tc.ctex"] [params] diff --git a/entities/player/assets/jetpackfx/smoke_05.png b/assets/entities/player/jetpackfx/smoke_05.png similarity index 100% rename from entities/player/assets/jetpackfx/smoke_05.png rename to assets/entities/player/jetpackfx/smoke_05.png diff --git a/entities/player/assets/jetpackfx/smoke_05.png.import b/assets/entities/player/jetpackfx/smoke_05.png.import similarity index 70% rename from entities/player/assets/jetpackfx/smoke_05.png.import rename to assets/entities/player/jetpackfx/smoke_05.png.import index 482ef49..723743a 100644 --- a/entities/player/assets/jetpackfx/smoke_05.png.import +++ b/assets/entities/player/jetpackfx/smoke_05.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dg8jhudb2pp5" -path="res://.godot/imported/smoke_05.png-0e09dd48bb034f353433668dafb91bd9.ctex" +path="res://.godot/imported/smoke_05.png-2ccd2aca2e107ac7cdb1ce2d99b87cb3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entities/player/assets/jetpackfx/smoke_05.png" -dest_files=["res://.godot/imported/smoke_05.png-0e09dd48bb034f353433668dafb91bd9.ctex"] +source_file="res://assets/entities/player/jetpackfx/smoke_05.png" +dest_files=["res://.godot/imported/smoke_05.png-2ccd2aca2e107ac7cdb1ce2d99b87cb3.ctex"] [params] diff --git a/entities/player/assets/jetpackfx/smoke_06.png b/assets/entities/player/jetpackfx/smoke_06.png similarity index 100% rename from entities/player/assets/jetpackfx/smoke_06.png rename to assets/entities/player/jetpackfx/smoke_06.png diff --git a/entities/player/assets/jetpackfx/smoke_06.png.import b/assets/entities/player/jetpackfx/smoke_06.png.import similarity index 70% rename from entities/player/assets/jetpackfx/smoke_06.png.import rename to assets/entities/player/jetpackfx/smoke_06.png.import index 34260f4..e5a8b90 100644 --- a/entities/player/assets/jetpackfx/smoke_06.png.import +++ b/assets/entities/player/jetpackfx/smoke_06.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bj3byo4v71rub" -path="res://.godot/imported/smoke_06.png-551015dc27729e05438bc76194d0b9c3.ctex" +path="res://.godot/imported/smoke_06.png-e4c52ad9bcb18dbe30652c94c7b24186.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://entities/player/assets/jetpackfx/smoke_06.png" -dest_files=["res://.godot/imported/smoke_06.png-551015dc27729e05438bc76194d0b9c3.ctex"] +source_file="res://assets/entities/player/jetpackfx/smoke_06.png" +dest_files=["res://.godot/imported/smoke_06.png-e4c52ad9bcb18dbe30652c94c7b24186.ctex"] [params] diff --git a/entities/player/assets/vanguard.glb b/assets/entities/player/vanguard.glb similarity index 100% rename from entities/player/assets/vanguard.glb rename to assets/entities/player/vanguard.glb diff --git a/entities/player/assets/vanguard.glb.import b/assets/entities/player/vanguard.glb.import similarity index 99% rename from entities/player/assets/vanguard.glb.import rename to assets/entities/player/vanguard.glb.import index c3629ae..325bc55 100644 --- a/entities/player/assets/vanguard.glb.import +++ b/assets/entities/player/vanguard.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://4naw661fqmjg" -path="res://.godot/imported/vanguard.glb-cadeef0df4a787cdbb2a53b5a94a5c23.scn" +path="res://.godot/imported/vanguard.glb-9faae062a08c457e0e142660ac28fbe8.scn" [deps] -source_file="res://entities/player/assets/vanguard.glb" -dest_files=["res://.godot/imported/vanguard.glb-cadeef0df4a787cdbb2a53b5a94a5c23.scn"] +source_file="res://assets/entities/player/vanguard.glb" +dest_files=["res://.godot/imported/vanguard.glb-9faae062a08c457e0e142660ac28fbe8.scn"] [params] diff --git a/entities/player/assets/vanguard_0.png b/assets/entities/player/vanguard_0.png similarity index 100% rename from entities/player/assets/vanguard_0.png rename to assets/entities/player/vanguard_0.png diff --git a/entities/player/assets/vanguard_0.png.import b/assets/entities/player/vanguard_0.png.import similarity index 71% rename from entities/player/assets/vanguard_0.png.import rename to assets/entities/player/vanguard_0.png.import index f6e35c1..7e1a363 100644 --- a/entities/player/assets/vanguard_0.png.import +++ b/assets/entities/player/vanguard_0.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://ia3bdpe4rm1m" -path.bptc="res://.godot/imported/vanguard_0.png-601f36bc664114e126d425d5f45085ef.bptc.ctex" +path.bptc="res://.godot/imported/vanguard_0.png-45ffdc5e70a613a050549364c0eae5c8.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -12,8 +12,8 @@ generator_parameters={} [deps] -source_file="res://entities/player/assets/vanguard_0.png" -dest_files=["res://.godot/imported/vanguard_0.png-601f36bc664114e126d425d5f45085ef.bptc.ctex"] +source_file="res://assets/entities/player/vanguard_0.png" +dest_files=["res://.godot/imported/vanguard_0.png-45ffdc5e70a613a050549364c0eae5c8.bptc.ctex"] [params] diff --git a/entities/player/assets/vanguard_1.png b/assets/entities/player/vanguard_1.png similarity index 100% rename from entities/player/assets/vanguard_1.png rename to assets/entities/player/vanguard_1.png diff --git a/entities/player/assets/vanguard_1.png.import b/assets/entities/player/vanguard_1.png.import similarity index 72% rename from entities/player/assets/vanguard_1.png.import rename to assets/entities/player/vanguard_1.png.import index 7aedb2f..66bfc4e 100644 --- a/entities/player/assets/vanguard_1.png.import +++ b/assets/entities/player/vanguard_1.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://bvgfmpb2l1juf" -path.bptc="res://.godot/imported/vanguard_1.png-39b5712c4c4119a42b3540a159f8b3f2.bptc.ctex" +path.bptc="res://.godot/imported/vanguard_1.png-a2214fa2775d8e8e0ebf9072e275c873.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -12,8 +12,8 @@ generator_parameters={} [deps] -source_file="res://entities/player/assets/vanguard_1.png" -dest_files=["res://.godot/imported/vanguard_1.png-39b5712c4c4119a42b3540a159f8b3f2.bptc.ctex"] +source_file="res://assets/entities/player/vanguard_1.png" +dest_files=["res://.godot/imported/vanguard_1.png-a2214fa2775d8e8e0ebf9072e275c873.bptc.ctex"] [params] diff --git a/entities/player/assets/vanguard_2.png b/assets/entities/player/vanguard_2.png similarity index 100% rename from entities/player/assets/vanguard_2.png rename to assets/entities/player/vanguard_2.png diff --git a/entities/player/assets/vanguard_2.png.import b/assets/entities/player/vanguard_2.png.import similarity index 72% rename from entities/player/assets/vanguard_2.png.import rename to assets/entities/player/vanguard_2.png.import index f04e9f9..3e120b9 100644 --- a/entities/player/assets/vanguard_2.png.import +++ b/assets/entities/player/vanguard_2.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://vtrbc3eja3df" -path.bptc="res://.godot/imported/vanguard_2.png-986e3665904b0d4758f584d5d3b7b726.bptc.ctex" +path.bptc="res://.godot/imported/vanguard_2.png-295a9fefd1a11ffd9b4d70a9ec13df77.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -12,8 +12,8 @@ generator_parameters={} [deps] -source_file="res://entities/player/assets/vanguard_2.png" -dest_files=["res://.godot/imported/vanguard_2.png-986e3665904b0d4758f584d5d3b7b726.bptc.ctex"] +source_file="res://assets/entities/player/vanguard_2.png" +dest_files=["res://.godot/imported/vanguard_2.png-295a9fefd1a11ffd9b4d70a9ec13df77.bptc.ctex"] [params] diff --git a/environments/skyboxes/kloppenheim_06_puresky_2k.exr b/assets/environments/skyboxes/kloppenheim_06_puresky_2k.exr similarity index 100% rename from environments/skyboxes/kloppenheim_06_puresky_2k.exr rename to assets/environments/skyboxes/kloppenheim_06_puresky_2k.exr diff --git a/environments/skyboxes/kloppenheim_06_puresky_2k.exr.import b/assets/environments/skyboxes/kloppenheim_06_puresky_2k.exr.import similarity index 73% rename from environments/skyboxes/kloppenheim_06_puresky_2k.exr.import rename to assets/environments/skyboxes/kloppenheim_06_puresky_2k.exr.import index 9c1dd8d..29f0f6e 100644 --- a/environments/skyboxes/kloppenheim_06_puresky_2k.exr.import +++ b/assets/environments/skyboxes/kloppenheim_06_puresky_2k.exr.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://btdbu0qbe1646" -path.bptc="res://.godot/imported/kloppenheim_06_puresky_2k.exr-ec828ffc9b05b2c03fb35e84cd230d2d.bptc.ctex" +path.bptc="res://.godot/imported/kloppenheim_06_puresky_2k.exr-6f5310d3f45c506f4d066dd4d2808455.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://environments/skyboxes/kloppenheim_06_puresky_2k.exr" -dest_files=["res://.godot/imported/kloppenheim_06_puresky_2k.exr-ec828ffc9b05b2c03fb35e84cd230d2d.bptc.ctex"] +source_file="res://assets/environments/skyboxes/kloppenheim_06_puresky_2k.exr" +dest_files=["res://.godot/imported/kloppenheim_06_puresky_2k.exr-6f5310d3f45c506f4d066dd4d2808455.bptc.ctex"] [params] diff --git a/maps/desert/assets/desert.r16 b/assets/maps/desert/desert.r16 similarity index 100% rename from maps/desert/assets/desert.r16 rename to assets/maps/desert/desert.r16 diff --git a/maps/desert/resources/env.tres b/assets/maps/desert/env.tres similarity index 100% rename from maps/desert/resources/env.tres rename to assets/maps/desert/env.tres diff --git a/maps/desert/resources/material.tres b/assets/maps/desert/material.tres similarity index 100% rename from maps/desert/resources/material.tres rename to assets/maps/desert/material.tres diff --git a/maps/desert/resources/storage.res b/assets/maps/desert/storage.res similarity index 100% rename from maps/desert/resources/storage.res rename to assets/maps/desert/storage.res diff --git a/maps/desert/resources/textures.tres b/assets/maps/desert/textures.tres similarity index 65% rename from maps/desert/resources/textures.tres rename to assets/maps/desert/textures.tres index b705417..e09f232 100644 --- a/maps/desert/resources/textures.tres +++ b/assets/maps/desert/textures.tres @@ -1,23 +1,23 @@ [gd_resource type="Terrain3DTextureList" load_steps=7 format=3 uid="uid://d1j24k8sq8qpj"] -[ext_resource type="Texture2D" uid="uid://dwk8islw7ebab" path="res://maps/desert/assets/textures/rock029_alb_ht.png" id="1_onshe"] -[ext_resource type="Texture2D" uid="uid://lgfhdcsb2ryx" path="res://maps/desert/assets/textures/rock029_nrm_rgh.png" id="2_ij8ws"] -[ext_resource type="Texture2D" uid="uid://cngjywcua4vv8" path="res://maps/desert/assets/textures/ground054_alb_ht.png" id="3_1p8kc"] -[ext_resource type="Texture2D" uid="uid://cbk7l6hs0yrcc" path="res://maps/desert/assets/textures/ground054_nrm_rgh.png" id="4_2trjt"] +[ext_resource type="Texture2D" uid="uid://dwk8islw7ebab" path="res://assets/maps/desert/textures/rock029_alb_ht.png" id="1_whfpx"] +[ext_resource type="Texture2D" uid="uid://lgfhdcsb2ryx" path="res://assets/maps/desert/textures/rock029_nrm_rgh.png" id="2_sjj76"] +[ext_resource type="Texture2D" uid="uid://cngjywcua4vv8" path="res://assets/maps/desert/textures/ground054_alb_ht.png" id="3_vgbyh"] +[ext_resource type="Texture2D" uid="uid://cbk7l6hs0yrcc" path="res://assets/maps/desert/textures/ground054_nrm_rgh.png" id="4_lsmk8"] [sub_resource type="Terrain3DTexture" id="Terrain3DTexture_wue72"] name = "Rock" albedo_color = Color(0.921569, 0.890196, 0.933333, 1) -albedo_texture = ExtResource("1_onshe") -normal_texture = ExtResource("2_ij8ws") +albedo_texture = ExtResource("1_whfpx") +normal_texture = ExtResource("2_sjj76") uv_scale = 0.05 [sub_resource type="Terrain3DTexture" id="Terrain3DTexture_dkh73"] name = "Sand" texture_id = 1 albedo_color = Color(0.792157, 0.72549, 0.694118, 1) -albedo_texture = ExtResource("3_1p8kc") -normal_texture = ExtResource("4_2trjt") +albedo_texture = ExtResource("3_vgbyh") +normal_texture = ExtResource("4_lsmk8") uv_scale = 0.15 [resource] diff --git a/maps/desert/assets/textures/ground054_alb_ht.png b/assets/maps/desert/textures/ground054_alb_ht.png similarity index 100% rename from maps/desert/assets/textures/ground054_alb_ht.png rename to assets/maps/desert/textures/ground054_alb_ht.png diff --git a/maps/desert/assets/textures/ground054_alb_ht.png.import b/assets/maps/desert/textures/ground054_alb_ht.png.import similarity index 69% rename from maps/desert/assets/textures/ground054_alb_ht.png.import rename to assets/maps/desert/textures/ground054_alb_ht.png.import index ed56397..66fa164 100644 --- a/maps/desert/assets/textures/ground054_alb_ht.png.import +++ b/assets/maps/desert/textures/ground054_alb_ht.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cngjywcua4vv8" -path.bptc="res://.godot/imported/ground054_alb_ht.png-460d3ac5c09d7955ca61b8b57742b1a9.bptc.ctex" +path.bptc="res://.godot/imported/ground054_alb_ht.png-eb0240ba5957ecef3ec6c98e09149e9c.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/desert/assets/textures/ground054_alb_ht.png" -dest_files=["res://.godot/imported/ground054_alb_ht.png-460d3ac5c09d7955ca61b8b57742b1a9.bptc.ctex"] +source_file="res://assets/maps/desert/textures/ground054_alb_ht.png" +dest_files=["res://.godot/imported/ground054_alb_ht.png-eb0240ba5957ecef3ec6c98e09149e9c.bptc.ctex"] [params] diff --git a/maps/desert/assets/textures/ground054_nrm_rgh.png b/assets/maps/desert/textures/ground054_nrm_rgh.png similarity index 100% rename from maps/desert/assets/textures/ground054_nrm_rgh.png rename to assets/maps/desert/textures/ground054_nrm_rgh.png diff --git a/maps/desert/assets/textures/ground054_nrm_rgh.png.import b/assets/maps/desert/textures/ground054_nrm_rgh.png.import similarity index 69% rename from maps/desert/assets/textures/ground054_nrm_rgh.png.import rename to assets/maps/desert/textures/ground054_nrm_rgh.png.import index 2fb2555..87fc7d2 100644 --- a/maps/desert/assets/textures/ground054_nrm_rgh.png.import +++ b/assets/maps/desert/textures/ground054_nrm_rgh.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cbk7l6hs0yrcc" -path.bptc="res://.godot/imported/ground054_nrm_rgh.png-9ea209f1a7f6e48624db85005a037890.bptc.ctex" +path.bptc="res://.godot/imported/ground054_nrm_rgh.png-96c8ee6e00b41f3dc617890125eeb4ac.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/desert/assets/textures/ground054_nrm_rgh.png" -dest_files=["res://.godot/imported/ground054_nrm_rgh.png-9ea209f1a7f6e48624db85005a037890.bptc.ctex"] +source_file="res://assets/maps/desert/textures/ground054_nrm_rgh.png" +dest_files=["res://.godot/imported/ground054_nrm_rgh.png-96c8ee6e00b41f3dc617890125eeb4ac.bptc.ctex"] [params] diff --git a/maps/desert/assets/textures/rock029_alb_ht.png b/assets/maps/desert/textures/rock029_alb_ht.png similarity index 100% rename from maps/desert/assets/textures/rock029_alb_ht.png rename to assets/maps/desert/textures/rock029_alb_ht.png diff --git a/maps/desert/assets/textures/rock029_alb_ht.png.import b/assets/maps/desert/textures/rock029_alb_ht.png.import similarity index 69% rename from maps/desert/assets/textures/rock029_alb_ht.png.import rename to assets/maps/desert/textures/rock029_alb_ht.png.import index 0153cc5..d055e7d 100644 --- a/maps/desert/assets/textures/rock029_alb_ht.png.import +++ b/assets/maps/desert/textures/rock029_alb_ht.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://dwk8islw7ebab" -path.bptc="res://.godot/imported/rock029_alb_ht.png-dd746789bc129bafaa8d1cc908de0e3e.bptc.ctex" +path.bptc="res://.godot/imported/rock029_alb_ht.png-0662ce08bbe1f5ed2336f058ddf57c67.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/desert/assets/textures/rock029_alb_ht.png" -dest_files=["res://.godot/imported/rock029_alb_ht.png-dd746789bc129bafaa8d1cc908de0e3e.bptc.ctex"] +source_file="res://assets/maps/desert/textures/rock029_alb_ht.png" +dest_files=["res://.godot/imported/rock029_alb_ht.png-0662ce08bbe1f5ed2336f058ddf57c67.bptc.ctex"] [params] diff --git a/maps/desert/assets/textures/rock029_nrm_rgh.png b/assets/maps/desert/textures/rock029_nrm_rgh.png similarity index 100% rename from maps/desert/assets/textures/rock029_nrm_rgh.png rename to assets/maps/desert/textures/rock029_nrm_rgh.png diff --git a/maps/desert/assets/textures/rock029_nrm_rgh.png.import b/assets/maps/desert/textures/rock029_nrm_rgh.png.import similarity index 69% rename from maps/desert/assets/textures/rock029_nrm_rgh.png.import rename to assets/maps/desert/textures/rock029_nrm_rgh.png.import index 0b1aa12..efa29fa 100644 --- a/maps/desert/assets/textures/rock029_nrm_rgh.png.import +++ b/assets/maps/desert/textures/rock029_nrm_rgh.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://lgfhdcsb2ryx" -path.bptc="res://.godot/imported/rock029_nrm_rgh.png-3bf029664d0f58a1c79abd2d6666ba90.bptc.ctex" +path.bptc="res://.godot/imported/rock029_nrm_rgh.png-070c2fb9e485e3ad090b9041437fb3c1.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/desert/assets/textures/rock029_nrm_rgh.png" -dest_files=["res://.godot/imported/rock029_nrm_rgh.png-3bf029664d0f58a1c79abd2d6666ba90.bptc.ctex"] +source_file="res://assets/maps/desert/textures/rock029_nrm_rgh.png" +dest_files=["res://.godot/imported/rock029_nrm_rgh.png-070c2fb9e485e3ad090b9041437fb3c1.bptc.ctex"] [params] diff --git a/maps/genesis/resources/env.tres b/assets/maps/genesis/env.tres similarity index 90% rename from maps/genesis/resources/env.tres rename to assets/maps/genesis/env.tres index 6653e43..7c1f00c 100644 --- a/maps/genesis/resources/env.tres +++ b/assets/maps/genesis/env.tres @@ -1,9 +1,9 @@ [gd_resource type="Environment" load_steps=4 format=3 uid="uid://d2ahijqqspw5f"] -[ext_resource type="Texture2D" uid="uid://btdbu0qbe1646" path="res://environments/skyboxes/kloppenheim_06_puresky_2k.exr" id="1_k44rf"] +[ext_resource type="Texture2D" uid="uid://btdbu0qbe1646" path="res://assets/environments/skyboxes/kloppenheim_06_puresky_2k.exr" id="1_cc15g"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_7tawh"] -panorama = ExtResource("1_k44rf") +panorama = ExtResource("1_cc15g") [sub_resource type="Sky" id="Sky_iloxd"] sky_material = SubResource("PanoramaSkyMaterial_7tawh") diff --git a/maps/genesis/resources/material.res b/assets/maps/genesis/material.res similarity index 100% rename from maps/genesis/resources/material.res rename to assets/maps/genesis/material.res diff --git a/maps/genesis/resources/storage.res b/assets/maps/genesis/storage.res similarity index 100% rename from maps/genesis/resources/storage.res rename to assets/maps/genesis/storage.res diff --git a/maps/genesis/resources/textures.res b/assets/maps/genesis/textures.res similarity index 100% rename from maps/genesis/resources/textures.res rename to assets/maps/genesis/textures.res diff --git a/maps/genesis/assets/textures/ground037_alb_ht.png b/assets/maps/genesis/textures/ground037_alb_ht.png similarity index 100% rename from maps/genesis/assets/textures/ground037_alb_ht.png rename to assets/maps/genesis/textures/ground037_alb_ht.png diff --git a/maps/genesis/assets/textures/ground037_alb_ht.png.import b/assets/maps/genesis/textures/ground037_alb_ht.png.import similarity index 69% rename from maps/genesis/assets/textures/ground037_alb_ht.png.import rename to assets/maps/genesis/textures/ground037_alb_ht.png.import index 7b0670d..3714eba 100644 --- a/maps/genesis/assets/textures/ground037_alb_ht.png.import +++ b/assets/maps/genesis/textures/ground037_alb_ht.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://ddprscrpsofah" -path.bptc="res://.godot/imported/ground037_alb_ht.png-b65037b7797c79d182d5e53b32e49a98.bptc.ctex" +path.bptc="res://.godot/imported/ground037_alb_ht.png-8cdb3e9a9ec92d089a96ce9f331c2659.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/genesis/assets/textures/ground037_alb_ht.png" -dest_files=["res://.godot/imported/ground037_alb_ht.png-b65037b7797c79d182d5e53b32e49a98.bptc.ctex"] +source_file="res://assets/maps/genesis/textures/ground037_alb_ht.png" +dest_files=["res://.godot/imported/ground037_alb_ht.png-8cdb3e9a9ec92d089a96ce9f331c2659.bptc.ctex"] [params] diff --git a/maps/genesis/assets/textures/ground037_nrm_rgh.png b/assets/maps/genesis/textures/ground037_nrm_rgh.png similarity index 100% rename from maps/genesis/assets/textures/ground037_nrm_rgh.png rename to assets/maps/genesis/textures/ground037_nrm_rgh.png diff --git a/maps/genesis/assets/textures/ground037_nrm_rgh.png.import b/assets/maps/genesis/textures/ground037_nrm_rgh.png.import similarity index 69% rename from maps/genesis/assets/textures/ground037_nrm_rgh.png.import rename to assets/maps/genesis/textures/ground037_nrm_rgh.png.import index 466ff1a..a5d382b 100644 --- a/maps/genesis/assets/textures/ground037_nrm_rgh.png.import +++ b/assets/maps/genesis/textures/ground037_nrm_rgh.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://c1ots7w6i0i1q" -path.bptc="res://.godot/imported/ground037_nrm_rgh.png-9e25ec612e0ce15ff2c117ec4096a8f7.bptc.ctex" +path.bptc="res://.godot/imported/ground037_nrm_rgh.png-cef7dc2c59f94189f70ed1ff74982ae0.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/genesis/assets/textures/ground037_nrm_rgh.png" -dest_files=["res://.godot/imported/ground037_nrm_rgh.png-9e25ec612e0ce15ff2c117ec4096a8f7.bptc.ctex"] +source_file="res://assets/maps/genesis/textures/ground037_nrm_rgh.png" +dest_files=["res://.godot/imported/ground037_nrm_rgh.png-cef7dc2c59f94189f70ed1ff74982ae0.bptc.ctex"] [params] diff --git a/maps/genesis/assets/textures/rock030_alb_ht.png b/assets/maps/genesis/textures/rock030_alb_ht.png similarity index 100% rename from maps/genesis/assets/textures/rock030_alb_ht.png rename to assets/maps/genesis/textures/rock030_alb_ht.png diff --git a/maps/genesis/assets/textures/rock030_alb_ht.png.import b/assets/maps/genesis/textures/rock030_alb_ht.png.import similarity index 69% rename from maps/genesis/assets/textures/rock030_alb_ht.png.import rename to assets/maps/genesis/textures/rock030_alb_ht.png.import index f681803..4b807ff 100644 --- a/maps/genesis/assets/textures/rock030_alb_ht.png.import +++ b/assets/maps/genesis/textures/rock030_alb_ht.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://br7bfxcxh60df" -path.bptc="res://.godot/imported/rock030_alb_ht.png-264f70712792662fedd23fe3bac9e221.bptc.ctex" +path.bptc="res://.godot/imported/rock030_alb_ht.png-fe00c64acbe940603592a437507f1f60.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/genesis/assets/textures/rock030_alb_ht.png" -dest_files=["res://.godot/imported/rock030_alb_ht.png-264f70712792662fedd23fe3bac9e221.bptc.ctex"] +source_file="res://assets/maps/genesis/textures/rock030_alb_ht.png" +dest_files=["res://.godot/imported/rock030_alb_ht.png-fe00c64acbe940603592a437507f1f60.bptc.ctex"] [params] diff --git a/maps/genesis/assets/textures/rock030_nrm_rgh.png b/assets/maps/genesis/textures/rock030_nrm_rgh.png similarity index 100% rename from maps/genesis/assets/textures/rock030_nrm_rgh.png rename to assets/maps/genesis/textures/rock030_nrm_rgh.png diff --git a/maps/genesis/assets/textures/rock030_nrm_rgh.png.import b/assets/maps/genesis/textures/rock030_nrm_rgh.png.import similarity index 69% rename from maps/genesis/assets/textures/rock030_nrm_rgh.png.import rename to assets/maps/genesis/textures/rock030_nrm_rgh.png.import index 814d712..182bb2a 100644 --- a/maps/genesis/assets/textures/rock030_nrm_rgh.png.import +++ b/assets/maps/genesis/textures/rock030_nrm_rgh.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cr72kjil43vgj" -path.bptc="res://.godot/imported/rock030_nrm_rgh.png-ca17d43269b25394f8e7aa1fa0631681.bptc.ctex" +path.bptc="res://.godot/imported/rock030_nrm_rgh.png-98c7396c6191774c05c5db2f7e9c27dd.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/genesis/assets/textures/rock030_nrm_rgh.png" -dest_files=["res://.godot/imported/rock030_nrm_rgh.png-ca17d43269b25394f8e7aa1fa0631681.bptc.ctex"] +source_file="res://assets/maps/genesis/textures/rock030_nrm_rgh.png" +dest_files=["res://.godot/imported/rock030_nrm_rgh.png-98c7396c6191774c05c5db2f7e9c27dd.bptc.ctex"] [params] diff --git a/maps/genesis/assets/vortex.r16 b/assets/maps/genesis/vortex.r16 similarity index 100% rename from maps/genesis/assets/vortex.r16 rename to assets/maps/genesis/vortex.r16 diff --git a/entities/weapons/chaingun/assets/chaingun.blend b/assets/weapons/chaingun/chaingun.blend similarity index 100% rename from entities/weapons/chaingun/assets/chaingun.blend rename to assets/weapons/chaingun/chaingun.blend diff --git a/entities/weapons/chaingun/assets/chaingun.glb b/assets/weapons/chaingun/chaingun.glb similarity index 100% rename from entities/weapons/chaingun/assets/chaingun.glb rename to assets/weapons/chaingun/chaingun.glb diff --git a/entities/weapons/chaingun/assets/chaingun.glb.import b/assets/weapons/chaingun/chaingun.glb.import similarity index 72% rename from entities/weapons/chaingun/assets/chaingun.glb.import rename to assets/weapons/chaingun/chaingun.glb.import index d4c96e3..b9f028e 100644 --- a/entities/weapons/chaingun/assets/chaingun.glb.import +++ b/assets/weapons/chaingun/chaingun.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://cumv8wij5uufk" -path="res://.godot/imported/chaingun.glb-16cef2303c058492773f5f33b566245e.scn" +path="res://.godot/imported/chaingun.glb-e5f2ca9f0da213c6c65f8f888aabc944.scn" [deps] -source_file="res://entities/weapons/chaingun/assets/chaingun.glb" -dest_files=["res://.godot/imported/chaingun.glb-16cef2303c058492773f5f33b566245e.scn"] +source_file="res://assets/weapons/chaingun/chaingun.glb" +dest_files=["res://.godot/imported/chaingun.glb-e5f2ca9f0da213c6c65f8f888aabc944.scn"] [params] diff --git a/entities/weapons/chaingun/assets/tracer.blend b/assets/weapons/chaingun/tracer.blend similarity index 100% rename from entities/weapons/chaingun/assets/tracer.blend rename to assets/weapons/chaingun/tracer.blend diff --git a/entities/weapons/grenade_launcher/assets/grenade_launcher.glb b/assets/weapons/grenade_launcher/grenade_launcher.glb similarity index 100% rename from entities/weapons/grenade_launcher/assets/grenade_launcher.glb rename to assets/weapons/grenade_launcher/grenade_launcher.glb diff --git a/entities/weapons/grenade_launcher/assets/grenade_launcher.glb.import b/assets/weapons/grenade_launcher/grenade_launcher.glb.import similarity index 69% rename from entities/weapons/grenade_launcher/assets/grenade_launcher.glb.import rename to assets/weapons/grenade_launcher/grenade_launcher.glb.import index 955018e..2b75267 100644 --- a/entities/weapons/grenade_launcher/assets/grenade_launcher.glb.import +++ b/assets/weapons/grenade_launcher/grenade_launcher.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://bbp260t2qivxk" -path="res://.godot/imported/grenade_launcher.glb-de2ec3425486969fecbf31d608a94604.scn" +path="res://.godot/imported/grenade_launcher.glb-6d6fe15497c22230a350b8a40da603de.scn" [deps] -source_file="res://entities/weapons/grenade_launcher/assets/grenade_launcher.glb" -dest_files=["res://.godot/imported/grenade_launcher.glb-de2ec3425486969fecbf31d608a94604.scn"] +source_file="res://assets/weapons/grenade_launcher/grenade_launcher.glb" +dest_files=["res://.godot/imported/grenade_launcher.glb-6d6fe15497c22230a350b8a40da603de.scn"] [params] diff --git a/entities/weapons/grenade_launcher/assets/grenadelauncher.blend b/assets/weapons/grenade_launcher/grenadelauncher.blend similarity index 100% rename from entities/weapons/grenade_launcher/assets/grenadelauncher.blend rename to assets/weapons/grenade_launcher/grenadelauncher.blend diff --git a/entities/weapons/space_gun/assets/disclauncher.glb b/assets/weapons/spacegun/disclauncher.glb similarity index 100% rename from entities/weapons/space_gun/assets/disclauncher.glb rename to assets/weapons/spacegun/disclauncher.glb diff --git a/entities/weapons/space_gun/assets/disclauncher.glb.import b/assets/weapons/spacegun/disclauncher.glb.import similarity index 70% rename from entities/weapons/space_gun/assets/disclauncher.glb.import rename to assets/weapons/spacegun/disclauncher.glb.import index a79a2e5..2c75ddc 100644 --- a/entities/weapons/space_gun/assets/disclauncher.glb.import +++ b/assets/weapons/spacegun/disclauncher.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://bjcn37ops3bro" -path="res://.godot/imported/disclauncher.glb-e58edebbe444fad4554f8c76e8b18f06.scn" +path="res://.godot/imported/disclauncher.glb-7911bf158d0ed044284c7e25a4671fdf.scn" [deps] -source_file="res://entities/weapons/space_gun/assets/disclauncher.glb" -dest_files=["res://.godot/imported/disclauncher.glb-e58edebbe444fad4554f8c76e8b18f06.scn"] +source_file="res://assets/weapons/spacegun/disclauncher.glb" +dest_files=["res://.godot/imported/disclauncher.glb-7911bf158d0ed044284c7e25a4671fdf.scn"] [params] diff --git a/entities/weapons/space_gun/assets/models/.gdignore b/assets/weapons/spacegun/models/.gdignore similarity index 100% rename from entities/weapons/space_gun/assets/models/.gdignore rename to assets/weapons/spacegun/models/.gdignore diff --git a/entities/weapons/space_gun/assets/models/disclauncher.blend b/assets/weapons/spacegun/models/disclauncher.blend similarity index 100% rename from entities/weapons/space_gun/assets/models/disclauncher.blend rename to assets/weapons/spacegun/models/disclauncher.blend diff --git a/maps/genesis/resources/textures.res.depren b/maps/genesis/resources/textures.res.depren deleted file mode 100644 index 880b31742e1c9bcf2529541582534585d932c5a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmV;^0WAJfQ$s@n000005C8z&0{{TK0RR9fwJ-f(+yada0ESXTJ3!?o9e43!%P?%^ zhd8OrmjWb&4^r$6kzGQvH?<}vL(;y3OE)0hcS%{@hOy|_%Ve1bli7U8h^>(nF#s+A zHvl!`6DR*8Jlo>sPEvz=Ae)mF$^^@QO@NnQyJ>KL_k&HNi*B-;P5(Ln1^#FL2mApA z_Ig`S`+s0_raWz|vvQGVf7NpTZ#b>nmACf6nUm8-kMBPLC%djR;a#~pV;~LyE81Nt zE-0;I*EH0zqJj|;Gm>$QdYy}kCr(D}@?`X@twCrnTPva6EK}B?^<)R3NaCYU7NipC zzXL~;v3^T)1(I9t&TQMMcnTs@ebzlJ0#ii@MgJd4Efm?s0w{!iN;W9MJW^vm6W8+bZ`QhDjN?HAd^{^q?D9`G!s>r{4BOMnMe*?PeU6=ZM5LkFT{cH zn}(J_aYHx6aScz147rkNA|#9dvGACW`iv8n068;lSxNV_4w?lZ&_s9qX-DIv!0FYk z1Bxl;gt^>$BR6BUP`M<1m0T9~J;0QIWJM@4;#=R&|4`_gW}%cLasrKn(j?&mKfS6@ JQw&m5LqiM1&zk@M diff --git a/project.godot b/project.godot index 2aecb3b..0eab191 100644 --- a/project.godot +++ b/project.godot @@ -11,14 +11,14 @@ config_version=5 [application] config/name="open-fpsz" -run/main_scene="res://main.tscn" +run/main_scene="res://src/main.tscn" config/features=PackedStringArray("4.2", "Forward Plus") config/icon="res://icon.svg" [autoload] -Settings="*res://systems/settings.gd" -MapsManager="*res://systems/maps_manager.gd" +Settings="*res://src/systems/settings.gd" +MapsManager="*res://src/systems/maps_manager.gd" [debug] diff --git a/entities/buildings/flag_stand.tscn b/src/entities/buildings/flag_stand.tscn similarity index 100% rename from entities/buildings/flag_stand.tscn rename to src/entities/buildings/flag_stand.tscn diff --git a/entities/components/explosive_damage_component.gd b/src/entities/components/explosive_damage_component.gd similarity index 100% rename from entities/components/explosive_damage_component.gd rename to src/entities/components/explosive_damage_component.gd diff --git a/entities/components/flag_carry_component.gd b/src/entities/components/flag_carry_component.gd similarity index 100% rename from entities/components/flag_carry_component.gd rename to src/entities/components/flag_carry_component.gd diff --git a/entities/components/health_component.gd b/src/entities/components/health_component.gd similarity index 100% rename from entities/components/health_component.gd rename to src/entities/components/health_component.gd diff --git a/entities/components/inventory.gd b/src/entities/components/inventory.gd similarity index 100% rename from entities/components/inventory.gd rename to src/entities/components/inventory.gd diff --git a/entities/components/match_participant_component.gd b/src/entities/components/match_participant_component.gd similarity index 100% rename from entities/components/match_participant_component.gd rename to src/entities/components/match_participant_component.gd diff --git a/entities/dummy_target/dummy_target.gd b/src/entities/dummy_target/dummy_target.gd similarity index 100% rename from entities/dummy_target/dummy_target.gd rename to src/entities/dummy_target/dummy_target.gd diff --git a/entities/dummy_target/dummy_target.tscn b/src/entities/dummy_target/dummy_target.tscn similarity index 93% rename from entities/dummy_target/dummy_target.tscn rename to src/entities/dummy_target/dummy_target.tscn index 62806d3..44beb5f 100644 --- a/entities/dummy_target/dummy_target.tscn +++ b/src/entities/dummy_target/dummy_target.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://dpnu1lvfncx6q"] -[ext_resource type="Script" path="res://entities/dummy_target/dummy_target.gd" id="1_iup5v"] -[ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://entities/player/collision_shape.tres" id="2_i5k5j"] -[ext_resource type="PackedScene" uid="uid://chuein4frnvwt" path="res://entities/dummy_target/assets/player_mesh.glb" id="4_fuync"] +[ext_resource type="Script" path="res://src/entities/dummy_target/dummy_target.gd" id="1_iup5v"] +[ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://src/entities/player/collision_shape.tres" id="2_i5k5j"] +[ext_resource type="PackedScene" uid="uid://chuein4frnvwt" path="res://assets/entities/dummy_target/dummy_target.glb" id="4_fuync"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_b0142"] friction = 0.5 diff --git a/entities/flag/flag.gd b/src/entities/flag/flag.gd similarity index 100% rename from entities/flag/flag.gd rename to src/entities/flag/flag.gd diff --git a/entities/flag/flag.tscn b/src/entities/flag/flag.tscn similarity index 91% rename from entities/flag/flag.tscn rename to src/entities/flag/flag.tscn index c1a5337..fd1a756 100644 --- a/entities/flag/flag.tscn +++ b/src/entities/flag/flag.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=8 format=3 uid="uid://c88l3h0ph00c7"] -[ext_resource type="Script" path="res://entities/flag/flag.gd" id="1_y7d3d"] +[ext_resource type="Script" path="res://src/entities/flag/flag.gd" id="1_y7d3d"] [ext_resource type="Script" path="res://addons/smoothing/smoothing.gd" id="2_es4ce"] -[ext_resource type="PackedScene" uid="uid://d3l7fvbdg6m5g" path="res://entities/flag/assets/flag.glb" id="2_i78em"] -[ext_resource type="PackedScene" uid="uid://bcgkc5fhhyauv" path="res://entities/flag/waypoint.tscn" id="3_tu6jg"] +[ext_resource type="PackedScene" uid="uid://d3l7fvbdg6m5g" path="res://assets/entities/flag/flag.glb" id="2_i78em"] +[ext_resource type="PackedScene" uid="uid://bcgkc5fhhyauv" path="res://src/entities/flag/waypoint.tscn" id="3_tu6jg"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_4ymrw"] friction = 0.5 diff --git a/entities/flag/waypoint.gd b/src/entities/flag/waypoint.gd similarity index 100% rename from entities/flag/waypoint.gd rename to src/entities/flag/waypoint.gd diff --git a/entities/flag/waypoint.tscn b/src/entities/flag/waypoint.tscn similarity index 89% rename from entities/flag/waypoint.tscn rename to src/entities/flag/waypoint.tscn index a3f5cc5..743c17c 100644 --- a/entities/flag/waypoint.tscn +++ b/src/entities/flag/waypoint.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bcgkc5fhhyauv"] -[ext_resource type="Script" path="res://entities/flag/waypoint.gd" id="1_gmnl6"] +[ext_resource type="Script" path="res://src/entities/flag/waypoint.gd" id="1_gmnl6"] [node name="IFF" type="Control"] layout_mode = 3 diff --git a/entities/player/collision_shape.tres b/src/entities/player/collision_shape.tres similarity index 100% rename from entities/player/collision_shape.tres rename to src/entities/player/collision_shape.tres diff --git a/entities/player/player.gd b/src/entities/player/player.gd similarity index 100% rename from entities/player/player.gd rename to src/entities/player/player.gd diff --git a/entities/player/player.tscn b/src/entities/player/player.tscn similarity index 90% rename from entities/player/player.tscn rename to src/entities/player/player.tscn index ba7efd0..1c5e4c5 100644 --- a/entities/player/player.tscn +++ b/src/entities/player/player.tscn @@ -1,23 +1,23 @@ [gd_scene load_steps=44 format=3 uid="uid://cbhx1xme0sb7k"] -[ext_resource type="Script" path="res://entities/player/player.gd" id="1_mk68k"] -[ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://entities/player/collision_shape.tres" id="2_vjqny"] -[ext_resource type="PackedScene" uid="uid://bcv81ku26xo" path="res://interfaces/hud/hud.tscn" id="3_ccety"] -[ext_resource type="Script" path="res://entities/components/match_participant_component.gd" id="6_lrose"] -[ext_resource type="Script" path="res://entities/player/player_input.gd" id="6_ymcrr"] -[ext_resource type="PackedScene" uid="uid://dsysi2rd3bu76" path="res://interfaces/hud/iffs/iff.tscn" id="7_8hc80"] -[ext_resource type="Script" path="res://entities/components/inventory.gd" id="8_768qh"] -[ext_resource type="PackedScene" uid="uid://drbefw6akui2v" path="res://entities/player/vanguard.tscn" id="8_eiy7q"] -[ext_resource type="Script" path="res://entities/components/flag_carry_component.gd" id="8_pdfbn"] -[ext_resource type="Texture2D" uid="uid://ct1v5iadtpadm" path="res://entities/player/assets/jetpackfx/smoke_01.png" id="9_4pant"] -[ext_resource type="PackedScene" uid="uid://c8co0qa2omjmh" path="res://entities/weapons/space_gun/space_gun.tscn" id="9_achlo"] -[ext_resource type="Texture2D" uid="uid://doxo4vfn0bjlp" path="res://entities/player/assets/jetpackfx/smoke_02.png" id="10_5b1bx"] -[ext_resource type="Texture2D" uid="uid://dmf12llra7aq5" path="res://entities/player/assets/jetpackfx/Particle01.png" id="11_6ndfi"] +[ext_resource type="Script" path="res://src/entities/player/player.gd" id="1_mk68k"] +[ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://src/entities/player/collision_shape.tres" id="2_vjqny"] +[ext_resource type="PackedScene" uid="uid://bcv81ku26xo" path="res://src/interfaces/hud/hud.tscn" id="3_ccety"] +[ext_resource type="Script" path="res://src/entities/components/match_participant_component.gd" id="6_lrose"] +[ext_resource type="Script" path="res://src/entities/player/player_input.gd" id="6_ymcrr"] +[ext_resource type="PackedScene" uid="uid://dsysi2rd3bu76" path="res://src/interfaces/hud/iffs/iff.tscn" id="7_8hc80"] +[ext_resource type="Script" path="res://src/entities/components/inventory.gd" id="8_768qh"] +[ext_resource type="PackedScene" uid="uid://drbefw6akui2v" path="res://src/entities/player/vanguard.tscn" id="8_eiy7q"] +[ext_resource type="Script" path="res://src/entities/components/flag_carry_component.gd" id="8_pdfbn"] +[ext_resource type="Texture2D" uid="uid://ct1v5iadtpadm" path="res://assets/entities/player/jetpackfx/smoke_01.png" id="9_4pant"] +[ext_resource type="PackedScene" uid="uid://c8co0qa2omjmh" path="res://src/entities/weapons/spacegun/space_gun.tscn" id="9_achlo"] +[ext_resource type="Texture2D" uid="uid://doxo4vfn0bjlp" path="res://assets/entities/player/jetpackfx/smoke_02.png" id="10_5b1bx"] +[ext_resource type="Texture2D" uid="uid://dmf12llra7aq5" path="res://assets/entities/player/jetpackfx/Particle01.png" id="11_6ndfi"] [ext_resource type="Script" path="res://addons/smoothing/smoothing.gd" id="11_k330l"] -[ext_resource type="Script" path="res://entities/components/health_component.gd" id="14_ctgxn"] -[ext_resource type="PackedScene" uid="uid://b0xql5hi0b52y" path="res://entities/weapons/chaingun/chaingun.tscn" id="15_io0a3"] -[ext_resource type="PackedScene" uid="uid://cstl7yxc75572" path="res://entities/weapons/grenade_launcher/grenade_launcher.tscn" id="16_4xs2j"] -[ext_resource type="PackedScene" uid="uid://d3l7fvbdg6m5g" path="res://entities/flag/assets/flag.glb" id="18_7nkei"] +[ext_resource type="Script" path="res://src/entities/components/health_component.gd" id="14_ctgxn"] +[ext_resource type="PackedScene" uid="uid://b0xql5hi0b52y" path="res://src/entities/weapons/chaingun/chaingun.tscn" id="15_io0a3"] +[ext_resource type="PackedScene" uid="uid://cstl7yxc75572" path="res://src/entities/weapons/grenade_launcher/grenade_launcher.tscn" id="16_4xs2j"] +[ext_resource type="PackedScene" uid="uid://d3l7fvbdg6m5g" path="res://assets/entities/flag/flag.glb" id="18_7nkei"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_clur0"] resource_local_to_scene = true diff --git a/entities/player/player_input.gd b/src/entities/player/player_input.gd similarity index 100% rename from entities/player/player_input.gd rename to src/entities/player/player_input.gd diff --git a/entities/player/vanguard.gd b/src/entities/player/vanguard.gd similarity index 100% rename from entities/player/vanguard.gd rename to src/entities/player/vanguard.gd diff --git a/entities/player/vanguard.tscn b/src/entities/player/vanguard.tscn similarity index 99% rename from entities/player/vanguard.tscn rename to src/entities/player/vanguard.tscn index c3f4000..10caaed 100644 --- a/entities/player/vanguard.tscn +++ b/src/entities/player/vanguard.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=28 format=3 uid="uid://drbefw6akui2v"] -[ext_resource type="PackedScene" uid="uid://4naw661fqmjg" path="res://entities/player/assets/vanguard.glb" id="1_d2ik6"] -[ext_resource type="Script" path="res://entities/player/vanguard.gd" id="2_c22xr"] -[ext_resource type="PackedScene" uid="uid://bjcn37ops3bro" path="res://entities/weapons/space_gun/assets/disclauncher.glb" id="3_s13xh"] +[ext_resource type="PackedScene" uid="uid://4naw661fqmjg" path="res://assets/entities/player/vanguard.glb" id="1_d2ik6"] +[ext_resource type="Script" path="res://src/entities/player/vanguard.gd" id="2_c22xr"] +[ext_resource type="PackedScene" uid="uid://bjcn37ops3bro" path="res://assets/weapons/spacegun/disclauncher.glb" id="3_s13xh"] [sub_resource type="Animation" id="Animation_bdd76"] resource_name = "t_pose" diff --git a/entities/weapons/chaingun/chaingun.gd b/src/entities/weapons/chaingun/chaingun.gd similarity index 100% rename from entities/weapons/chaingun/chaingun.gd rename to src/entities/weapons/chaingun/chaingun.gd diff --git a/entities/weapons/chaingun/chaingun.tscn b/src/entities/weapons/chaingun/chaingun.tscn similarity index 88% rename from entities/weapons/chaingun/chaingun.tscn rename to src/entities/weapons/chaingun/chaingun.tscn index 632a3f6..1fb7343 100644 --- a/entities/weapons/chaingun/chaingun.tscn +++ b/src/entities/weapons/chaingun/chaingun.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://b0xql5hi0b52y"] -[ext_resource type="PackedScene" uid="uid://cumv8wij5uufk" path="res://entities/weapons/chaingun/assets/chaingun.glb" id="1_d8tdv"] -[ext_resource type="Script" path="res://entities/weapons/chaingun/chaingun.gd" id="2_qsqeh"] +[ext_resource type="PackedScene" uid="uid://cumv8wij5uufk" path="res://assets/weapons/chaingun/chaingun.glb" id="1_d8tdv"] +[ext_resource type="Script" path="res://src/entities/weapons/chaingun/chaingun.gd" id="2_qsqeh"] [node name="ChainGun" node_paths=PackedStringArray("anim_player") instance=ExtResource("1_d8tdv")] script = ExtResource("2_qsqeh") diff --git a/entities/weapons/grenade_launcher/grenade_launcher.gd b/src/entities/weapons/grenade_launcher/grenade_launcher.gd similarity index 100% rename from entities/weapons/grenade_launcher/grenade_launcher.gd rename to src/entities/weapons/grenade_launcher/grenade_launcher.gd diff --git a/entities/weapons/grenade_launcher/grenade_launcher.tscn b/src/entities/weapons/grenade_launcher/grenade_launcher.tscn similarity index 78% rename from entities/weapons/grenade_launcher/grenade_launcher.tscn rename to src/entities/weapons/grenade_launcher/grenade_launcher.tscn index e5703f8..d3e5689 100644 --- a/entities/weapons/grenade_launcher/grenade_launcher.tscn +++ b/src/entities/weapons/grenade_launcher/grenade_launcher.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://cstl7yxc75572"] -[ext_resource type="PackedScene" uid="uid://bbp260t2qivxk" path="res://entities/weapons/grenade_launcher/assets/grenade_launcher.glb" id="1_keuur"] -[ext_resource type="Script" path="res://entities/weapons/grenade_launcher/grenade_launcher.gd" id="2_38xn3"] -[ext_resource type="PackedScene" uid="uid://dak767xehqa6x" path="res://entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn" id="3_rg5nk"] +[ext_resource type="PackedScene" uid="uid://bbp260t2qivxk" path="res://assets/weapons/grenade_launcher/grenade_launcher.glb" id="1_keuur"] +[ext_resource type="Script" path="res://src/entities/weapons/grenade_launcher/grenade_launcher.gd" id="2_38xn3"] +[ext_resource type="PackedScene" uid="uid://dak767xehqa6x" path="res://src/entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn" id="3_rg5nk"] [node name="GrenadeLauncher" node_paths=PackedStringArray("nozzle", "anim_player") instance=ExtResource("1_keuur")] script = ExtResource("2_38xn3") diff --git a/entities/weapons/grenade_launcher/grenade_launcher_projectile.gd b/src/entities/weapons/grenade_launcher/grenade_launcher_projectile.gd similarity index 100% rename from entities/weapons/grenade_launcher/grenade_launcher_projectile.gd rename to src/entities/weapons/grenade_launcher/grenade_launcher_projectile.gd diff --git a/entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn b/src/entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn similarity index 88% rename from entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn rename to src/entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn index c2e0561..23e49a6 100644 --- a/entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn +++ b/src/entities/weapons/grenade_launcher/grenade_launcher_projectile.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://dak767xehqa6x"] -[ext_resource type="Script" path="res://entities/weapons/grenade_launcher/grenade_launcher_projectile.gd" id="1_i8v2u"] +[ext_resource type="Script" path="res://src/entities/weapons/grenade_launcher/grenade_launcher_projectile.gd" id="1_i8v2u"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_r263x"] diff --git a/entities/weapons/space_gun/projectile.gd b/src/entities/weapons/spacegun/projectile.gd similarity index 100% rename from entities/weapons/space_gun/projectile.gd rename to src/entities/weapons/spacegun/projectile.gd diff --git a/entities/weapons/space_gun/projectile.tscn b/src/entities/weapons/spacegun/projectile.tscn similarity index 85% rename from entities/weapons/space_gun/projectile.tscn rename to src/entities/weapons/spacegun/projectile.tscn index 52f7c21..ca59e89 100644 --- a/entities/weapons/space_gun/projectile.tscn +++ b/src/entities/weapons/spacegun/projectile.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=8 format=3 uid="uid://dn1tcakam5egs"] -[ext_resource type="Script" path="res://entities/weapons/space_gun/projectile.gd" id="1_4j1dp"] -[ext_resource type="PackedScene" uid="uid://8atq41j7wd55" path="res://entities/weapons/space_gun/projectile_explosion.tscn" id="2_llml6"] +[ext_resource type="Script" path="res://src/entities/weapons/spacegun/projectile.gd" id="1_4j1dp"] +[ext_resource type="PackedScene" uid="uid://8atq41j7wd55" path="res://src/entities/weapons/spacegun/projectile_explosion.tscn" id="2_llml6"] [ext_resource type="Script" path="res://addons/smoothing/smoothing.gd" id="3_dmi64"] -[ext_resource type="Script" path="res://entities/weapons/space_gun/projectile_trail.gd" id="3_ygqbh"] +[ext_resource type="Script" path="res://src/entities/weapons/spacegun/projectile_trail.gd" id="3_ygqbh"] [sub_resource type="SphereShape3D" id="SphereShape3D_umtte"] radius = 0.15 diff --git a/entities/weapons/space_gun/projectile_explosion.gd b/src/entities/weapons/spacegun/projectile_explosion.gd similarity index 100% rename from entities/weapons/space_gun/projectile_explosion.gd rename to src/entities/weapons/spacegun/projectile_explosion.gd diff --git a/entities/weapons/space_gun/projectile_explosion.tscn b/src/entities/weapons/spacegun/projectile_explosion.tscn similarity index 87% rename from entities/weapons/space_gun/projectile_explosion.tscn rename to src/entities/weapons/spacegun/projectile_explosion.tscn index e7391d6..f0ea12c 100644 --- a/entities/weapons/space_gun/projectile_explosion.tscn +++ b/src/entities/weapons/spacegun/projectile_explosion.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=3 uid="uid://8atq41j7wd55"] -[ext_resource type="Script" path="res://entities/weapons/space_gun/projectile_explosion.gd" id="1_fp5td"] -[ext_resource type="Script" path="res://entities/components/explosive_damage_component.gd" id="2_28ymv"] +[ext_resource type="Script" path="res://src/entities/weapons/spacegun/projectile_explosion.gd" id="1_fp5td"] +[ext_resource type="Script" path="res://src/entities/components/explosive_damage_component.gd" id="2_28ymv"] [sub_resource type="Curve" id="Curve_rg204"] _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] diff --git a/entities/weapons/space_gun/projectile_trail.gd b/src/entities/weapons/spacegun/projectile_trail.gd similarity index 100% rename from entities/weapons/space_gun/projectile_trail.gd rename to src/entities/weapons/spacegun/projectile_trail.gd diff --git a/entities/weapons/space_gun/space_gun.gd b/src/entities/weapons/spacegun/space_gun.gd similarity index 100% rename from entities/weapons/space_gun/space_gun.gd rename to src/entities/weapons/spacegun/space_gun.gd diff --git a/entities/weapons/space_gun/space_gun.tscn b/src/entities/weapons/spacegun/space_gun.tscn similarity index 88% rename from entities/weapons/space_gun/space_gun.tscn rename to src/entities/weapons/spacegun/space_gun.tscn index 67ff928..51c12e3 100644 --- a/entities/weapons/space_gun/space_gun.tscn +++ b/src/entities/weapons/spacegun/space_gun.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://c8co0qa2omjmh"] -[ext_resource type="Script" path="res://entities/weapons/space_gun/space_gun.gd" id="1_6sm4s"] -[ext_resource type="PackedScene" uid="uid://dn1tcakam5egs" path="res://entities/weapons/space_gun/projectile.tscn" id="2_wvneg"] -[ext_resource type="PackedScene" uid="uid://bjcn37ops3bro" path="res://entities/weapons/space_gun/assets/disclauncher.glb" id="3_5k2xm"] +[ext_resource type="Script" path="res://src/entities/weapons/spacegun/space_gun.gd" id="1_6sm4s"] +[ext_resource type="PackedScene" uid="uid://dn1tcakam5egs" path="res://src/entities/weapons/spacegun/projectile.tscn" id="2_wvneg"] +[ext_resource type="PackedScene" uid="uid://bjcn37ops3bro" path="res://assets/weapons/spacegun/disclauncher.glb" id="3_5k2xm"] [node name="SpaceGun" type="Node3D" node_paths=PackedStringArray("nozzle", "anim_player")] script = ExtResource("1_6sm4s") diff --git a/entities/weapons/weapon.gd b/src/entities/weapons/weapon.gd similarity index 100% rename from entities/weapons/weapon.gd rename to src/entities/weapons/weapon.gd diff --git a/interfaces/hud/hud.tscn b/src/interfaces/hud/hud.tscn similarity index 97% rename from interfaces/hud/hud.tscn rename to src/interfaces/hud/hud.tscn index 7bed4de..c3d0e36 100644 --- a/interfaces/hud/hud.tscn +++ b/src/interfaces/hud/hud.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://bcv81ku26xo"] -[ext_resource type="StyleBox" uid="uid://dcn1ll2ra4lwn" path="res://interfaces/hud/vitals/background.tres" id="1_gmv44"] -[ext_resource type="StyleBox" uid="uid://bq7rjpm38pao7" path="res://interfaces/hud/vitals/health_foreground.tres" id="2_6ejsl"] +[ext_resource type="StyleBox" uid="uid://dcn1ll2ra4lwn" path="res://src/interfaces/hud/vitals/background.tres" id="1_gmv44"] +[ext_resource type="StyleBox" uid="uid://bq7rjpm38pao7" path="res://src/interfaces/hud/vitals/health_foreground.tres" id="2_6ejsl"] [sub_resource type="GDScript" id="GDScript_2vxif"] script/source = "# This file is part of open-fpsz. diff --git a/interfaces/hud/iffs/health_foreground.tres b/src/interfaces/hud/iffs/health_foreground.tres similarity index 100% rename from interfaces/hud/iffs/health_foreground.tres rename to src/interfaces/hud/iffs/health_foreground.tres diff --git a/interfaces/hud/iffs/iff.gd b/src/interfaces/hud/iffs/iff.gd similarity index 100% rename from interfaces/hud/iffs/iff.gd rename to src/interfaces/hud/iffs/iff.gd diff --git a/interfaces/hud/iffs/iff.tscn b/src/interfaces/hud/iffs/iff.tscn similarity index 90% rename from interfaces/hud/iffs/iff.tscn rename to src/interfaces/hud/iffs/iff.tscn index e26d442..c85c957 100644 --- a/interfaces/hud/iffs/iff.tscn +++ b/src/interfaces/hud/iffs/iff.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://dsysi2rd3bu76"] -[ext_resource type="Script" path="res://interfaces/hud/iffs/iff.gd" id="1_g1wra"] -[ext_resource type="StyleBox" uid="uid://cgv081wfih7la" path="res://interfaces/hud/iffs/health_foreground.tres" id="2_e3xla"] -[ext_resource type="StyleBox" uid="uid://dcn1ll2ra4lwn" path="res://interfaces/hud/vitals/background.tres" id="2_jtos4"] +[ext_resource type="Script" path="res://src/interfaces/hud/iffs/iff.gd" id="1_g1wra"] +[ext_resource type="StyleBox" uid="uid://cgv081wfih7la" path="res://src/interfaces/hud/iffs/health_foreground.tres" id="2_e3xla"] +[ext_resource type="StyleBox" uid="uid://dcn1ll2ra4lwn" path="res://src/interfaces/hud/vitals/background.tres" id="2_jtos4"] [node name="IFF" type="Control"] layout_mode = 3 diff --git a/interfaces/hud/vitals/background.tres b/src/interfaces/hud/vitals/background.tres similarity index 100% rename from interfaces/hud/vitals/background.tres rename to src/interfaces/hud/vitals/background.tres diff --git a/interfaces/hud/vitals/health_foreground.tres b/src/interfaces/hud/vitals/health_foreground.tres similarity index 100% rename from interfaces/hud/vitals/health_foreground.tres rename to src/interfaces/hud/vitals/health_foreground.tres diff --git a/interfaces/menus/boot/background.webp b/src/interfaces/menus/boot/background.webp similarity index 100% rename from interfaces/menus/boot/background.webp rename to src/interfaces/menus/boot/background.webp diff --git a/interfaces/menus/boot/background.webp.import b/src/interfaces/menus/boot/background.webp.import similarity index 70% rename from interfaces/menus/boot/background.webp.import rename to src/interfaces/menus/boot/background.webp.import index 5b478ed..933ae5b 100644 --- a/interfaces/menus/boot/background.webp.import +++ b/src/interfaces/menus/boot/background.webp.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c1tjamjm8qjog" -path="res://.godot/imported/background.webp-f3f369ebd80fe0ef765a073acba84e0f.ctex" +path="res://.godot/imported/background.webp-3afc239cb0209ca1f9f40cd7b3176d4d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://interfaces/menus/boot/background.webp" -dest_files=["res://.godot/imported/background.webp-f3f369ebd80fe0ef765a073acba84e0f.ctex"] +source_file="res://src/interfaces/menus/boot/background.webp" +dest_files=["res://.godot/imported/background.webp-3afc239cb0209ca1f9f40cd7b3176d4d.ctex"] [params] diff --git a/interfaces/menus/boot/boot.tscn b/src/interfaces/menus/boot/boot.tscn similarity index 99% rename from interfaces/menus/boot/boot.tscn rename to src/interfaces/menus/boot/boot.tscn index 5da0d5c..b19dc67 100644 --- a/interfaces/menus/boot/boot.tscn +++ b/src/interfaces/menus/boot/boot.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=28 format=3 uid="uid://bjctlqvs33nqy"] -[ext_resource type="Texture2D" uid="uid://c1tjamjm8qjog" path="res://interfaces/menus/boot/background.webp" id="1_ph586"] +[ext_resource type="Texture2D" uid="uid://c1tjamjm8qjog" path="res://src/interfaces/menus/boot/background.webp" id="1_ph586"] [sub_resource type="GDScript" id="GDScript_jd8xf"] resource_name = "MainMenu" diff --git a/interfaces/scoreboard/scoreboard.gd b/src/interfaces/scoreboard/scoreboard.gd similarity index 100% rename from interfaces/scoreboard/scoreboard.gd rename to src/interfaces/scoreboard/scoreboard.gd diff --git a/interfaces/scoreboard/scoreboard.tscn b/src/interfaces/scoreboard/scoreboard.tscn similarity index 94% rename from interfaces/scoreboard/scoreboard.tscn rename to src/interfaces/scoreboard/scoreboard.tscn index 119f412..b7b1bd1 100644 --- a/interfaces/scoreboard/scoreboard.tscn +++ b/src/interfaces/scoreboard/scoreboard.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://b8bosdd0o1lu7"] -[ext_resource type="Script" path="res://interfaces/scoreboard/scoreboard.gd" id="1_k2wav"] +[ext_resource type="Script" path="res://src/interfaces/scoreboard/scoreboard.gd" id="1_k2wav"] [node name="Scoreboard" type="Control"] layout_mode = 3 diff --git a/main.tscn b/src/main.tscn similarity index 92% rename from main.tscn rename to src/main.tscn index c67118d..7655e3b 100644 --- a/main.tscn +++ b/src/main.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://ma1if3sjox6i"] -[ext_resource type="PackedScene" uid="uid://boviiugcnfyrj" path="res://modes/singleplayer/demo.tscn" id="1_vgk6g"] -[ext_resource type="PackedScene" uid="uid://bvwxfgygm2xb8" path="res://modes/multiplayer/multiplayer.tscn" id="2_iumx3"] -[ext_resource type="PackedScene" uid="uid://bjctlqvs33nqy" path="res://interfaces/menus/boot/boot.tscn" id="3_s8c8j"] +[ext_resource type="PackedScene" uid="uid://boviiugcnfyrj" path="res://src/modes/singleplayer/demo.tscn" id="1_yx35a"] +[ext_resource type="PackedScene" uid="uid://bvwxfgygm2xb8" path="res://src/modes/multiplayer/multiplayer.tscn" id="2_ft4qh"] +[ext_resource type="PackedScene" uid="uid://bjctlqvs33nqy" path="res://src/interfaces/menus/boot/boot.tscn" id="3_ckmd0"] [sub_resource type="GDScript" id="GDScript_e61dq"] script/source = "# This file is part of open-fpsz. @@ -97,7 +97,7 @@ func _join_server(host : String, port : int, nickname : String) -> void: [node name="Game" type="Node3D"] script = SubResource("GDScript_e61dq") -SINGLEPLAYER = ExtResource("1_vgk6g") -MULTIPLAYER = ExtResource("2_iumx3") +SINGLEPLAYER = ExtResource("1_yx35a") +MULTIPLAYER = ExtResource("2_ft4qh") -[node name="BootMenu" parent="." instance=ExtResource("3_s8c8j")] +[node name="BootMenu" parent="." instance=ExtResource("3_ckmd0")] diff --git a/maps/components/deathmatch_scoring_component.gd b/src/maps/components/deathmatch_scoring_component.gd similarity index 100% rename from maps/components/deathmatch_scoring_component.gd rename to src/maps/components/deathmatch_scoring_component.gd diff --git a/maps/components/rabbit_scoring_component.gd b/src/maps/components/rabbit_scoring_component.gd similarity index 100% rename from maps/components/rabbit_scoring_component.gd rename to src/maps/components/rabbit_scoring_component.gd diff --git a/maps/desert/desert.tscn b/src/maps/desert/desert.tscn similarity index 84% rename from maps/desert/desert.tscn rename to src/maps/desert/desert.tscn index 4f5e605..a56721d 100644 --- a/maps/desert/desert.tscn +++ b/src/maps/desert/desert.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://btlkog4b87p4x"] -[ext_resource type="Terrain3DStorage" uid="uid://wgmg245njt8e" path="res://maps/desert/resources/storage.res" id="1_lmk23"] -[ext_resource type="Terrain3DMaterial" uid="uid://c3isipd4wqxpk" path="res://maps/desert/resources/material.tres" id="2_n44fh"] -[ext_resource type="Terrain3DTextureList" uid="uid://d1j24k8sq8qpj" path="res://maps/desert/resources/textures.tres" id="3_w1yus"] -[ext_resource type="Environment" uid="uid://nw62ce5cglvs" path="res://maps/desert/resources/env.tres" id="4_m7p64"] -[ext_resource type="PackedScene" uid="uid://brux62vritay" path="res://entities/buildings/flag_stand.tscn" id="5_7ta6y"] +[ext_resource type="Terrain3DStorage" uid="uid://wgmg245njt8e" path="res://assets/maps/desert/storage.res" id="1_lmk23"] +[ext_resource type="Terrain3DMaterial" uid="uid://c3isipd4wqxpk" path="res://assets/maps/desert/material.tres" id="2_n44fh"] +[ext_resource type="Terrain3DTextureList" uid="uid://d1j24k8sq8qpj" path="res://assets/maps/desert/textures.tres" id="3_w1yus"] +[ext_resource type="Environment" uid="uid://nw62ce5cglvs" path="res://assets/maps/desert/env.tres" id="4_m7p64"] +[ext_resource type="PackedScene" uid="uid://brux62vritay" path="res://src/entities/buildings/flag_stand.tscn" id="5_7ta6y"] [node name="Desert" type="Terrain3D"] storage = ExtResource("1_lmk23") diff --git a/maps/genesis/genesis.tscn b/src/maps/genesis/genesis.tscn similarity index 84% rename from maps/genesis/genesis.tscn rename to src/maps/genesis/genesis.tscn index 53e804e..77860dd 100644 --- a/maps/genesis/genesis.tscn +++ b/src/maps/genesis/genesis.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://chbno00ugl6te"] -[ext_resource type="Terrain3DStorage" uid="uid://dyon4xda4k40d" path="res://maps/genesis/resources/storage.res" id="1_a88qe"] -[ext_resource type="Terrain3DMaterial" uid="uid://bd4lr5sxu8xu" path="res://maps/genesis/resources/material.res" id="2_o2y3d"] -[ext_resource type="Terrain3DTextureList" uid="uid://dnqa8kxgm3xuw" path="res://maps/genesis/resources/textures.res" id="3_1cww7"] -[ext_resource type="Environment" uid="uid://d2ahijqqspw5f" path="res://maps/genesis/resources/env.tres" id="5_3klr3"] -[ext_resource type="PackedScene" uid="uid://brux62vritay" path="res://entities/buildings/flag_stand.tscn" id="5_4kwtt"] +[ext_resource type="Terrain3DStorage" uid="uid://dyon4xda4k40d" path="res://assets/maps/genesis/storage.res" id="1_a88qe"] +[ext_resource type="Terrain3DMaterial" uid="uid://bd4lr5sxu8xu" path="res://assets/maps/genesis/material.res" id="2_o2y3d"] +[ext_resource type="Terrain3DTextureList" uid="uid://dnqa8kxgm3xuw" path="res://assets/maps/genesis/textures.res" id="3_1cww7"] +[ext_resource type="Environment" uid="uid://d2ahijqqspw5f" path="res://assets/maps/genesis/env.tres" id="5_3klr3"] +[ext_resource type="PackedScene" uid="uid://brux62vritay" path="res://src/entities/buildings/flag_stand.tscn" id="5_4kwtt"] [node name="Genesis" type="Terrain3D"] storage = ExtResource("1_a88qe") diff --git a/maps/maps.tres b/src/maps/maps.tres similarity index 65% rename from maps/maps.tres rename to src/maps/maps.tres index 0af83db..e741cac 100644 --- a/maps/maps.tres +++ b/src/maps/maps.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="ArrayPackedSceneResource" load_steps=4 format=3 uid="uid://dut5f1sq0wfeb"] -[ext_resource type="PackedScene" uid="uid://chbno00ugl6te" path="res://maps/genesis/genesis.tscn" id="1_7kpvp"] -[ext_resource type="PackedScene" uid="uid://btlkog4b87p4x" path="res://maps/desert/desert.tscn" id="2_8vsif"] -[ext_resource type="Script" path="res://types/resources/array_packed_scene.gd" id="3_by6r1"] +[ext_resource type="PackedScene" uid="uid://chbno00ugl6te" path="res://src/maps/genesis/genesis.tscn" id="1_7kpvp"] +[ext_resource type="PackedScene" uid="uid://btlkog4b87p4x" path="res://src/maps/desert/desert.tscn" id="2_8vsif"] +[ext_resource type="Script" path="res://src/types/resources/array_packed_scene.gd" id="3_by6r1"] [resource] script = ExtResource("3_by6r1") diff --git a/modes/multiplayer/multiplayer.gd b/src/modes/multiplayer/multiplayer.gd similarity index 100% rename from modes/multiplayer/multiplayer.gd rename to src/modes/multiplayer/multiplayer.gd diff --git a/modes/multiplayer/multiplayer.tscn b/src/modes/multiplayer/multiplayer.tscn similarity index 77% rename from modes/multiplayer/multiplayer.tscn rename to src/modes/multiplayer/multiplayer.tscn index eafe09f..62fbdad 100644 --- a/modes/multiplayer/multiplayer.tscn +++ b/src/modes/multiplayer/multiplayer.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=7 format=3 uid="uid://bvwxfgygm2xb8"] -[ext_resource type="Script" path="res://modes/multiplayer/multiplayer.gd" id="1_r1kd6"] -[ext_resource type="PackedScene" uid="uid://cbhx1xme0sb7k" path="res://entities/player/player.tscn" id="2_og1vb"] -[ext_resource type="PackedScene" uid="uid://c88l3h0ph00c7" path="res://entities/flag/flag.tscn" id="3_h0rie"] -[ext_resource type="Script" path="res://maps/components/rabbit_scoring_component.gd" id="5_7woao"] -[ext_resource type="PackedScene" uid="uid://b8bosdd0o1lu7" path="res://interfaces/scoreboard/scoreboard.tscn" id="5_uj0pp"] -[ext_resource type="Script" path="res://maps/components/deathmatch_scoring_component.gd" id="6_iov4u"] +[ext_resource type="Script" path="res://src/modes/multiplayer/multiplayer.gd" id="1_r1kd6"] +[ext_resource type="PackedScene" uid="uid://cbhx1xme0sb7k" path="res://src/entities/player/player.tscn" id="2_og1vb"] +[ext_resource type="PackedScene" uid="uid://c88l3h0ph00c7" path="res://src/entities/flag/flag.tscn" id="3_h0rie"] +[ext_resource type="Script" path="res://src/maps/components/rabbit_scoring_component.gd" id="5_7woao"] +[ext_resource type="PackedScene" uid="uid://b8bosdd0o1lu7" path="res://src/interfaces/scoreboard/scoreboard.tscn" id="5_uj0pp"] +[ext_resource type="Script" path="res://src/maps/components/deathmatch_scoring_component.gd" id="6_iov4u"] [node name="Multiplayer" type="Node"] script = ExtResource("1_r1kd6") diff --git a/modes/singleplayer/demo.gd b/src/modes/singleplayer/demo.gd similarity index 100% rename from modes/singleplayer/demo.gd rename to src/modes/singleplayer/demo.gd diff --git a/modes/singleplayer/demo.tscn b/src/modes/singleplayer/demo.tscn similarity index 75% rename from modes/singleplayer/demo.tscn rename to src/modes/singleplayer/demo.tscn index f5b73c5..4bfd26e 100644 --- a/modes/singleplayer/demo.tscn +++ b/src/modes/singleplayer/demo.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://boviiugcnfyrj"] -[ext_resource type="Script" path="res://modes/singleplayer/demo.gd" id="1_kkjqs"] -[ext_resource type="PackedScene" uid="uid://cbhx1xme0sb7k" path="res://entities/player/player.tscn" id="2_6wbjq"] -[ext_resource type="PackedScene" uid="uid://c88l3h0ph00c7" path="res://entities/flag/flag.tscn" id="4_1j2pw"] -[ext_resource type="PackedScene" uid="uid://btlkog4b87p4x" path="res://maps/desert/desert.tscn" id="4_dogmv"] -[ext_resource type="PackedScene" uid="uid://dpnu1lvfncx6q" path="res://entities/dummy_target/dummy_target.tscn" id="5_euor2"] +[ext_resource type="Script" path="res://src/modes/singleplayer/demo.gd" id="1_kkjqs"] +[ext_resource type="PackedScene" uid="uid://cbhx1xme0sb7k" path="res://src/entities/player/player.tscn" id="2_6wbjq"] +[ext_resource type="PackedScene" uid="uid://c88l3h0ph00c7" path="res://src/entities/flag/flag.tscn" id="4_1j2pw"] +[ext_resource type="PackedScene" uid="uid://btlkog4b87p4x" path="res://src/maps/desert/desert.tscn" id="4_dogmv"] +[ext_resource type="PackedScene" uid="uid://dpnu1lvfncx6q" path="res://src/entities/dummy_target/dummy_target.tscn" id="5_euor2"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_c5jqv"] resource_local_to_scene = true diff --git a/systems/maps_manager.gd b/src/systems/maps_manager.gd similarity index 96% rename from systems/maps_manager.gd rename to src/systems/maps_manager.gd index 683846f..640307c 100644 --- a/systems/maps_manager.gd +++ b/src/systems/maps_manager.gd @@ -22,7 +22,7 @@ var environment := Environment.new() ## Random number generator instance var _rng := RandomNumberGenerator.new() -var _maps_resource : ArrayPackedSceneResource = preload("res://maps/maps.tres") +var _maps_resource : ArrayPackedSceneResource = preload("res://src/maps/maps.tres") var maps : Array[PackedScene] = _maps_resource.get_items() ## Reference to the current terrain map in the scene diff --git a/systems/settings.gd b/src/systems/settings.gd similarity index 100% rename from systems/settings.gd rename to src/systems/settings.gd diff --git a/systems/teams.gd b/src/systems/teams.gd similarity index 100% rename from systems/teams.gd rename to src/systems/teams.gd diff --git a/types/resources/array_packed_scene.gd b/src/types/resources/array_packed_scene.gd similarity index 100% rename from types/resources/array_packed_scene.gd rename to src/types/resources/array_packed_scene.gd diff --git a/types/resources/array_packed_scene.tres b/src/types/resources/array_packed_scene.tres similarity index 67% rename from types/resources/array_packed_scene.tres rename to src/types/resources/array_packed_scene.tres index 163e7d4..c41e031 100644 --- a/types/resources/array_packed_scene.tres +++ b/src/types/resources/array_packed_scene.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="ArrayPackedSceneResource" load_steps=2 format=3 uid="uid://cpnargstkucch"] -[ext_resource type="Script" path="res://types/resources/array_packed_scene.gd" id="1_r1ygd"] +[ext_resource type="Script" path="res://src/types/resources/array_packed_scene.gd" id="1_r1ygd"] [resource] script = ExtResource("1_r1ygd")