diff --git a/Scenes/EditorStages/ProtoRoadStage.tscn b/Scenes/EditorStages/ProtoRoadStage.tscn index 17d4a93..ce1419c 100644 --- a/Scenes/EditorStages/ProtoRoadStage.tscn +++ b/Scenes/EditorStages/ProtoRoadStage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://0p6p1owvvesv"] +[gd_scene load_steps=12 format=3 uid="uid://0p6p1owvvesv"] [ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="1_pj7jr"] [ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="2_6jho3"] @@ -9,6 +9,7 @@ [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="7_r2dgu"] [ext_resource type="PackedScene" uid="uid://dq1fvhg4rb6ro" path="res://Models/Stages/ProtoRoadStage/RoadStageNeon.glb" id="8_basbq"] [ext_resource type="PackedScene" uid="uid://bxjnp7g3w2wc8" path="res://Models/Stages/ProtoRoadStage/RoadStage.glb" id="9_hijvq"] +[ext_resource type="PackedScene" uid="uid://d1noqem71b260" path="res://Models/Stages/2-Stage/Illum/2StageGeneric-CECStarLight.glb" id="10_s0omj"] [sub_resource type="Environment" id="Environment_aswoc"] ambient_light_source = 1 @@ -35,13 +36,6 @@ script = ExtResource("2_6jho3") transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 2.4, 0.9, 0.5) script = ExtResource("2_6jho3") -[node name="Special" type="Node3D" parent="."] -script = ExtResource("7_r2dgu") - -[node name="Neon Sign" parent="Special" instance=ExtResource("8_basbq")] -transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 0, 0) -visible = false - [node name="RoadStage" parent="." instance=ExtResource("9_hijvq")] transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 0, 0) @@ -99,3 +93,261 @@ fov = 60.0 [node name="Angle 6" type="Camera3D" parent="."] transform = Transform3D(0.965926, -0.0669873, 0.25, 0, 0.965926, 0.258819, -0.258819, -0.25, 0.933013, 2, 2, 5) fov = 60.0 + +[node name="Special" type="Node3D" parent="."] +script = ExtResource("7_r2dgu") + +[node name="CEC Neon Sign" parent="Special" instance=ExtResource("8_basbq")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 0, 0) +visible = false + +[node name="CEC Star" parent="Special" instance=ExtResource("10_s0omj")] +transform = Transform3D(-1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, -6, 3.6, 1.5) +visible = false + +[node name="Spots" type="Node3D" parent="."] +script = ExtResource("7_r2dgu") + +[node name="Chuck" type="SpotLight3D" parent="Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.984808, 0.173648, 0, -0.173648, 0.984808, -3, 2.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Helen" type="SpotLight3D" parent="Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.984808, 0.173648, 0, -0.173648, 0.984808, -0.375, 2.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +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.6, 2.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Jasper" type="SpotLight3D" parent="Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.984808, 0.173648, 0, -0.173648, 0.984808, 1.55, 2.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Pasqually" type="SpotLight3D" parent="Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.978148, 0.207912, 0, -0.207912, 0.978148, 2.4, 2.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Building" type="Node3D" parent="."] +script = ExtResource("7_r2dgu") + +[node name="Helen" type="SpotLight3D" parent="Building" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.843391, 0.5373, 0, -0.5373, 0.843391, -0.375, 2.7, 4) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Organ Face" type="SpotLight3D" parent="Building" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.819152, 0.573576, 0, -0.573576, 0.819152, 0.6, 2.7, 4) +visible = false +light_color = Color(1, 0, 0, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Organ Legs" type="SpotLight3D" parent="Building" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.793353, 0.608761, 0, -0.608761, 0.793353, 0.6, 2.7, 4) +visible = false +light_color = Color(1, 0.762667, 0.11, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 7.5 + +[node name="Jasper" type="SpotLight3D" parent="Building" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.843391, 0.5373, 0, -0.5373, 0.843391, 1.55, 2.7, 4) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Pasqually" type="SpotLight3D" parent="Building" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.843391, 0.5373, 0, -0.5373, 0.843391, 2.4, 2.7, 4) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +shadow_enabled = true +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Backdrop" type="Node3D" parent="."] +script = ExtResource("7_r2dgu") + +[node name="Red" type="Node3D" parent="Backdrop"] +visible = false + +[node name="MR1" type="SpotLight3D" parent="Backdrop/Red" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -1.5, 1, 0.05) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 +shadow_enabled = true +shadow_bias = 0.1 + +[node name="MR2" type="SpotLight3D" parent="Backdrop/Red" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 0.5, 1, 0.05) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 +shadow_enabled = true +shadow_bias = 0.1 + +[node name="Amber" type="Node3D" parent="Backdrop"] +visible = false + +[node name="MA1" type="SpotLight3D" parent="Backdrop/Amber" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -1, 1, 0.05) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 +shadow_enabled = true +shadow_bias = 0.1 + +[node name="MA2" type="SpotLight3D" parent="Backdrop/Amber" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 1, 1, 0.05) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 +shadow_enabled = true +shadow_bias = 0.1 + +[node name="Blue" type="Node3D" parent="Backdrop"] +visible = false + +[node name="MB1" type="SpotLight3D" parent="Backdrop/Blue" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -0.5, 1.2, 0.05) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 +shadow_enabled = true +shadow_bias = 0.1 + +[node name="MB2" type="SpotLight3D" parent="Backdrop/Blue" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 1.5, 1.2, 0.05) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 +shadow_enabled = true +shadow_bias = 0.1 + +[node name="Floods" type="Node3D" parent="."] +script = ExtResource("7_r2dgu") + +[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, -3.25, 2.5, 2) +visible = false +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[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, -3, 2.5, 2) +visible = false +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[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, -2.75, 2.5, 2) +visible = false +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="Main Red" type="Node3D" parent="Floods"] +visible = false + +[node name="MR1" type="SpotLight3D" parent="Floods/Main Red" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -0.75, 2.5, 2) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="MR2" type="SpotLight3D" parent="Floods/Main Red" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.75, 2.5, 2) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="MR3" type="SpotLight3D" parent="Floods/Main Red" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 2.25, 2.5, 2) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="Main Amber" type="Node3D" parent="Floods"] +visible = false + +[node name="MA1" type="SpotLight3D" parent="Floods/Main Amber" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -0.25, 2.5, 2) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="MA2" type="SpotLight3D" parent="Floods/Main Amber" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 1.25, 2.5, 2) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="MA3" type="SpotLight3D" parent="Floods/Main Amber" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 2.75, 2.5, 2) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="Main Blue" type="Node3D" parent="Floods"] +visible = false + +[node name="MB1" type="SpotLight3D" parent="Floods/Main Blue" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.25, 2.5, 2) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="MB2" type="SpotLight3D" parent="Floods/Main Blue" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 1.75, 2.5, 2) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 +shadow_enabled = true + +[node name="MB3" type="SpotLight3D" parent="Floods/Main Blue" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 3.25, 2.5, 2) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 +shadow_enabled = true diff --git a/Scripts/Configs/Stages.gd b/Scripts/Configs/Stages.gd index f97ff5d..f921558 100644 --- a/Scripts/Configs/Stages.gd +++ b/Scripts/Configs/Stages.gd @@ -249,7 +249,7 @@ var CStage = { } var ProtoRoadStage = { - "bits": 41, + "bits": 61, "scene": "res://Scenes/EditorStages/ProtoRoadStage.tscn", "scene_ref_base": "SubViewport/ProtoRoadStage/", "camera_count": 6, @@ -298,7 +298,27 @@ var ProtoRoadStage = { 38: { "bot": "Pasqually", "movement": "Eyelids", "flow_in": 7.5, "flow_out": 5.0 }, 39: { "bot": "Pasqually", "movement": "Right Arm", "flow_in": 2.0, "flow_out": 1.0 }, 40: { "bot": "Pasqually", "movement": "Left Arm", "flow_in": 2.0, "flow_out": 1.0 }, - 80: { "bot": "Special", "movement": "Neon Sign", "flow_in": "None", "flow_out": "None" }, + 50: { "bot": "Spots", "movement": "Chuck", "flow_in": "None", "flow_out": "None" }, + 51: { "bot": "Spots", "movement": "Helen", "flow_in": "None", "flow_out": "None" }, + 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" }, + 65: { "bot": "Floods", "movement": "CEC Red", "flow_in": "None", "flow_out": "None" }, + 66: { "bot": "Floods", "movement": "CEC Amber", "flow_in": "None", "flow_out": "None" }, + 67: { "bot": "Floods", "movement": "CEC Blue", "flow_in": "None", "flow_out": "None" }, + 68: { "bot": "Floods", "movement": "Main Red", "flow_in": "None", "flow_out": "None" }, + 69: { "bot": "Floods", "movement": "Main Amber", "flow_in": "None", "flow_out": "None" }, + 70: { "bot": "Floods", "movement": "Main Blue", "flow_in": "None", "flow_out": "None" }, + 71: { "bot": "Backdrop", "movement": "Red", "flow_in": "None", "flow_out": "None" }, + 72: { "bot": "Backdrop", "movement": "Amber", "flow_in": "None", "flow_out": "None" }, + 73: { "bot": "Backdrop", "movement": "Blue", "flow_in": "None", "flow_out": "None" }, + 74: { "bot": "Building", "movement": "Organ Face", "flow_in": "None", "flow_out": "None" }, + 76: { "bot": "Building", "movement": "Helen", "flow_in": "None", "flow_out": "None" }, + 77: { "bot": "Building", "movement": "Organ Legs", "flow_in": "None", "flow_out": "None" }, + 78: { "bot": "Building", "movement": "Jasper", "flow_in": "None", "flow_out": "None" }, + 79: { "bot": "Special", "movement": "CEC Neon Sign", "flow_in": "None", "flow_out": "None" }, + 80: { "bot": "Special", "movement": "CEC Star", "flow_in": "None", "flow_out": "None" }, + 84: { "bot": "Building", "movement": "Pasqually", "flow_in": "None", "flow_out": "None" }, }, "cosmetics":