From 1efee5b65e90b020e2f75669b5525741d2d87d32 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Mon, 4 Aug 2025 20:26:51 -0700 Subject: [PATCH] cosmetics in free roam --- Scenes/FreeRoam/Generic/Generic1Stage.tscn | 458 ++++++++++---------- Scenes/GUI/Controls/CosmeticAdjustment.tscn | 20 +- Scenes/GUI/EditorScreen.tscn | 3 +- Scenes/GUI/InGameMenu.tscn | 203 ++++++++- Scenes/GUI/MainMenu.tscn | 2 +- Scripts/EditorScreen.gd | 2 + Scripts/InGameMenu.gd | 31 +- UI/Themes/{EditorDark.tres => Dark.tres} | 0 8 files changed, 474 insertions(+), 245 deletions(-) rename UI/Themes/{EditorDark.tres => Dark.tres} (100%) diff --git a/Scenes/FreeRoam/Generic/Generic1Stage.tscn b/Scenes/FreeRoam/Generic/Generic1Stage.tscn index 36d2725..efecd75 100644 --- a/Scenes/FreeRoam/Generic/Generic1Stage.tscn +++ b/Scenes/FreeRoam/Generic/Generic1Stage.tscn @@ -110,236 +110,6 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3. light_color = Color(1, 0.960784, 0.85098, 1) spot_angle = 90.0 -[node name="StageAssets" type="Node3D" parent="."] - -[node name="Chuck" parent="StageAssets" 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") - -[node name="Helen" parent="StageAssets" instance=ExtResource("5_0hrbq")] -transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -1.2, 1.52, -0.7) -script = ExtResource("4_fdybi") - -[node name="Munch" parent="StageAssets" instance=ExtResource("6_5nqmm")] -transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 1.52, -0.7) -script = ExtResource("4_fdybi") - -[node name="Jasper" parent="StageAssets" instance=ExtResource("7_cw8uy")] -transform = Transform3D(0.579556, 0, -0.155291, 0, 0.6, 0, 0.155291, 0, 0.579556, 1.5, 1.4, -0.8) -script = ExtResource("4_fdybi") - -[node name="Pasqually" parent="StageAssets" instance=ExtResource("8_qaqoe")] -transform = Transform3D(0.519615, 0, -0.3, 0, 0.6, 0, 0.3, 0, 0.519615, 3, 1.4, -0.8) -script = ExtResource("4_fdybi") - -[node name="Spots" type="Node3D" parent="StageAssets"] -script = ExtResource("9_yvbl1") - -[node name="Chuck" type="SpotLight3D" parent="StageAssets/Spots"] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -2.6, 3.7, 5) -visible = false -light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 -spot_range = 8.0 -spot_attenuation = -1.0 -spot_angle = 5.0 - -[node name="Helen" type="SpotLight3D" parent="StageAssets/Spots"] -transform = Transform3D(1, -5.67102e-08, 2.31578e-07, -9.98193e-10, 0.970296, 0.241922, -2.38419e-07, -0.241922, 0.970296, -1.2, 3.7, 5) -visible = false -light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 -spot_range = 8.0 -spot_attenuation = -1.0 -spot_angle = 5.0 - -[node name="Munch" type="SpotLight3D" parent="StageAssets/Spots"] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 3.7, 5) -visible = false -light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 -spot_range = 8.0 -spot_attenuation = -1.0 -spot_angle = 5.0 - -[node name="Jasper" type="SpotLight3D" parent="StageAssets/Spots"] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 1.5, 3.6, 5) -visible = false -light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 -spot_range = 8.0 -spot_attenuation = -1.0 -spot_angle = 5.0 - -[node name="Pasqually" type="SpotLight3D" parent="StageAssets/Spots"] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 3, 3.6, 5) -visible = false -light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 -spot_range = 8.0 -spot_attenuation = -1.0 -spot_angle = 5.0 - -[node name="Organ" type="Node3D" parent="StageAssets"] -script = ExtResource("9_yvbl1") - -[node name="Inner" parent="StageAssets/Organ" instance=ExtResource("10_shuix")] -visible = false - -[node name="Middle" parent="StageAssets/Organ" instance=ExtResource("11_4t0m2")] -visible = false - -[node name="Outer" parent="StageAssets/Organ" instance=ExtResource("12_rs0sv")] -visible = false - -[node name="Face Amber" type="OmniLight3D" parent="StageAssets/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="StageAssets/Organ"] -visible = false - -[node name="FB1" type="OmniLight3D" parent="StageAssets/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="StageAssets/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="Floods" type="Node3D" parent="StageAssets"] -script = ExtResource("9_yvbl1") - -[node name="CEC Red" type="SpotLight3D" parent="StageAssets/Floods"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -2.9, 3.5, 0) -visible = false -light_color = Color(1, 0, 0, 1) -light_energy = 2.0 - -[node name="CEC Amber" type="SpotLight3D" parent="StageAssets/Floods"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -2.6, 3.5, 0) -visible = false -light_color = Color(1, 0.498039, 0, 1) -light_energy = 2.0 - -[node name="CEC Blue" type="SpotLight3D" parent="StageAssets/Floods"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -2.3, 3.5, 0) -visible = false -light_color = Color(0, 0.498039, 1, 1) -light_energy = 2.0 - -[node name="Main Red" type="Node3D" parent="StageAssets/Floods"] -visible = false - -[node name="MR1" type="SpotLight3D" parent="StageAssets/Floods/Main Red"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -1.5, 3.5, 0) -light_color = Color(1, 0, 0, 1) -light_energy = 2.0 - -[node name="MR2" type="SpotLight3D" parent="StageAssets/Floods/Main Red"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.25, 3.5, 0) -light_color = Color(1, 0, 0, 1) -light_energy = 2.0 - -[node name="MR3" type="SpotLight3D" parent="StageAssets/Floods/Main Red"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 2, 3.5, 0) -light_color = Color(1, 0, 0, 1) -light_energy = 2.0 - -[node name="Main Amber" type="Node3D" parent="StageAssets/Floods"] -visible = false - -[node name="MA1" type="SpotLight3D" parent="StageAssets/Floods/Main Amber"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -1, 3.5, 0) -light_color = Color(1, 0.498039, 0, 1) -light_energy = 2.0 - -[node name="MA2" type="SpotLight3D" parent="StageAssets/Floods/Main Amber"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.75, 3.5, 0) -light_color = Color(1, 0.498039, 0, 1) -light_energy = 2.0 - -[node name="MA3" type="SpotLight3D" parent="StageAssets/Floods/Main Amber"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 2.5, 3.5, 0) -light_color = Color(1, 0.498039, 0, 1) -light_energy = 2.0 - -[node name="Main Blue" type="Node3D" parent="StageAssets/Floods"] -visible = false - -[node name="MB1" type="SpotLight3D" parent="StageAssets/Floods/Main Blue"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -0.5, 3.5, 0) -light_color = Color(0, 0.498039, 1, 1) -light_energy = 2.0 - -[node name="MB2" type="SpotLight3D" parent="StageAssets/Floods/Main Blue"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 1.25, 3.5, 0) -light_color = Color(0, 0.498039, 1, 1) -light_energy = 2.0 - -[node name="MB3" type="SpotLight3D" parent="StageAssets/Floods/Main Blue"] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 3, 3.5, 0) -light_color = Color(0, 0.498039, 1, 1) -light_energy = 2.0 - -[node name="Backdrop" type="Node3D" parent="StageAssets"] -script = ExtResource("9_yvbl1") - -[node name="Red" type="Node3D" parent="StageAssets/Backdrop"] -visible = false - -[node name="MR1" type="SpotLight3D" parent="StageAssets/Backdrop/Red"] -transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -1.5, 1, -1.25) -light_color = Color(1, 0, 0, 1) -light_energy = 2.0 - -[node name="MR2" type="SpotLight3D" parent="StageAssets/Backdrop/Red"] -transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 0.5, 1, -1.25) -light_color = Color(1, 0, 0, 1) -light_energy = 2.0 - -[node name="Amber" type="Node3D" parent="StageAssets/Backdrop"] -visible = false - -[node name="MA1" type="SpotLight3D" parent="StageAssets/Backdrop/Amber"] -transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -1, 1, -1.25) -light_color = Color(1, 0.498039, 0, 1) -light_energy = 2.0 - -[node name="MA2" type="SpotLight3D" parent="StageAssets/Backdrop/Amber"] -transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 1, 1, -1.25) -light_color = Color(1, 0.498039, 0, 1) -light_energy = 2.0 - -[node name="Blue" type="Node3D" parent="StageAssets/Backdrop"] -visible = false - -[node name="MB1" type="SpotLight3D" parent="StageAssets/Backdrop/Blue"] -transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -0.5, 1, -1.25) -light_color = Color(0, 0.498039, 1, 1) -light_energy = 2.0 - -[node name="MB2" type="SpotLight3D" parent="StageAssets/Backdrop/Blue"] -transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 1.5, 1, -1.25) -light_color = Color(0, 0.498039, 1, 1) -light_energy = 2.0 - -[node name="Special" type="Node3D" parent="StageAssets"] -script = ExtResource("9_yvbl1") - -[node name="Kick Drum" type="OmniLight3D" parent="StageAssets/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="StageAssets" instance=ExtResource("13_1oq0m")] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 3, 4) - [node name="Player" parent="." instance=ExtResource("14_ncqi6")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3) current_map = "Generic 1-Stage" @@ -353,3 +123,231 @@ shape = SubResource("ConcavePolygonShape3D_5nqmm") [node name="CollisionShape3D" type="CollisionShape3D" parent="RoomCollider"] shape = SubResource("ConcavePolygonShape3D_cw8uy") + +[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") + +[node name="Helen" parent="." instance=ExtResource("5_0hrbq")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -1.2, 1.52, -0.7) +script = ExtResource("4_fdybi") + +[node name="Munch" parent="." instance=ExtResource("6_5nqmm")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 1.52, -0.7) +script = ExtResource("4_fdybi") + +[node name="Jasper" parent="." instance=ExtResource("7_cw8uy")] +transform = Transform3D(0.579556, 0, -0.155291, 0, 0.6, 0, 0.155291, 0, 0.579556, 1.5, 1.4, -0.8) +script = ExtResource("4_fdybi") + +[node name="Pasqually" parent="." instance=ExtResource("8_qaqoe")] +transform = Transform3D(0.519615, 0, -0.3, 0, 0.6, 0, 0.3, 0, 0.519615, 3, 1.4, -0.8) +script = ExtResource("4_fdybi") + +[node name="Spots" type="Node3D" parent="."] +script = ExtResource("9_yvbl1") + +[node name="Chuck" type="SpotLight3D" parent="Spots"] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -2.6, 3.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Helen" type="SpotLight3D" parent="Spots"] +transform = Transform3D(1, -5.67102e-08, 2.31578e-07, -9.98193e-10, 0.970296, 0.241922, -2.38419e-07, -0.241922, 0.970296, -1.2, 3.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Munch" type="SpotLight3D" parent="Spots"] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 3.7, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Jasper" type="SpotLight3D" parent="Spots"] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 1.5, 3.6, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Pasqually" type="SpotLight3D" parent="Spots"] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 3, 3.6, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.8 +spot_range = 8.0 +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")] +visible = false + +[node name="Middle" parent="Organ" instance=ExtResource("11_4t0m2")] +visible = false + +[node name="Outer" parent="Organ" instance=ExtResource("12_rs0sv")] +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 + +[node name="Floods" type="Node3D" parent="."] +script = ExtResource("9_yvbl1") + +[node name="CEC Red" type="SpotLight3D" parent="Floods"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -2.9, 3.5, 0) +visible = false +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 + +[node name="CEC Amber" type="SpotLight3D" parent="Floods"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -2.6, 3.5, 0) +visible = false +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 + +[node name="CEC Blue" type="SpotLight3D" parent="Floods"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -2.3, 3.5, 0) +visible = false +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 + +[node name="Main Red" type="Node3D" parent="Floods"] +visible = false + +[node name="MR1" type="SpotLight3D" parent="Floods/Main Red"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -1.5, 3.5, 0) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 + +[node name="MR2" type="SpotLight3D" parent="Floods/Main Red"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.25, 3.5, 0) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 + +[node name="MR3" type="SpotLight3D" parent="Floods/Main Red"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 2, 3.5, 0) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 + +[node name="Main Amber" type="Node3D" parent="Floods"] +visible = false + +[node name="MA1" type="SpotLight3D" parent="Floods/Main Amber"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -1, 3.5, 0) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 + +[node name="MA2" type="SpotLight3D" parent="Floods/Main Amber"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.75, 3.5, 0) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 + +[node name="MA3" type="SpotLight3D" parent="Floods/Main Amber"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 2.5, 3.5, 0) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 + +[node name="Main Blue" type="Node3D" parent="Floods"] +visible = false + +[node name="MB1" type="SpotLight3D" parent="Floods/Main Blue"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -0.5, 3.5, 0) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 + +[node name="MB2" type="SpotLight3D" parent="Floods/Main Blue"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 1.25, 3.5, 0) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 + +[node name="MB3" type="SpotLight3D" parent="Floods/Main Blue"] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 3, 3.5, 0) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 + +[node name="Backdrop" type="Node3D" parent="."] +script = ExtResource("9_yvbl1") + +[node name="Red" type="Node3D" parent="Backdrop"] +visible = false + +[node name="MR1" type="SpotLight3D" parent="Backdrop/Red"] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -1.5, 1, -1.25) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 + +[node name="MR2" type="SpotLight3D" parent="Backdrop/Red"] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 0.5, 1, -1.25) +light_color = Color(1, 0, 0, 1) +light_energy = 2.0 + +[node name="Amber" type="Node3D" parent="Backdrop"] +visible = false + +[node name="MA1" type="SpotLight3D" parent="Backdrop/Amber"] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -1, 1, -1.25) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 + +[node name="MA2" type="SpotLight3D" parent="Backdrop/Amber"] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 1, 1, -1.25) +light_color = Color(1, 0.498039, 0, 1) +light_energy = 2.0 + +[node name="Blue" type="Node3D" parent="Backdrop"] +visible = false + +[node name="MB1" type="SpotLight3D" parent="Backdrop/Blue"] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, -0.5, 1, -1.25) +light_color = Color(0, 0.498039, 1, 1) +light_energy = 2.0 + +[node name="MB2" type="SpotLight3D" parent="Backdrop/Blue"] +transform = Transform3D(1, 0, 0, 0, 2.98023e-08, -1, 0, 1, 2.98023e-08, 1.5, 1, -1.25) +light_color = Color(0, 0.498039, 1, 1) +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) +visible = false +light_color = Color(1, 0, 0, 1) +light_energy = 0.25 + +[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/Scenes/GUI/Controls/CosmeticAdjustment.tscn b/Scenes/GUI/Controls/CosmeticAdjustment.tscn index 75b90ef..484f05f 100644 --- a/Scenes/GUI/Controls/CosmeticAdjustment.tscn +++ b/Scenes/GUI/Controls/CosmeticAdjustment.tscn @@ -4,15 +4,17 @@ [node name="FlowControl" type="Control"] layout_mode = 3 -anchors_preset = 0 -offset_right = 384.0 +anchor_right = 1.0 offset_bottom = 40.0 script = ExtResource("1_fg0vw") [node name="Panel" type="Panel" parent="."] -layout_mode = 0 -offset_right = 384.0 -offset_bottom = 40.0 +layout_mode = 1 +anchors_preset = -1 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="Label" type="Label" parent="Panel"] layout_mode = 0 @@ -26,10 +28,12 @@ clip_text = true text_overrun_behavior = 3 [node name="OptionButton" type="OptionButton" parent="Panel"] -layout_mode = 0 -offset_left = 188.0 +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.5 +anchor_right = 1.0 offset_top = 4.0 -offset_right = 380.0 +offset_right = -4.0 offset_bottom = 36.0 [connection signal="item_selected" from="Panel/OptionButton" to="." method="_on_option_button_item_selected"] diff --git a/Scenes/GUI/EditorScreen.tscn b/Scenes/GUI/EditorScreen.tscn index b7f620c..46a53e3 100644 --- a/Scenes/GUI/EditorScreen.tscn +++ b/Scenes/GUI/EditorScreen.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=26 format=3 uid="uid://oiehbor0dlqx"] [ext_resource type="Script" uid="uid://dfiwoln8mdwm8" path="res://Scripts/EditorScreen.gd" id="1_sd512"] -[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/EditorDark.tres" id="1_v0ton"] +[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/Dark.tres" id="1_v0ton"] [ext_resource type="Texture2D" uid="uid://xllpr3qc064c" path="res://UI/TransportControls/Play.png" id="3_g6u4d"] [ext_resource type="Texture2D" uid="uid://dgacnkv2dc65s" path="res://UI/TransportControls/PlayBackwards.png" id="3_mr8sb"] [ext_resource type="Texture2D" uid="uid://dts4eh6hyt8p3" path="res://UI/TransportControls/SkipBackwards.png" id="3_r4ytj"] @@ -629,6 +629,7 @@ offset_bottom = 388.0 [node name="CosmeticsHandle" type="Control" parent="FlyoutPanel/Cosmetics/InvisibleMask"] anchors_preset = 0 +offset_right = 384.0 [node name="VScrollBar" type="VScrollBar" parent="FlyoutPanel/Cosmetics"] layout_mode = 0 diff --git a/Scenes/GUI/InGameMenu.tscn b/Scenes/GUI/InGameMenu.tscn index 6dfa2e1..2794b0d 100644 --- a/Scenes/GUI/InGameMenu.tscn +++ b/Scenes/GUI/InGameMenu.tscn @@ -1,6 +1,29 @@ -[gd_scene load_steps=2 format=3 uid="uid://cd67bfok34xhy"] +[gd_scene load_steps=14 format=3 uid="uid://cd67bfok34xhy"] [ext_resource type="Script" uid="uid://pwg37gka2qr4" path="res://Scripts/InGameMenu.gd" id="1_cp535"] +[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/Dark.tres" id="1_fxnf3"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cp535"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_fxnf3"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_esrnp"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_okjcw"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5t5ap"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_j5gkc"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_4hvdi"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_76ga2"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ausu3"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_b5eqy"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_x8byx"] [node name="InGameMenu" type="Control"] layout_mode = 3 @@ -9,9 +32,10 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +theme = ExtResource("1_fxnf3") script = ExtResource("1_cp535") -[node name="ColorRect" type="ColorRect" parent="."] +[node name="BG" type="ColorRect" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -79,9 +103,184 @@ offset_right = 260.0 offset_bottom = 312.0 text = "Exit to Desktop" +[node name="ShowLabel" type="Label" parent="."] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -264.0 +offset_top = -40.0 +offset_right = -8.0 +offset_bottom = -8.0 +grow_horizontal = 0 +grow_vertical = 0 +text = "No Show Loaded" +horizontal_alignment = 2 +vertical_alignment = 1 + +[node name="FlowControlsScreen" type="Control" parent="."] +visible = false +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="ColorRect" type="ColorRect" parent="FlowControlsScreen"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0.121569, 0.121569, 0.121569, 0.501961) + +[node name="InputEater" type="Button" parent="FlowControlsScreen"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/focus = SubResource("StyleBoxEmpty_cp535") +theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_fxnf3") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_esrnp") +theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_okjcw") +theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_5t5ap") +theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_j5gkc") +theme_override_styles/hover = SubResource("StyleBoxEmpty_4hvdi") +theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_76ga2") +theme_override_styles/pressed = SubResource("StyleBoxEmpty_ausu3") +theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_b5eqy") +theme_override_styles/normal = SubResource("StyleBoxEmpty_x8byx") + +[node name="DialogPanel" type="Panel" parent="FlowControlsScreen"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.5 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = 64.0 +offset_right = -64.0 +offset_bottom = -64.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="InvisibleMask" type="Control" parent="FlowControlsScreen/DialogPanel"] +clip_contents = true +layout_mode = 1 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 4.0 +offset_top = 4.0 +offset_right = -16.0 +offset_bottom = -4.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="FlowHandle" type="Control" parent="FlowControlsScreen/DialogPanel/InvisibleMask"] +anchors_preset = 0 + +[node name="VScrollBar" type="VScrollBar" parent="FlowControlsScreen/DialogPanel"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -12.0 +offset_top = 4.0 +offset_right = -4.0 +offset_bottom = -4.0 +max_value = 0.0 +step = 1.0 + +[node name="CosmeticsScreen" type="Control" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="ColorRect" type="ColorRect" parent="CosmeticsScreen"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0.121569, 0.121569, 0.121569, 0.501961) + +[node name="InputEater" type="Button" parent="CosmeticsScreen"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/focus = SubResource("StyleBoxEmpty_cp535") +theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_fxnf3") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_esrnp") +theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_okjcw") +theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_5t5ap") +theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_j5gkc") +theme_override_styles/hover = SubResource("StyleBoxEmpty_4hvdi") +theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_76ga2") +theme_override_styles/pressed = SubResource("StyleBoxEmpty_ausu3") +theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_b5eqy") +theme_override_styles/normal = SubResource("StyleBoxEmpty_x8byx") + +[node name="DialogPanel" type="Panel" parent="CosmeticsScreen"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.5 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = 64.0 +offset_right = -64.0 +offset_bottom = -64.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="InvisibleMask" type="Control" parent="CosmeticsScreen/DialogPanel"] +clip_contents = true +layout_mode = 1 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 4.0 +offset_top = 4.0 +offset_right = -16.0 +offset_bottom = -4.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="CosmeticsHandle" type="Control" parent="CosmeticsScreen/DialogPanel/InvisibleMask"] +layout_mode = 1 +anchors_preset = 10 +anchor_right = 1.0 +grow_horizontal = 2 + +[node name="VScrollBar" type="VScrollBar" parent="CosmeticsScreen/DialogPanel"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -12.0 +offset_top = 4.0 +offset_right = -4.0 +offset_bottom = -4.0 +max_value = 0.0 +step = 1.0 + [connection signal="pressed" from="Buttons/ReturnButton" to="." method="_on_return_button_pressed"] [connection signal="pressed" from="Buttons/LoadShowButton" to="." method="_on_load_show_button_pressed"] [connection signal="pressed" from="Buttons/CosmeticsButton" to="." method="_on_cosmetics_button_pressed"] [connection signal="pressed" from="Buttons/FlowControlsButton" to="." method="_on_flow_controls_button_pressed"] [connection signal="pressed" from="Buttons/ExitMenuButton" to="." method="_on_exit_menu_button_pressed"] [connection signal="pressed" from="Buttons/ExitButton" to="." method="_on_exit_button_pressed"] +[connection signal="pressed" from="FlowControlsScreen/InputEater" to="." method="_on_input_eater_pressed"] +[connection signal="pressed" from="CosmeticsScreen/InputEater" to="." method="_on_input_eater_pressed"] diff --git a/Scenes/GUI/MainMenu.tscn b/Scenes/GUI/MainMenu.tscn index f605ead..46d9b95 100644 --- a/Scenes/GUI/MainMenu.tscn +++ b/Scenes/GUI/MainMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=19 format=3 uid="uid://1ikkb4b8mw1w"] -[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/EditorDark.tres" id="1_dkd36"] +[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/Dark.tres" id="1_dkd36"] [ext_resource type="Script" uid="uid://b5nh5td5bdsfd" path="res://Scripts/MainMenu.gd" id="1_ocgay"] [ext_resource type="Texture2D" uid="uid://dbh0vh85wks2l" path="res://UI/logo.png" id="2_6d82g"] [ext_resource type="Texture2D" uid="uid://6mf6wucl3y6k" path="res://UI/MenuBG/BalconyBG.png" id="2_j6v32"] diff --git a/Scripts/EditorScreen.gd b/Scripts/EditorScreen.gd index 56609ff..6ecde33 100644 --- a/Scripts/EditorScreen.gd +++ b/Scripts/EditorScreen.gd @@ -23,6 +23,7 @@ func reload_stage() -> void: $SequencerPanel/TimelinePanel/VScrollBar.value = 0 $FlyoutPanel/Movements/VScrollBar.value = 0 $FlyoutPanel/FlowControls/VScrollBar.value = 0 + $FlyoutPanel/Cosmetics/VScrollBar.value = 0 $CameraPreview.visible = false for row in $SequencerPanel/TimelinePanel/InvisibleMask/MovementRowsContainer.get_children(): row.queue_free() @@ -60,6 +61,7 @@ func reload_stage() -> void: cosmetic_adjustment.scene_handle = "../../../../../" + Stages.stages_info[current_stage]["scene_ref_base"] cosmetic_adjustment.drop_index = Stages.stages_info[current_stage]["cosmetic_defaults"][cosmetics_count] cosmetic_adjustment.position.y = cosmetics_offset + cosmetic_adjustment.anchor_right = 1.0 cosmetics_offset += 44 cosmetics_count += 1 $FlyoutPanel/Cosmetics/InvisibleMask/CosmeticsHandle.add_child(cosmetic_adjustment) diff --git a/Scripts/InGameMenu.gd b/Scripts/InGameMenu.gd index a4a4115..7ad5358 100644 --- a/Scripts/InGameMenu.gd +++ b/Scripts/InGameMenu.gd @@ -1,5 +1,21 @@ extends Control +func _ready() -> void: + var cosmetics_offset = 0 + var cosmetics_count = 0 + for cosmetic_subtable in FreeRoamMaps.MapIndex[get_node("../").current_map]["stage"]["cosmetics"]: + for cosmetic in cosmetic_subtable: + var cosmetic_adjustment = load("res://Scenes/GUI/Controls/CosmeticAdjustment.tscn").instantiate() + cosmetic_adjustment.vis_name = cosmetic + cosmetic_adjustment.options = cosmetic_subtable[cosmetic] + cosmetic_adjustment.scene_handle = "../../../../../../../" + cosmetic_adjustment.drop_index = FreeRoamMaps.MapIndex[get_node("../").current_map]["stage"]["cosmetic_defaults"][cosmetics_count] + cosmetic_adjustment.position.y = cosmetics_offset + cosmetic_adjustment.anchor_right = 1.0 + cosmetics_offset += 44 + cosmetics_count += 1 + $CosmeticsScreen/DialogPanel/InvisibleMask/CosmeticsHandle.add_child(cosmetic_adjustment) + $CosmeticsScreen/DialogPanel/VScrollBar.max_value = cosmetics_count - 1 func _on_exit_button_pressed() -> void: get_tree().quit() @@ -10,18 +26,27 @@ func _on_exit_menu_button_pressed() -> void: func _on_flow_controls_button_pressed() -> void: - pass # Replace with function body. + $BG.visible = false + $FlowControlsScreen.visible = true func _on_cosmetics_button_pressed() -> void: - pass # Replace with function body. + $BG.visible = false + $CosmeticsScreen.visible = true func _on_load_show_button_pressed() -> void: - pass # Replace with function body. + $BG.visible = false func _on_return_button_pressed() -> void: get_node("../").interact = true get_node("../").capture_mouse() visible = false + + +func _on_input_eater_pressed() -> void: + $BG.visible = true + $CosmeticsScreen.visible = false + $FlowControlsScreen.visible = false + diff --git a/UI/Themes/EditorDark.tres b/UI/Themes/Dark.tres similarity index 100% rename from UI/Themes/EditorDark.tres rename to UI/Themes/Dark.tres