diff --git a/Models/Stages/3-Stage/3Stage.glb b/Models/Stages/3-Stage/3Stage.glb index 1b486bd..e0adf81 100644 Binary files a/Models/Stages/3-Stage/3Stage.glb and b/Models/Stages/3-Stage/3Stage.glb differ diff --git a/Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb b/Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb new file mode 100644 index 0000000..056e31c Binary files /dev/null and b/Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb differ diff --git a/Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb.import b/Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb.import new file mode 100644 index 0000000..95e696e --- /dev/null +++ b/Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cenr1chkafopu" +path="res://.godot/imported/3Stage-CECNeon.glb-b5de4e32038b6a70f45aca15589dc2bf.scn" + +[deps] + +source_file="res://Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb" +dest_files=["res://.godot/imported/3Stage-CECNeon.glb-b5de4e32038b6a70f45aca15589dc2bf.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/Stages/3-Stage/Illum/3Stage-CECStar.glb b/Models/Stages/3-Stage/Illum/3Stage-CECStar.glb index 0773773..bc20603 100644 Binary files a/Models/Stages/3-Stage/Illum/3Stage-CECStar.glb and b/Models/Stages/3-Stage/Illum/3Stage-CECStar.glb differ diff --git a/Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb b/Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb new file mode 100644 index 0000000..ed7e22a Binary files /dev/null and b/Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb differ diff --git a/Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb.import b/Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb.import new file mode 100644 index 0000000..5905431 --- /dev/null +++ b/Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dfij7ytda3csj" +path="res://.godot/imported/3Stage-CECStarTips.glb-eea6891f8821f902b7f44ddd783a989e.scn" + +[deps] + +source_file="res://Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb" +dest_files=["res://.godot/imported/3Stage-CECStarTips.glb-eea6891f8821f902b7f44ddd783a989e.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/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb b/Models/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb new file mode 100644 index 0000000..afe1334 Binary files /dev/null and b/Models/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb differ diff --git a/Models/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb.import b/Models/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb.import new file mode 100644 index 0000000..f0db09f --- /dev/null +++ b/Models/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dtwjqllgmkuna" +path="res://.godot/imported/3Stage-JukeboxTopper.glb-c6374eee39991adb07677d8970cc9ff2.scn" + +[deps] + +source_file="res://Models/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb" +dest_files=["res://.godot/imported/3Stage-JukeboxTopper.glb-c6374eee39991adb07677d8970cc9ff2.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/Scenes/EditorStages/3Stage.tscn b/Scenes/EditorStages/3Stage.tscn index 6aceb64..b2af13d 100644 --- a/Scenes/EditorStages/3Stage.tscn +++ b/Scenes/EditorStages/3Stage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://c4n7jns8vmcg4"] +[gd_scene load_steps=20 format=3 uid="uid://c4n7jns8vmcg4"] [ext_resource type="PackedScene" uid="uid://cy35b87ip330v" path="res://Models/Stages/3-Stage/3Stage.glb" id="2_nhspc"] [ext_resource type="PackedScene" uid="uid://bccho13aa6akj" path="res://Models/Animatronics/3-Stage/3stBuilding.glb" id="6_5tgym"] @@ -8,9 +8,12 @@ [ext_resource type="PackedScene" uid="uid://bf5esdqd1ca7r" path="res://Models/Stages/3-Stage/Illum/3Stage-CECStar.glb" id="8_4iojy"] [ext_resource type="PackedScene" uid="uid://dtqool7t7275f" path="res://Models/Stages/3-Stage/Illum/3Stage-FiberCurtain.glb" id="9_0r6eb"] [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="9_d7ghp"] +[ext_resource type="PackedScene" uid="uid://cenr1chkafopu" path="res://Models/Stages/3-Stage/Illum/3Stage-CECNeon.glb" id="9_vp7dp"] [ext_resource type="PackedScene" uid="uid://cx6ypljyhl8rf" path="res://Models/Stages/3-Stage/Illum/3Stage-OrganFaceAmber.glb" id="10_m7q6x"] [ext_resource type="PackedScene" uid="uid://ds1yefd37cwtf" path="res://Models/Stages/3-Stage/Illum/3Stage-OrganFaceBlue.glb" id="11_a5anu"] +[ext_resource type="PackedScene" uid="uid://dfij7ytda3csj" path="res://Models/Stages/3-Stage/Illum/3Stage-CECStarTips.glb" id="11_xg3a1"] [ext_resource type="PackedScene" uid="uid://dpfuhwdrtqpb" path="res://Models/Stages/3-Stage/Illum/3Stage-OrganLegsBottom.glb" id="12_1lpde"] +[ext_resource type="PackedScene" uid="uid://dtwjqllgmkuna" path="res://Models/Stages/3-Stage/Illum/3Stage-JukeboxTopper.glb" id="12_3bb7b"] [ext_resource type="PackedScene" uid="uid://gcgxhrhwa1is" path="res://Models/Stages/3-Stage/Illum/3Stage-OrganLegsMiddle.glb" id="13_vp7dp"] [ext_resource type="PackedScene" uid="uid://boo7wyp4mv37r" path="res://Models/Stages/3-Stage/Illum/3Stage-OrganLegsUpper.glb" id="14_xg3a1"] [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="15_1j3kr"] @@ -322,6 +325,10 @@ spot_angle = 30.0 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 6.4) visible = false +[node name="CEC Neon" parent="Special" instance=ExtResource("9_vp7dp")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 6.4) +visible = false + [node name="Fiber Curtain" parent="Special" instance=ExtResource("9_0r6eb")] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 6.4) visible = false @@ -342,6 +349,15 @@ light_energy = 2.0 shadow_enabled = true spot_angle = 30.0 +[node name="Jukebox Topper" type="Node3D" parent="Special"] +visible = false + +[node name="3Stage-CECStarTips" parent="Special/Jukebox Topper" instance=ExtResource("11_xg3a1")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 6.4) + +[node name="3Stage-JukeboxTopper" parent="Special/Jukebox Topper" instance=ExtResource("12_3bb7b")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 6.4) + [node name="Organ" type="Node3D" parent="."] script = ExtResource("9_d7ghp") diff --git a/Scripts/Configs/Stages.gd b/Scripts/Configs/Stages.gd index 36f0606..c042240 100644 --- a/Scripts/Configs/Stages.gd +++ b/Scripts/Configs/Stages.gd @@ -1186,7 +1186,7 @@ var StatenIsland1Stage = { } var CEI3Stage = { - "bits": 62, + "bits": 64, "scene": "res://Scenes/EditorStages/3Stage.tscn", "scene_ref_base": "SubViewport/3Stage/", "camera_count": 4, @@ -1255,6 +1255,8 @@ var CEI3Stage = { 168: { "bot": "Organ", "movement": "Legs Middle", "flow_in": "None", "flow_out": "None" }, 169: { "bot": "Organ", "movement": "Legs Bottom", "flow_in": "None", "flow_out": "None" }, 175: { "bot": "Special", "movement": "CEC Star", "flow_in": "None", "flow_out": "None" }, + 176: { "bot": "Special", "movement": "CEC Neon", "flow_in": "None", "flow_out": "None" }, + 177: { "bot": "Special", "movement": "Jukebox Topper", "flow_in": "None", "flow_out": "None" }, 178: { "bot": "Special", "movement": "Fiber Curtain", "flow_in": "None", "flow_out": "None" }, 179: { "bot": "Special", "movement": "Drums Yellow", "flow_in": "None", "flow_out": "None" }, 180: { "bot": "Special", "movement": "Drums Red", "flow_in": "None", "flow_out": "None" },