redo generic rooms

Models/FreeRoamLocations/GenericRoom/GenericRoomCollide.obj.import

@@ -1,25 +0,0 @@
-[remap]
-
-importer="wavefront_obj"
-importer_version=1
-type="Mesh"
-uid="uid://b17wba3b2w1bt"
-path="res://.godot/imported/GenericRoomCollide.obj-5219a62d9731e2738906f5ecc0e93e84.mesh"
-
-[deps]
-
-files=["res://.godot/imported/GenericRoomCollide.obj-5219a62d9731e2738906f5ecc0e93e84.mesh"]
-
-source_file="res://Models/FreeRoamLocations/GenericRoom/GenericRoomCollide.obj"
-dest_files=["res://.godot/imported/GenericRoomCollide.obj-5219a62d9731e2738906f5ecc0e93e84.mesh", "res://.godot/imported/GenericRoomCollide.obj-5219a62d9731e2738906f5ecc0e93e84.mesh"]
-
-[params]
-
-generate_tangents=true
-generate_lods=true
-generate_shadow_mesh=true
-generate_lightmap_uv2=false
-generate_lightmap_uv2_texel_size=0.2
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-force_disable_mesh_compression=false

Models/FreeRoamLocations/GenericRoom/GenericRoomExtension_90sCarpet.png.import

