Housekeeping for all the new stuff that diverged from the reorganization

20 files changed, 28 insertions, 28 deletions

diff --git a/ship/mast/crows_nest.material b/ship/mast/crows_nest.material
new file mode 100644
index 0000000..16d983f
--- /dev/null
+++ b/ship/mast/crows_nest.material
diff --git a/maps/main_stage/assets/mast/crows_nest_albedo.png b/ship/mast/crows_nest_albedo.png
index d522bd3..d522bd3 100644
--- a/maps/main_stage/assets/mast/crows_nest_albedo.png
+++ b/ship/mast/crows_nest_albedo.png
diff --git a/maps/main_stage/assets/mast/crows_nest_albedo.png.import b/ship/mast/crows_nest_albedo.png.import
index afbe284..a06f65a 100644
--- a/maps/main_stage/assets/mast/crows_nest_albedo.png.import
+++ b/ship/mast/crows_nest_albedo.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.s3tc.stex"
-path.etc2="res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.etc2.stex"
+path.s3tc="res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.s3tc.stex"
+path.etc2="res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/crows_nest_albedo.png"
-dest_files=[ "res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.s3tc.stex", "res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.etc2.stex" ]
+source_file="res://ship/mast/crows_nest_albedo.png"
+dest_files=[ "res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.s3tc.stex", "res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/crows_nest_normal.png b/ship/mast/crows_nest_normal.png
index ad2b161..ad2b161 100644
--- a/maps/main_stage/assets/mast/crows_nest_normal.png
+++ b/ship/mast/crows_nest_normal.png
diff --git a/maps/main_stage/assets/mast/crows_nest_normal.png.import b/ship/mast/crows_nest_normal.png.import
index a35d66f..7f5891f 100644
--- a/maps/main_stage/assets/mast/crows_nest_normal.png.import
+++ b/ship/mast/crows_nest_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.s3tc.stex"
-path.etc2="res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.etc2.stex"
+path.s3tc="res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.s3tc.stex"
+path.etc2="res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/crows_nest_normal.png"
-dest_files=[ "res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.s3tc.stex", "res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.etc2.stex" ]
+source_file="res://ship/mast/crows_nest_normal.png"
+dest_files=[ "res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.s3tc.stex", "res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/crows_nest_rough.png b/ship/mast/crows_nest_rough.png
index 095d44e..095d44e 100644
--- a/maps/main_stage/assets/mast/crows_nest_rough.png
+++ b/ship/mast/crows_nest_rough.png
diff --git a/maps/main_stage/assets/mast/crows_nest_rough.png.import b/ship/mast/crows_nest_rough.png.import
index 7c08bcc..3cc7f4f 100644
--- a/maps/main_stage/assets/mast/crows_nest_rough.png.import
+++ b/ship/mast/crows_nest_rough.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.s3tc.stex"
-path.etc2="res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.etc2.stex"
+path.s3tc="res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.s3tc.stex"
+path.etc2="res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/crows_nest_rough.png"
-dest_files=[ "res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.s3tc.stex", "res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.etc2.stex" ]
+source_file="res://ship/mast/crows_nest_rough.png"
+dest_files=[ "res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.s3tc.stex", "res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.etc2.stex" ]
 
 [params]
 
diff --git a/ship/mast/ladder.material b/ship/mast/ladder.material
new file mode 100644
index 0000000..2e7c6b7
--- /dev/null
+++ b/ship/mast/ladder.material
diff --git a/maps/main_stage/assets/mast/mast.bin b/ship/mast/mast.bin
index de00876..de00876 100644
--- a/maps/main_stage/assets/mast/mast.bin
+++ b/ship/mast/mast.bin
diff --git a/maps/main_stage/assets/mast/mast.blend b/ship/mast/mast.blend
index 99120e6..99120e6 100644
--- a/maps/main_stage/assets/mast/mast.blend
+++ b/ship/mast/mast.blend
diff --git a/maps/main_stage/assets/mast/mast.gltf b/ship/mast/mast.gltf
index 437c7d3..437c7d3 100644
--- a/maps/main_stage/assets/mast/mast.gltf
+++ b/ship/mast/mast.gltf
diff --git a/maps/main_stage/assets/mast/mast.gltf.import b/ship/mast/mast.gltf.import
index 3355b0a..98a5969 100644
--- a/maps/main_stage/assets/mast/mast.gltf.import
+++ b/ship/mast/mast.gltf.import
@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/mast.gltf-c26f825e73317fbb8bbea6356fca2387.scn"
+path="res://.import/mast.gltf-9c8558b523bece86d63dc5f0c2812468.scn"
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast.gltf"
-dest_files=[ "res://.import/mast.gltf-c26f825e73317fbb8bbea6356fca2387.scn" ]
+source_file="res://ship/mast/mast.gltf"
+dest_files=[ "res://.import/mast.gltf-9c8558b523bece86d63dc5f0c2812468.scn" ]
 
 [params]
 
diff --git a/ship/mast/mast.material b/ship/mast/mast.material
new file mode 100644
index 0000000..9cc7c9c
--- /dev/null
+++ b/ship/mast/mast.material
diff --git a/maps/main_stage/assets/mast/mast.tscn b/ship/mast/mast.tscn
index 6e70f4c..0f9e068 100644
--- a/maps/main_stage/assets/mast/mast.tscn
+++ b/ship/mast/mast.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://maps/main_stage/assets/mast/mast.gltf" type="PackedScene" id=1]
+[ext_resource path="res://ship/mast/mast.gltf" type="PackedScene" id=1]
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.258624, 13.019, 1.30381 )
diff --git a/maps/main_stage/assets/mast/mast_albedo.png b/ship/mast/mast_albedo.png
index 7ed8933..7ed8933 100644
--- a/maps/main_stage/assets/mast/mast_albedo.png
+++ b/ship/mast/mast_albedo.png
diff --git a/maps/main_stage/assets/mast/mast_albedo.png.import b/ship/mast/mast_albedo.png.import
index e3168e2..4c15c9f 100644
--- a/maps/main_stage/assets/mast/mast_albedo.png.import
+++ b/ship/mast/mast_albedo.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.s3tc.stex"
-path.etc2="res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.etc2.stex"
+path.s3tc="res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.s3tc.stex"
+path.etc2="res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast_albedo.png"
-dest_files=[ "res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.s3tc.stex", "res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.etc2.stex" ]
+source_file="res://ship/mast/mast_albedo.png"
+dest_files=[ "res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.s3tc.stex", "res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/mast_normal.png b/ship/mast/mast_normal.png
index 020d40b..020d40b 100644
--- a/maps/main_stage/assets/mast/mast_normal.png
+++ b/ship/mast/mast_normal.png
diff --git a/maps/main_stage/assets/mast/mast_normal.png.import b/ship/mast/mast_normal.png.import
index e49c225..4070fa3 100644
--- a/maps/main_stage/assets/mast/mast_normal.png.import
+++ b/ship/mast/mast_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.s3tc.stex"
-path.etc2="res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.etc2.stex"
+path.s3tc="res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.s3tc.stex"
+path.etc2="res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast_normal.png"
-dest_files=[ "res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.s3tc.stex", "res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.etc2.stex" ]
+source_file="res://ship/mast/mast_normal.png"
+dest_files=[ "res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.s3tc.stex", "res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/mast_rough.png b/ship/mast/mast_rough.png
index 6c5c6fa..6c5c6fa 100644
--- a/maps/main_stage/assets/mast/mast_rough.png
+++ b/ship/mast/mast_rough.png
diff --git a/maps/main_stage/assets/mast/mast_rough.png.import b/ship/mast/mast_rough.png.import
index 1ec888f..ba5ae75 100644
--- a/maps/main_stage/assets/mast/mast_rough.png.import
+++ b/ship/mast/mast_rough.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.s3tc.stex"
-path.etc2="res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.etc2.stex"
+path.s3tc="res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.s3tc.stex"
+path.etc2="res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast_rough.png"
-dest_files=[ "res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.s3tc.stex", "res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.etc2.stex" ]
+source_file="res://ship/mast/mast_rough.png"
+dest_files=[ "res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.s3tc.stex", "res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.etc2.stex" ]
 
 [params]