Merge tag 'pull-level-integration' of https://normalmode.org/malf/z/godot_wildjam_49 into malf-pr

Integrate main level scenes and organize files

This branch _mostly_ captures the features of your ship_testing branch,
with the main exclusion being the door on the lower ramp.

We consolidate the "Stage" content into the "Main" scene, and remove
some unused directories now that there are no extra map scenes.

19 files changed, 91 insertions, 21 deletions

diff --git a/maps/main_stage/assets/crate/Planks016_2K_Color.png b/ship/crate/Planks016_2K_Color.png
index d5fb0fc..d5fb0fc 100644
--- a/maps/main_stage/assets/crate/Planks016_2K_Color.png
+++ b/ship/crate/Planks016_2K_Color.png
diff --git a/maps/main_stage/assets/crate/Planks016_2K_Color.png.import b/ship/crate/Planks016_2K_Color.png.import
index 3a64502..dcfa971 100644
--- a/maps/main_stage/assets/crate/Planks016_2K_Color.png.import
+++ b/ship/crate/Planks016_2K_Color.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/Planks016_2K_Color.png-3cf1f812b110ccb69f42b77a07c05d3f.s3tc.stex"
-path.etc2="res://.import/Planks016_2K_Color.png-3cf1f812b110ccb69f42b77a07c05d3f.etc2.stex"
+path.s3tc="res://.import/Planks016_2K_Color.png-d32746870be4532d2da0d9c86cecc2bd.s3tc.stex"
+path.etc2="res://.import/Planks016_2K_Color.png-d32746870be4532d2da0d9c86cecc2bd.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/crate/Planks016_2K_Color.png"
-dest_files=[ "res://.import/Planks016_2K_Color.png-3cf1f812b110ccb69f42b77a07c05d3f.s3tc.stex", "res://.import/Planks016_2K_Color.png-3cf1f812b110ccb69f42b77a07c05d3f.etc2.stex" ]
+source_file="res://ship/crate/Planks016_2K_Color.png"
+dest_files=[ "res://.import/Planks016_2K_Color.png-d32746870be4532d2da0d9c86cecc2bd.s3tc.stex", "res://.import/Planks016_2K_Color.png-d32746870be4532d2da0d9c86cecc2bd.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png b/ship/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png
index c447758..c447758 100644
--- a/maps/main_stage/assets/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png
+++ b/ship/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png
diff --git a/maps/main_stage/assets/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png.import b/ship/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png.import
index 9c818c7..2701188 100644
--- a/maps/main_stage/assets/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png.import
+++ b/ship/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-6a96d91b2c99f17f29dabcbb83fbd237.s3tc.stex"
-path.etc2="res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-6a96d91b2c99f17f29dabcbb83fbd237.etc2.stex"
+path.s3tc="res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-97d8db8272a124eada1c2e198b5950e8.s3tc.stex"
+path.etc2="res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-97d8db8272a124eada1c2e198b5950e8.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png"
-dest_files=[ "res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-6a96d91b2c99f17f29dabcbb83fbd237.s3tc.stex", "res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-6a96d91b2c99f17f29dabcbb83fbd237.etc2.stex" ]
+source_file="res://ship/crate/Planks016_2K_Metalness-Planks016_2K_Roughness.png"
+dest_files=[ "res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-97d8db8272a124eada1c2e198b5950e8.s3tc.stex", "res://.import/Planks016_2K_Metalness-Planks016_2K_Roughness.png-97d8db8272a124eada1c2e198b5950e8.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png b/ship/crate/Planks016_2K_NormalGL.png
index 7242c57..7242c57 100644
--- a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png
+++ b/ship/crate/Planks016_2K_NormalGL.png
diff --git a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png.import b/ship/crate/Planks016_2K_NormalGL.png.import
index 5ab6561..67ddfa5 100644
--- a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png.import
+++ b/ship/crate/Planks016_2K_NormalGL.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.s3tc.stex"
-path.etc2="res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.etc2.stex"
+path.s3tc="res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.s3tc.stex"
+path.etc2="res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/crate/Planks016_2K_NormalGL.png"
-dest_files=[ "res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.s3tc.stex", "res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.etc2.stex" ]
+source_file="res://ship/crate/Planks016_2K_NormalGL.png"
+dest_files=[ "res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.s3tc.stex", "res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/crate/crate.bin b/ship/crate/crate.bin
index bec90cb..bec90cb 100644
--- a/maps/main_stage/assets/crate/crate.bin
+++ b/ship/crate/crate.bin
diff --git a/maps/main_stage/assets/crate/crate.blend b/ship/crate/crate.blend
index 4887700..4887700 100644
--- a/maps/main_stage/assets/crate/crate.blend
+++ b/ship/crate/crate.blend
diff --git a/maps/main_stage/assets/crate/crate.gltf b/ship/crate/crate.gltf
index d8e1d7e..d8e1d7e 100644
--- a/maps/main_stage/assets/crate/crate.gltf
+++ b/ship/crate/crate.gltf
diff --git a/maps/main_stage/assets/crate/crate.gltf.import b/ship/crate/crate.gltf.import
index 2a89dfb..4f6f7c9 100644
--- a/maps/main_stage/assets/crate/crate.gltf.import
+++ b/ship/crate/crate.gltf.import
@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/crate.gltf-246b0677f228bdf06036ae649d890af4.scn"
+path="res://.import/crate.gltf-7ce5423f210566bb7aa647e2bc16bfb5.scn"
 
 [deps]
 
-source_file="res://maps/main_stage/assets/crate/crate.gltf"
-dest_files=[ "res://.import/crate.gltf-246b0677f228bdf06036ae649d890af4.scn" ]
+source_file="res://ship/crate/crate.gltf"
+dest_files=[ "res://.import/crate.gltf-7ce5423f210566bb7aa647e2bc16bfb5.scn" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/crate/crate.material b/ship/crate/crate.material
index 5e17eb7..960b98b 100644
--- a/maps/main_stage/assets/crate/crate.material
+++ b/ship/crate/crate.material
diff --git a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Color.png b/ship/crate/texture/planks/Planks016_2K_Color.png
index d5fb0fc..d5fb0fc 100644
--- a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Color.png
+++ b/ship/crate/texture/planks/Planks016_2K_Color.png
diff --git a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Color.png.import b/ship/crate/texture/planks/Planks016_2K_Color.png.import
index fcd6db4..54fef2a 100644
--- a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Color.png.import
+++ b/ship/crate/texture/planks/Planks016_2K_Color.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Planks016_2K_Color.png-55e16429acdcd16fc5ddfce95a201e9e.stex"
+path="res://.import/Planks016_2K_Color.png-4dcd2494903a9e20e3c21d08dcb88c1b.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://maps/main_stage/assets/crate/texture/planks/Planks016_2K_Color.png"
-dest_files=[ "res://.import/Planks016_2K_Color.png-55e16429acdcd16fc5ddfce95a201e9e.stex" ]
+source_file="res://ship/crate/texture/planks/Planks016_2K_Color.png"
+dest_files=[ "res://.import/Planks016_2K_Color.png-4dcd2494903a9e20e3c21d08dcb88c1b.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Metalness.png b/ship/crate/texture/planks/Planks016_2K_Metalness.png
index b0d6f27..b0d6f27 100644
--- a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Metalness.png
+++ b/ship/crate/texture/planks/Planks016_2K_Metalness.png
diff --git a/ship/crate/texture/planks/Planks016_2K_Metalness.png.import b/ship/crate/texture/planks/Planks016_2K_Metalness.png.import
new file mode 100644
index 0000000..a296340
--- /dev/null
+++ b/ship/crate/texture/planks/Planks016_2K_Metalness.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Planks016_2K_Metalness.png-a3dfeec2a019c2b69aa9680c72998872.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ship/crate/texture/planks/Planks016_2K_Metalness.png"
+dest_files=[ "res://.import/Planks016_2K_Metalness.png-a3dfeec2a019c2b69aa9680c72998872.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_NormalGL.png b/ship/crate/texture/planks/Planks016_2K_NormalGL.png
index 7242c57..7242c57 100644
--- a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_NormalGL.png
+++ b/ship/crate/texture/planks/Planks016_2K_NormalGL.png
diff --git a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_NormalGL.png.import b/ship/crate/texture/planks/Planks016_2K_NormalGL.png.import
index 6dc41d5..f3de9cb 100644
--- a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_NormalGL.png.import
+++ b/ship/crate/texture/planks/Planks016_2K_NormalGL.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Planks016_2K_NormalGL.png-907a2d180ac48886c9c6c7942c8459e6.stex"
+path="res://.import/Planks016_2K_NormalGL.png-2099c40638ad017c4b6122bb2d68eb11.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://maps/main_stage/assets/crate/texture/planks/Planks016_2K_NormalGL.png"
-dest_files=[ "res://.import/Planks016_2K_NormalGL.png-907a2d180ac48886c9c6c7942c8459e6.stex" ]
+source_file="res://ship/crate/texture/planks/Planks016_2K_NormalGL.png"
+dest_files=[ "res://.import/Planks016_2K_NormalGL.png-2099c40638ad017c4b6122bb2d68eb11.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Roughness.png b/ship/crate/texture/planks/Planks016_2K_Roughness.png
index 4c6665e..4c6665e 100644
--- a/maps/main_stage/assets/crate/texture/planks/Planks016_2K_Roughness.png
+++ b/ship/crate/texture/planks/Planks016_2K_Roughness.png
diff --git a/ship/crate/texture/planks/Planks016_2K_Roughness.png.import b/ship/crate/texture/planks/Planks016_2K_Roughness.png.import
new file mode 100644
index 0000000..7e6ac3e
--- /dev/null
+++ b/ship/crate/texture/planks/Planks016_2K_Roughness.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Planks016_2K_Roughness.png-0c4b693ea1c967e88fcd556340f99565.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ship/crate/texture/planks/Planks016_2K_Roughness.png"
+dest_files=[ "res://.import/Planks016_2K_Roughness.png-0c4b693ea1c967e88fcd556340f99565.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0