@@ -1,45 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b1qqt3iieb0x3"
-path.s3tc="res://.godot/imported/GenericRoomExtension_90sCarpet.png-e6eb5cf0649d57d82df665c82e90a2fd.s3tc.ctex"
-path.etc2="res://.godot/imported/GenericRoomExtension_90sCarpet.png-e6eb5cf0649d57d82df665c82e90a2fd.etc2.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
-"vram_texture": true
-}
-generator_parameters={
-"md5": "bec1df9050ab55c447f4ed9478448586"
-}
-
-[deps]
-
-source_file="res://Models/FreeRoamLocations/GenericRoom/GenericRoomExtension_90sCarpet.png"
-dest_files=["res://.godot/imported/GenericRoomExtension_90sCarpet.png-e6eb5cf0649d57d82df665c82e90a2fd.s3tc.ctex", "res://.godot/imported/GenericRoomExtension_90sCarpet.png-e6eb5cf0649d57d82df665c82e90a2fd.etc2.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=0

Models/GenericRooms/1-Stage/Generic1StageRoomCollider.obj

@@ -1,52 +0,0 @@
-# Blender 4.5.0
-# www.blender.org
-mtllib Generic1StageRoomCollider.mtl
-o RoomCollide
-v 9.800000 0.000000 12.800000
-v -2.400000 0.800000 -1.200000
-v 2.400000 0.800000 -1.200000
-v -2.400000 3.000000 -1.200000
-v 2.400000 3.000000 -1.200000
-v -3.600000 0.800000 -1.000000
-v -3.600000 3.000000 -1.000000
-v 3.600000 0.800000 -1.000000
-v 3.600000 3.000000 -1.000000
-v 3.800000 0.000000 -0.400000
-v 9.800000 0.000000 -0.400000
-v 3.800000 3.800000 -0.400000
-v 9.800000 0.000000 10.400001
-v 9.800000 3.800000 10.400001
-v 7.400000 0.000000 12.800001
-v 7.400000 3.800000 12.800001
-v -9.800001 0.000000 12.800001
-v -9.800001 3.800000 12.800001
-v -9.800001 0.000000 -0.399999
-v -9.800001 3.800000 -0.399999
-v -3.800001 0.000000 -0.399999
-v -3.800001 3.800000 -0.399999
-v 9.800000 3.800000 -0.400000
-v 9.800000 3.800000 12.800000
-vn -0.0000 1.0000 -0.0000
-vn -0.0000 -0.0000 1.0000
-vn 0.1644 -0.0000 0.9864
-vn -0.1644 -0.0000 0.9864
-vn -1.0000 -0.0000 -0.0000
-vn -0.7071 -0.0000 -0.7071
-vn -0.0000 -0.0000 -1.0000
-vn 1.0000 -0.0000 -0.0000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-s 0
-f 17/1/1 1/2/1 11/3/1 19/4/1
-f 2/1/2 3/2/2 5/3/2 4/4/2
-f 2/1/3 4/4/3 7/4/3 6/1/3
-f 5/3/4 3/2/4 8/2/4 9/3/4
-f 10/1/2 11/2/2 23/3/2 12/4/2
-f 23/3/5 11/2/5 13/2/5 14/3/5
-f 14/3/6 13/2/6 15/2/6 16/3/6
-f 16/3/7 15/2/7 17/2/7 18/3/7
-f 18/3/8 17/2/8 19/2/8 20/3/8
-f 20/3/2 19/2/2 21/2/2 22/3/2
-f 18/1/1 24/2/1 23/3/1 20/4/1

Models/GenericRooms/1-Stage/Generic1StageRoomCollider.obj.import

@@ -1,25 +0,0 @@
-[remap]
-
-importer="wavefront_obj"
-importer_version=1
-type="Mesh"
-uid="uid://cf4oa43hi1w5t"
-path="res://.godot/imported/Generic1StageRoomCollider.obj-c3fe5915e79ec4c76b2b12d6964193de.mesh"
-
-[deps]
-
-files=["res://.godot/imported/Generic1StageRoomCollider.obj-c3fe5915e79ec4c76b2b12d6964193de.mesh"]
-
-source_file="res://Models/GenericRooms/1-Stage/Generic1StageRoomCollider.obj"
-dest_files=["res://.godot/imported/Generic1StageRoomCollider.obj-c3fe5915e79ec4c76b2b12d6964193de.mesh", "res://.godot/imported/Generic1StageRoomCollider.obj-c3fe5915e79ec4c76b2b12d6964193de.mesh"]
-
-[params]
-
-generate_tangents=true
-generate_lods=true
-generate_shadow_mesh=true
-generate_lightmap_uv2=false
-generate_lightmap_uv2_texel_size=0.2
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-force_disable_mesh_compression=false

Models/GenericRooms/1-Stage/Generic1StageStageCollider.obj

@@ -1,64 +0,0 @@
-# Blender 4.5.0
-# www.blender.org
-mtllib Generic1StageStageCollider.mtl
-o StageCollide
-v -3.800000 0.000000 0.300000
-v -3.800000 0.800000 0.300000
-v -3.800000 0.000000 -2.600000
-v 3.800000 0.000000 0.300000
-v 3.800000 0.800000 0.300000
-v 3.800000 0.000000 -2.600000
-v 3.800000 0.800000 -2.600000
-v -3.800000 0.800000 -2.600000
-v -3.800000 0.800000 -0.400000
-v -3.800000 3.700000 -0.400000
-v 3.800000 3.700000 -2.600000
-v 3.800000 0.800000 -0.400000
-v 3.800000 3.700000 -0.400000
-v -3.800000 3.700000 0.300000
-v -3.800000 3.800000 0.300000
-v -3.800000 3.700000 -2.600000
-v -3.800000 3.800000 -2.600000
-v 3.800000 3.700000 0.300000
-v 3.800000 3.800000 0.300000
-v 3.800000 3.800000 -2.600000
-vn -1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 -1.0000
-vn 1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 1.0000
-vn -0.0000 -1.0000 -0.0000
-vn -0.0000 1.0000 -0.0000
-vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
-vt 0.375000 0.250000
-vt 0.625000 0.500000
-vt 0.375000 0.500000
-vt 0.625000 0.750000
-vt 0.375000 0.750000
-vt 0.625000 1.000000
-vt 0.375000 1.000000
-vt 0.125000 0.500000
-vt 0.125000 0.750000
-vt 0.875000 0.500000
-vt 0.875000 0.750000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-s 0
-f 1/1/1 2/2/1 8/3/1 3/4/1
-f 3/4/2 8/3/2 7/5/2 6/6/2
-f 6/6/3 7/5/3 5/7/3 4/8/3
-f 4/8/4 5/7/4 2/9/4 1/10/4
-f 3/11/5 6/6/5 4/8/5 1/12/5
-f 7/5/6 8/13/6 2/14/6 5/7/6
-f 14/1/1 15/2/1 17/3/1 16/4/1
-f 10/15/3 9/16/3 8/17/3 16/18/3
-f 11/18/1 7/17/1 12/17/1 13/18/1
-f 16/4/2 17/3/2 20/5/2 11/6/2
-f 16/18/4 8/17/4 7/17/4 11/18/4
-f 11/6/3 20/5/3 19/7/3 18/8/3
-f 18/8/4 19/7/4 15/9/4 14/10/4
-f 16/11/5 11/6/5 18/8/5 14/12/5
-f 20/5/6 17/13/6 15/14/6 19/7/6

Models/GenericRooms/1-Stage/Generic1StageStageCollider.obj.import

@@ -1,25 +0,0 @@
-[remap]
-
-importer="wavefront_obj"
-importer_version=1
-type="Mesh"
-uid="uid://cxetf6uisjlwr"
-path="res://.godot/imported/Generic1StageStageCollider.obj-7f7667c0a9194705d7bfe54c3ce2d112.mesh"
-
-[deps]
-
-files=["res://.godot/imported/Generic1StageStageCollider.obj-7f7667c0a9194705d7bfe54c3ce2d112.mesh"]
-
-source_file="res://Models/GenericRooms/1-Stage/Generic1StageStageCollider.obj"
-dest_files=["res://.godot/imported/Generic1StageStageCollider.obj-7f7667c0a9194705d7bfe54c3ce2d112.mesh", "res://.godot/imported/Generic1StageStageCollider.obj-7f7667c0a9194705d7bfe54c3ce2d112.mesh"]
-
-[params]
-
-generate_tangents=true
-generate_lods=true
-generate_shadow_mesh=true
-generate_lightmap_uv2=false
-generate_lightmap_uv2_texel_size=0.2
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-force_disable_mesh_compression=false

Models/GenericRooms/2-Stage/2StageGeneric-BotCollide.obj

@@ -1,122 +0,0 @@
-# Blender 4.5.0
-# www.blender.org
-o BotCollide
-v -3.400000 0.800000 -0.300000
-v -3.400000 2.700000 -0.300000
-v -3.400000 0.800000 -0.900000
-v -3.400000 2.700000 -0.900000
-v -2.600000 0.800000 -0.300000
-v -2.600000 2.700000 -0.300000
-v -2.600000 0.800000 -0.900000
-v -2.600000 2.700000 -0.900000
-v -0.700000 0.800000 -0.300000
-v -0.700000 2.700000 -0.300000
-v -0.700000 0.800000 -0.900000
-v -0.700000 2.700000 -0.900000
-v 0.100000 0.800000 -0.300000
-v 0.100000 2.700000 -0.300000
-v 0.100000 0.800000 -0.900000
-v 0.100000 2.700000 -0.900000
-v 0.400000 0.800000 -0.300000
-v 0.400000 2.700000 -0.300000
-v 0.400000 0.800000 -0.900000
-v 0.400000 2.700000 -0.900000
-v 1.200000 0.800000 -0.300000
-v 1.200000 2.700000 -0.300000
-v 1.200000 0.800000 -0.900000
-v 1.200000 2.700000 -0.900000
-v 1.400000 0.800000 -0.300000
-v 1.400000 2.600000 -0.300000
-v 1.400000 0.800000 -1.100000
-v 1.400000 2.600000 -1.100000
-v 2.200000 0.800000 -0.300000
-v 2.200000 2.600000 -0.300000
-v 2.200000 0.800000 -1.100000
-v 2.200000 2.600000 -1.100000
-v 2.600000 0.800000 -0.200000
-v 2.600000 2.600000 -0.200000
-v 2.600000 0.800000 -1.000000
-v 2.600000 2.600000 -1.000000
-v 3.400000 0.800000 -0.200000
-v 3.400000 2.600000 -0.200000
-v 3.400000 0.800000 -1.000000
-v 3.400000 2.600000 -1.000000
-v 0.200000 0.800000 0.050000
-v 0.200000 1.800000 0.050000
-v 0.200000 0.800000 -0.300000
-v 0.200000 1.800000 -0.300000
-v 1.400000 0.800000 0.050000
-v 1.400000 1.800000 0.050000
-v 1.400000 0.800000 -0.300000
-v 1.400000 1.800000 -0.300000
-v 2.300000 0.800000 0.200000
-v 2.300000 1.800000 0.200000
-v 2.300000 0.800000 -0.300000
-v 2.300000 1.800000 -0.300000
-v 3.299999 0.800000 0.200000
-v 3.299999 1.800000 0.200000
-v 3.299999 0.800000 -0.300000
-v 3.299999 1.800000 -0.300000
-vn -1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 -1.0000
-vn 1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 1.0000
-vn -0.0000 -1.0000 -0.0000
-vn -0.0000 1.0000 -0.0000
-vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
-vt 0.375000 0.250000
-vt 0.625000 0.500000
-vt 0.375000 0.500000
-vt 0.625000 0.750000
-vt 0.375000 0.750000
-vt 0.625000 1.000000
-vt 0.375000 1.000000
-vt 0.125000 0.500000
-vt 0.125000 0.750000
-vt 0.875000 0.500000
-vt 0.875000 0.750000
-s 0
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/4/2 4/3/2 8/5/2 7/6/2
-f 7/6/3 8/5/3 6/7/3 5/8/3
-f 5/8/4 6/7/4 2/9/4 1/10/4
-f 3/11/5 7/6/5 5/8/5 1/12/5
-f 8/5/6 4/13/6 2/14/6 6/7/6
-f 9/1/1 10/2/1 12/3/1 11/4/1
-f 11/4/2 12/3/2 16/5/2 15/6/2
-f 15/6/3 16/5/3 14/7/3 13/8/3
-f 13/8/4 14/7/4 10/9/4 9/10/4
-f 11/11/5 15/6/5 13/8/5 9/12/5
-f 16/5/6 12/13/6 10/14/6 14/7/6
-f 17/1/1 18/2/1 20/3/1 19/4/1
-f 19/4/2 20/3/2 24/5/2 23/6/2
-f 23/6/3 24/5/3 22/7/3 21/8/3
-f 21/8/4 22/7/4 18/9/4 17/10/4
-f 19/11/5 23/6/5 21/8/5 17/12/5
-f 24/5/6 20/13/6 18/14/6 22/7/6
-f 25/1/1 26/2/1 28/3/1 27/4/1
-f 27/4/2 28/3/2 32/5/2 31/6/2
-f 31/6/3 32/5/3 30/7/3 29/8/3
-f 29/8/4 30/7/4 26/9/4 25/10/4
-f 27/11/5 31/6/5 29/8/5 25/12/5
-f 32/5/6 28/13/6 26/14/6 30/7/6
-f 33/1/1 34/2/1 36/3/1 35/4/1
-f 35/4/2 36/3/2 40/5/2 39/6/2
-f 39/6/3 40/5/3 38/7/3 37/8/3
-f 37/8/4 38/7/4 34/9/4 33/10/4
-f 35/11/5 39/6/5 37/8/5 33/12/5
-f 40/5/6 36/13/6 34/14/6 38/7/6
-f 41/1/1 42/2/1 44/3/1 43/4/1
-f 43/4/2 44/3/2 48/5/2 47/6/2
-f 47/6/3 48/5/3 46/7/3 45/8/3
-f 45/8/4 46/7/4 42/9/4 41/10/4
-f 43/11/5 47/6/5 45/8/5 41/12/5
-f 48/5/6 44/13/6 42/14/6 46/7/6
-f 49/1/1 50/2/1 52/3/1 51/4/1
-f 51/4/2 52/3/2 56/5/2 55/6/2
-f 55/6/3 56/5/3 54/7/3 53/8/3
-f 53/8/4 54/7/4 50/9/4 49/10/4
-f 51/11/5 55/6/5 53/8/5 49/12/5
-f 56/5/6 52/13/6 50/14/6 54/7/6

Models/GenericRooms/2-Stage/2StageGeneric-BotCollide.obj.import

@@ -1,25 +0,0 @@
-[remap]
-
-importer="wavefront_obj"
-importer_version=1
-type="Mesh"
-uid="uid://8vgcmd68n6gc"
-path="res://.godot/imported/2StageGeneric-BotCollide.obj-ea7da390a0e640563c361d2d1b0ff027.mesh"
-
-[deps]
-
-files=["res://.godot/imported/2StageGeneric-BotCollide.obj-ea7da390a0e640563c361d2d1b0ff027.mesh"]
-
-source_file="res://Models/GenericRooms/2-Stage/2StageGeneric-BotCollide.obj"
-dest_files=["res://.godot/imported/2StageGeneric-BotCollide.obj-ea7da390a0e640563c361d2d1b0ff027.mesh", "res://.godot/imported/2StageGeneric-BotCollide.obj-ea7da390a0e640563c361d2d1b0ff027.mesh"]
-
-[params]
-
-generate_tangents=true
-generate_lods=true
-generate_shadow_mesh=true
-generate_lightmap_uv2=false
-generate_lightmap_uv2_texel_size=0.2
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-force_disable_mesh_compression=false

Models/GenericRooms/2-Stage/2StageGeneric-StageCollide.obj

@@ -1,80 +0,0 @@
-# Blender 4.5.0
-# www.blender.org
-o StageCollide
-v -3.800000 0.000000 0.300000
-v -3.800000 0.800000 0.300000
-v -3.800000 0.000000 -2.600000
-v 3.800000 0.000000 0.300000
-v 3.800000 0.800000 0.300000
-v 3.800000 0.000000 -2.600000
-v 3.800000 0.800000 -2.600000
-v -3.800000 0.800000 -2.600000
-v -3.800000 0.800000 -0.400000
-v -3.800000 3.700000 -0.400000
-v 3.800000 3.700000 -2.600000
-v 3.800000 0.800000 -0.400000
-v 3.800000 3.700000 -0.400000
-v -3.800000 3.700000 0.300000
-v -3.800000 3.800000 0.300000
-v -3.800000 3.700000 -2.600000
-v -3.800000 3.800000 -2.600000
-v 3.800000 3.700000 0.300000
-v 3.800000 3.800000 0.300000
-v 3.800000 3.800000 -2.600000
-v -3.800000 0.800000 -1.000000
-v -2.200000 0.800000 -1.000000
-v -3.800000 3.700000 -1.000000
-v -2.200000 3.700000 -1.000000
-v -2.200000 0.800000 0.200000
-v -2.200000 3.700000 0.200000
-v -1.000000 0.800000 0.200000
-v -1.000000 3.700000 0.200000
-v -1.000000 0.800000 -1.300000
-v -1.000000 3.700000 -1.300000
-v 3.800000 0.800000 -1.300000
-v 3.800000 3.700000 -1.300000
-vn -1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 -1.0000
-vn 1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 1.0000
-vn -0.0000 -1.0000 -0.0000
-vn -0.0000 1.0000 -0.0000
-vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
-vt 0.375000 0.250000
-vt 0.625000 0.500000
-vt 0.375000 0.500000
-vt 0.625000 0.750000
-vt 0.375000 0.750000
-vt 0.625000 1.000000
-vt 0.375000 1.000000
-vt 0.125000 0.500000
-vt 0.125000 0.750000
-vt 0.875000 0.500000
-vt 0.875000 0.750000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-s 0
-f 1/1/1 2/2/1 8/3/1 3/4/1
-f 3/4/2 8/3/2 7/5/2 6/6/2
-f 6/6/3 7/5/3 5/7/3 4/8/3
-f 4/8/4 5/7/4 2/9/4 1/10/4
-f 3/11/5 6/6/5 4/8/5 1/12/5
-f 7/5/6 8/13/6 2/14/6 5/7/6
-f 14/1/1 15/2/1 17/3/1 16/4/1
-f 10/15/3 9/16/3 8/17/3 16/18/3
-f 11/18/1 7/17/1 12/17/1 13/18/1
-f 16/4/2 17/3/2 20/5/2 11/6/2
-f 16/18/4 8/17/4 7/17/4 11/18/4
-f 11/6/3 20/5/3 19/7/3 18/8/3
-f 18/8/4 19/7/4 15/9/4 14/10/4
-f 16/11/5 11/6/5 18/8/5 14/12/5
-f 20/5/6 17/13/6 15/14/6 19/7/6
-f 21/15/4 22/16/4 24/17/4 23/18/4
-f 24/17/1 22/16/1 25/16/1 26/17/1
-f 26/17/4 25/16/4 27/16/4 28/17/4
-f 28/17/3 27/16/3 29/16/3 30/17/3
-f 30/17/4 29/16/4 31/16/4 32/17/4

Models/GenericRooms/2-Stage/2StageGeneric-StageCollide.obj.import

@@ -1,25 +0,0 @@
-[remap]
-
-importer="wavefront_obj"
-importer_version=1
-type="Mesh"
-uid="uid://bygnxgulh6inv"
-path="res://.godot/imported/2StageGeneric-StageCollide.obj-56f92f30ed9e4268a4d6efca7d58e075.mesh"
-
-[deps]
-
-files=["res://.godot/imported/2StageGeneric-StageCollide.obj-56f92f30ed9e4268a4d6efca7d58e075.mesh"]
-
-source_file="res://Models/GenericRooms/2-Stage/2StageGeneric-StageCollide.obj"
-dest_files=["res://.godot/imported/2StageGeneric-StageCollide.obj-56f92f30ed9e4268a4d6efca7d58e075.mesh", "res://.godot/imported/2StageGeneric-StageCollide.obj-56f92f30ed9e4268a4d6efca7d58e075.mesh"]
-
-[params]
-
-generate_tangents=true
-generate_lods=true
-generate_shadow_mesh=true
-generate_lightmap_uv2=false
-generate_lightmap_uv2_texel_size=0.2
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-force_disable_mesh_compression=false

Models/GenericRooms/GenericRoom/GenericRoom12Extension.glb.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://c2v8geaualnah"
+uid="uid://dqfruuevd22p8"
-path="res://.godot/imported/GenericRoomExtension.glb-309f42201df79cf76ffc140a6b41decb.scn"
+path="res://.godot/imported/GenericRoom12Extension.glb-c5f8c93929d213d212550b18d465d107.scn"
 
 [deps]
 
-source_file="res://Models/FreeRoamLocations/GenericRoom/GenericRoomExtension.glb"
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoom12Extension.glb"
-dest_files=["res://.godot/imported/GenericRoomExtension.glb-309f42201df79cf76ffc140a6b41decb.scn"]
+dest_files=["res://.godot/imported/GenericRoom12Extension.glb-c5f8c93929d213d212550b18d465d107.scn"]
 
 [params]
 

Models/GenericRooms/GenericRoom/GenericRoom12ExtensionCollide.obj

@@ -0,0 +1,19 @@
+# Blender 4.5.3 LTS
+# www.blender.org
+o GenericRoom12ExtensionCollide
+v -4.800000 0.000000 -0.400000
+v -3.200000 0.000000 -0.400000
+v -4.800000 3.800000 -0.400000
+v -3.200000 3.800000 -0.400000
+v 3.200000 0.000000 -0.400000
+v 4.800000 0.000000 -0.400000
+v 3.200000 3.800000 -0.400000
+v 4.800000 3.800000 -0.400000
+vn -0.0000 -0.0000 1.0000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+s 0
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 5/1/1 6/2/1 8/3/1 7/4/1

Models/GenericRooms/GenericRoom/GenericRoom12ExtensionCollide.obj.import

@@ -0,0 +1,25 @@
+[remap]
+
+importer="wavefront_obj"
+importer_version=1
+type="Mesh"
+uid="uid://bp2ej17gw0bfw"
+path="res://.godot/imported/GenericRoom12ExtensionCollide.obj-3f99757bf4f8381f57946dd494b59daf.mesh"
+
+[deps]
+
+files=["res://.godot/imported/GenericRoom12ExtensionCollide.obj-3f99757bf4f8381f57946dd494b59daf.mesh"]
+
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoom12ExtensionCollide.obj"
+dest_files=["res://.godot/imported/GenericRoom12ExtensionCollide.obj-3f99757bf4f8381f57946dd494b59daf.mesh", "res://.godot/imported/GenericRoom12ExtensionCollide.obj-3f99757bf4f8381f57946dd494b59daf.mesh"]
+
+[params]
+
+generate_tangents=true
+generate_lods=true
+generate_shadow_mesh=true
+generate_lightmap_uv2=false
+generate_lightmap_uv2_texel_size=0.2
+scale_mesh=Vector3(1, 1, 1)
+offset_mesh=Vector3(0, 0, 0)
+force_disable_mesh_compression=false

Models/GenericRooms/GenericRoom/GenericRoomCollide.obj.import

@@ -0,0 +1,25 @@
+[remap]
+
+importer="wavefront_obj"
+importer_version=1
+type="Mesh"
+uid="uid://b17wba3b2w1bt"
+path="res://.godot/imported/GenericRoomCollide.obj-fd275490d527cd7cb98cb94c4d706314.mesh"
+
+[deps]
+
+files=["res://.godot/imported/GenericRoomCollide.obj-fd275490d527cd7cb98cb94c4d706314.mesh"]
+
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomCollide.obj"
+dest_files=["res://.godot/imported/GenericRoomCollide.obj-fd275490d527cd7cb98cb94c4d706314.mesh", "res://.godot/imported/GenericRoomCollide.obj-fd275490d527cd7cb98cb94c4d706314.mesh"]
+
+[params]
+
+generate_tangents=true
+generate_lods=true
+generate_shadow_mesh=true
+generate_lightmap_uv2=false
+generate_lightmap_uv2_texel_size=0.2
+scale_mesh=Vector3(1, 1, 1)
+offset_mesh=Vector3(0, 0, 0)
+force_disable_mesh_compression=false

Models/GenericRooms/GenericRoom/GenericRoomMain.glb.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://bla4yvn024kfy"
+uid="uid://2b8osgxq7jqy"
-path="res://.godot/imported/GenericRoom.glb-6e199e5185825881f7483ed661eb34a1.scn"
+path="res://.godot/imported/GenericRoomMain.glb-7873842f07133c8346b3533af3b666df.scn"
 
 [deps]
 
-source_file="res://Models/FreeRoamLocations/GenericRoom/GenericRoom.glb"
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomMain.glb"
-dest_files=["res://.godot/imported/GenericRoom.glb-6e199e5185825881f7483ed661eb34a1.scn"]
+dest_files=["res://.godot/imported/GenericRoomMain.glb-7873842f07133c8346b3533af3b666df.scn"]
 
 [params]
 

Models/GenericRooms/GenericRoom/GenericRoomMainCollide.obj

@@ -0,0 +1,45 @@
+# Blender 4.5.3 LTS
+# www.blender.org
+o GenericRoomMainCollide
+v -8.000000 0.000000 8.000000
+v -8.000000 3.800000 8.000000
+v -8.000000 0.000000 -0.400000
+v -8.000000 3.800000 -0.400000
+v 8.000000 0.000000 8.000000
+v 8.000000 3.800000 8.000000
+v 8.000000 0.000000 -0.400000
+v 8.000000 3.800000 -0.400000
+v -4.800000 0.000000 -0.400000
+v -4.800000 3.800000 -0.400000
+v 4.800000 0.000000 -0.400000
+v 4.800000 3.800000 -0.400000
+vn -1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 -1.0000
+vn 1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 1.0000
+vn -0.0000 -1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.625000 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.625000 0.750000
+vt 0.375000 0.750000
+vt 0.625000 1.000000
+vt 0.375000 1.000000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+s 0
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/4/2 4/3/2 10/3/2 9/4/2
+f 7/5/3 8/6/3 6/7/3 5/8/3
+f 5/8/4 6/7/4 2/9/4 1/10/4
+f 3/11/5 7/5/5 5/8/5 1/12/5
+f 8/6/6 4/13/6 2/14/6 6/7/6
+f 8/6/2 7/5/2 11/5/2 12/6/2
+l 12 10
+l 11 9

Models/GenericRooms/GenericRoom/GenericRoomMainCollide.obj.import

@@ -0,0 +1,25 @@
+[remap]
+
+importer="wavefront_obj"
+importer_version=1
+type="Mesh"
+uid="uid://cx2j1pp1es5i8"
+path="res://.godot/imported/GenericRoomMainCollide.obj-25aa43de4953ce5af6893e145f900778.mesh"
+
+[deps]
+
+files=["res://.godot/imported/GenericRoomMainCollide.obj-25aa43de4953ce5af6893e145f900778.mesh"]
+
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomMainCollide.obj"
+dest_files=["res://.godot/imported/GenericRoomMainCollide.obj-25aa43de4953ce5af6893e145f900778.mesh", "res://.godot/imported/GenericRoomMainCollide.obj-25aa43de4953ce5af6893e145f900778.mesh"]
+
+[params]
+
+generate_tangents=true
+generate_lods=true
+generate_shadow_mesh=true
+generate_lightmap_uv2=false
+generate_lightmap_uv2_texel_size=0.2
+scale_mesh=Vector3(1, 1, 1)
+offset_mesh=Vector3(0, 0, 0)
+force_disable_mesh_compression=false

Models/GenericRooms/GenericRoom/GenericRoomMain_90sCarpet.png.import

@@ -2,9 +2,9 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://x7b063bqhp6d"
+uid="uid://bakfi8q7k2xq0"
-path.s3tc="res://.godot/imported/RockerStage-Room_90sCarpet.png-f0ceab90a0a6e64519f2e20dec8447b5.s3tc.ctex"
+path.s3tc="res://.godot/imported/GenericRoomMain_90sCarpet.png-5942a110ed703502657156b1511c03f6.s3tc.ctex"
-path.etc2="res://.godot/imported/RockerStage-Room_90sCarpet.png-f0ceab90a0a6e64519f2e20dec8447b5.etc2.ctex"
+path.etc2="res://.godot/imported/GenericRoomMain_90sCarpet.png-5942a110ed703502657156b1511c03f6.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -15,8 +15,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://Models/GenericRooms/RockerStage/RockerStage-Room_90sCarpet.png"
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomMain_90sCarpet.png"
-dest_files=["res://.godot/imported/RockerStage-Room_90sCarpet.png-f0ceab90a0a6e64519f2e20dec8447b5.s3tc.ctex", "res://.godot/imported/RockerStage-Room_90sCarpet.png-f0ceab90a0a6e64519f2e20dec8447b5.etc2.ctex"]
+dest_files=["res://.godot/imported/GenericRoomMain_90sCarpet.png-5942a110ed703502657156b1511c03f6.s3tc.ctex", "res://.godot/imported/GenericRoomMain_90sCarpet.png-5942a110ed703502657156b1511c03f6.etc2.ctex"]
 
 [params]
 

Models/GenericRooms/GenericRoom/GenericRoomRoadExtension.glb.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://bb4jn7jeekys4"
+uid="uid://b12h2qj8d6vat"
-path="res://.godot/imported/RoadStageGeneric-Room.glb-3fd4667cd3ee6512a1cf77f943f7498e.scn"
+path="res://.godot/imported/GenericRoomRoadExtension.glb-9bee0cef6ca009180f41d51431fd36d0.scn"
 
 [deps]
 
-source_file="res://Models/GenericRooms/RoadStage/RoadStageGeneric-Room.glb"
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomRoadExtension.glb"
-dest_files=["res://.godot/imported/RoadStageGeneric-Room.glb-3fd4667cd3ee6512a1cf77f943f7498e.scn"]
+dest_files=["res://.godot/imported/GenericRoomRoadExtension.glb-9bee0cef6ca009180f41d51431fd36d0.scn"]
 
 [params]
 
@@ -38,5 +38,5 @@ materials/extract=0
 materials/extract_format=0
 materials/extract_path=""
 _subresources={}
-gltf/naming_version=1
+gltf/naming_version=2
 gltf/embedded_image_handling=1

Models/GenericRooms/GenericRoom/GenericRoomRoadExtensionCollide.obj

@@ -0,0 +1,19 @@
+# Blender 4.5.3 LTS
+# www.blender.org
+o GenericRoomRoadExtensionCollide
+v -4.800000 0.000000 -0.400000
+v -4.500000 0.000000 -0.400000
+v -4.800000 3.800000 -0.400000
+v -4.500000 3.800000 -0.400000
+v 4.500000 0.000000 -0.400000
+v 4.800000 0.000000 -0.400000
+v 4.500000 3.800000 -0.400000
+v 4.800000 3.800000 -0.400000
+vn -0.0000 -0.0000 1.0000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+s 0
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 5/1/1 6/2/1 8/3/1 7/4/1

Models/GenericRooms/GenericRoom/GenericRoomRoadExtensionCollide.obj.import

@@ -0,0 +1,25 @@
+[remap]
+
+importer="wavefront_obj"
+importer_version=1
+type="Mesh"
+uid="uid://b0vqd3mci2524"
+path="res://.godot/imported/GenericRoomRoadExtensionCollide.obj-599f10875b04ca95dacac200537923ba.mesh"
+
+[deps]
+
+files=["res://.godot/imported/GenericRoomRoadExtensionCollide.obj-599f10875b04ca95dacac200537923ba.mesh"]
+
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomRoadExtensionCollide.obj"
+dest_files=["res://.godot/imported/GenericRoomRoadExtensionCollide.obj-599f10875b04ca95dacac200537923ba.mesh", "res://.godot/imported/GenericRoomRoadExtensionCollide.obj-599f10875b04ca95dacac200537923ba.mesh"]
+
+[params]
+
+generate_tangents=true
+generate_lods=true
+generate_shadow_mesh=true
+generate_lightmap_uv2=false
+generate_lightmap_uv2_texel_size=0.2
+scale_mesh=Vector3(1, 1, 1)
+offset_mesh=Vector3(0, 0, 0)
+force_disable_mesh_compression=false

Models/GenericRooms/GenericRoom/GenericRoomRockerExtension.glb.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://ddqduheks5ltu"
+uid="uid://bgah3ysknvp7q"
-path="res://.godot/imported/1StageGenericRoom.glb-3b68bf8366572673866d0e2a8baee7ab.scn"
+path="res://.godot/imported/GenericRoomRockerExtension.glb-5ce11000a983f499a2b49d1f9e2a5073.scn"
 
 [deps]
 
-source_file="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb"
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomRockerExtension.glb"
-dest_files=["res://.godot/imported/1StageGenericRoom.glb-3b68bf8366572673866d0e2a8baee7ab.scn"]
+dest_files=["res://.godot/imported/GenericRoomRockerExtension.glb-5ce11000a983f499a2b49d1f9e2a5073.scn"]
 
 [params]
 
@@ -38,5 +38,5 @@ materials/extract=0
 materials/extract_format=0
 materials/extract_path=""
 _subresources={}
-gltf/naming_version=1
+gltf/naming_version=2
 gltf/embedded_image_handling=1

Models/GenericRooms/GenericRoom/GenericRoomRockerExtensionCollide.obj

@@ -0,0 +1,14 @@
+# Blender 4.5.3 LTS
+# www.blender.org
+o GenericRoomRockerExtensionCollide
+v -4.800000 0.000000 -0.400000
+v 4.800000 0.000000 -0.400000
+v -4.800000 3.800000 -0.400000
+v 4.800000 3.800000 -0.400000
+vn -0.0000 -0.0000 1.0000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+s 0
+f 1/1/1 2/2/1 4/3/1 3/4/1

Models/GenericRooms/GenericRoom/GenericRoomRockerExtensionCollide.obj.import

@@ -0,0 +1,25 @@
+[remap]
+
+importer="wavefront_obj"
+importer_version=1
+type="Mesh"
+uid="uid://bi61mroisrqni"
+path="res://.godot/imported/GenericRoomRockerExtensionCollide.obj-12247cc686bb4c993006d2c203ed04c9.mesh"
+
+[deps]
+
+files=["res://.godot/imported/GenericRoomRockerExtensionCollide.obj-12247cc686bb4c993006d2c203ed04c9.mesh"]
+
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomRockerExtensionCollide.obj"
+dest_files=["res://.godot/imported/GenericRoomRockerExtensionCollide.obj-12247cc686bb4c993006d2c203ed04c9.mesh", "res://.godot/imported/GenericRoomRockerExtensionCollide.obj-12247cc686bb4c993006d2c203ed04c9.mesh"]
+
+[params]
+
+generate_tangents=true
+generate_lods=true
+generate_shadow_mesh=true
+generate_lightmap_uv2=false
+generate_lightmap_uv2_texel_size=0.2
+scale_mesh=Vector3(1, 1, 1)
+offset_mesh=Vector3(0, 0, 0)
+force_disable_mesh_compression=false

Models/GenericRooms/GenericRoom/GenericRoomRockerExtension_90sCarpet.png.import

@@ -2,9 +2,9 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bhmebfbe60mf1"
+uid="uid://dvjnh5cqc2ggu"
-path.s3tc="res://.godot/imported/RoadStageGeneric-Room_90sCarpet.png-2ef5f881b0f725581385b723053a42d0.s3tc.ctex"
+path.s3tc="res://.godot/imported/GenericRoomRockerExtension_90sCarpet.png-93dec9e74f73282611a4a57369ac95d3.s3tc.ctex"
-path.etc2="res://.godot/imported/RoadStageGeneric-Room_90sCarpet.png-2ef5f881b0f725581385b723053a42d0.etc2.ctex"
+path.etc2="res://.godot/imported/GenericRoomRockerExtension_90sCarpet.png-93dec9e74f73282611a4a57369ac95d3.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -15,8 +15,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://Models/GenericRooms/RoadStage/RoadStageGeneric-Room_90sCarpet.png"
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomRockerExtension_90sCarpet.png"
-dest_files=["res://.godot/imported/RoadStageGeneric-Room_90sCarpet.png-2ef5f881b0f725581385b723053a42d0.s3tc.ctex", "res://.godot/imported/RoadStageGeneric-Room_90sCarpet.png-2ef5f881b0f725581385b723053a42d0.etc2.ctex"]
+dest_files=["res://.godot/imported/GenericRoomRockerExtension_90sCarpet.png-93dec9e74f73282611a4a57369ac95d3.s3tc.ctex", "res://.godot/imported/GenericRoomRockerExtension_90sCarpet.png-93dec9e74f73282611a4a57369ac95d3.etc2.ctex"]
 
 [params]
 

Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb.import

@@ -0,0 +1,42 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://ctpymr0p4ojab"
+path="res://.godot/imported/GenericRoomStandardExtension.glb-14d5fed2397bd22a606be4220e06df18.scn"
+
+[deps]
+
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb"
+dest_files=["res://.godot/imported/GenericRoomStandardExtension.glb-14d5fed2397bd22a606be4220e06df18.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1

Models/GenericRooms/GenericRoom/GenericRoomStandardExtensionCollide.obj

@@ -0,0 +1,19 @@
+# Blender 4.5.3 LTS
+# www.blender.org
+o GenericRoomStandardExtensionCollide
+v -4.800000 0.000000 -0.400000
+v -3.800000 0.000000 -0.400000
+v -4.800000 3.800000 -0.400000
+v -3.800000 3.800000 -0.400000
+v 3.800000 0.000000 -0.400000
+v 4.800000 0.000000 -0.400000
+v 3.800000 3.800000 -0.400000
+v 4.800000 3.800000 -0.400000
+vn -0.0000 -0.0000 1.0000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+s 0
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 5/1/1 6/2/1 8/3/1 7/4/1

Models/GenericRooms/GenericRoom/GenericRoomStandardExtensionCollide.obj.import

@@ -0,0 +1,25 @@
+[remap]
+
+importer="wavefront_obj"
+importer_version=1
+type="Mesh"
+uid="uid://c7d8p7tie6icp"
+path="res://.godot/imported/GenericRoomStandardExtensionCollide.obj-88ea49b8e60825f9a576d482b7ea2bd6.mesh"
+
+[deps]
+
+files=["res://.godot/imported/GenericRoomStandardExtensionCollide.obj-88ea49b8e60825f9a576d482b7ea2bd6.mesh"]
+
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtensionCollide.obj"
+dest_files=["res://.godot/imported/GenericRoomStandardExtensionCollide.obj-88ea49b8e60825f9a576d482b7ea2bd6.mesh", "res://.godot/imported/GenericRoomStandardExtensionCollide.obj-88ea49b8e60825f9a576d482b7ea2bd6.mesh"]
+
+[params]
+
+generate_tangents=true
+generate_lods=true
+generate_shadow_mesh=true
+generate_lightmap_uv2=false
+generate_lightmap_uv2_texel_size=0.2
+scale_mesh=Vector3(1, 1, 1)
+offset_mesh=Vector3(0, 0, 0)
+force_disable_mesh_compression=false

Models/GenericRooms/GenericRoom/GenericRoomTemplate.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=13 format=3 uid="uid://dusg7f0lhyhjo"]
 
-[ext_resource type="PackedScene" uid="uid://bla4yvn024kfy" path="res://Models/FreeRoamLocations/GenericRoom/GenericRoom.glb" id="1_8jdal"]
+[ext_resource type="PackedScene" uid="uid://2b8osgxq7jqy" path="res://Models/GenericRooms/GenericRoom/GenericRoomMain.glb" id="1_8b2gp"]
 [ext_resource type="PackedScene" uid="uid://dwv4f6bls2btr" path="res://Scenes/Props/Static/90sShowroomBoothDouble.tscn" id="2_bbw2j"]
 [ext_resource type="PackedScene" uid="uid://b3y3v2k05s3qx" path="res://Scenes/Props/Static/90sShowroomBoothSingle.tscn" id="3_wktbn"]
 [ext_resource type="PackedScene" uid="uid://d3p2q6uuhtf34" path="res://Scenes/Props/Static/TableGrey1.5m.tscn" id="4_h41tf"]
@@ -12,13 +12,13 @@
 [ext_resource type="PackedScene" uid="uid://dnwiuv65kwfnj" path="res://Models/Artwork/RecordRed-Jowles.glb" id="10_ylkpt"]
 [ext_resource type="PackedScene" uid="uid://lysflwrlxbe" path="res://Models/Artwork/RecordRed-MCChuckie.glb" id="11_l1lnx"]
 
-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_5m8pg"]
+[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_8b2gp"]
-data = PackedVector3Array(-8, 3.8, 8, -8, 0, 8, -8, 3.8, -0.39999998, -8, 3.8, -0.39999998, -8, 0, 8, -8, 0, -0.39999998, -8, 3.8, -0.39999998, -8, 0, -0.39999998, -3.8, 3.8, -0.39999998, -3.8, 3.8, -0.39999998, -8, 0, -0.39999998, -3.8, 0, -0.39999998, 8, 3.8, -0.39999998, 8, 0, -0.39999998, 8, 3.8, 8, 8, 3.8, 8, 8, 0, -0.39999998, 8, 0, 8, 8, 3.8, 8, 8, 0, 8, -8, 3.8, 8, -8, 3.8, 8, 8, 0, 8, -8, 0, 8, 8, 0, -0.39999998, -8, 0, -0.39999998, 8, 0, 8, 8, 0, 8, -8, 0, -0.39999998, -8, 0, 8, -8, 3.8, -0.39999998, 8, 3.8, -0.39999998, -8, 3.8, 8, -8, 3.8, 8, 8, 3.8, -0.39999998, 8, 3.8, 8, 8, 0, -0.39999998, 8, 3.8, -0.39999998, 3.8, 0, -0.39999998, 3.8, 0, -0.39999998, 8, 3.8, -0.39999998, 3.8, 3.8, -0.39999998, 3.8, 0, -0.39999998, 3.8, 3.8, -0.39999998, 3.8, 0, -4, 3.8, 0, -4, 3.8, 3.8, -0.39999998, 3.8, 3.8, -4, -3.8, 3.8, -0.39999998, -3.8, 0, -0.39999998, -3.8, 3.8, -4, -3.8, 3.8, -4, -3.8, 0, -0.39999998, -3.8, 0, -4, -3.8, 3.8, -4, -3.8, 0, -4, 3.8, 3.8, -4, 3.8, 3.8, -4, -3.8, 0, -4, 3.8, 0, -4, -3.8, 3.8, -4, 3.8, 3.8, -4, -3.8, 3.8, -0.39999998, -3.8, 3.8, -0.39999998, 3.8, 3.8, -4, 3.8, 3.8, -0.39999998, -3.8, 0, -0.39999998, 3.8, 0, -0.39999998, -3.8, 0, -4, -3.8, 0, -4, 3.8, 0, -0.39999998, 3.8, 0, -4)
+data = PackedVector3Array(-8, 3.8, 8, -8, 0, 8, -8, 3.8, -0.39999998, -8, 3.8, -0.39999998, -8, 0, 8, -8, 0, -0.39999998, -8, 3.8, -0.39999998, -8, 0, -0.39999998, -4.8002, 3.8, -0.39999998, -4.8002, 3.8, -0.39999998, -8, 0, -0.39999998, -4.8002, 0, -0.39999998, 8, 3.8, -0.39999998, 8, 0, -0.39999998, 8, 3.8, 8, 8, 3.8, 8, 8, 0, -0.39999998, 8, 0, 8, 8, 3.8, 8, 8, 0, 8, -8, 3.8, 8, -8, 3.8, 8, 8, 0, 8, -8, 0, 8, 8, 0, -0.39999998, -8, 0, -0.39999998, 8, 0, 8, 8, 0, 8, -8, 0, -0.39999998, -8, 0, 8, -8, 3.8, -0.39999998, 8, 3.8, -0.39999998, -8, 3.8, 8, -8, 3.8, 8, 8, 3.8, -0.39999998, 8, 3.8, 8, 8, 0, -0.39999998, 8, 3.8, -0.39999998, 4.7999997, 0, -0.39999998, 4.7999997, 0, -0.39999998, 8, 3.8, -0.39999998, 4.7999997, 3.8, -0.39999998)
 backface_collision = true
 
 [node name="GenericRoomTemplate" type="Node3D"]
 
-[node name="GenericRoom" parent="." instance=ExtResource("1_8jdal")]
+[node name="GenericRoomMain2" parent="." instance=ExtResource("1_8b2gp")]
 
 [node name="RoomLights" type="Node3D" parent="."]
 
@@ -353,4 +353,4 @@ transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 8, 1
 [node name="CollideMap" type="StaticBody3D" parent="."]
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
-shape = SubResource("ConcavePolygonShape3D_5m8pg")
+shape = SubResource("ConcavePolygonShape3D_8b2gp")

Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn

@@ -1,14 +1,10 @@
-[gd_scene load_steps=3 format=3 uid="uid://c2hctwg8q7xsn"]
+[gd_scene load_steps=2 format=3 uid="uid://c2hctwg8q7xsn"]
 
-[ext_resource type="PackedScene" uid="uid://bla4yvn024kfy" path="res://Models/FreeRoamLocations/GenericRoom/GenericRoom.glb" id="1_fq3gv"]
+[ext_resource type="PackedScene" uid="uid://2b8osgxq7jqy" path="res://Models/GenericRooms/GenericRoom/GenericRoomMain.glb" id="1_otk63"]
-
-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_5m8pg"]
-data = PackedVector3Array(-8, 3.8, 8, -8, 0, 8, -8, 3.8, -0.39999998, -8, 3.8, -0.39999998, -8, 0, 8, -8, 0, -0.39999998, -8, 3.8, -0.39999998, -8, 0, -0.39999998, -3.8, 3.8, -0.39999998, -3.8, 3.8, -0.39999998, -8, 0, -0.39999998, -3.8, 0, -0.39999998, 8, 3.8, -0.39999998, 8, 0, -0.39999998, 8, 3.8, 8, 8, 3.8, 8, 8, 0, -0.39999998, 8, 0, 8, 8, 3.8, 8, 8, 0, 8, -8, 3.8, 8, -8, 3.8, 8, 8, 0, 8, -8, 0, 8, 8, 0, -0.39999998, -8, 0, -0.39999998, 8, 0, 8, 8, 0, 8, -8, 0, -0.39999998, -8, 0, 8, -8, 3.8, -0.39999998, 8, 3.8, -0.39999998, -8, 3.8, 8, -8, 3.8, 8, 8, 3.8, -0.39999998, 8, 3.8, 8, 8, 0, -0.39999998, 8, 3.8, -0.39999998, 3.8, 0, -0.39999998, 3.8, 0, -0.39999998, 8, 3.8, -0.39999998, 3.8, 3.8, -0.39999998, 3.8, 0, -0.39999998, 3.8, 3.8, -0.39999998, 3.8, 0, -4, 3.8, 0, -4, 3.8, 3.8, -0.39999998, 3.8, 3.8, -4, -3.8, 3.8, -0.39999998, -3.8, 0, -0.39999998, -3.8, 3.8, -4, -3.8, 3.8, -4, -3.8, 0, -0.39999998, -3.8, 0, -4, -3.8, 3.8, -4, -3.8, 0, -4, 3.8, 3.8, -4, 3.8, 3.8, -4, -3.8, 0, -4, 3.8, 0, -4, -3.8, 3.8, -4, 3.8, 3.8, -4, -3.8, 3.8, -0.39999998, -3.8, 3.8, -0.39999998, 3.8, 3.8, -4, 3.8, 3.8, -0.39999998, -3.8, 0, -0.39999998, 3.8, 0, -0.39999998, -3.8, 0, -4, -3.8, 0, -4, 3.8, 0, -0.39999998, 3.8, 0, -4)
-backface_collision = true
 
 [node name="GenericRoomTemplate" type="Node3D"]
 
-[node name="GenericRoom" parent="." instance=ExtResource("1_fq3gv")]
+[node name="GenericRoomMain" parent="." instance=ExtResource("1_otk63")]
 
 [node name="RoomLights" type="Node3D" parent="."]
 
@@ -256,8 +252,3 @@ light_color = Color(0.70980394, 0.6745098, 0.62352943, 1)
 light_energy = 0.05
 shadow_enabled = true
 omni_range = 10.0
-
-[node name="CollideMap" type="StaticBody3D" parent="."]
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
-shape = SubResource("ConcavePolygonShape3D_5m8pg")

Models/GenericRooms/GenericRoom/GenericRoom_90sCarpet.png.import

@@ -3,8 +3,8 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cfrvswhyxbv2k"
-path.s3tc="res://.godot/imported/GenericRoom_90sCarpet.png-07cfe572dc753b703dfccbdf2136c5da.s3tc.ctex"
+path.s3tc="res://.godot/imported/GenericRoom_90sCarpet.png-568f9c27966c65a7c4fbb5ebe37f7fe0.s3tc.ctex"
-path.etc2="res://.godot/imported/GenericRoom_90sCarpet.png-07cfe572dc753b703dfccbdf2136c5da.etc2.ctex"
+path.etc2="res://.godot/imported/GenericRoom_90sCarpet.png-568f9c27966c65a7c4fbb5ebe37f7fe0.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -15,8 +15,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://Models/FreeRoamLocations/GenericRoom/GenericRoom_90sCarpet.png"
+source_file="res://Models/GenericRooms/GenericRoom/GenericRoom_90sCarpet.png"
-dest_files=["res://.godot/imported/GenericRoom_90sCarpet.png-07cfe572dc753b703dfccbdf2136c5da.s3tc.ctex", "res://.godot/imported/GenericRoom_90sCarpet.png-07cfe572dc753b703dfccbdf2136c5da.etc2.ctex"]
+dest_files=["res://.godot/imported/GenericRoom_90sCarpet.png-568f9c27966c65a7c4fbb5ebe37f7fe0.s3tc.ctex", "res://.godot/imported/GenericRoom_90sCarpet.png-568f9c27966c65a7c4fbb5ebe37f7fe0.etc2.ctex"]
 
 [params]
 

Models/GenericRooms/RoadStage/RoadStageGeneric-RoomCollide.obj

@@ -1,34 +0,0 @@
-# Blender 4.5.1 LTS
-# www.blender.org
-o RoomCollide
-v -9.800000 0.000000 12.800000
-v -9.800000 3.800000 12.800000
-v -9.800000 0.000000 -0.400000
-v -9.800000 3.800000 -0.400000
-v 9.800000 0.000000 -0.400000
-v 9.800000 3.800000 -0.400000
-v 9.799999 3.800000 10.400000
-v 9.799999 0.000000 10.400000
-v 7.400000 0.000000 12.800000
-v 7.400000 3.800000 12.800000
-vn -1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 -1.0000
-vn -0.0000 1.0000 -0.0000
-vn 0.7071 -0.0000 0.7071
-vn 1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 1.0000
-vn -0.0000 -1.0000 -0.0000
-vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
-vt 0.375000 0.250000
-vt 0.625000 0.500000
-vt 0.375000 0.500000
-s 0
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/4/2 4/3/2 6/5/2 5/6/2
-f 2/2/3 10/2/3 7/2/3 6/5/3 4/3/3
-f 10/2/4 9/1/4 8/1/4 7/2/4
-f 6/5/5 7/2/5 8/1/5 5/6/5
-f 2/2/6 1/1/6 9/1/6 10/2/6
-f 3/4/7 5/6/7 8/1/7 9/1/7 1/1/7

Models/GenericRooms/RoadStage/RoadStageGeneric-RoomCollide.obj.import

@@ -1,25 +0,0 @@
-[remap]
-
-importer="wavefront_obj"
-importer_version=1
-type="Mesh"
-uid="uid://2ikmmfg177xk"
-path="res://.godot/imported/RoadStageGeneric-RoomCollide.obj-189e403f4d58026ae0ed6be39ad4e108.mesh"
-
-[deps]
-
-files=["res://.godot/imported/RoadStageGeneric-RoomCollide.obj-189e403f4d58026ae0ed6be39ad4e108.mesh"]
-
-source_file="res://Models/GenericRooms/RoadStage/RoadStageGeneric-RoomCollide.obj"
-dest_files=["res://.godot/imported/RoadStageGeneric-RoomCollide.obj-189e403f4d58026ae0ed6be39ad4e108.mesh", "res://.godot/imported/RoadStageGeneric-RoomCollide.obj-189e403f4d58026ae0ed6be39ad4e108.mesh"]
-
-[params]
-
-generate_tangents=true
-generate_lods=true
-generate_shadow_mesh=true
-generate_lightmap_uv2=false
-generate_lightmap_uv2_texel_size=0.2
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-force_disable_mesh_compression=false

Models/GenericRooms/RoadStage/RoadStageGeneric-StageCollide.obj

@@ -1,208 +0,0 @@
-# Blender 4.5.1 LTS
-# www.blender.org
-o StageCollide
-v -3.500000 0.000000 1.600000
-v -3.500000 0.500000 1.600000
-v -4.500000 0.000000 -0.400000
-v -4.500000 0.500000 -0.400000
-v 3.500000 0.000000 1.600000
-v 3.500000 0.500000 1.600000
-v 4.500000 0.000000 -0.400000
-v 4.500000 0.500000 -0.400000
-v -3.500000 3.700000 1.600000
-v -3.500000 3.800000 1.600000
-v -4.500000 3.700000 -0.400000
-v -4.500000 3.800000 -0.400000
-v 3.500000 3.700000 1.600000
-v 3.500000 3.800000 1.600000
-v 4.500000 3.700000 -0.400000
-v 4.500000 3.800000 -0.400000
-v -0.750000 0.500000 1.100000
-v -0.750000 1.750000 1.100000
-v -0.750000 0.500000 0.200000
-v -0.750000 1.750000 0.200000
-v 0.150000 0.500000 1.100000
-v 0.150000 1.750000 1.100000
-v 0.150000 0.500000 0.200000
-v 0.150000 1.750000 0.200000
-v 1.450000 0.500000 1.100000
-v 1.450000 1.750000 1.100000
-v 1.450000 0.500000 0.200000
-v 1.450000 1.750000 0.200000
-v 2.350000 0.500000 1.100000
-v 2.350000 1.750000 1.100000
-v 2.350000 0.500000 0.200000
-v 2.350000 1.750000 0.200000
-v 0.250000 0.500000 1.300000
-v 0.250000 1.500000 1.300000
-v 0.250000 0.500000 0.300000
-v 0.250000 1.500000 0.300000
-v 1.350000 0.500000 1.300000
-v 1.350000 1.500000 1.300000
-v 1.350000 0.500000 0.300000
-v 1.350000 1.500000 0.300000
-v 2.450000 1.200000 1.300000
-v 2.450000 1.800000 1.300000
-v 2.450000 1.200000 0.900000
-v 2.450000 1.800000 0.900000
-v 3.750000 1.200000 1.300000
-v 3.750000 1.800000 1.300000
-v 3.750000 1.200000 0.900000
-v 3.750000 1.800000 0.900000
-v 2.650000 0.500000 1.100000
-v 2.650000 1.650000 1.100000
-v 2.650000 0.500000 0.300000
-v 2.650000 1.650000 0.300000
-v 3.550000 0.500000 1.100000
-v 3.550000 1.650000 1.100000
-v 3.550000 0.500000 0.300000
-v 3.550000 1.650000 0.300000
-v -2.150000 0.500000 0.950000
-v -2.150000 2.400000 0.950000
-v -2.150000 0.500000 0.300000
-v -2.150000 2.400000 0.300000
-v -0.850000 0.500000 0.950000
-v -0.850000 2.400000 0.950000
-v -0.850000 0.500000 0.300000
-v -0.850000 2.400000 0.300000
-v -3.600000 0.500000 1.400000
-v -3.600000 1.000000 1.400000
-v -3.600000 0.500000 0.450000
-v -3.600000 1.000000 0.450000
-v -2.400000 0.500000 1.400000
-v -2.400000 1.000000 1.400000
-v -2.400000 0.500000 0.450000
-v -2.400000 1.000000 0.450000
-v -3.400000 0.500000 0.450000
-v -3.400000 2.400000 0.450000
-v -3.400000 0.500000 -0.400000
-v -3.400000 2.400000 -0.400000
-v -2.600000 0.500000 0.450000
-v -2.600000 2.400000 0.450000
-v -2.600000 0.500000 -0.400000
-v -2.600000 2.400000 -0.400000
-v -4.150001 0.500000 0.150000
-v -4.150001 3.500000 0.150000
-v -4.150001 0.500000 -0.400000
-v -4.150001 3.500000 -0.400000
-v -3.450000 0.500000 0.150000
-v -3.450000 3.500000 0.150000
-v -3.450000 0.500000 -0.400000
-v -3.450000 3.500000 -0.400000
-v 3.449999 0.500000 0.150000
-v 3.449999 3.500000 0.150000
-v 3.449999 0.500000 -0.400000
-v 3.449999 3.500000 -0.400000
-v 4.150000 0.500000 0.150000
-v 4.150000 3.500000 0.150000
-v 4.150000 0.500000 -0.400000
-v 4.150000 3.500000 -0.400000
-v 0.199999 0.500000 0.300000
-v 0.199999 3.200000 0.300000
-v 0.199999 0.500000 -0.400000
-v 0.199999 3.200000 -0.400000
-v 1.400000 0.500000 0.300000
-v 1.400000 3.200000 0.300000
-v 1.400000 0.500000 -0.400000
-v 1.400000 3.200000 -0.400000
-vn -0.8944 -0.0000 0.4472
-vn -0.0000 -0.0000 -1.0000
-vn 0.8944 -0.0000 0.4472
-vn -0.0000 -0.0000 1.0000
-vn -0.0000 -1.0000 -0.0000
-vn -0.0000 1.0000 -0.0000
-vn -1.0000 -0.0000 -0.0000
-vn 1.0000 -0.0000 -0.0000
-vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
-vt 0.375000 0.250000
-vt 0.625000 0.500000
-vt 0.375000 0.500000
-vt 0.625000 0.750000
-vt 0.375000 0.750000
-vt 0.625000 1.000000
-vt 0.375000 1.000000
-vt 0.125000 0.500000
-vt 0.125000 0.750000
-vt 0.875000 0.500000
-vt 0.875000 0.750000
-s 0
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/4/2 4/3/2 8/5/2 7/6/2
-f 7/6/3 8/5/3 6/7/3 5/8/3
-f 5/8/4 6/7/4 2/9/4 1/10/4
-f 3/11/5 7/6/5 5/8/5 1/12/5
-f 8/5/6 4/13/6 2/14/6 6/7/6
-f 9/1/1 10/2/1 12/3/1 11/4/1
-f 11/4/2 12/3/2 16/5/2 15/6/2
-f 15/6/3 16/5/3 14/7/3 13/8/3
-f 13/8/4 14/7/4 10/9/4 9/10/4
-f 11/11/5 15/6/5 13/8/5 9/12/5
-f 16/5/6 12/13/6 10/14/6 14/7/6
-f 17/1/7 18/2/7 20/3/7 19/4/7
-f 19/4/2 20/3/2 24/5/2 23/6/2
-f 23/6/8 24/5/8 22/7/8 21/8/8
-f 21/8/4 22/7/4 18/9/4 17/10/4
-f 19/11/5 23/6/5 21/8/5 17/12/5
-f 24/5/6 20/13/6 18/14/6 22/7/6
-f 25/1/7 26/2/7 28/3/7 27/4/7
-f 27/4/2 28/3/2 32/5/2 31/6/2
-f 31/6/8 32/5/8 30/7/8 29/8/8
-f 29/8/4 30/7/4 26/9/4 25/10/4
-f 27/11/5 31/6/5 29/8/5 25/12/5
-f 32/5/6 28/13/6 26/14/6 30/7/6
-f 33/1/7 34/2/7 36/3/7 35/4/7
-f 35/4/2 36/3/2 40/5/2 39/6/2
-f 39/6/8 40/5/8 38/7/8 37/8/8
-f 37/8/4 38/7/4 34/9/4 33/10/4
-f 35/11/5 39/6/5 37/8/5 33/12/5
-f 40/5/6 36/13/6 34/14/6 38/7/6
-f 41/1/7 42/2/7 44/3/7 43/4/7
-f 43/4/2 44/3/2 48/5/2 47/6/2
-f 47/6/8 48/5/8 46/7/8 45/8/8
-f 45/8/4 46/7/4 42/9/4 41/10/4
-f 43/11/5 47/6/5 45/8/5 41/12/5
-f 48/5/6 44/13/6 42/14/6 46/7/6
-f 49/1/7 50/2/7 52/3/7 51/4/7
-f 51/4/2 52/3/2 56/5/2 55/6/2
-f 55/6/8 56/5/8 54/7/8 53/8/8
-f 53/8/4 54/7/4 50/9/4 49/10/4
-f 51/11/5 55/6/5 53/8/5 49/12/5
-f 56/5/6 52/13/6 50/14/6 54/7/6
-f 57/1/7 58/2/7 60/3/7 59/4/7
-f 59/4/2 60/3/2 64/5/2 63/6/2
-f 63/6/8 64/5/8 62/7/8 61/8/8
-f 61/8/4 62/7/4 58/9/4 57/10/4
-f 59/11/5 63/6/5 61/8/5 57/12/5
-f 64/5/6 60/13/6 58/14/6 62/7/6
-f 65/1/7 66/2/7 68/3/7 67/4/7
-f 67/4/2 68/3/2 72/5/2 71/6/2
-f 71/6/8 72/5/8 70/7/8 69/8/8
-f 69/8/4 70/7/4 66/9/4 65/10/4
-f 67/11/5 71/6/5 69/8/5 65/12/5
-f 72/5/6 68/13/6 66/14/6 70/7/6
-f 73/1/7 74/2/7 76/3/7 75/4/7
-f 75/4/2 76/3/2 80/5/2 79/6/2
-f 79/6/8 80/5/8 78/7/8 77/8/8
-f 77/8/4 78/7/4 74/9/4 73/10/4
-f 75/11/5 79/6/5 77/8/5 73/12/5
-f 80/5/6 76/13/6 74/14/6 78/7/6
-f 81/1/7 82/2/7 84/3/7 83/4/7
-f 83/4/2 84/3/2 88/5/2 87/6/2
-f 87/6/8 88/5/8 86/7/8 85/8/8
-f 85/8/4 86/7/4 82/9/4 81/10/4
-f 83/11/5 87/6/5 85/8/5 81/12/5
-f 88/5/6 84/13/6 82/14/6 86/7/6
-f 89/1/7 90/2/7 92/3/7 91/4/7
-f 91/4/2 92/3/2 96/5/2 95/6/2
-f 95/6/8 96/5/8 94/7/8 93/8/8
-f 93/8/4 94/7/4 90/9/4 89/10/4
-f 91/11/5 95/6/5 93/8/5 89/12/5
-f 96/5/6 92/13/6 90/14/6 94/7/6
-f 97/1/7 98/2/7 100/3/7 99/4/7
-f 99/4/2 100/3/2 104/5/2 103/6/2
-f 103/6/8 104/5/8 102/7/8 101/8/8
-f 101/8/4 102/7/4 98/9/4 97/10/4
-f 99/11/5 103/6/5 101/8/5 97/12/5
-f 104/5/6 100/13/6 98/14/6 102/7/6

Models/GenericRooms/RoadStage/RoadStageGeneric-StageCollide.obj.import

@@ -1,25 +0,0 @@
-[remap]
-
-importer="wavefront_obj"
-importer_version=1
-type="Mesh"
-uid="uid://4wdrjkfw7p6t"
-path="res://.godot/imported/RoadStageGeneric-StageCollide.obj-5c35d3f2ce0468e572a491059a5ffcc1.mesh"
-
-[deps]
-
-files=["res://.godot/imported/RoadStageGeneric-StageCollide.obj-5c35d3f2ce0468e572a491059a5ffcc1.mesh"]
-
-source_file="res://Models/GenericRooms/RoadStage/RoadStageGeneric-StageCollide.obj"
-dest_files=["res://.godot/imported/RoadStageGeneric-StageCollide.obj-5c35d3f2ce0468e572a491059a5ffcc1.mesh", "res://.godot/imported/RoadStageGeneric-StageCollide.obj-5c35d3f2ce0468e572a491059a5ffcc1.mesh"]
-
-[params]
-
-generate_tangents=true
-generate_lods=true
-generate_shadow_mesh=true
-generate_lightmap_uv2=false
-generate_lightmap_uv2_texel_size=0.2
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-force_disable_mesh_compression=false

Models/GenericRooms/RockerStage/RockerStage-Room.glb.import

@@ -1,42 +0,0 @@
-[remap]
-
-importer="scene"
-importer_version=1
-type="PackedScene"
-uid="uid://cpeq7njjmq5xu"
-path="res://.godot/imported/RockerStage-Room.glb-c72bf6632a662769762b9b0dc26774dc.scn"
-
-[deps]
-
-source_file="res://Models/GenericRooms/RockerStage/RockerStage-Room.glb"
-dest_files=["res://.godot/imported/RockerStage-Room.glb-c72bf6632a662769762b9b0dc26774dc.scn"]
-
-[params]
-
-nodes/root_type=""
-nodes/root_name=""
-nodes/root_script=null
-nodes/apply_root_scale=true
-nodes/root_scale=1.0
-nodes/import_as_skeleton_bones=false
-nodes/use_name_suffixes=true
-nodes/use_node_type_suffixes=true
-meshes/ensure_tangents=true
-meshes/generate_lods=true
-meshes/create_shadow_meshes=true
-meshes/light_baking=1
-meshes/lightmap_texel_size=0.2
-meshes/force_disable_compression=false
-skins/use_named_skins=true
-animation/import=true
-animation/fps=30
-animation/trimming=false
-animation/remove_immutable_tracks=true
-animation/import_rest_as_RESET=false
-import_script/path=""
-materials/extract=0
-materials/extract_format=0
-materials/extract_path=""
-_subresources={}
-gltf/naming_version=1
-gltf/embedded_image_handling=1

Models/Stages/1-StageW2-StageProps/12StageGenericCollide.obj

@@ -0,0 +1,197 @@
+# Blender 4.5.3 LTS
+# www.blender.org
+o StageCollide
+v -3.200000 0.000000 0.300000
+v -3.200000 0.800000 0.300000
+v -3.200000 0.000000 -2.600000
+v 3.200000 0.000000 0.300000
+v 3.200000 0.800000 0.300000
+v 3.200000 0.000000 -2.600000
+v 3.200000 0.800000 -2.600000
+v -3.200000 0.800000 -2.600000
+v -3.200000 0.800000 -0.400000
+v -3.200000 3.700000 -0.400000
+v 3.200000 3.700000 -2.600000
+v 3.200000 0.800000 -0.400000
+v 3.200000 3.700000 -0.400000
+v -3.200000 3.700000 0.300000
+v -3.200000 3.800000 0.300000
+v -3.200000 3.700000 -2.600000
+v -3.200000 3.800000 -2.600000
+v 3.200000 3.700000 0.300000
+v 3.200000 3.800000 0.300000
+v 3.200000 3.800000 -2.600000
+v -3.200000 0.800000 -1.000000
+v -1.600000 0.800000 -1.000000
+v -3.200000 3.700000 -1.000000
+v -1.600000 3.700000 -1.000000
+v -1.600000 0.800000 -1.300000
+v -1.600000 3.700000 -1.300000
+v 3.200000 0.800000 -1.300000
+v 3.200000 3.700000 -1.300000
+v -3.200000 0.000000 -0.400000
+v -3.200000 3.800000 -0.400000
+vn -1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 -1.0000
+vn 1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 1.0000
+vn -0.0000 -1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.625000 0.250000
+vt 0.375000 0.250000
+vt 0.625000 0.500000
+vt 0.375000 0.500000
+vt 0.625000 0.750000
+vt 0.375000 0.750000
+vt 0.625000 1.000000
+vt 0.375000 1.000000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+s 0
+f 1/1/1 2/2/1 8/3/1 3/4/1
+f 3/4/2 8/3/2 7/5/2 6/6/2
+f 6/6/3 7/5/3 5/7/3 4/8/3
+f 4/8/4 5/7/4 2/9/4 1/10/4
+f 3/11/5 6/6/5 4/8/5 1/12/5
+f 7/5/6 8/13/6 2/14/6 5/7/6
+f 14/1/1 15/2/1 17/3/1 16/4/1
+f 10/15/3 9/16/3 8/17/3 16/18/3
+f 11/18/1 7/17/1 12/17/1 13/18/1
+f 16/4/2 17/3/2 20/5/2 11/6/2
+f 16/18/4 8/17/4 7/17/4 11/18/4
+f 11/6/3 20/5/3 19/7/3 18/8/3
+f 18/8/4 19/7/4 15/9/4 14/10/4
+f 16/11/5 11/6/5 18/8/5 14/12/5
+f 20/5/6 17/13/6 15/14/6 19/7/6
+f 21/15/4 22/16/4 24/17/4 23/18/4
+f 24/17/3 22/16/3 25/16/3 26/17/3
+f 26/17/4 25/16/4 27/16/4 28/17/4
+l 30 29
+o BotCollide
+v -2.800000 0.800000 -0.300000
+v -2.800000 2.700000 -0.300000
+v -2.800000 0.800000 -0.900000
+v -2.800000 2.700000 -0.900000
+v -2.000000 0.800000 -0.300000
+v -2.000000 2.700000 -0.300000
+v -2.000000 0.800000 -0.900000
+v -2.000000 2.700000 -0.900000
+v -1.300000 0.800000 -0.300000
+v -1.300000 2.700000 -0.300000
+v -1.300000 0.800000 -0.900000
+v -1.300000 2.700000 -0.900000
+v -0.500000 0.800000 -0.300000
+v -0.500000 2.700000 -0.300000
+v -0.500000 0.800000 -0.900000
+v -0.500000 2.700000 -0.900000
+v -0.200000 0.800000 -0.300000
+v -0.200000 2.700000 -0.300000
+v -0.200000 0.800000 -0.900000
+v -0.200000 2.700000 -0.900000
+v 0.600000 0.800000 -0.300000
+v 0.600000 2.700000 -0.300000
+v 0.600000 0.800000 -0.900000
+v 0.600000 2.700000 -0.900000
+v 0.800000 0.800000 -0.300000
+v 0.800000 2.600000 -0.300000
+v 0.800000 0.800000 -1.100000
+v 0.800000 2.600000 -1.100000
+v 1.600000 0.800000 -0.300000
+v 1.600000 2.600000 -0.300000
+v 1.600000 0.800000 -1.100000
+v 1.600000 2.600000 -1.100000
+v 2.000000 0.800000 -0.200000
+v 2.000000 2.600000 -0.200000
+v 2.000000 0.800000 -1.000000
+v 2.000000 2.600000 -1.000000
+v 2.800000 0.800000 -0.200000
+v 2.800000 2.600000 -0.200000
+v 2.800000 0.800000 -1.000000
+v 2.800000 2.600000 -1.000000
+v -0.400000 0.800000 0.050000
+v -0.400000 1.800000 0.050000
+v -0.400000 0.800000 -0.300000
+v -0.400000 1.800000 -0.300000
+v 0.800000 0.800000 0.050000
+v 0.800000 1.800000 0.050000
+v 0.800000 0.800000 -0.300000
+v 0.800000 1.800000 -0.300000
+v 1.700000 0.800000 0.200000
+v 1.700000 1.800000 0.200000
+v 1.700000 0.800000 -0.300000
+v 1.700000 1.800000 -0.300000
+v 2.699999 0.800000 0.200000
+v 2.699999 1.800000 0.200000
+v 2.699999 0.800000 -0.300000
+v 2.699999 1.800000 -0.300000
+vn -1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 -1.0000
+vn 1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 1.0000
+vn -0.0000 -1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.625000 0.250000
+vt 0.375000 0.250000
+vt 0.625000 0.500000
+vt 0.375000 0.500000
+vt 0.625000 0.750000
+vt 0.375000 0.750000
+vt 0.625000 1.000000
+vt 0.375000 1.000000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+s 0
+f 31/19/7 32/20/7 34/21/7 33/22/7
+f 33/22/8 34/21/8 38/23/8 37/24/8
+f 37/24/9 38/23/9 36/25/9 35/26/9
+f 35/26/10 36/25/10 32/27/10 31/28/10
+f 33/29/11 37/24/11 35/26/11 31/30/11
+f 38/23/12 34/31/12 32/32/12 36/25/12
+f 39/19/7 40/20/7 42/21/7 41/22/7
+f 41/22/8 42/21/8 46/23/8 45/24/8
+f 45/24/9 46/23/9 44/25/9 43/26/9
+f 43/26/10 44/25/10 40/27/10 39/28/10
+f 41/29/11 45/24/11 43/26/11 39/30/11
+f 46/23/12 42/31/12 40/32/12 44/25/12
+f 47/19/7 48/20/7 50/21/7 49/22/7
+f 49/22/8 50/21/8 54/23/8 53/24/8
+f 53/24/9 54/23/9 52/25/9 51/26/9
+f 51/26/10 52/25/10 48/27/10 47/28/10
+f 49/29/11 53/24/11 51/26/11 47/30/11
+f 54/23/12 50/31/12 48/32/12 52/25/12
+f 55/19/7 56/20/7 58/21/7 57/22/7
+f 57/22/8 58/21/8 62/23/8 61/24/8
+f 61/24/9 62/23/9 60/25/9 59/26/9
+f 59/26/10 60/25/10 56/27/10 55/28/10
+f 57/29/11 61/24/11 59/26/11 55/30/11
+f 62/23/12 58/31/12 56/32/12 60/25/12
+f 63/19/7 64/20/7 66/21/7 65/22/7
+f 65/22/8 66/21/8 70/23/8 69/24/8
+f 69/24/9 70/23/9 68/25/9 67/26/9
+f 67/26/10 68/25/10 64/27/10 63/28/10
+f 65/29/11 69/24/11 67/26/11 63/30/11
+f 70/23/12 66/31/12 64/32/12 68/25/12
+f 71/19/7 72/20/7 74/21/7 73/22/7
+f 73/22/8 74/21/8 78/23/8 77/24/8
+f 77/24/9 78/23/9 76/25/9 75/26/9
+f 75/26/10 76/25/10 72/27/10 71/28/10
+f 73/29/11 77/24/11 75/26/11 71/30/11
+f 78/23/12 74/31/12 72/32/12 76/25/12
+f 79/19/7 80/20/7 82/21/7 81/22/7
+f 81/22/8 82/21/8 86/23/8 85/24/8
+f 85/24/9 86/23/9 84/25/9 83/26/9
+f 83/26/10 84/25/10 80/27/10 79/28/10
+f 81/29/11 85/24/11 83/26/11 79/30/11
+f 86/23/12 82/31/12 80/32/12 84/25/12

Models/Stages/1-StageW2-StageProps/12StageGenericCollide.obj.import

@@ -0,0 +1,25 @@
+[remap]
+
+importer="wavefront_obj"
+importer_version=1
+type="Mesh"
+uid="uid://bpiw83jj4gke7"
+path="res://.godot/imported/12StageGenericCollide.obj-4e6b4ce3fb2507d514291ec4a78e6a03.mesh"
+
+[deps]
+
+files=["res://.godot/imported/12StageGenericCollide.obj-4e6b4ce3fb2507d514291ec4a78e6a03.mesh"]
+
+source_file="res://Models/Stages/1-StageW2-StageProps/12StageGenericCollide.obj"
+dest_files=["res://.godot/imported/12StageGenericCollide.obj-4e6b4ce3fb2507d514291ec4a78e6a03.mesh", "res://.godot/imported/12StageGenericCollide.obj-4e6b4ce3fb2507d514291ec4a78e6a03.mesh"]
+
+[params]
+
+generate_tangents=true
+generate_lods=true
+generate_shadow_mesh=true
+generate_lightmap_uv2=false
+generate_lightmap_uv2_texel_size=0.2
+scale_mesh=Vector3(1, 1, 1)
+offset_mesh=Vector3(0, 0, 0)
+force_disable_mesh_compression=false

Models/Stages/RockerStage/RockerStage_90sCarpet.png.import

@@ -2,9 +2,9 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dlclfn5iofioh"
+uid="uid://bnw24u465poxi"
-path.s3tc="res://.godot/imported/1StageGenericRoom_90sCarpet.png-c5da71b758421eec912a4221c7be2214.s3tc.ctex"
+path.s3tc="res://.godot/imported/RockerStage_90sCarpet.png-ba39d6381a0991249b76020479072671.s3tc.ctex"
-path.etc2="res://.godot/imported/1StageGenericRoom_90sCarpet.png-c5da71b758421eec912a4221c7be2214.etc2.ctex"
+path.etc2="res://.godot/imported/RockerStage_90sCarpet.png-ba39d6381a0991249b76020479072671.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -15,8 +15,8 @@ generator_parameters={
 
 [deps]
 
-source_file="res://Models/GenericRooms/1-Stage/1StageGenericRoom_90sCarpet.png"
+source_file="res://Models/Stages/RockerStage/RockerStage_90sCarpet.png"
-dest_files=["res://.godot/imported/1StageGenericRoom_90sCarpet.png-c5da71b758421eec912a4221c7be2214.s3tc.ctex", "res://.godot/imported/1StageGenericRoom_90sCarpet.png-c5da71b758421eec912a4221c7be2214.etc2.ctex"]
+dest_files=["res://.godot/imported/RockerStage_90sCarpet.png-ba39d6381a0991249b76020479072671.s3tc.ctex", "res://.godot/imported/RockerStage_90sCarpet.png-ba39d6381a0991249b76020479072671.etc2.ctex"]
 
 [params]
 

Scenes/EditorStages/1Stage.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=28 format=3 uid="uid://bl4wyf7wq84i"]
+[gd_scene load_steps=29 format=3 uid="uid://bl4wyf7wq84i"]
 
 [ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Animatronics/Cyberamics/Cyber Munch.glb" id="1_3gw4q"]
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_bg74u"]
+[ext_resource type="PackedScene" uid="uid://c2hctwg8q7xsn" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn" id="1_t0mai"]
 [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="2_abugi"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="2_ehisq"]
 [ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Animatronics/Cyberamics/Cyber Jasper.glb" id="3_sntwi"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_ryg5o"]
 [ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="5_lou7w"]
@@ -32,7 +33,9 @@ ambient_light_source = 1
 
 [node name="1Stage" type="Node3D"]
 
-[node name="1StageGenericRoom" parent="." instance=ExtResource("1_bg74u")]
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("1_t0mai")]
+
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("2_ehisq")]
 
 [node name="StageModel" parent="." instance=ExtResource("8_3gw4q")]
 
@@ -308,43 +311,6 @@ fov = 60.0
 transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2, 2.75, 5)
 fov = 60.0
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Organ" type="Node3D" parent="."]
 script = ExtResource("7_66voy")
 

