diff --git a/Models/1Stage/1StageGeneric.glb b/Models/1Stage/1StageGeneric.glb index 3503b5a..2fb63c4 100644 Binary files a/Models/1Stage/1StageGeneric.glb and b/Models/1Stage/1StageGeneric.glb differ diff --git a/Models/1Stage/1StageGeneric_1stbricks.png b/Models/1Stage/1StageGeneric_1stbricks.png new file mode 100644 index 0000000..8170317 Binary files /dev/null and b/Models/1Stage/1StageGeneric_1stbricks.png differ diff --git a/Models/1Stage/1StageGeneric_1stbricks.png.import b/Models/1Stage/1StageGeneric_1stbricks.png.import new file mode 100644 index 0000000..50e41c5 --- /dev/null +++ b/Models/1Stage/1StageGeneric_1stbricks.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csdiwct8boblb" +path.s3tc="res://.godot/imported/1StageGeneric_1stbricks.png-be243d2ce9f02dcc421b2fbb3a62ddc3.s3tc.ctex" +path.etc2="res://.godot/imported/1StageGeneric_1stbricks.png-be243d2ce9f02dcc421b2fbb3a62ddc3.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "c507ca3af318193eceed9391599ee531" +} + +[deps] + +source_file="res://Models/1Stage/1StageGeneric_1stbricks.png" +dest_files=["res://.godot/imported/1StageGeneric_1stbricks.png-be243d2ce9f02dcc421b2fbb3a62ddc3.s3tc.ctex", "res://.godot/imported/1StageGeneric_1stbricks.png-be243d2ce9f02dcc421b2fbb3a62ddc3.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 diff --git a/Models/1Stage/1StageGeneric_mmbbpink.png b/Models/1Stage/1StageGeneric_mmbbpink.png index 895db29..3405a57 100644 Binary files a/Models/1Stage/1StageGeneric_mmbbpink.png and b/Models/1Stage/1StageGeneric_mmbbpink.png differ diff --git a/Models/1Stage/1StageGeneric_mmbbpink.png.import b/Models/1Stage/1StageGeneric_mmbbpink.png.import index 8da81dc..16ca4a4 100644 --- a/Models/1Stage/1StageGeneric_mmbbpink.png.import +++ b/Models/1Stage/1StageGeneric_mmbbpink.png.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "b52da239e5a4c697720bc03617698afe" +"md5": "c7ebad9f63bd75c5e256c77386fa38f8" } [deps] diff --git a/Models/1Stage/Illum/1StageIllum-BandSignCenter.glb b/Models/1Stage/Illum/1StageIllum-BandSignCenter.glb new file mode 100644 index 0000000..48eb744 Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-BandSignCenter.glb differ diff --git a/Models/1Stage/1StageGenericOrganLightsInner.glb.import b/Models/1Stage/Illum/1StageIllum-BandSignCenter.glb.import similarity index 69% rename from Models/1Stage/1StageGenericOrganLightsInner.glb.import rename to Models/1Stage/Illum/1StageIllum-BandSignCenter.glb.import index 8447854..cac9089 100644 --- a/Models/1Stage/1StageGenericOrganLightsInner.glb.import +++ b/Models/1Stage/Illum/1StageIllum-BandSignCenter.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://bju74jawdmt6y" -path="res://.godot/imported/1StageGenericOrganLightsInner.glb-43a4326a6fed54974040fba761894ca0.scn" +uid="uid://vwweomarnkh1" +path="res://.godot/imported/1StageIllum-BandSignCenter.glb-b97e240803e06c60458a6bbfd67dd31f.scn" [deps] -source_file="res://Models/1Stage/1StageGenericOrganLightsInner.glb" -dest_files=["res://.godot/imported/1StageGenericOrganLightsInner.glb-43a4326a6fed54974040fba761894ca0.scn"] +source_file="res://Models/1Stage/Illum/1StageIllum-BandSignCenter.glb" +dest_files=["res://.godot/imported/1StageIllum-BandSignCenter.glb-b97e240803e06c60458a6bbfd67dd31f.scn"] [params] diff --git a/Models/1Stage/Illum/1StageIllum-BandSignCenter_mmbbpink.png b/Models/1Stage/Illum/1StageIllum-BandSignCenter_mmbbpink.png new file mode 100644 index 0000000..3405a57 Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-BandSignCenter_mmbbpink.png differ diff --git a/Models/1Stage/Illum/1StageIllum-BandSignCenter_mmbbpink.png.import b/Models/1Stage/Illum/1StageIllum-BandSignCenter_mmbbpink.png.import new file mode 100644 index 0000000..da053b1 --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-BandSignCenter_mmbbpink.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://jte42y0h7oyw" +path.s3tc="res://.godot/imported/1StageIllum-BandSignCenter_mmbbpink.png-a0fe03e5cf5ccb3e22d16a710b861f48.s3tc.ctex" +path.etc2="res://.godot/imported/1StageIllum-BandSignCenter_mmbbpink.png-a0fe03e5cf5ccb3e22d16a710b861f48.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "c7ebad9f63bd75c5e256c77386fa38f8" +} + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-BandSignCenter_mmbbpink.png" +dest_files=["res://.godot/imported/1StageIllum-BandSignCenter_mmbbpink.png-a0fe03e5cf5ccb3e22d16a710b861f48.s3tc.ctex", "res://.godot/imported/1StageIllum-BandSignCenter_mmbbpink.png-a0fe03e5cf5ccb3e22d16a710b861f48.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 diff --git a/Models/1Stage/Illum/1StageIllum-BandSignRight.glb b/Models/1Stage/Illum/1StageIllum-BandSignRight.glb new file mode 100644 index 0000000..148d07d Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-BandSignRight.glb differ diff --git a/Models/1Stage/1StageGenericOrganLightsOuter.glb.import b/Models/1Stage/Illum/1StageIllum-BandSignRight.glb.import similarity index 69% rename from Models/1Stage/1StageGenericOrganLightsOuter.glb.import rename to Models/1Stage/Illum/1StageIllum-BandSignRight.glb.import index b9f57fb..65d7790 100644 --- a/Models/1Stage/1StageGenericOrganLightsOuter.glb.import +++ b/Models/1Stage/Illum/1StageIllum-BandSignRight.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://dm3wfbhs34bkd" -path="res://.godot/imported/1StageGenericOrganLightsOuter.glb-84725dbd2b06a8ead1a71792379e40b2.scn" +uid="uid://bt0glfp77f5wo" +path="res://.godot/imported/1StageIllum-BandSignRight.glb-5d61275e0c9e0e48ccf121d33456fd8d.scn" [deps] -source_file="res://Models/1Stage/1StageGenericOrganLightsOuter.glb" -dest_files=["res://.godot/imported/1StageGenericOrganLightsOuter.glb-84725dbd2b06a8ead1a71792379e40b2.scn"] +source_file="res://Models/1Stage/Illum/1StageIllum-BandSignRight.glb" +dest_files=["res://.godot/imported/1StageIllum-BandSignRight.glb-5d61275e0c9e0e48ccf121d33456fd8d.scn"] [params] diff --git a/Models/1Stage/Illum/1StageIllum-BandSignRight_mmbbpink.png b/Models/1Stage/Illum/1StageIllum-BandSignRight_mmbbpink.png new file mode 100644 index 0000000..3405a57 Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-BandSignRight_mmbbpink.png differ diff --git a/Models/1Stage/Illum/1StageIllum-BandSignRight_mmbbpink.png.import b/Models/1Stage/Illum/1StageIllum-BandSignRight_mmbbpink.png.import new file mode 100644 index 0000000..d17ee99 --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-BandSignRight_mmbbpink.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d26vymeqck1w2" +path.s3tc="res://.godot/imported/1StageIllum-BandSignRight_mmbbpink.png-1b8a4c9ac9851a49e5e948bbcdb91607.s3tc.ctex" +path.etc2="res://.godot/imported/1StageIllum-BandSignRight_mmbbpink.png-1b8a4c9ac9851a49e5e948bbcdb91607.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "c7ebad9f63bd75c5e256c77386fa38f8" +} + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-BandSignRight_mmbbpink.png" +dest_files=["res://.godot/imported/1StageIllum-BandSignRight_mmbbpink.png-1b8a4c9ac9851a49e5e948bbcdb91607.s3tc.ctex", "res://.godot/imported/1StageIllum-BandSignRight_mmbbpink.png-1b8a4c9ac9851a49e5e948bbcdb91607.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 diff --git a/Models/1Stage/Illum/1StageIllum-CECSign.glb b/Models/1Stage/Illum/1StageIllum-CECSign.glb new file mode 100644 index 0000000..9831238 Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-CECSign.glb differ diff --git a/Models/1Stage/Illum/1StageIllum-CECSign.glb.import b/Models/1Stage/Illum/1StageIllum-CECSign.glb.import new file mode 100644 index 0000000..b28e625 --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-CECSign.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://x2t2t08hq0u7" +path="res://.godot/imported/1StageIllum-CECSign.glb-183c1b593d44f165614168909eeb5849.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-CECSign.glb" +dest_files=["res://.godot/imported/1StageIllum-CECSign.glb-183c1b593d44f165614168909eeb5849.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/1Stage/Illum/1StageIllum-DrumHead.glb b/Models/1Stage/Illum/1StageIllum-DrumHead.glb new file mode 100644 index 0000000..e14c0bb Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-DrumHead.glb differ diff --git a/Models/1Stage/Illum/1StageIllum-DrumHead.glb.import b/Models/1Stage/Illum/1StageIllum-DrumHead.glb.import new file mode 100644 index 0000000..ca38f0d --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-DrumHead.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dsh7xdswaqkm3" +path="res://.godot/imported/1StageIllum-DrumHead.glb-390269d067f6b806feb8242da44af1a2.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-DrumHead.glb" +dest_files=["res://.godot/imported/1StageIllum-DrumHead.glb-390269d067f6b806feb8242da44af1a2.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/1Stage/Illum/1StageIllum-FiberCurtain.glb b/Models/1Stage/Illum/1StageIllum-FiberCurtain.glb new file mode 100644 index 0000000..f354740 Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-FiberCurtain.glb differ diff --git a/Models/1Stage/1StageGenericOrganLightsMiddle.glb.import b/Models/1Stage/Illum/1StageIllum-FiberCurtain.glb.import similarity index 69% rename from Models/1Stage/1StageGenericOrganLightsMiddle.glb.import rename to Models/1Stage/Illum/1StageIllum-FiberCurtain.glb.import index 4bbeb12..7421abf 100644 --- a/Models/1Stage/1StageGenericOrganLightsMiddle.glb.import +++ b/Models/1Stage/Illum/1StageIllum-FiberCurtain.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://dxejch2vv4k20" -path="res://.godot/imported/1StageGenericOrganLightsMiddle.glb-1934312a10e47b9b60f24c340e4e783a.scn" +uid="uid://75qn68fu5a7l" +path="res://.godot/imported/1StageIllum-FiberCurtain.glb-256bc475e954920682457a0ca049a582.scn" [deps] -source_file="res://Models/1Stage/1StageGenericOrganLightsMiddle.glb" -dest_files=["res://.godot/imported/1StageGenericOrganLightsMiddle.glb-1934312a10e47b9b60f24c340e4e783a.scn"] +source_file="res://Models/1Stage/Illum/1StageIllum-FiberCurtain.glb" +dest_files=["res://.godot/imported/1StageIllum-FiberCurtain.glb-256bc475e954920682457a0ca049a582.scn"] [params] diff --git a/Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb b/Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb new file mode 100644 index 0000000..7e6df2c Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb differ diff --git a/Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb.import b/Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb.import new file mode 100644 index 0000000..19d8232 --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://ce0bwyc6xm6t8" +path="res://.godot/imported/1StageIllum-OrganFaceAmber.glb-07065cf71d3e232199bc7bb79fade0a5.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb" +dest_files=["res://.godot/imported/1StageIllum-OrganFaceAmber.glb-07065cf71d3e232199bc7bb79fade0a5.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb b/Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb new file mode 100644 index 0000000..43b85bc Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb differ diff --git a/Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb.import b/Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb.import new file mode 100644 index 0000000..9eaeb8e --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cltfuwsfemt8q" +path="res://.godot/imported/1StageIllum-OrganFaceBlue.glb-d425c0c3cef121f6554a86ccb56b7ec5.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb" +dest_files=["res://.godot/imported/1StageIllum-OrganFaceBlue.glb-d425c0c3cef121f6554a86ccb56b7ec5.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/1Stage/1StageGenericOrganLightsInner.glb b/Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb similarity index 100% rename from Models/1Stage/1StageGenericOrganLightsInner.glb rename to Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb diff --git a/Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb.import b/Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb.import new file mode 100644 index 0000000..b92389e --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://es0mjvijjwy8" +path="res://.godot/imported/1StageIllum-OrganLightsInner.glb-02b50d9258da3eed6541817c333a0fb3.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb" +dest_files=["res://.godot/imported/1StageIllum-OrganLightsInner.glb-02b50d9258da3eed6541817c333a0fb3.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/1Stage/1StageGenericOrganLightsMiddle.glb b/Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb similarity index 100% rename from Models/1Stage/1StageGenericOrganLightsMiddle.glb rename to Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb diff --git a/Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb.import b/Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb.import new file mode 100644 index 0000000..815148f --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://i2jx8qr8hit1" +path="res://.godot/imported/1StageIllum-OrganLightsMiddle.glb-7c9270aae67901fa6ec24418c525ec65.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb" +dest_files=["res://.godot/imported/1StageIllum-OrganLightsMiddle.glb-7c9270aae67901fa6ec24418c525ec65.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/1Stage/1StageGenericOrganLightsOuter.glb b/Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb similarity index 100% rename from Models/1Stage/1StageGenericOrganLightsOuter.glb rename to Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb diff --git a/Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb.import b/Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb.import new file mode 100644 index 0000000..c893a7d --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c6fp5o20j87am" +path="res://.godot/imported/1StageIllum-OrganLightsOuter.glb-2b8b2102b522628888748541c1617bdc.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb" +dest_files=["res://.godot/imported/1StageIllum-OrganLightsOuter.glb-2b8b2102b522628888748541c1617bdc.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/1Stage/Illum/1StageIllum-RopeLights.glb b/Models/1Stage/Illum/1StageIllum-RopeLights.glb new file mode 100644 index 0000000..acb1cea Binary files /dev/null and b/Models/1Stage/Illum/1StageIllum-RopeLights.glb differ diff --git a/Models/1Stage/Illum/1StageIllum-RopeLights.glb.import b/Models/1Stage/Illum/1StageIllum-RopeLights.glb.import new file mode 100644 index 0000000..4b69144 --- /dev/null +++ b/Models/1Stage/Illum/1StageIllum-RopeLights.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://chhs7d280p7k7" +path="res://.godot/imported/1StageIllum-RopeLights.glb-d56d610f50ea9c8908baac1bb29c8617.scn" + +[deps] + +source_file="res://Models/1Stage/Illum/1StageIllum-RopeLights.glb" +dest_files=["res://.godot/imported/1StageIllum-RopeLights.glb-d56d610f50ea9c8908baac1bb29c8617.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/FreeRoam/Generic/1StageGenericRoom.glb b/Models/FreeRoam/Generic/1StageGenericRoom.glb index aafa87a..6cb5e08 100644 Binary files a/Models/FreeRoam/Generic/1StageGenericRoom.glb and b/Models/FreeRoam/Generic/1StageGenericRoom.glb differ diff --git a/Models/FreeRoam/Generic/Generic1StageRoomCollider.obj b/Models/FreeRoam/Generic/Generic1StageRoomCollider.obj index 064b3f1..6dfbbf9 100644 --- a/Models/FreeRoam/Generic/Generic1StageRoomCollider.obj +++ b/Models/FreeRoam/Generic/Generic1StageRoomCollider.obj @@ -26,14 +26,6 @@ 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 -v -0.600000 0.800000 0.050000 -v -0.600000 1.800000 0.050000 -v -0.600000 0.800000 -0.350000 -v -0.600000 1.800000 -0.350000 -v 0.600000 0.800000 0.050000 -v 0.600000 1.800000 0.050000 -v 0.600000 0.800000 -0.350000 -v 0.600000 1.800000 -0.350000 vn -0.0000 1.0000 -0.0000 vn -0.0000 -0.0000 1.0000 vn 0.1644 -0.0000 0.9864 @@ -42,25 +34,10 @@ 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 -vn -0.0000 -1.0000 -0.0000 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 -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 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 @@ -73,9 +50,3 @@ 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 -f 25/5/5 26/6/5 28/7/5 27/8/5 -f 27/8/7 28/7/7 32/9/7 31/10/7 -f 31/10/8 32/9/8 30/11/8 29/12/8 -f 29/12/2 30/11/2 26/13/2 25/14/2 -f 27/15/9 31/10/9 29/12/9 25/16/9 -f 32/9/1 28/17/1 26/18/1 30/11/1 diff --git a/Scenes/EditorStages/1Stage.tscn b/Scenes/EditorStages/1Stage.tscn index b83d955..1fae629 100644 --- a/Scenes/EditorStages/1Stage.tscn +++ b/Scenes/EditorStages/1Stage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://bl4wyf7wq84i"] +[gd_scene load_steps=25 format=3 uid="uid://bl4wyf7wq84i"] [ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Cyberamics/Cyber Munch.glb" id="1_3gw4q"] [ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/FreeRoam/Generic/1StageGenericRoom.glb" id="1_bg74u"] @@ -9,12 +9,20 @@ [ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Cyberamics/Cyber Pasqually.glb" id="6_bg74u"] [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="7_66voy"] [ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/1Stage/1StageGeneric.glb" id="8_3gw4q"] -[ext_resource type="PackedScene" uid="uid://bju74jawdmt6y" path="res://Models/1Stage/1StageGenericOrganLightsInner.glb" id="8_ryg5o"] -[ext_resource type="PackedScene" uid="uid://dxejch2vv4k20" path="res://Models/1Stage/1StageGenericOrganLightsMiddle.glb" id="9_lou7w"] -[ext_resource type="PackedScene" uid="uid://dm3wfbhs34bkd" path="res://Models/1Stage/1StageGenericOrganLightsOuter.glb" id="10_bg74u"] [ext_resource type="PackedScene" uid="uid://mvv5sjk3vbtl" path="res://Scenes/Props/HelicopterLight.tscn" id="12_lou7w"] +[ext_resource type="PackedScene" uid="uid://es0mjvijjwy8" path="res://Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb" id="13_c2d3b"] +[ext_resource type="PackedScene" uid="uid://i2jx8qr8hit1" path="res://Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb" id="14_fsllk"] [ext_resource type="PackedScene" uid="uid://cky4dxfbw52gb" path="res://Models/1Stage/1StageCurtains.glb" id="14_llmth"] [ext_resource type="Script" uid="uid://csyks2ufy3o3x" path="res://Scripts/OneWayController.gd" id="15_spjag"] +[ext_resource type="PackedScene" uid="uid://c6fp5o20j87am" path="res://Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb" id="15_u6pmy"] +[ext_resource type="PackedScene" uid="uid://ce0bwyc6xm6t8" path="res://Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb" id="16_t0mai"] +[ext_resource type="PackedScene" uid="uid://cltfuwsfemt8q" path="res://Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb" id="17_ehisq"] +[ext_resource type="PackedScene" uid="uid://vwweomarnkh1" path="res://Models/1Stage/Illum/1StageIllum-BandSignCenter.glb" id="18_y04di"] +[ext_resource type="PackedScene" uid="uid://bt0glfp77f5wo" path="res://Models/1Stage/Illum/1StageIllum-BandSignRight.glb" id="19_le4fr"] +[ext_resource type="PackedScene" uid="uid://x2t2t08hq0u7" path="res://Models/1Stage/Illum/1StageIllum-CECSign.glb" id="20_41jon"] +[ext_resource type="PackedScene" uid="uid://dsh7xdswaqkm3" path="res://Models/1Stage/Illum/1StageIllum-DrumHead.glb" id="21_uoo35"] +[ext_resource type="PackedScene" uid="uid://75qn68fu5a7l" path="res://Models/1Stage/Illum/1StageIllum-FiberCurtain.glb" id="22_uofta"] +[ext_resource type="PackedScene" uid="uid://chhs7d280p7k7" path="res://Models/1Stage/Illum/1StageIllum-RopeLights.glb" id="23_2helq"] [sub_resource type="Environment" id="Environment_w3m2i"] ambient_light_source = 1 @@ -93,36 +101,13 @@ spot_range = 8.0 spot_attenuation = -1.0 spot_angle = 5.0 -[node name="Organ" type="Node3D" parent="."] -script = ExtResource("7_66voy") - -[node name="Inner" parent="Organ" instance=ExtResource("8_ryg5o")] +[node name="Wink" type="SpotLight3D" parent="Spots"] +transform = Transform3D(1, 0, 0, 0, 0.998135, 0.0610485, 0, -0.0610485, 0.998135, 0, 3.7, 4) visible = false - -[node name="Middle" parent="Organ" instance=ExtResource("9_lou7w")] -visible = false - -[node name="Outer" parent="Organ" instance=ExtResource("10_bg74u")] -visible = false - -[node name="Face Amber" type="OmniLight3D" parent="Organ"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7, 0.1) -visible = false -light_color = Color(1, 0.501961, 0, 1) -light_energy = 0.1 - -[node name="Face Blue" type="Node3D" parent="Organ"] -visible = false - -[node name="FB1" type="OmniLight3D" parent="Organ/Face Blue"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.35, 1.7, 0.1) -light_color = Color(0, 0.501961, 1, 1) -light_energy = 0.1 - -[node name="FB2" type="OmniLight3D" parent="Organ/Face Blue"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.35, 1.7, 0.1) -light_color = Color(0, 0.501961, 1, 1) -light_energy = 0.1 +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +spot_attenuation = -1.0 +spot_angle = 5.0 [node name="Floods" type="Node3D" parent="."] script = ExtResource("7_66voy") @@ -241,15 +226,6 @@ transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 1.5, 1, light_color = Color(0, 0.498039, 1, 1) light_energy = 2.0 -[node name="Special" type="Node3D" parent="."] -script = ExtResource("7_66voy") - -[node name="Kick Drum" type="OmniLight3D" parent="Special"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 1.2, 0) -visible = false -light_color = Color(1, 0, 0, 1) -light_energy = 0.25 - [node name="Special Helicopter" parent="." instance=ExtResource("12_lou7w")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 3, 4) @@ -307,3 +283,61 @@ spot_angle = 90.0 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) spot_angle = 90.0 + +[node name="Organ" type="Node3D" parent="."] +script = ExtResource("7_66voy") + +[node name="Legs Inner" type="Node3D" parent="Organ"] +visible = false + +[node name="1StageIllum-OrganLightsInner" parent="Organ/Legs Inner" instance=ExtResource("13_c2d3b")] + +[node name="Legs Middle" type="Node3D" parent="Organ"] +visible = false + +[node name="1StageIllum-OrganLightsMiddle" parent="Organ/Legs Middle" instance=ExtResource("14_fsllk")] + +[node name="Legs Outer" type="Node3D" parent="Organ"] +visible = false + +[node name="1StageIllum-OrganLightsOuter" parent="Organ/Legs Outer" instance=ExtResource("15_u6pmy")] + +[node name="Face Amber" type="Node3D" parent="Organ"] +visible = false + +[node name="1StageIllum-OrganFaceAmber" parent="Organ/Face Amber" instance=ExtResource("16_t0mai")] + +[node name="Face Blue" type="Node3D" parent="Organ"] +visible = false + +[node name="1StageIllum-OrganFaceBlue" parent="Organ/Face Blue" instance=ExtResource("17_ehisq")] + +[node name="Special" type="Node3D" parent="."] +script = ExtResource("7_66voy") + +[node name="Band Sign" type="Node3D" parent="Special"] +visible = false + +[node name="BandSignCenter" parent="Special/Band Sign" instance=ExtResource("18_y04di")] + +[node name="BandSignRight" parent="Special/Band Sign" instance=ExtResource("19_le4fr")] + +[node name="CEC Sign" parent="Special" instance=ExtResource("20_41jon")] +visible = false + +[node name="Drum Light" parent="Special" instance=ExtResource("21_uoo35")] +visible = false + +[node name="Fiber Curtain" parent="Special" instance=ExtResource("22_uofta")] +visible = false + +[node name="CEC Rope Light" parent="Special" instance=ExtResource("23_2helq")] +visible = false + +[node name="Gobo Light" type="SpotLight3D" parent="Special"] +transform = Transform3D(1, 0, 0, 0, 0.948324, 0.317305, 0, -0.317305, 0.948324, 0, 3.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +spot_range = 6.0 +spot_attenuation = -1.0 +spot_angle = 10.0 diff --git a/Scenes/FreeRoam/Generic/Generic1Stage.tscn b/Scenes/FreeRoam/Generic/Generic1Stage.tscn index 97901c9..1ff5e3d 100644 --- a/Scenes/FreeRoam/Generic/Generic1Stage.tscn +++ b/Scenes/FreeRoam/Generic/Generic1Stage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://b6rem1te85htp"] +[gd_scene load_steps=28 format=3 uid="uid://b6rem1te85htp"] [ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/FreeRoam/Generic/1StageGenericRoom.glb" id="1_8m4fm"] [ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/1Stage/1StageGeneric.glb" id="2_ncqi6"] @@ -9,22 +9,30 @@ [ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Cyberamics/Cyber Jasper.glb" id="7_cw8uy"] [ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Cyberamics/Cyber Pasqually.glb" id="8_qaqoe"] [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="9_yvbl1"] -[ext_resource type="PackedScene" uid="uid://bju74jawdmt6y" path="res://Models/1Stage/1StageGenericOrganLightsInner.glb" id="10_shuix"] -[ext_resource type="PackedScene" uid="uid://dxejch2vv4k20" path="res://Models/1Stage/1StageGenericOrganLightsMiddle.glb" id="11_4t0m2"] -[ext_resource type="PackedScene" uid="uid://dm3wfbhs34bkd" path="res://Models/1Stage/1StageGenericOrganLightsOuter.glb" id="12_rs0sv"] +[ext_resource type="PackedScene" uid="uid://es0mjvijjwy8" path="res://Models/1Stage/Illum/1StageIllum-OrganLightsInner.glb" id="11_5nqmm"] +[ext_resource type="PackedScene" uid="uid://i2jx8qr8hit1" path="res://Models/1Stage/Illum/1StageIllum-OrganLightsMiddle.glb" id="12_cw8uy"] [ext_resource type="PackedScene" uid="uid://mvv5sjk3vbtl" path="res://Scenes/Props/HelicopterLight.tscn" id="13_1oq0m"] +[ext_resource type="PackedScene" uid="uid://c6fp5o20j87am" path="res://Models/1Stage/Illum/1StageIllum-OrganLightsOuter.glb" id="13_qaqoe"] [ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/player.tscn" id="14_ncqi6"] +[ext_resource type="PackedScene" uid="uid://ce0bwyc6xm6t8" path="res://Models/1Stage/Illum/1StageIllum-OrganFaceAmber.glb" id="14_yvbl1"] [ext_resource type="PackedScene" uid="uid://cky4dxfbw52gb" path="res://Models/1Stage/1StageCurtains.glb" id="15_r26gl"] +[ext_resource type="PackedScene" uid="uid://cltfuwsfemt8q" path="res://Models/1Stage/Illum/1StageIllum-OrganFaceBlue.glb" id="15_shuix"] [ext_resource type="Script" uid="uid://csyks2ufy3o3x" path="res://Scripts/OneWayController.gd" id="16_fdybi"] +[ext_resource type="PackedScene" uid="uid://vwweomarnkh1" path="res://Models/1Stage/Illum/1StageIllum-BandSignCenter.glb" id="16_rs0sv"] +[ext_resource type="PackedScene" uid="uid://bt0glfp77f5wo" path="res://Models/1Stage/Illum/1StageIllum-BandSignRight.glb" id="17_1oq0m"] +[ext_resource type="PackedScene" uid="uid://x2t2t08hq0u7" path="res://Models/1Stage/Illum/1StageIllum-CECSign.glb" id="18_0tsrs"] +[ext_resource type="PackedScene" uid="uid://dsh7xdswaqkm3" path="res://Models/1Stage/Illum/1StageIllum-DrumHead.glb" id="19_6rkbs"] +[ext_resource type="PackedScene" uid="uid://75qn68fu5a7l" path="res://Models/1Stage/Illum/1StageIllum-FiberCurtain.glb" id="20_xpgff"] +[ext_resource type="PackedScene" uid="uid://chhs7d280p7k7" path="res://Models/1Stage/Illum/1StageIllum-RopeLights.glb" id="21_xsano"] [sub_resource type="Environment" id="Environment_0tsrs"] ambient_light_source = 1 -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_5nqmm"] -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) +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_vk72j"] +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) -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_cw8uy"] -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, -0.6, 1.8, 0.05, -0.6, 0.8, 0.05, -0.6, 1.8, -0.35, -0.6, 1.8, -0.35, -0.6, 0.8, 0.05, -0.6, 0.8, -0.35, -0.6, 1.8, -0.35, -0.6, 0.8, -0.35, 0.6, 1.8, -0.35, 0.6, 1.8, -0.35, -0.6, 0.8, -0.35, 0.6, 0.8, -0.35, 0.6, 1.8, -0.35, 0.6, 0.8, -0.35, 0.6, 1.8, 0.05, 0.6, 1.8, 0.05, 0.6, 0.8, -0.35, 0.6, 0.8, 0.05, 0.6, 1.8, 0.05, 0.6, 0.8, 0.05, -0.6, 1.8, 0.05, -0.6, 1.8, 0.05, 0.6, 0.8, 0.05, -0.6, 0.8, 0.05, 0.6, 0.8, -0.35, -0.6, 0.8, -0.35, 0.6, 0.8, 0.05, 0.6, 0.8, 0.05, -0.6, 0.8, -0.35, -0.6, 0.8, 0.05, -0.6, 1.8, -0.35, 0.6, 1.8, -0.35, -0.6, 1.8, 0.05, -0.6, 1.8, 0.05, 0.6, 1.8, -0.35, 0.6, 1.8, 0.05) +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_8opuw"] +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) [node name="Generic1Stage" type="Node3D"] @@ -116,15 +124,14 @@ spot_angle = 90.0 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3) current_map = "Generic 1-Stage" -[node name="StageCollider" type="StaticBody3D" parent="."] +[node name="CollideMap" type="StaticBody3D" parent="."] +visible = false -[node name="CollisionShape3D" type="CollisionShape3D" parent="StageCollider"] -shape = SubResource("ConcavePolygonShape3D_5nqmm") +[node name="CollisionShape3D2" type="CollisionShape3D" parent="CollideMap"] +shape = SubResource("ConcavePolygonShape3D_vk72j") -[node name="RoomCollider" type="StaticBody3D" parent="."] - -[node name="CollisionShape3D" type="CollisionShape3D" parent="RoomCollider"] -shape = SubResource("ConcavePolygonShape3D_cw8uy") +[node name="CollisionShape3D" type="CollisionShape3D" parent="CollideMap"] +shape = SubResource("ConcavePolygonShape3D_8opuw") [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) @@ -194,36 +201,41 @@ spot_range = 8.0 spot_attenuation = -1.0 spot_angle = 5.0 +[node name="Wink" type="SpotLight3D" parent="Spots"] +transform = Transform3D(1, 0, 0, 0, 0.998135, 0.0610485, 0, -0.0610485, 0.998135, 0, 3.7, 4) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +spot_attenuation = -1.0 +spot_angle = 5.0 + [node name="Organ" type="Node3D" parent="."] script = ExtResource("9_yvbl1") -[node name="Inner" parent="Organ" instance=ExtResource("10_shuix")] +[node name="Legs Inner" type="Node3D" parent="Organ"] visible = false -[node name="Middle" parent="Organ" instance=ExtResource("11_4t0m2")] +[node name="1StageIllum-OrganLightsInner" parent="Organ/Legs Inner" instance=ExtResource("11_5nqmm")] + +[node name="Legs Middle" type="Node3D" parent="Organ"] visible = false -[node name="Outer" parent="Organ" instance=ExtResource("12_rs0sv")] +[node name="1StageIllum-OrganLightsMiddle" parent="Organ/Legs Middle" instance=ExtResource("12_cw8uy")] + +[node name="Legs Outer" type="Node3D" parent="Organ"] visible = false -[node name="Face Amber" type="OmniLight3D" parent="Organ"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7, 0.1) +[node name="1StageIllum-OrganLightsOuter" parent="Organ/Legs Outer" instance=ExtResource("13_qaqoe")] + +[node name="Face Amber" type="Node3D" parent="Organ"] visible = false -light_color = Color(1, 0.501961, 0, 1) -light_energy = 0.1 + +[node name="1StageIllum-OrganFaceAmber" parent="Organ/Face Amber" instance=ExtResource("14_yvbl1")] [node name="Face Blue" type="Node3D" parent="Organ"] visible = false -[node name="FB1" type="OmniLight3D" parent="Organ/Face Blue"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.35, 1.7, 0.1) -light_color = Color(0, 0.501961, 1, 1) -light_energy = 0.1 - -[node name="FB2" type="OmniLight3D" parent="Organ/Face Blue"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.35, 1.7, 0.1) -light_color = Color(0, 0.501961, 1, 1) -light_energy = 0.1 +[node name="1StageIllum-OrganFaceBlue" parent="Organ/Face Blue" instance=ExtResource("15_shuix")] [node name="Floods" type="Node3D" parent="."] script = ExtResource("9_yvbl1") @@ -345,11 +357,32 @@ light_energy = 2.0 [node name="Special" type="Node3D" parent="."] script = ExtResource("9_yvbl1") -[node name="Kick Drum" type="OmniLight3D" parent="Special"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 1.2, 0) +[node name="Band Sign" type="Node3D" parent="Special"] visible = false -light_color = Color(1, 0, 0, 1) -light_energy = 0.25 + +[node name="BandSignCenter" parent="Special/Band Sign" instance=ExtResource("16_rs0sv")] + +[node name="BandSignRight" parent="Special/Band Sign" instance=ExtResource("17_1oq0m")] + +[node name="CEC Sign" parent="Special" instance=ExtResource("18_0tsrs")] +visible = false + +[node name="Drum Light" parent="Special" instance=ExtResource("19_6rkbs")] +visible = false + +[node name="Fiber Curtain" parent="Special" instance=ExtResource("20_xpgff")] +visible = false + +[node name="CEC Rope Light" parent="Special" instance=ExtResource("21_xsano")] +visible = false + +[node name="Gobo Light" type="SpotLight3D" parent="Special"] +transform = Transform3D(1, 0, 0, 0, 0.948324, 0.317305, 0, -0.317305, 0.948324, 0, 3.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +spot_range = 6.0 +spot_attenuation = -1.0 +spot_angle = 10.0 [node name="Special Helicopter" parent="." instance=ExtResource("13_1oq0m")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 3, 4) diff --git a/Scripts/Configs/Cosmetics.gd b/Scripts/Configs/Cosmetics.gd index 8cc7afd..4858b51 100644 --- a/Scripts/Configs/Cosmetics.gd +++ b/Scripts/Configs/Cosmetics.gd @@ -656,6 +656,37 @@ var Valence = { } } +var Cyber1StageSpecial = { + "Curtains": + { + "On": + { + "Curtain": true, + }, + "Off": + { + "Curtain": false, + }, + }, + "Band Sign": + { + "Right": + { + "Special/Band Sign/BandSignCenter": false, + "Special/Band Sign/BandSignRight": true, + "StageModel/BandSignCenter": false, + "StageModel/BandSignRight": true, + }, + "Center": + { + "Special/Band Sign/BandSignCenter": true, + "Special/Band Sign/BandSignRight": false, + "StageModel/BandSignCenter": true, + "StageModel/BandSignRight": false, + }, + }, +} + var HelenHouseHelen = { "Helen Hair": { diff --git a/Scripts/Configs/Stages.gd b/Scripts/Configs/Stages.gd index f3b9d45..2e37222 100644 --- a/Scripts/Configs/Stages.gd +++ b/Scripts/Configs/Stages.gd @@ -376,7 +376,7 @@ var Cyber3Stage = { } var Cyber1Stage = { - "bits": 60, + "bits": 69, "scene": "res://Scenes/EditorStages/1Stage.tscn", "scene_ref_base": "SubViewport/1Stage/", "camera_count": 5, @@ -430,6 +430,7 @@ var Cyber1Stage = { 52: { "bot": "Spots", "movement": "Munch", "flow_in": "None", "flow_out": "None" }, 53: { "bot": "Spots", "movement": "Jasper", "flow_in": "None", "flow_out": "None" }, 54: { "bot": "Spots", "movement": "Pasqually", "flow_in": "None", "flow_out": "None" }, + 55: { "bot": "Spots", "movement": "Wink", "flow_in": "None", "flow_out": "None" }, 61: { "bot": "Curtain", "movement": "Up", "flow_in": 0.2, "flow_out": 0.2 }, 62: { "bot": "Curtain", "movement": "Down", "flow_in": 0.2, "flow_out": 0.2 }, 65: { "bot": "Floods", "movement": "CEC Red", "flow_in": "None", "flow_out": "None" }, @@ -443,10 +444,15 @@ var Cyber1Stage = { 73: { "bot": "Backdrop", "movement": "Blue", "flow_in": "None", "flow_out": "None" }, 74: { "bot": "Organ", "movement": "Face Amber", "flow_in": "None", "flow_out": "None" }, 75: { "bot": "Organ", "movement": "Face Blue", "flow_in": "None", "flow_out": "None" }, - 76: { "bot": "Organ", "movement": "Outer", "flow_in": "None", "flow_out": "None" }, - 77: { "bot": "Organ", "movement": "Middle", "flow_in": "None", "flow_out": "None" }, - 78: { "bot": "Organ", "movement": "Inner", "flow_in": "None", "flow_out": "None" }, - 84: { "bot": "Special", "movement": "Kick Drum", "flow_in": "None", "flow_out": "None" }, + 76: { "bot": "Organ", "movement": "Legs Outer", "flow_in": "None", "flow_out": "None" }, + 77: { "bot": "Organ", "movement": "Legs Middle", "flow_in": "None", "flow_out": "None" }, + 78: { "bot": "Organ", "movement": "Legs Inner", "flow_in": "None", "flow_out": "None" }, + 79: { "bot": "Special", "movement": "CEC Sign", "flow_in": "None", "flow_out": "None" }, + 80: { "bot": "Special", "movement": "CEC Rope Light", "flow_in": "None", "flow_out": "None" }, + 82: { "bot": "Special", "movement": "Fiber Curtain", "flow_in": "None", "flow_out": "None" }, + 83: { "bot": "Special", "movement": "Band Sign", "flow_in": "None", "flow_out": "None" }, + 84: { "bot": "Special", "movement": "Drum Light", "flow_in": "None", "flow_out": "None" }, + 85: { "bot": "Special", "movement": "Gobo Light", "flow_in": "None", "flow_out": "None" }, 86: { "bot": "Special Helicopter", "movement": "Light", "flow_in": 15.0, "flow_out": 6.0 }, }, @@ -457,9 +463,10 @@ var Cyber1Stage = { Cosmetics.CyberMunch, Cosmetics.CyberJasper, Cosmetics.CyberPasqually, - Cosmetics.Valence + Cosmetics.Valence, + Cosmetics.Cyber1StageSpecial ], - "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0 ] + "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0, 0 ] } var stages_info = { diff --git a/Scripts/InGameMenu.gd b/Scripts/InGameMenu.gd index 71cddba..4ab80a1 100644 --- a/Scripts/InGameMenu.gd +++ b/Scripts/InGameMenu.gd @@ -208,6 +208,9 @@ func _on_play_button_pressed() -> void: func _physics_process(_delta: float) -> void: if (playing): + if (index > loaded_frames.size()): + _on_stop_button_pressed() + return var j = 0 for i in stage["bit_mapping"]: if (loaded_frames[index][j]):