Scenes/EditorStages/1StageW2StageProps.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=26 format=3 uid="uid://fd2f5wjrpkke"]
+[gd_scene load_steps=27 format=3 uid="uid://fd2f5wjrpkke"]
 
 [ext_resource type="PackedScene" uid="uid://dty4pv83503iv" path="res://Models/Stages/1-StageW2-StageProps/12StageCurtains.glb" id="1_8mdw3"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="2_dxrb3"]
@@ -9,7 +9,9 @@
 [ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Animatronics/Cyberamics/Cyber Pasqually.glb" id="7_q1t8f"]
 [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="8_1aq8j"]
 [ext_resource type="PackedScene" uid="uid://mvv5sjk3vbtl" path="res://Scenes/Props/Stage/HelicopterLight.tscn" id="9_xrxi4"]
+[ext_resource type="PackedScene" uid="uid://dqfruuevd22p8" path="res://Models/GenericRooms/GenericRoom/GenericRoom12Extension.glb" id="11_8s0e6"]
 [ext_resource type="Script" uid="uid://csyks2ufy3o3x" path="res://Scripts/OneWayController.gd" id="11_cm6ho"]
+[ext_resource type="PackedScene" uid="uid://c2hctwg8q7xsn" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn" id="12_7d8th"]
 [ext_resource type="PackedScene" uid="uid://i0mdtx4awen1" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-OrganLightsInner.glb" id="12_y0nt0"]
 [ext_resource type="PackedScene" uid="uid://7sjl1s1e03ml" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-OrganLightsMiddle.glb" id="13_o8y2c"]
 [ext_resource type="PackedScene" uid="uid://cw7ndo3hivt21" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-OrganLightsOuter.glb" id="14_oig8i"]
@@ -22,7 +24,6 @@
 [ext_resource type="PackedScene" uid="uid://u3v6pjj2gavj" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-FiberCurtain.glb" id="22_6khan"]
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="23_8s0e6"]
 [ext_resource type="PackedScene" uid="uid://siys6kk0og2r" path="res://Models/Stages/1-StageW2-StageProps/12StageGeneric.glb" id="23_dxrb3"]
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="23_png03"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="24_7d8th"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
@@ -31,34 +32,34 @@ ambient_light_source = 1
 [node name="1StageW2StageProps" type="Node3D"]
 
 [node name="Curtain" parent="." instance=ExtResource("1_8mdw3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0.25)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 1.1, 0.25)
 script = ExtResource("11_cm6ho")
 
 [node name="Chuck" parent="." instance=ExtResource("2_dxrb3")]
-transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -1.7, 1.52, -0.6)
+transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -2.3000002, 1.52, -0.6)
 script = ExtResource("3_8s0e6")
 
 [node name="Helen" parent="." instance=ExtResource("4_7d8th")]
-transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -0.3, 1.52, -0.7)
+transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -0.90000004, 1.52, -0.7)
 script = ExtResource("3_8s0e6")
 
 [node name="Munch" parent="." instance=ExtResource("5_tf4cw")]
-transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0.8, 1.52, -0.7)
+transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0.19999999, 1.52, -0.7)
 script = ExtResource("3_8s0e6")
 
 [node name="Jasper" parent="." instance=ExtResource("6_hl2rs")]
-transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 1.8, 1.4, -0.7)
+transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 1.1999999, 1.4, -0.7)
 script = ExtResource("3_8s0e6")
 
 [node name="Pasqually" parent="." instance=ExtResource("7_q1t8f")]
-transform = Transform3D(0.519615, 0, -0.3, 0, 0.6, 0, 0.3, 0, 0.519615, 3.1, 1.4, -0.8)
+transform = Transform3D(0.519615, 0, -0.3, 0, 0.6, 0, 0.3, 0, 0.519615, 2.5, 1.4, -0.8)
 script = ExtResource("3_8s0e6")
 
 [node name="Spots" type="Node3D" parent="."]
 script = ExtResource("8_1aq8j")
 
 [node name="Chuck" type="SpotLight3D" parent="Spots" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -1.7, 3.7, 5)
+transform = Transform3D(1, 0, 0, 0, 0.9702958, 0.24192195, 0, -0.24192195, 0.9702958, -2.3000002, 3.7, 5)
 visible = false
 light_color = Color(1, 0.960784, 0.85098, 1)
 light_energy = 0.8
@@ -69,7 +70,7 @@ spot_attenuation = -1.0
 spot_angle = 5.0
 
 [node name="Helen" type="SpotLight3D" parent="Spots" groups=["lights"]]
-transform = Transform3D(1, -5.67102e-08, 2.31578e-07, -9.98193e-10, 0.970296, 0.241922, -2.38419e-07, -0.241922, 0.970296, -0.3, 3.7, 5)
+transform = Transform3D(1, -5.6710245e-08, 2.3157844e-07, -9.98193e-10, 0.9702958, 0.24192195, -2.38419e-07, -0.24192195, 0.9702958, -0.90000004, 3.7, 5)
 visible = false
 light_color = Color(1, 0.960784, 0.85098, 1)
 light_energy = 0.8
@@ -80,7 +81,7 @@ spot_attenuation = -1.0
 spot_angle = 5.0
 
 [node name="Munch" type="SpotLight3D" parent="Spots" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0.8, 3.7, 5)
+transform = Transform3D(1, 0, 0, 0, 0.9702958, 0.24192195, 0, -0.24192195, 0.9702958, 0.19999999, 3.7, 5)
 visible = false
 light_color = Color(1, 0.960784, 0.85098, 1)
 light_energy = 0.8
@@ -91,7 +92,7 @@ spot_attenuation = -1.0
 spot_angle = 5.0
 
 [node name="Jasper" type="SpotLight3D" parent="Spots" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 1.8, 3.6, 5)
+transform = Transform3D(1, 0, 0, 0, 0.9702958, 0.24192195, 0, -0.24192195, 0.9702958, 1.1999999, 3.6, 5)
 visible = false
 light_color = Color(1, 0.960784, 0.85098, 1)
 light_energy = 0.8
@@ -102,7 +103,7 @@ spot_attenuation = -1.0
 spot_angle = 5.0
 
 [node name="Pasqually" type="SpotLight3D" parent="Spots" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 3.1, 3.6, 5)
+transform = Transform3D(1, 0, 0, 0, 0.9702958, 0.24192195, 0, -0.24192195, 0.9702958, 2.5, 3.6, 5)
 visible = false
 light_color = Color(1, 0.960784, 0.85098, 1)
 light_energy = 0.8
@@ -113,7 +114,7 @@ spot_attenuation = -1.0
 spot_angle = 5.0
 
 [node name="Wink" type="SpotLight3D" parent="Spots" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.998135, 0.0610485, 0, -0.0610485, 0.998135, 0.6, 3.7, 4)
+transform = Transform3D(1, 0, 0, 0, 0.99813485, 0.061048493, 0, -0.061048493, 0.99813485, 0, 3.7, 4)
 visible = false
 light_color = Color(1, 0.960784, 0.85098, 1)
 light_energy = 0.8
@@ -126,7 +127,7 @@ spot_angle = 5.0
 script = ExtResource("8_1aq8j")
 
 [node name="CEC Red" type="SpotLight3D" parent="Floods" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -2.25, 3.5, 0)
+transform = Transform3D(1, 0, 0, 0, 0.7071068, 0.7071068, 0, -0.7071068, 0.7071068, -2.85, 3.5, 0)
 visible = false
 light_color = Color(1, 0, 0, 1)
 light_energy = 2.0
@@ -134,7 +135,7 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="CEC Amber" type="SpotLight3D" parent="Floods" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -1.75, 3.5, 0)
+transform = Transform3D(1, 0, 0, 0, 0.7071068, 0.7071068, 0, -0.7071068, 0.7071068, -2.35, 3.5, 0)
 visible = false
 light_color = Color(1, 0.498039, 0, 1)
 light_energy = 2.0
@@ -142,7 +143,7 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="CEC Blue" type="SpotLight3D" parent="Floods" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -1.25, 3.5, 0)
+transform = Transform3D(1, 0, 0, 0, 0.7071068, 0.7071068, 0, -0.7071068, 0.7071068, -1.85, 3.5, 0)
 visible = false
 light_color = Color(0, 0.498039, 1, 1)
 light_energy = 2.0
@@ -150,6 +151,7 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="Main Red" type="Node3D" parent="Floods"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="MR1" type="SpotLight3D" parent="Floods/Main Red" groups=["lights"]]
@@ -174,6 +176,7 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="Main Amber" type="Node3D" parent="Floods"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="MA1" type="SpotLight3D" parent="Floods/Main Amber" groups=["lights"]]
@@ -198,6 +201,7 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="Main Blue" type="Node3D" parent="Floods"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="MB1" type="SpotLight3D" parent="Floods/Main Blue" groups=["lights"]]
@@ -225,6 +229,7 @@ shadow_bias = 0.1
 script = ExtResource("8_1aq8j")
 
 [node name="Red" type="Node3D" parent="Backdrop"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="MR1" type="SpotLight3D" parent="Backdrop/Red" groups=["lights"]]
@@ -249,6 +254,7 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="Amber" type="Node3D" parent="Backdrop"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="MA1" type="SpotLight3D" parent="Backdrop/Amber" groups=["lights"]]
@@ -273,6 +279,7 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="Blue" type="Node3D" parent="Backdrop"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="MB1" type="SpotLight3D" parent="Backdrop/Blue" groups=["lights"]]
@@ -297,93 +304,65 @@ shadow_enabled = true
 shadow_bias = 0.1
 
 [node name="Special Helicopter" parent="." instance=ExtResource("9_xrxi4")]
-transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0.6, 3, 4)
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 3, 4)
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_w3m2i")
 
 [node name="Angle 1" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 0.984808, 0.173648, 0, -0.173648, 0.984808, 0.6, 2.75, 3.5)
+transform = Transform3D(1, 0, 0, 0, 0.9848078, 0.17364796, 0, -0.17364796, 0.9848078, 0, 2.75, 3.5)
 current = true
 fov = 60.0
 
 [node name="Angle 2" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -1.7, 2.5, 1)
+transform = Transform3D(1, 0, 0, 0, 0.9659259, 0.25881898, 0, -0.25881898, 0.9659259, -2.3000002, 2.5, 1)
 fov = 60.0
 
 [node name="Angle 3" type="Camera3D" parent="."]
-transform = Transform3D(1, 4.52534e-08, -1.68888e-07, -4.02637e-15, 0.965926, 0.258819, 1.74846e-07, -0.258819, 0.965926, 0.8, 2.5, 1)
+transform = Transform3D(1, 4.5253465e-08, -1.6888828e-07, -4.02637e-15, 0.9659259, 0.25881898, 1.74846e-07, -0.25881898, 0.9659259, 0.19999999, 2.5, 1)
 fov = 60.0
 
 [node name="Angle 4" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 0.984267, 0.17669, 0, -0.17669, 0.984267, 3, 2.25, 1.323)
+transform = Transform3D(1, 0, 0, 0, 0.98426664, 0.17668995, 0, -0.17668994, 0.98426664, 2.4, 2.25, 1.323)
 fov = 60.0
 
 [node name="Angle 5" type="Camera3D" parent="."]
-transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2, 2.75, 5)
+transform = Transform3D(0.96501654, -0.045077816, 0.25828472, 0, 0.98510945, 0.17192875, -0.26218888, -0.1659141, 0.9506469, 1.4, 2.75, 5)
 fov = 60.0
 
-[node name="Room Lights" type="Node3D" parent="."]
+[node name="GenericRoom12Extension2" parent="." instance=ExtResource("11_8s0e6")]
 
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("12_7d8th")]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
 
 [node name="Organ" type="Node3D" parent="."]
 script = ExtResource("8_1aq8j")
 
 [node name="Legs Inner" type="Node3D" parent="Organ"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="2StageGeneric-OrganLightsInner" parent="Organ/Legs Inner" instance=ExtResource("12_y0nt0")]
 
 [node name="Legs Middle" type="Node3D" parent="Organ"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="2StageGeneric-OrganLightsMiddle" parent="Organ/Legs Middle" instance=ExtResource("13_o8y2c")]
 
 [node name="Legs Outer" type="Node3D" parent="Organ"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="2StageGeneric-OrganLightsOuter" parent="Organ/Legs Outer" instance=ExtResource("14_oig8i")]
 
 [node name="Face Amber" type="Node3D" parent="Organ"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="2StageGeneric-OrganFaceAmber" parent="Organ/Face Amber" instance=ExtResource("15_8mmgv")]
 
 [node name="Face Blue" type="Node3D" parent="Organ"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="2StageGeneric-OrganFaceBlue" parent="Organ/Face Blue" instance=ExtResource("16_t6deu")]
@@ -392,7 +371,7 @@ visible = false
 script = ExtResource("8_1aq8j")
 
 [node name="Gobo Light" type="SpotLight3D" parent="Special"]
-transform = Transform3D(1, 0, 0, 0, 0.93029, 0.366826, 0, -0.366826, 0.93029, 0.6, 3.7, 4)
+transform = Transform3D(1, 0, 0, 0, 0.9302896, 0.3668259, 0, -0.36682588, 0.9302896, 0, 3.7, 4)
 visible = false
 light_color = Color(1, 0.960784, 0.85098, 1)
 light_projector = ExtResource("17_q87rh")
@@ -403,21 +382,23 @@ spot_attenuation = -1.0
 spot_angle = 10.0
 
 [node name="Band Sign" parent="Special" instance=ExtResource("18_ufdx8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="Drum Light" parent="Special" instance=ExtResource("21_n06s7")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="Fiber Curtain" parent="Special" instance=ExtResource("22_6khan")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
 [node name="CEC Star" parent="Special" instance=ExtResource("20_ty70p")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0)
 visible = false
 
-[node name="GenericRoom" parent="." instance=ExtResource("23_png03")]
-
 [node name="StageModel" parent="." instance=ExtResource("23_dxrb3")]
 
 [node name="Wink" parent="." instance=ExtResource("23_8s0e6")]
-transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0.6, 3.4, 0.38)
+transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 0.38)
 script = ExtResource("24_7d8th")

Scenes/EditorStages/2Stage.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=27 format=3 uid="uid://bsdj108ha8a5c"]
+[gd_scene load_steps=28 format=3 uid="uid://bsdj108ha8a5c"]
 
 [ext_resource type="PackedScene" uid="uid://d2op7m5kcf0o4" path="res://Models/Stages/2-Stage/2StageGeneric.glb" id="2_8qxcb"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="3_fmn8a"]
@@ -21,10 +21,11 @@
 [ext_resource type="PackedScene" uid="uid://d1noqem71b260" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-CECStarLight.glb" id="20_e2ou4"]
 [ext_resource type="PackedScene" uid="uid://cjctqykx0ara2" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-DrumLight.glb" id="21_5spu2"]
 [ext_resource type="PackedScene" uid="uid://u3v6pjj2gavj" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-FiberCurtain.glb" id="22_dtnir"]
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="23_lxqxd"]
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="24_a1kpa"]
 [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="24_hbd3d"]
+[ext_resource type="PackedScene" uid="uid://c2hctwg8q7xsn" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn" id="25_1qbln"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="25_fmn8a"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="26_jbtpf"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
 ambient_light_source = 1
@@ -326,43 +327,6 @@ fov = 60.0
 transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2, 2.75, 5)
 fov = 60.0
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Organ" type="Node3D" parent="."]
 script = ExtResource("9_34vne")
 
@@ -420,8 +384,10 @@ visible = false
 [node name="Fiber Curtain" parent="Special" instance=ExtResource("22_dtnir")]
 visible = false
 
-[node name="GenericRoom" parent="." instance=ExtResource("23_lxqxd")]
-
 [node name="Wink" parent="." instance=ExtResource("24_a1kpa")]
 transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 0.38)
 script = ExtResource("25_fmn8a")
+
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("25_1qbln")]
+
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("26_jbtpf")]

Scenes/EditorStages/RoadStage.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://c8v1gl4pnevj7"]
+[gd_scene load_steps=24 format=3 uid="uid://c8v1gl4pnevj7"]
 
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="2_ulwgu"]
 [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="3_fuxvp"]
@@ -17,10 +17,11 @@
 [ext_resource type="PackedScene" uid="uid://b70g4m0u3v833" path="res://Models/Stages/RoadStage/Illum/RoadStageGenericIllum-OrganFace.glb" id="16_lpy20"]
 [ext_resource type="PackedScene" uid="uid://jhxwcq257624" path="res://Models/Stages/RoadStage/Illum/RoadStageGenericIllum-OrganLegs.glb" id="17_ck7mq"]
 [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="17_q6pu5"]
+[ext_resource type="PackedScene" uid="uid://c2hctwg8q7xsn" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn" id="19_lpy20"]
+[ext_resource type="PackedScene" uid="uid://b12h2qj8d6vat" path="res://Models/GenericRooms/GenericRoom/GenericRoomRoadExtension.glb" id="20_ck7mq"]
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="20_lpy20"]
 [ext_resource type="PackedScene" uid="uid://ih4w01wjpkh7" path="res://Models/Stages/RoadStage/RoadStageGeneric.glb" id="20_yedsm"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="21_ck7mq"]
-[ext_resource type="PackedScene" uid="uid://bb4jn7jeekys4" path="res://Models/GenericRooms/RoadStage/RoadStageGeneric-Room.glb" id="21_lpy20"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
 ambient_light_source = 1
@@ -295,43 +296,6 @@ fov = 60.0
 transform = Transform3D(0.965017, -0.0450778, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2.5, 2.75, 6)
 fov = 60.0
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 3)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 3)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 3)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Special" type="Node3D" parent="."]
 script = ExtResource("8_1tllj")
 
@@ -385,7 +349,9 @@ visible = false
 
 [node name="StageModel" parent="." instance=ExtResource("20_yedsm")]
 
-[node name="RoadStageGeneric-Room" parent="." instance=ExtResource("21_lpy20")]
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("19_lpy20")]
+
+[node name="GenericRoomRoadExtension2" parent="." instance=ExtResource("20_ck7mq")]
 
 [node name="Wink" parent="." instance=ExtResource("20_lpy20")]
 transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 1.7)

Scenes/EditorStages/RockerStage.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://wrswf8nml18g"]
+[gd_scene load_steps=12 format=3 uid="uid://wrswf8nml18g"]
 
 [ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Animatronics/Cyberamics/Cyber Munch.glb" id="1_j7i2r"]
 [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="2_12yvg"]
@@ -7,8 +7,9 @@
 [ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="5_l1tdl"]
 [ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Animatronics/Cyberamics/Cyber Pasqually.glb" id="6_thsgt"]
 [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="7_c38b3"]
+[ext_resource type="PackedScene" uid="uid://bgah3ysknvp7q" path="res://Models/GenericRooms/GenericRoom/GenericRoomRockerExtension.glb" id="8_867dv"]
+[ext_resource type="PackedScene" uid="uid://c2hctwg8q7xsn" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn" id="9_1gqmv"]
 [ext_resource type="PackedScene" uid="uid://hygeqb04ijl6" path="res://Models/Stages/RockerStage/RockerStage.glb" id="21_tsnrc"]
-[ext_resource type="PackedScene" uid="uid://cpeq7njjmq5xu" path="res://Models/GenericRooms/RockerStage/RockerStage-Room.glb" id="22_i4sb4"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
 ambient_light_source = 1
@@ -59,46 +60,11 @@ fov = 60.0
 transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2.5, 2.75, 5)
 fov = 60.0
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="StageModel" parent="." instance=ExtResource("21_tsnrc")]
 
-[node name="RockerStage-Room" parent="." instance=ExtResource("22_i4sb4")]
+[node name="GenericRoomRockerExtension2" parent="." instance=ExtResource("8_867dv")]
+
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("9_1gqmv")]
 
 [node name="Spots" type="Node3D" parent="."]
 script = ExtResource("7_c38b3")

Scenes/EditorStages/StatenIsland1Stage.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=25 format=3 uid="uid://xt2mwts8x1db"]
+[gd_scene load_steps=26 format=3 uid="uid://xt2mwts8x1db"]
 
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_3nmnt"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="3_3npig"]
 [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="4_ldffk"]
 [ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="5_rw2ds"]
@@ -22,6 +21,8 @@
 [ext_resource type="PackedScene" uid="uid://q1wopkkiwb6q" path="res://Models/Stages/StatenIsland1Stage/StatenIsland1Stage.glb" id="21_snh0w"]
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="22_bu2ca"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="23_3nmnt"]
+[ext_resource type="PackedScene" uid="uid://c2hctwg8q7xsn" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn" id="23_jswrp"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="24_3npig"]
 [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="24_37ti8"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
@@ -29,8 +30,6 @@ ambient_light_source = 1
 
 [node name="StatenIsland1Stage" type="Node3D"]
 
-[node name="1StageGenericRoom" parent="." instance=ExtResource("1_3nmnt")]
-
 [node name="Chuck" parent="." instance=ExtResource("3_3npig")]
 transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -2.6, 1.52, -0.6)
 script = ExtResource("4_ldffk")
@@ -303,43 +302,6 @@ fov = 60.0
 transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2, 2.75, 5)
 fov = 60.0
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Organ" type="Node3D" parent="."]
 script = ExtResource("9_6wyod")
 
@@ -396,3 +358,7 @@ visible = false
 [node name="Wink" parent="." instance=ExtResource("22_bu2ca")]
 transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 0.36)
 script = ExtResource("23_3nmnt")
+
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("23_jswrp")]
+
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("24_3npig")]

Scenes/EditorStages/Turntable1Stage.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=32 format=3 uid="uid://dpx3vckl36huk"]
+[gd_scene load_steps=33 format=3 uid="uid://dpx3vckl36huk"]
 
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_j07wj"]
 [ext_resource type="PackedScene" uid="uid://ctjh7xod2rlir" path="res://Models/Stages/Turntable1Stage/Turntable.glb" id="2_3r1iw"]
 [ext_resource type="Script" uid="uid://d0ogq15ja5hqy" path="res://Scripts/1StageTurntable.gd" id="2_41ap5"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="3_2yrnb"]
@@ -30,14 +29,14 @@
 [ext_resource type="PackedScene" uid="uid://cieh4e67l50sw" path="res://Models/Stages/Turntable1Stage/Turntable1Stage.glb" id="27_7o87h"]
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="29_7gday"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="30_7o87h"]
+[ext_resource type="PackedScene" uid="uid://c2hctwg8q7xsn" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate_Editor.tscn" id="30_jxt2e"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="31_pymdb"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
 ambient_light_source = 1
 
 [node name="Turntable1Stage" type="Node3D"]
 
-[node name="1StageGenericRoom" parent="." instance=ExtResource("1_j07wj")]
-
 [node name="Turntable" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7, 0.8, -0.9)
 script = ExtResource("2_41ap5")
@@ -328,43 +327,6 @@ fov = 60.0
 transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2, 2.75, 5)
 fov = 60.0
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Organ" type="Node3D" parent="."]
 script = ExtResource("9_jxt2e")
 
@@ -434,5 +396,9 @@ light_path = "Turntable/CECSign"
 transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 0.38)
 script = ExtResource("30_7o87h")
 
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("30_jxt2e")]
+
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("31_pymdb")]
+
 [connection signal="visibility_changed" from="Special/CEC Rope Light" to="Special/CEC Rope Light" method="_on_visibility_changed"]
 [connection signal="visibility_changed" from="Special/CEC Sign" to="Special/CEC Sign" method="_on_visibility_changed"]

Scenes/FreeRoam/Generic/Generic1Stage.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=34 format=3 uid="uid://b6rem1te85htp"]
+[gd_scene load_steps=36 format=3 uid="uid://b6rem1te85htp"]
 
 [ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/Stages/1-Stage/1StageGeneric.glb" id="2_ncqi6"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="3_r26gl"]
@@ -25,8 +25,9 @@
 [ext_resource type="PackedScene" uid="uid://chhs7d280p7k7" path="res://Models/Stages/1-Stage/Illum/1StageIllum-RopeLights.glb" id="21_xsano"]
 [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="22_1oq0m"]
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="26_6rkbs"]
-[ext_resource type="PackedScene" uid="uid://dusg7f0lhyhjo" path="res://Models/FreeRoamLocations/GenericRoom/GenericRoomTemplate.tscn" id="27_6rkbs"]
+[ext_resource type="PackedScene" uid="uid://dusg7f0lhyhjo" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate.tscn" id="27_6rkbs"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="27_xpgff"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="28_xpgff"]
 
 [sub_resource type="Environment" id="Environment_0tsrs"]
 ambient_light_source = 1
@@ -47,6 +48,10 @@ size = Vector3(1.2, 1, 0.4)
 [sub_resource type="BoxShape3D" id="BoxShape3D_xpgff"]
 size = Vector3(0.8, 1, 0.8)
 
+[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_xsano"]
+data = PackedVector3Array(-3.8000998, 0, -0.39999998, -4.7999997, 0, -0.39999998, -3.8000998, 3.8, -0.39999998, -3.8000998, 3.8, -0.39999998, -4.7999997, 0, -0.39999998, -4.7999997, 3.8, -0.39999998, 4.7999997, 0, -0.39999998, 3.7998998, 0, -0.39999998, 4.7999997, 3.8, -0.39999998, 4.7999997, 3.8, -0.39999998, 3.7998998, 0, -0.39999998, 3.7998998, 3.8, -0.39999998)
+backface_collision = true
+
 [node name="Generic1Stage" type="Node3D"]
 
 [node name="StageModel" parent="." instance=ExtResource("2_ncqi6")]
@@ -91,6 +96,9 @@ shape = SubResource("BoxShape3D_6rkbs")
 transform = Transform3D(0.965926, 0, -0.258819, 0, 1, 0, 0.258819, 0, 0.965926, 2.6, 1.3, -0.2)
 shape = SubResource("BoxShape3D_xpgff")
 
+[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
+shape = SubResource("ConcavePolygonShape3D_xsano")
+
 [node name="Chuck" parent="." instance=ExtResource("3_r26gl")]
 transform = Transform3D(0.579556, 0, 0.155291, 0, 0.6, 0, -0.155291, 0, 0.579556, -2.6, 1.52, -0.6)
 script = ExtResource("4_fdybi")
@@ -382,3 +390,5 @@ script = ExtResource("27_xpgff")
 [node name="PropHandle" type="Node3D" parent="."]
 
 [node name="GenericRoomTemplate" parent="." instance=ExtResource("27_6rkbs")]
+
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("28_xpgff")]

Scenes/FreeRoam/Generic/Generic2Stage.tscn

@@ -1,6 +1,6 @@
-[gd_scene load_steps=31 format=3 uid="uid://dg5hea6ciqc2l"]
+[gd_scene load_steps=32 format=3 uid="uid://dg5hea6ciqc2l"]
 
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_1cxy2"]
+[ext_resource type="PackedScene" uid="uid://dusg7f0lhyhjo" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate.tscn" id="2_otf21"]
 [ext_resource type="PackedScene" uid="uid://d2op7m5kcf0o4" path="res://Models/Stages/2-Stage/2StageGeneric.glb" id="2_xuq3d"]
 [ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="3_mu2fq"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_esubh"]
@@ -26,14 +26,11 @@
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="25_otf21"]
 [ext_resource type="Script" uid="uid://csyks2ufy3o3x" path="res://Scripts/OneWayController.gd" id="25_qjfev"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="26_mu2fq"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="27_mu2fq"]
 
 [sub_resource type="Environment" id="Environment_0tsrs"]
 ambient_light_source = 1
 
-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_1cxy2"]
-data = PackedVector3Array(9.8, 0, 12.8, -9.8, 0, 12.8, 9.8, 0, -0.4, 9.8, 0, -0.4, -9.8, 0, 12.8, -9.8, 0, -0.4, 2.4, 0.8, -1.2, -2.4, 0.8, -1.2, 2.4, 3, -1.2, 2.4, 3, -1.2, -2.4, 0.8, -1.2, -2.4, 3, -1.2, -2.4, 3, -1.2, -2.4, 0.8, -1.2, -3.6, 3, -1, -3.6, 3, -1, -2.4, 0.8, -1.2, -3.6, 0.8, -1, 2.4, 0.8, -1.2, 2.4, 3, -1.2, 3.6, 0.8, -1, 3.6, 0.8, -1, 2.4, 3, -1.2, 3.6, 3, -1, 9.8, 0, -0.4, 3.8, 0, -0.4, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, 3.8, 0, -0.4, 3.8, 3.8, -0.4, 9.8, 0, -0.4, 9.8, 3.8, -0.4, 9.8, 0, 10.4, 9.8, 0, 10.4, 9.8, 3.8, -0.4, 9.8, 3.8, 10.4, 9.8, 0, 10.4, 9.8, 3.8, 10.4, 7.4, 0, 12.8, 7.4, 0, 12.8, 9.8, 3.8, 10.4, 7.4, 3.8, 12.8, 7.4, 0, 12.8, 7.4, 3.8, 12.8, -9.8, 0, 12.8, -9.8, 0, 12.8, 7.4, 3.8, 12.8, -9.8, 3.8, 12.8, -9.8, 0, 12.8, -9.8, 3.8, 12.8, -9.8, 0, -0.4, -9.8, 0, -0.4, -9.8, 3.8, 12.8, -9.8, 3.8, -0.4, -9.8, 0, -0.4, -9.8, 3.8, -0.4, -3.8, 0, -0.4, -3.8, 0, -0.4, -9.8, 3.8, -0.4, -3.8, 3.8, -0.4, 9.8, 3.8, 12.8, -9.8, 3.8, 12.8, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, -9.8, 3.8, 12.8, -9.8, 3.8, -0.4)
-backface_collision = true
-
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_xuq3d"]
 data = PackedVector3Array(-3.8, 0.8, 0.3, -3.8, 0, 0.3, -3.8, 0.8, -2.6, -3.8, 0.8, -2.6, -3.8, 0, 0.3, -3.8, 0, -2.6, -3.8, 0.8, -2.6, -3.8, 0, -2.6, 3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 0, -2.6, 3.8, 0, -2.6, 3.8, 0.8, -2.6, 3.8, 0, -2.6, 3.8, 0.8, 0.3, 3.8, 0.8, 0.3, 3.8, 0, -2.6, 3.8, 0, 0.3, 3.8, 0.8, 0.3, 3.8, 0, 0.3, -3.8, 0.8, 0.3, -3.8, 0.8, 0.3, 3.8, 0, 0.3, -3.8, 0, 0.3, 3.8, 0, -2.6, -3.8, 0, -2.6, 3.8, 0, 0.3, 3.8, 0, 0.3, -3.8, 0, -2.6, -3.8, 0, 0.3, -3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 0.8, 0.3, -3.8, 0.8, 0.3, 3.8, 0.8, -2.6, 3.8, 0.8, 0.3, -3.8, 3.8, 0.3, -3.8, 3.7, 0.3, -3.8, 3.8, -2.6, -3.8, 3.8, -2.6, -3.8, 3.7, 0.3, -3.8, 3.7, -2.6, -3.8, 0.8, -0.4, -3.8, 3.7, -0.4, -3.8, 0.8, -2.6, -3.8, 0.8, -2.6, -3.8, 3.7, -0.4, -3.8, 3.7, -2.6, 3.8, 0.8, -2.6, 3.8, 3.7, -2.6, 3.8, 0.8, -0.4, 3.8, 0.8, -0.4, 3.8, 3.7, -2.6, 3.8, 3.7, -0.4, -3.8, 3.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.8, -2.6, 3.8, 3.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, -2.6, -3.8, 0.8, -2.6, -3.8, 3.7, -2.6, 3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, -2.6, 3.8, 3.8, -2.6, 3.8, 3.7, -2.6, 3.8, 3.8, 0.3, 3.8, 3.8, 0.3, 3.8, 3.7, -2.6, 3.8, 3.7, 0.3, 3.8, 3.8, 0.3, 3.8, 3.7, 0.3, -3.8, 3.8, 0.3, -3.8, 3.8, 0.3, 3.8, 3.7, 0.3, -3.8, 3.7, 0.3, 3.8, 3.7, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, 0.3, 3.8, 3.7, 0.3, -3.8, 3.7, -2.6, -3.8, 3.7, 0.3, -3.8, 3.8, -2.6, 3.8, 3.8, -2.6, -3.8, 3.8, 0.3, -3.8, 3.8, 0.3, 3.8, 3.8, -2.6, 3.8, 3.8, 0.3, -2.2, 0.8, -1, -3.8, 0.8, -1, -2.2, 3.7, -1, -2.2, 3.7, -1, -3.8, 0.8, -1, -3.8, 3.7, -1, -2.2, 0.8, -1, -2.2, 3.7, -1, -2.2, 0.8, 0.2, -2.2, 0.8, 0.2, -2.2, 3.7, -1, -2.2, 3.7, 0.2, -2.2, 0.8, 0.2, -2.2, 3.7, 0.2, -1, 0.8, 0.2, -1, 0.8, 0.2, -2.2, 3.7, 0.2, -1, 3.7, 0.2, -1, 0.8, 0.2, -1, 3.7, 0.2, -1, 0.8, -1.3, -1, 0.8, -1.3, -1, 3.7, 0.2, -1, 3.7, -1.3, -1, 0.8, -1.3, -1, 3.7, -1.3, 3.8, 0.8, -1.3, 3.8, 0.8, -1.3, -1, 3.7, -1.3, 3.8, 3.7, -1.3)
 backface_collision = true
@@ -42,137 +39,34 @@ backface_collision = true
 data = PackedVector3Array(-3.4, 2.7, -0.3, -3.4, 0.8, -0.3, -3.4, 2.7, -0.9, -3.4, 2.7, -0.9, -3.4, 0.8, -0.3, -3.4, 0.8, -0.9, -3.4, 2.7, -0.9, -3.4, 0.8, -0.9, -2.6, 2.7, -0.9, -2.6, 2.7, -0.9, -3.4, 0.8, -0.9, -2.6, 0.8, -0.9, -2.6, 2.7, -0.9, -2.6, 0.8, -0.9, -2.6, 2.7, -0.3, -2.6, 2.7, -0.3, -2.6, 0.8, -0.9, -2.6, 0.8, -0.3, -2.6, 2.7, -0.3, -2.6, 0.8, -0.3, -3.4, 2.7, -0.3, -3.4, 2.7, -0.3, -2.6, 0.8, -0.3, -3.4, 0.8, -0.3, -2.6, 0.8, -0.9, -3.4, 0.8, -0.9, -2.6, 0.8, -0.3, -2.6, 0.8, -0.3, -3.4, 0.8, -0.9, -3.4, 0.8, -0.3, -3.4, 2.7, -0.9, -2.6, 2.7, -0.9, -3.4, 2.7, -0.3, -3.4, 2.7, -0.3, -2.6, 2.7, -0.9, -2.6, 2.7, -0.3, -0.7, 2.7, -0.3, -0.7, 0.8, -0.3, -0.7, 2.7, -0.9, -0.7, 2.7, -0.9, -0.7, 0.8, -0.3, -0.7, 0.8, -0.9, -0.7, 2.7, -0.9, -0.7, 0.8, -0.9, 0.1, 2.7, -0.9, 0.1, 2.7, -0.9, -0.7, 0.8, -0.9, 0.1, 0.8, -0.9, 0.1, 2.7, -0.9, 0.1, 0.8, -0.9, 0.1, 2.7, -0.3, 0.1, 2.7, -0.3, 0.1, 0.8, -0.9, 0.1, 0.8, -0.3, 0.1, 2.7, -0.3, 0.1, 0.8, -0.3, -0.7, 2.7, -0.3, -0.7, 2.7, -0.3, 0.1, 0.8, -0.3, -0.7, 0.8, -0.3, 0.1, 0.8, -0.9, -0.7, 0.8, -0.9, 0.1, 0.8, -0.3, 0.1, 0.8, -0.3, -0.7, 0.8, -0.9, -0.7, 0.8, -0.3, -0.7, 2.7, -0.9, 0.1, 2.7, -0.9, -0.7, 2.7, -0.3, -0.7, 2.7, -0.3, 0.1, 2.7, -0.9, 0.1, 2.7, -0.3, 0.3999, 2.7, -0.3, 0.3999, 0.8, -0.3, 0.3999, 2.7, -0.9, 0.3999, 2.7, -0.9, 0.3999, 0.8, -0.3, 0.3999, 0.8, -0.9, 0.3999, 2.7, -0.9, 0.3999, 0.8, -0.9, 1.1999, 2.7, -0.9, 1.1999, 2.7, -0.9, 0.3999, 0.8, -0.9, 1.1999, 0.8, -0.9, 1.1999, 2.7, -0.9, 1.1999, 0.8, -0.9, 1.1999, 2.7, -0.3, 1.1999, 2.7, -0.3, 1.1999, 0.8, -0.9, 1.1999, 0.8, -0.3, 1.1999, 2.7, -0.3, 1.1999, 0.8, -0.3, 0.3999, 2.7, -0.3, 0.3999, 2.7, -0.3, 1.1999, 0.8, -0.3, 0.3999, 0.8, -0.3, 1.1999, 0.8, -0.9, 0.3999, 0.8, -0.9, 1.1999, 0.8, -0.3, 1.1999, 0.8, -0.3, 0.3999, 0.8, -0.9, 0.3999, 0.8, -0.3, 0.3999, 2.7, -0.9, 1.1999, 2.7, -0.9, 0.3999, 2.7, -0.3, 0.3999, 2.7, -0.3, 1.1999, 2.7, -0.9, 1.1999, 2.7, -0.3, 1.4, 2.6, -0.3, 1.4, 0.8, -0.3, 1.4, 2.6, -1.1, 1.4, 2.6, -1.1, 1.4, 0.8, -0.3, 1.4, 0.8, -1.1, 1.4, 2.6, -1.1, 1.4, 0.8, -1.1, 2.2, 2.6, -1.1, 2.2, 2.6, -1.1, 1.4, 0.8, -1.1, 2.2, 0.8, -1.1, 2.2, 2.6, -1.1, 2.2, 0.8, -1.1, 2.2, 2.6, -0.3, 2.2, 2.6, -0.3, 2.2, 0.8, -1.1, 2.2, 0.8, -0.3, 2.2, 2.6, -0.3, 2.2, 0.8, -0.3, 1.4, 2.6, -0.3, 1.4, 2.6, -0.3, 2.2, 0.8, -0.3, 1.4, 0.8, -0.3, 2.2, 0.8, -1.1, 1.4, 0.8, -1.1, 2.2, 0.8, -0.3, 2.2, 0.8, -0.3, 1.4, 0.8, -1.1, 1.4, 0.8, -0.3, 1.4, 2.6, -1.1, 2.2, 2.6, -1.1, 1.4, 2.6, -0.3, 1.4, 2.6, -0.3, 2.2, 2.6, -1.1, 2.2, 2.6, -0.3, 2.5999, 2.6, -0.2, 2.5999, 0.8, -0.2, 2.5999, 2.6, -1, 2.5999, 2.6, -1, 2.5999, 0.8, -0.2, 2.5999, 0.8, -1, 2.5999, 2.6, -1, 2.5999, 0.8, -1, 3.4, 2.6, -1, 3.4, 2.6, -1, 2.5999, 0.8, -1, 3.4, 0.8, -1, 3.4, 2.6, -1, 3.4, 0.8, -1, 3.4, 2.6, -0.2, 3.4, 2.6, -0.2, 3.4, 0.8, -1, 3.4, 0.8, -0.2, 3.4, 2.6, -0.2, 3.4, 0.8, -0.2, 2.5999, 2.6, -0.2, 2.5999, 2.6, -0.2, 3.4, 0.8, -0.2, 2.5999, 0.8, -0.2, 3.4, 0.8, -1, 2.5999, 0.8, -1, 3.4, 0.8, -0.2, 3.4, 0.8, -0.2, 2.5999, 0.8, -1, 2.5999, 0.8, -0.2, 2.5999, 2.6, -1, 3.4, 2.6, -1, 2.5999, 2.6, -0.2, 2.5999, 2.6, -0.2, 3.4, 2.6, -1, 3.4, 2.6, -0.2, 0.2, 1.8, 0.05, 0.2, 0.8, 0.05, 0.2, 1.8, -0.3, 0.2, 1.8, -0.3, 0.2, 0.8, 0.05, 0.2, 0.8, -0.3, 0.2, 1.8, -0.3, 0.2, 0.8, -0.3, 1.4, 1.8, -0.3, 1.4, 1.8, -0.3, 0.2, 0.8, -0.3, 1.4, 0.8, -0.3, 1.4, 1.8, -0.3, 1.4, 0.8, -0.3, 1.4, 1.8, 0.05, 1.4, 1.8, 0.05, 1.4, 0.8, -0.3, 1.4, 0.8, 0.05, 1.4, 1.8, 0.05, 1.4, 0.8, 0.05, 0.2, 1.8, 0.05, 0.2, 1.8, 0.05, 1.4, 0.8, 0.05, 0.2, 0.8, 0.05, 1.4, 0.8, -0.3, 0.2, 0.8, -0.3, 1.4, 0.8, 0.05, 1.4, 0.8, 0.05, 0.2, 0.8, -0.3, 0.2, 0.8, 0.05, 0.2, 1.8, -0.3, 1.4, 1.8, -0.3, 0.2, 1.8, 0.05, 0.2, 1.8, 0.05, 1.4, 1.8, -0.3, 1.4, 1.8, 0.05, 2.2999, 1.8, 0.2, 2.2999, 0.8, 0.2, 2.2999, 1.8, -0.3, 2.2999, 1.8, -0.3, 2.2999, 0.8, 0.2, 2.2999, 0.8, -0.3, 2.2999, 1.8, -0.3, 2.2999, 0.8, -0.3, 3.3, 1.8, -0.3, 3.3, 1.8, -0.3, 2.2999, 0.8, -0.3, 3.3, 0.8, -0.3, 3.3, 1.8, -0.3, 3.3, 0.8, -0.3, 3.3, 1.8, 0.2, 3.3, 1.8, 0.2, 3.3, 0.8, -0.3, 3.3, 0.8, 0.2, 3.3, 1.8, 0.2, 3.3, 0.8, 0.2, 2.2999, 1.8, 0.2, 2.2999, 1.8, 0.2, 3.3, 0.8, 0.2, 2.2999, 0.8, 0.2, 3.3, 0.8, -0.3, 2.2999, 0.8, -0.3, 3.3, 0.8, 0.2, 3.3, 0.8, 0.2, 2.2999, 0.8, -0.3, 2.2999, 0.8, 0.2, 2.2999, 1.8, -0.3, 3.3, 1.8, -0.3, 2.2999, 1.8, 0.2, 2.2999, 1.8, 0.2, 3.3, 1.8, -0.3, 3.3, 1.8, 0.2)
 backface_collision = true
 
-[node name="Generic1Stage" type="Node3D"]
+[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_esubh"]
+data = PackedVector3Array(-3.8000998, 0, -0.39999998, -4.7999997, 0, -0.39999998, -3.8000998, 3.8, -0.39999998, -3.8000998, 3.8, -0.39999998, -4.7999997, 0, -0.39999998, -4.7999997, 3.8, -0.39999998, 4.7999997, 0, -0.39999998, 3.7998998, 0, -0.39999998, 4.7999997, 3.8, -0.39999998, 4.7999997, 3.8, -0.39999998, 3.7998998, 0, -0.39999998, 3.7998998, 3.8, -0.39999998)
+backface_collision = true
 
-[node name="2StageGenericRoom" parent="." instance=ExtResource("1_1cxy2")]
+[node name="Generic2Stage" type="Node3D"]
 
 [node name="StageModel" parent="." instance=ExtResource("2_xuq3d")]
 
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("2_otf21")]
+
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_0tsrs")
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D6" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D7" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D8" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D9" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D10" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D11" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D12" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D13" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D14" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D15" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Player" parent="." instance=ExtResource("3_mu2fq")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7)
 current_map = "Generic 2-Stage"
 
 [node name="CollideMap" type="StaticBody3D" parent="."]
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
-shape = SubResource("ConcavePolygonShape3D_1cxy2")
-
 [node name="CollisionShape3D2" type="CollisionShape3D" parent="CollideMap"]
 shape = SubResource("ConcavePolygonShape3D_xuq3d")
 
 [node name="CollisionShape3D3" type="CollisionShape3D" parent="CollideMap"]
 shape = SubResource("ConcavePolygonShape3D_otf21")
 
+[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
+shape = SubResource("ConcavePolygonShape3D_esubh")
+
 [node name="Special Helicopter" parent="." instance=ExtResource("23_gh5ft")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 3, 5)
 
@@ -477,4 +371,4 @@ script = ExtResource("26_mu2fq")
 
 [node name="PropHandle" type="Node3D" parent="."]
 
-[editable path="StageModel"]
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("27_mu2fq")]

Scenes/FreeRoam/Generic/GenericRockerStage.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=3 uid="uid://drrdmgbkp7q8y"]
+[gd_scene load_steps=14 format=3 uid="uid://drrdmgbkp7q8y"]
 
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="1_n5ody"]
 [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="2_oux6y"]
@@ -7,15 +7,16 @@
 [ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Animatronics/Cyberamics/Cyber Jasper.glb" id="5_y08bm"]
 [ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Animatronics/Cyberamics/Cyber Pasqually.glb" id="6_shx2r"]
 [ext_resource type="PackedScene" uid="uid://hygeqb04ijl6" path="res://Models/Stages/RockerStage/RockerStage.glb" id="7_iuaco"]
-[ext_resource type="PackedScene" uid="uid://cpeq7njjmq5xu" path="res://Models/GenericRooms/RockerStage/RockerStage-Room.glb" id="8_4cnbt"]
 [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="9_b0dxe"]
+[ext_resource type="PackedScene" uid="uid://bgah3ysknvp7q" path="res://Models/GenericRooms/GenericRoom/GenericRoomRockerExtension.glb" id="10_2hovw"]
 [ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="10_81kcq"]
+[ext_resource type="PackedScene" uid="uid://dusg7f0lhyhjo" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate.tscn" id="10_yo1ck"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
 ambient_light_source = 1
 
-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_81kcq"]
+[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_a5vrl"]
-data = PackedVector3Array(-9.8, 3.8, 12.8, -9.8, 0, 12.8, -9.8, 3.8, -0.4, -9.8, 3.8, -0.4, -9.8, 0, 12.8, -9.8, 0, -0.4, -9.8, 3.8, -0.4, -9.8, 0, -0.4, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, -9.8, 0, -0.4, 9.8, 0, -0.4, 7.4, 3.8, 12.8, -9.8, 3.8, 12.8, 9.8, 3.8, 10.4, 9.8, 3.8, 10.4, -9.8, 3.8, 12.8, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, -9.8, 3.8, 12.8, -9.8, 3.8, -0.4, 7.4, 0, 12.8, 7.4, 3.8, 12.8, 9.8, 0, 10.4, 9.8, 0, 10.4, 7.4, 3.8, 12.8, 9.8, 3.8, 10.4, 9.8, 3.8, 10.4, 9.8, 3.8, -0.4, 9.8, 0, 10.4, 9.8, 0, 10.4, 9.8, 3.8, -0.4, 9.8, 0, -0.4, -9.8, 0, 12.8, -9.8, 3.8, 12.8, 7.4, 0, 12.8, 7.4, 0, 12.8, -9.8, 3.8, 12.8, 7.4, 3.8, 12.8, 9.8, 0, -0.4, -9.8, 0, -0.4, 9.8, 0, 10.4, 9.8, 0, 10.4, -9.8, 0, -0.4, 7.4, 0, 12.8, 7.4, 0, 12.8, -9.8, 0, -0.4, -9.8, 0, 12.8)
+data = PackedVector3Array(4.7999997, 0, -0.39999998, -4.7999997, 0, -0.39999998, 4.7999997, 3.8, -0.39999998, 4.7999997, 3.8, -0.39999998, -4.7999997, 0, -0.39999998, -4.7999997, 3.8, -0.39999998)
 backface_collision = true
 
 [node name="RockerStage" type="Node3D"]
@@ -45,8 +46,6 @@ environment = SubResource("Environment_w3m2i")
 
 [node name="StageModel" parent="." instance=ExtResource("7_iuaco")]
 
-[node name="RockerStage-Room" parent="." instance=ExtResource("8_4cnbt")]
-
 [node name="Spots" type="Node3D" parent="."]
 script = ExtResource("9_b0dxe")
 
@@ -267,120 +266,17 @@ spot_attenuation = 2.0
 spot_angle = 30.0
 spot_angle_attenuation = 0.15
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D6" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D7" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D8" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D9" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D10" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D11" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D12" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D13" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D14" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D15" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Player" parent="." instance=ExtResource("10_81kcq")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7)
 current_map = "Generic Rocker Stage"
 
 [node name="CollideMap" type="StaticBody3D" parent="."]
 
-[node name="CollisionShape3D2" type="CollisionShape3D" parent="CollideMap"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
-shape = SubResource("ConcavePolygonShape3D_81kcq")
+shape = SubResource("ConcavePolygonShape3D_a5vrl")
+
+[node name="GenericRoomRockerExtension2" parent="." instance=ExtResource("10_2hovw")]
 
 [node name="PropHandle" type="Node3D" parent="."]
+
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("10_yo1ck")]

Scenes/FreeRoam/Generic/GenericStatenIsland1Stage.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=32 format=3 uid="uid://bom4cd4waf6ff"]
+[gd_scene load_steps=33 format=3 uid="uid://bom4cd4waf6ff"]
 
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_c6ocl"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="2_37igk"]
 [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="3_k16ks"]
 [ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="4_fcp4x"]
@@ -23,15 +22,13 @@
 [ext_resource type="PackedScene" uid="uid://q1wopkkiwb6q" path="res://Models/Stages/StatenIsland1Stage/StatenIsland1Stage.glb" id="21_1sklg"]
 [ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="22_d4cv5"]
 [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="23_w2kgj"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="24_1r4lx"]
 [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="24_8h8ie"]
+[ext_resource type="PackedScene" uid="uid://dusg7f0lhyhjo" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate.tscn" id="24_w2kgj"]
 
 [sub_resource type="Environment" id="Environment_w3m2i"]
 ambient_light_source = 1
 
-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_rp74k"]
-data = PackedVector3Array(9.8, 0, 12.8, -9.8, 0, 12.8, 9.8, 0, -0.4, 9.8, 0, -0.4, -9.8, 0, 12.8, -9.8, 0, -0.4, 2.4, 0.8, -1.2, -2.4, 0.8, -1.2, 2.4, 3, -1.2, 2.4, 3, -1.2, -2.4, 0.8, -1.2, -2.4, 3, -1.2, -2.4, 3, -1.2, -2.4, 0.8, -1.2, -3.6, 3, -1, -3.6, 3, -1, -2.4, 0.8, -1.2, -3.6, 0.8, -1, 2.4, 0.8, -1.2, 2.4, 3, -1.2, 3.6, 0.8, -1, 3.6, 0.8, -1, 2.4, 3, -1.2, 3.6, 3, -1, 9.8, 0, -0.4, 3.8, 0, -0.4, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, 3.8, 0, -0.4, 3.8, 3.8, -0.4, 9.8, 0, -0.4, 9.8, 3.8, -0.4, 9.8, 0, 10.4, 9.8, 0, 10.4, 9.8, 3.8, -0.4, 9.8, 3.8, 10.4, 9.8, 0, 10.4, 9.8, 3.8, 10.4, 7.4, 0, 12.8, 7.4, 0, 12.8, 9.8, 3.8, 10.4, 7.4, 3.8, 12.8, 7.4, 0, 12.8, 7.4, 3.8, 12.8, -9.8, 0, 12.8, -9.8, 0, 12.8, 7.4, 3.8, 12.8, -9.8, 3.8, 12.8, -9.8, 0, 12.8, -9.8, 3.8, 12.8, -9.8, 0, -0.4, -9.8, 0, -0.4, -9.8, 3.8, 12.8, -9.8, 3.8, -0.4, -9.8, 0, -0.4, -9.8, 3.8, -0.4, -3.8, 0, -0.4, -3.8, 0, -0.4, -9.8, 3.8, -0.4, -3.8, 3.8, -0.4, 9.8, 3.8, 12.8, -9.8, 3.8, 12.8, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, -9.8, 3.8, 12.8, -9.8, 3.8, -0.4)
-backface_collision = true
-
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_w2kgj"]
 data = PackedVector3Array(-3.8, 0.8, 0.3, -3.8, 0, 0.3, -3.8, 0.8, -2.6, -3.8, 0.8, -2.6, -3.8, 0, 0.3, -3.8, 0, -2.6, -3.8, 0.8, -2.6, -3.8, 0, -2.6, 3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 0, -2.6, 3.8, 0, -2.6, 3.8, 0.8, -2.6, 3.8, 0, -2.6, 3.8, 0.8, 0.3, 3.8, 0.8, 0.3, 3.8, 0, -2.6, 3.8, 0, 0.3, 3.8, 0.8, 0.3, 3.8, 0, 0.3, -3.8, 0.8, 0.3, -3.8, 0.8, 0.3, 3.8, 0, 0.3, -3.8, 0, 0.3, 3.8, 0, -2.6, -3.8, 0, -2.6, 3.8, 0, 0.3, 3.8, 0, 0.3, -3.8, 0, -2.6, -3.8, 0, 0.3, -3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 0.8, 0.3, -3.8, 0.8, 0.3, 3.8, 0.8, -2.6, 3.8, 0.8, 0.3, -3.8, 3.8, 0.3, -3.8, 3.7, 0.3, -3.8, 3.8, -2.6, -3.8, 3.8, -2.6, -3.8, 3.7, 0.3, -3.8, 3.7, -2.6, -3.8, 0.8, -0.4, -3.8, 3.7, -0.4, -3.8, 0.8, -2.6, -3.8, 0.8, -2.6, -3.8, 3.7, -0.4, -3.8, 3.7, -2.6, 3.8, 0.8, -2.6, 3.8, 3.7, -2.6, 3.8, 0.8, -0.4, 3.8, 0.8, -0.4, 3.8, 3.7, -2.6, 3.8, 3.7, -0.4, -3.8, 3.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.8, -2.6, 3.8, 3.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, -2.6, -3.8, 0.8, -2.6, -3.8, 3.7, -2.6, 3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, -2.6, 3.8, 3.8, -2.6, 3.8, 3.7, -2.6, 3.8, 3.8, 0.3, 3.8, 3.8, 0.3, 3.8, 3.7, -2.6, 3.8, 3.7, 0.3, 3.8, 3.8, 0.3, 3.8, 3.7, 0.3, -3.8, 3.8, 0.3, -3.8, 3.8, 0.3, 3.8, 3.7, 0.3, -3.8, 3.7, 0.3, 3.8, 3.7, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, 0.3, 3.8, 3.7, 0.3, -3.8, 3.7, -2.6, -3.8, 3.7, 0.3, -3.8, 3.8, -2.6, 3.8, 3.8, -2.6, -3.8, 3.8, 0.3, -3.8, 3.8, 0.3, 3.8, 3.8, -2.6, 3.8, 3.8, 0.3)
 backface_collision = true
@@ -48,9 +45,11 @@ size = Vector3(1.2, 1, 0.4)
 [sub_resource type="BoxShape3D" id="BoxShape3D_367tx"]
 size = Vector3(0.8, 1, 0.8)
 
-[node name="StatenIsland1Stage" type="Node3D"]
+[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_xp5qk"]
+data = PackedVector3Array(-3.8000998, 0, -0.39999998, -4.7999997, 0, -0.39999998, -3.8000998, 3.8, -0.39999998, -3.8000998, 3.8, -0.39999998, -4.7999997, 0, -0.39999998, -4.7999997, 3.8, -0.39999998, 4.7999997, 0, -0.39999998, 3.7998998, 0, -0.39999998, 4.7999997, 3.8, -0.39999998, 4.7999997, 3.8, -0.39999998, 3.7998998, 0, -0.39999998, 3.7998998, 3.8, -0.39999998)
+backface_collision = true
 
-[node name="1StageGenericRoom" parent="." instance=ExtResource("1_c6ocl")]
+[node name="StatenIsland1Stage" type="Node3D"]
 
 [node name="Chuck" parent="." instance=ExtResource("2_37igk")]
 transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -2.6, 1.52, -0.6)
@@ -357,122 +356,11 @@ visible = false
 
 [node name="StageModel" parent="." instance=ExtResource("21_1sklg")]
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D6" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D7" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D8" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D9" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D10" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D11" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D12" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D13" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D14" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D15" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Player" parent="." instance=ExtResource("22_d4cv5")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3)
 current_map = "Generic Staten Island 1-Stage"
 
 [node name="CollideMap" type="StaticBody3D" parent="."]
-visible = false
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
-shape = SubResource("ConcavePolygonShape3D_rp74k")
 
 [node name="CollisionShape3D2" type="CollisionShape3D" parent="CollideMap"]
 shape = SubResource("ConcavePolygonShape3D_w2kgj")
@@ -505,8 +393,15 @@ shape = SubResource("BoxShape3D_xp5qk")
 transform = Transform3D(0.965926, 0, -0.258819, 0, 1, 0, 0.258819, 0, 0.965926, 2.7, 1.3, -0.2)
 shape = SubResource("BoxShape3D_367tx")
 
+[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
+shape = SubResource("ConcavePolygonShape3D_xp5qk")
+
 [node name="Wink" parent="." instance=ExtResource("23_w2kgj")]
 transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 0.36)
 script = ExtResource("24_8h8ie")
 
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("24_1r4lx")]
+
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("24_w2kgj")]
+
 [node name="PropHandle" type="Node3D" parent="."]

Scenes/FreeRoam/Generic/GenericTurntable1Stage.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=40 format=3 uid="uid://smw0vxn1byvr"]
+[gd_scene load_steps=41 format=3 uid="uid://smw0vxn1byvr"]
 
-[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_7tjm7"]
+[ext_resource type="PackedScene" uid="uid://dusg7f0lhyhjo" path="res://Models/GenericRooms/GenericRoom/GenericRoomTemplate.tscn" id="1_hjlxd"]
+[ext_resource type="PackedScene" uid="uid://ctpymr0p4ojab" path="res://Models/GenericRooms/GenericRoom/GenericRoomStandardExtension.glb" id="2_35rr1"]
 [ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="3_dndd2"]
 [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_gpxvw"]
 [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="5_xwaqk"]
@@ -35,10 +36,6 @@
 [sub_resource type="Environment" id="Environment_0tsrs"]
 ambient_light_source = 1
 
-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_xwaqk"]
-data = PackedVector3Array(9.8, 0, 12.8, -9.8, 0, 12.8, 9.8, 0, -0.4, 9.8, 0, -0.4, -9.8, 0, 12.8, -9.8, 0, -0.4, 2.4, 0.8, -1.2, -2.4, 0.8, -1.2, 2.4, 3, -1.2, 2.4, 3, -1.2, -2.4, 0.8, -1.2, -2.4, 3, -1.2, -2.4, 3, -1.2, -2.4, 0.8, -1.2, -3.6, 3, -1, -3.6, 3, -1, -2.4, 0.8, -1.2, -3.6, 0.8, -1, 2.4, 0.8, -1.2, 2.4, 3, -1.2, 3.6, 0.8, -1, 3.6, 0.8, -1, 2.4, 3, -1.2, 3.6, 3, -1, 9.8, 0, -0.4, 3.8, 0, -0.4, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, 3.8, 0, -0.4, 3.8, 3.8, -0.4, 9.8, 0, -0.4, 9.8, 3.8, -0.4, 9.8, 0, 10.4, 9.8, 0, 10.4, 9.8, 3.8, -0.4, 9.8, 3.8, 10.4, 9.8, 0, 10.4, 9.8, 3.8, 10.4, 7.4, 0, 12.8, 7.4, 0, 12.8, 9.8, 3.8, 10.4, 7.4, 3.8, 12.8, 7.4, 0, 12.8, 7.4, 3.8, 12.8, -9.8, 0, 12.8, -9.8, 0, 12.8, 7.4, 3.8, 12.8, -9.8, 3.8, 12.8, -9.8, 0, 12.8, -9.8, 3.8, 12.8, -9.8, 0, -0.4, -9.8, 0, -0.4, -9.8, 3.8, 12.8, -9.8, 3.8, -0.4, -9.8, 0, -0.4, -9.8, 3.8, -0.4, -3.8, 0, -0.4, -3.8, 0, -0.4, -9.8, 3.8, -0.4, -3.8, 3.8, -0.4, 9.8, 3.8, 12.8, -9.8, 3.8, 12.8, 9.8, 3.8, -0.4, 9.8, 3.8, -0.4, -9.8, 3.8, 12.8, -9.8, 3.8, -0.4)
-backface_collision = true
-
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_r7ql1"]
 data = PackedVector3Array(-3.8, 0.8, 0.3, -3.8, 0, 0.3, -3.8, 0.8, -2.6, -3.8, 0.8, -2.6, -3.8, 0, 0.3, -3.8, 0, -2.6, -3.8, 0.8, -2.6, -3.8, 0, -2.6, 3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 0, -2.6, 3.8, 0, -2.6, 3.8, 0.8, -2.6, 3.8, 0, -2.6, 3.8, 0.8, 0.3, 3.8, 0.8, 0.3, 3.8, 0, -2.6, 3.8, 0, 0.3, 3.8, 0.8, 0.3, 3.8, 0, 0.3, -3.8, 0.8, 0.3, -3.8, 0.8, 0.3, 3.8, 0, 0.3, -3.8, 0, 0.3, 3.8, 0, -2.6, -3.8, 0, -2.6, 3.8, 0, 0.3, 3.8, 0, 0.3, -3.8, 0, -2.6, -3.8, 0, 0.3, -3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 0.8, 0.3, -3.8, 0.8, 0.3, 3.8, 0.8, -2.6, 3.8, 0.8, 0.3, -3.8, 3.8, 0.3, -3.8, 3.7, 0.3, -3.8, 3.8, -2.6, -3.8, 3.8, -2.6, -3.8, 3.7, 0.3, -3.8, 3.7, -2.6, -3.8, 0.8, -0.4, -3.8, 3.7, -0.4, -3.8, 0.8, -2.6, -3.8, 0.8, -2.6, -3.8, 3.7, -0.4, -3.8, 3.7, -2.6, 3.8, 0.8, -2.6, 3.8, 3.7, -2.6, 3.8, 0.8, -0.4, 3.8, 0.8, -0.4, 3.8, 3.7, -2.6, 3.8, 3.7, -0.4, -3.8, 3.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.8, -2.6, 3.8, 3.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, -2.6, -3.8, 0.8, -2.6, -3.8, 3.7, -2.6, 3.8, 0.8, -2.6, 3.8, 0.8, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, -2.6, 3.8, 3.8, -2.6, 3.8, 3.7, -2.6, 3.8, 3.8, 0.3, 3.8, 3.8, 0.3, 3.8, 3.7, -2.6, 3.8, 3.7, 0.3, 3.8, 3.8, 0.3, 3.8, 3.7, 0.3, -3.8, 3.8, 0.3, -3.8, 3.8, 0.3, 3.8, 3.7, 0.3, -3.8, 3.7, 0.3, 3.8, 3.7, -2.6, -3.8, 3.7, -2.6, 3.8, 3.7, 0.3, 3.8, 3.7, 0.3, -3.8, 3.7, -2.6, -3.8, 3.7, 0.3, -3.8, 3.8, -2.6, 3.8, 3.8, -2.6, -3.8, 3.8, 0.3, -3.8, 3.8, 0.3, 3.8, 3.8, -2.6, 3.8, 3.8, 0.3)
 backface_collision = true
@@ -59,129 +56,24 @@ size = Vector3(1.2, 1, 0.4)
 [sub_resource type="BoxShape3D" id="BoxShape3D_t2c5c"]
 size = Vector3(0.8, 1, 0.8)
 
+[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_t2c5c"]
+data = PackedVector3Array(-3.8000998, 0, -0.39999998, -4.7999997, 0, -0.39999998, -3.8000998, 3.8, -0.39999998, -3.8000998, 3.8, -0.39999998, -4.7999997, 0, -0.39999998, -4.7999997, 3.8, -0.39999998, 4.7999997, 0, -0.39999998, 3.7998998, 0, -0.39999998, 4.7999997, 3.8, -0.39999998, 4.7999997, 3.8, -0.39999998, 3.7998998, 0, -0.39999998, 3.7998998, 3.8, -0.39999998)
+backface_collision = true
+
 [node name="Generic1Stage" type="Node3D"]
 
-[node name="1StageGenericRoom" parent="." instance=ExtResource("1_7tjm7")]
+[node name="GenericRoomTemplate" parent="." instance=ExtResource("1_hjlxd")]
+
+[node name="GenericRoomStandardExtension2" parent="." instance=ExtResource("2_35rr1")]
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_0tsrs")
 
-[node name="Room Lights" type="Node3D" parent="."]
-
-[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, -4, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D6" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D7" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D8" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D9" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D10" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 11)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D11" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D12" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D13" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D14" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
-[node name="OmniLight3D15" type="SpotLight3D" parent="Room Lights" groups=["lights"]]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 6.5)
-light_color = Color(1, 0.960784, 0.85098, 1)
-shadow_enabled = true
-shadow_bias = 0.1
-spot_angle = 80.0
-
 [node name="Player" parent="." instance=ExtResource("3_dndd2")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7)
 current_map = "Generic Turntable 1-Stage"
 
 [node name="CollideMap" type="StaticBody3D" parent="."]
-visible = false
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
-shape = SubResource("ConcavePolygonShape3D_xwaqk")
 
 [node name="CollisionShape3D2" type="CollisionShape3D" parent="CollideMap"]
 shape = SubResource("ConcavePolygonShape3D_r7ql1")
@@ -214,6 +106,9 @@ shape = SubResource("BoxShape3D_35rr1")
 transform = Transform3D(0.965926, 0, -0.258819, 0, 1, 0, 0.258819, 0, 0.965926, 2.6, 1.3, -0.2)
 shape = SubResource("BoxShape3D_t2c5c")
 
+[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"]
+shape = SubResource("ConcavePolygonShape3D_t2c5c")
+
 [node name="Helen" parent="." instance=ExtResource("6_r7ql1")]
 transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -1.2, 1.52, -0.7)
 script = ExtResource("5_xwaqk")