diff --git a/Models/GenericRooms/CStage/CStage-RoomCollide.obj b/Models/GenericRooms/CStage/CStage-RoomCollide.obj new file mode 100644 index 0000000..e7e632d --- /dev/null +++ b/Models/GenericRooms/CStage/CStage-RoomCollide.obj @@ -0,0 +1,30 @@ +# Blender 4.5.1 LTS +# www.blender.org +o RoomCollide +v -3.900000 0.000000 0.000000 +v -6.800000 0.000000 0.000000 +v -6.800000 0.000000 8.000000 +v 7.600000 0.000000 8.000000 +v 7.600000 0.000000 0.000000 +v 3.900000 0.000000 0.000000 +v -3.900000 4.000000 0.000000 +v -6.800000 4.000000 0.000000 +v -6.800000 4.000000 8.000000 +v 7.600000 4.000000 8.000000 +v 7.600000 4.000000 0.000000 +v 3.900000 4.000000 0.000000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -1.0000 -0.0000 -0.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 1.0000 -0.0000 +vt 0.000000 0.000000 +s 0 +f 2/1/1 1/1/1 6/1/1 5/1/1 4/1/1 3/1/1 +f 3/1/2 4/1/2 10/1/2 9/1/2 +f 2/1/3 3/1/3 9/1/3 8/1/3 +f 4/1/4 5/1/4 11/1/4 10/1/4 +f 1/1/5 2/1/5 8/1/5 7/1/5 +f 5/1/5 6/1/5 12/1/5 11/1/5 +f 8/1/6 9/1/6 10/1/6 11/1/6 12/1/6 7/1/6 diff --git a/Models/GenericRooms/CStage/CStage-RoomCollide.obj.import b/Models/GenericRooms/CStage/CStage-RoomCollide.obj.import new file mode 100644 index 0000000..8dffe8e --- /dev/null +++ b/Models/GenericRooms/CStage/CStage-RoomCollide.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://dkwrmd70arspm" +path="res://.godot/imported/CStage-RoomCollide.obj-5b6633e39a912e592554a0aa7c3088a9.mesh" + +[deps] + +files=["res://.godot/imported/CStage-RoomCollide.obj-5b6633e39a912e592554a0aa7c3088a9.mesh"] + +source_file="res://Models/GenericRooms/CStage/CStage-RoomCollide.obj" +dest_files=["res://.godot/imported/CStage-RoomCollide.obj-5b6633e39a912e592554a0aa7c3088a9.mesh", "res://.godot/imported/CStage-RoomCollide.obj-5b6633e39a912e592554a0aa7c3088a9.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/Models/GenericRooms/CStage/CStage-StageCollide.obj b/Models/GenericRooms/CStage/CStage-StageCollide.obj new file mode 100644 index 0000000..584a3df --- /dev/null +++ b/Models/GenericRooms/CStage/CStage-StageCollide.obj @@ -0,0 +1,38 @@ +# Blender 4.5.1 LTS +# www.blender.org +o StageCollide +v -3.900000 0.000000 0.700000 +v -3.900000 4.000000 0.700000 +v -3.900000 0.000000 -1.000000 +v -3.900000 4.000000 -1.000000 +v 3.900000 0.000000 0.700000 +v 3.900000 4.000000 0.700000 +v 3.900000 0.000000 -1.000000 +v 3.900000 4.000000 -1.000000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.875000 0.500000 +vt 0.875000 0.750000 +s 0 +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 8/5/2 7/6/2 +f 7/6/3 8/5/3 6/7/3 5/8/3 +f 5/8/4 6/7/4 2/9/4 1/10/4 +f 3/11/5 7/6/5 5/8/5 1/12/5 +f 8/5/6 4/13/6 2/14/6 6/7/6 diff --git a/Models/GenericRooms/CStage/CStage-StageCollide.obj.import b/Models/GenericRooms/CStage/CStage-StageCollide.obj.import new file mode 100644 index 0000000..c4effd6 --- /dev/null +++ b/Models/GenericRooms/CStage/CStage-StageCollide.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://ck3j4njhgmuf3" +path="res://.godot/imported/CStage-StageCollide.obj-74bef22a30f3373883b91520e1bc155a.mesh" + +[deps] + +files=["res://.godot/imported/CStage-StageCollide.obj-74bef22a30f3373883b91520e1bc155a.mesh"] + +source_file="res://Models/GenericRooms/CStage/CStage-StageCollide.obj" +dest_files=["res://.godot/imported/CStage-StageCollide.obj-74bef22a30f3373883b91520e1bc155a.mesh", "res://.godot/imported/CStage-StageCollide.obj-74bef22a30f3373883b91520e1bc155a.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/Models/Stages/CStage/CStage.glb b/Models/Stages/CStage/CStage.glb index d13c97e..121a293 100644 Binary files a/Models/Stages/CStage/CStage.glb and b/Models/Stages/CStage/CStage.glb differ diff --git a/Scenes/EditorStages/CStage.tscn b/Scenes/EditorStages/CStage.tscn index 8780f8c..611fa57 100644 --- a/Scenes/EditorStages/CStage.tscn +++ b/Scenes/EditorStages/CStage.tscn @@ -15,88 +15,88 @@ ambient_light_source = 1 [node name="CStage" type="Node3D"] [node name="Munch" parent="." instance=ExtResource("5_byvoj")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 3, 0) +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, 2, 0) script = ExtResource("5_bawsr") [node name="Jasper" parent="." instance=ExtResource("1_nkhpr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.25, 3, 0) +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -1.5, 2, 0) script = ExtResource("5_bawsr") [node name="Chuck" parent="." instance=ExtResource("4_nkhpr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 2, 0) script = ExtResource("5_bawsr") [node name="Helen" parent="." instance=ExtResource("4_vmyhs")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.25, 3, 0) +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 1.5, 2, 0) script = ExtResource("5_bawsr") [node name="Pasqually" parent="." instance=ExtResource("6_nkhpr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 3, 0) +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, 2, 0) script = ExtResource("5_bawsr") [node name="Spots" type="Node3D" parent="."] script = ExtResource("7_fp2rj") [node name="Chuck" type="SpotLight3D" parent="Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 4, 5) visible = false light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 +light_energy = 0.5 shadow_enabled = true shadow_bias = 0.1 spot_range = 8.0 spot_attenuation = -1.0 -spot_angle = 7.5 +spot_angle = 5.0 [node name="Helen" type="SpotLight3D" parent="Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 2.25, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 1.5, 4, 5) visible = false light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 +light_energy = 0.5 shadow_enabled = true shadow_bias = 0.1 spot_range = 8.0 spot_attenuation = -1.0 -spot_angle = 7.5 +spot_angle = 5.0 [node name="Jasper" type="SpotLight3D" parent="Spots" groups=["lights"]] -transform = Transform3D(1, -5.67102e-08, 2.31578e-07, -9.98193e-10, 0.970296, 0.241922, -2.38419e-07, -0.241922, 0.970296, -2.25, 5.5, 5) +transform = Transform3D(1, -5.67102e-08, 2.31578e-07, -9.98193e-10, 0.970296, 0.241922, -2.38419e-07, -0.241922, 0.970296, -1.5, 4, 5) visible = false light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 +light_energy = 0.5 shadow_enabled = true shadow_bias = 0.1 spot_range = 8.0 spot_attenuation = -1.0 -spot_angle = 7.5 +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, -4.5, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -3, 4, 5) visible = false light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 +light_energy = 0.5 shadow_enabled = true shadow_bias = 0.1 spot_range = 8.0 spot_attenuation = -1.0 -spot_angle = 7.5 +spot_angle = 5.0 [node name="Pasqually" type="SpotLight3D" parent="Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 4.5, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 3, 4, 5) visible = false light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 +light_energy = 0.5 shadow_enabled = true shadow_bias = 0.1 spot_range = 8.0 spot_attenuation = -1.0 -spot_angle = 7.5 +spot_angle = 5.0 [node name="Color Spots" type="Node3D" parent="."] script = ExtResource("7_fp2rj") [node name="Chuck" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 4, 5) visible = false light_color = Color(0.734652, 0.426335, 0.999996, 1) light_energy = 0.8 @@ -107,7 +107,7 @@ spot_attenuation = -1.0 spot_angle = 7.5 [node name="Chuck 2" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 4, 5) visible = false light_color = Color(1, 0, 0, 1) light_energy = 0.8 @@ -118,7 +118,7 @@ spot_attenuation = -1.0 spot_angle = 7.5 [node name="Helen" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 2.25, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 1.5, 4, 5) visible = false light_color = Color(0.734652, 0.426335, 0.999996, 1) light_energy = 0.8 @@ -129,7 +129,7 @@ spot_attenuation = -1.0 spot_angle = 7.5 [node name="Jasper" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -2.25, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -1.5, 4, 5) visible = false light_color = Color(0.734652, 0.426335, 0.999996, 1) light_energy = 0.8 @@ -140,7 +140,7 @@ spot_attenuation = -1.0 spot_angle = 7.5 [node name="Munch" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -4.5, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -3, 4, 5) visible = false light_color = Color(0.734652, 0.426335, 0.999996, 1) light_energy = 0.8 @@ -151,7 +151,7 @@ spot_attenuation = -1.0 spot_angle = 7.5 [node name="Pasqually" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 4.5, 5.5, 5) +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 3, 4, 5) visible = false light_color = Color(0.734652, 0.426335, 0.999996, 1) light_energy = 0.8 @@ -165,7 +165,7 @@ spot_angle = 7.5 script = ExtResource("7_fp2rj") [node name="L" type="SpotLight3D" parent="Valence" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -2.25, 5.5, 0.25) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -2, 3.5, 0.25) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -174,7 +174,7 @@ spot_attenuation = -1.0 spot_angle = 15.0 [node name="L Center" type="SpotLight3D" parent="Valence" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -1.2, 5.5, 0.5) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -1, 3.5, 0.5) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -183,7 +183,7 @@ spot_attenuation = -1.0 spot_angle = 15.0 [node name="Center" type="SpotLight3D" parent="Valence" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 5.5, 0.75) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 3.5, 0.75) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -192,7 +192,7 @@ spot_attenuation = -1.0 spot_angle = 15.0 [node name="R Center" type="SpotLight3D" parent="Valence" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 1.2, 5.5, 0.5) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 1, 3.5, 0.5) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -201,7 +201,7 @@ spot_attenuation = -1.0 spot_angle = 15.0 [node name="R" type="SpotLight3D" parent="Valence" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 2.25, 5.5, 0.25) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 2, 3.5, 0.25) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -213,7 +213,7 @@ spot_angle = 15.0 script = ExtResource("7_fp2rj") [node name="L Blue" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(0.866025, 0.433013, 0.25, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -2.5, 3, -1.1) +transform = Transform3D(0.866025, 0.433013, 0.25, -0.482963, 0.595035, 0.642402, 0.12941, -0.677077, 0.724445, -2.5, 4, -0.1) visible = false light_color = Color(0, 0, 1, 1) shadow_enabled = true @@ -223,7 +223,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="L Amber" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(0.866025, 0.433013, 0.25, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -2, 3, -1.1) +transform = Transform3D(0.866025, 0.433013, 0.25, -0.482963, 0.595035, 0.642402, 0.12941, -0.677077, 0.724445, -2, 4, -0.1) visible = false light_color = Color(1, 0.74902, 0, 1) shadow_enabled = true @@ -233,7 +233,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="L Red" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(0.866025, 0.433013, 0.25, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -1.5, 3, -1.1) +transform = Transform3D(0.866025, 0.433013, 0.25, -0.482963, 0.595035, 0.642402, 0.12941, -0.677077, 0.724445, -1.5, 4, -0.1) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -243,7 +243,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="C Blue" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.5, -0.866025, 0, 0.866025, 0.5, -0.5, 3, -1.1) +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -0.5, 4, -0.1) visible = false light_color = Color(0, 0, 1, 1) shadow_enabled = true @@ -253,7 +253,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="C Amber" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.5, -0.866025, 0, 0.866025, 0.5, 0, 3, -1.1) +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 4, -0.1) visible = false light_color = Color(1, 0.74902, 0, 1) shadow_enabled = true @@ -263,7 +263,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="C Red" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.5, -0.866025, 0, 0.866025, 0.5, 0.5, 3, -1.1) +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.5, 4, -0.1) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -273,7 +273,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="R Blue" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(0.866025, -0.433013, -0.25, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 1.5, 3, -1.1) +transform = Transform3D(0.866025, -0.433013, -0.25, 0.482963, 0.595035, 0.642402, -0.12941, -0.677077, 0.724444, 1.5, 4, -0.1) visible = false light_color = Color(0, 0, 1, 1) shadow_enabled = true @@ -283,7 +283,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="R Amber" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(0.866025, -0.433013, -0.25, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 2, 3, -1.1) +transform = Transform3D(0.866025, -0.433013, -0.25, 0.482963, 0.595035, 0.642402, -0.12941, -0.677077, 0.724444, 2, 4, -0.1) visible = false light_color = Color(1, 0.74902, 0, 1) shadow_enabled = true @@ -293,7 +293,7 @@ spot_angle = 30.0 spot_angle_attenuation = 0.15 [node name="R Red" type="SpotLight3D" parent="Backdrop" groups=["lights"]] -transform = Transform3D(0.866025, -0.433013, -0.25, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 2.5, 3, -1.1) +transform = Transform3D(0.866025, -0.433013, -0.25, 0.482963, 0.595035, 0.642402, -0.12941, -0.677077, 0.724444, 2.5, 4, -0.1) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -308,7 +308,7 @@ environment = SubResource("Environment_w3m2i") [node name="Room Lights" type="Node3D" parent="."] [node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 4, 6, 4) +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 4, 4, 4) light_color = Color(1, 0.960784, 0.85098, 1) shadow_enabled = true shadow_bias = 0.1 @@ -316,7 +316,7 @@ spot_range = 7.0 spot_angle = 80.0 [node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -4, 6, 4) +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -4, 4, 4) light_color = Color(1, 0.960784, 0.85098, 1) shadow_enabled = true shadow_bias = 0.1 @@ -324,23 +324,7 @@ spot_range = 7.0 spot_angle = 80.0 [node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 6, 4) -light_color = Color(1, 0.960784, 0.85098, 1) -shadow_enabled = true -shadow_bias = 0.1 -spot_range = 7.0 -spot_angle = 80.0 - -[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 6.86654, 6, 4) -light_color = Color(1, 0.960784, 0.85098, 1) -shadow_enabled = true -shadow_bias = 0.1 -spot_range = 7.0 -spot_angle = 80.0 - -[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -7, 6, 4) +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 4, 4) light_color = Color(1, 0.960784, 0.85098, 1) shadow_enabled = true shadow_bias = 0.1 @@ -348,25 +332,24 @@ spot_range = 7.0 spot_angle = 80.0 [node name="CStage" parent="." instance=ExtResource("7_1s7sj")] -transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 0, 0) [node name="Angle 1" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 4.75, 3.5) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 3.25, 2.5) current = true fov = 60.0 [node name="Angle 2" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -4.5, 4.75, 3) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -3, 3.25, 2) fov = 60.0 [node name="Angle 3" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 4.5, 4.75, 3) +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 3, 3.25, 2) fov = 60.0 [node name="Angle 4" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.984267, 0.17669, 0, -0.17669, 0.984267, 0, 4.75, 6.32348) +transform = Transform3D(1, 0, 0, 0, 0.984267, 0.17669, 0, -0.17669, 0.984267, 0, 3.25, 5) fov = 60.0 [node name="Angle 5" type="Camera3D" parent="."] -transform = Transform3D(0.965016, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 3, 4.75, 7) +transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2, 3, 5) fov = 60.0 diff --git a/Scenes/FreeRoam/Generic/GenericCStage.tscn b/Scenes/FreeRoam/Generic/GenericCStage.tscn new file mode 100644 index 0000000..ceb778c --- /dev/null +++ b/Scenes/FreeRoam/Generic/GenericCStage.tscn @@ -0,0 +1,355 @@ +[gd_scene load_steps=13 format=3 uid="uid://np3nnd7a2tpc"] + +[ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Animatronics/Cyberamics/Cyber Munch.glb" id="1_2ll83"] +[ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="2_kxabj"] +[ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Animatronics/Cyberamics/Cyber Jasper.glb" id="3_kbf8b"] +[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_0jv2x"] +[ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="5_scjuh"] +[ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Animatronics/Cyberamics/Cyber Pasqually.glb" id="6_p46tt"] +[ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="7_ygsdq"] +[ext_resource type="PackedScene" uid="uid://dfw3sbg135u2h" path="res://Models/Stages/CStage/CStage.glb" id="8_rlprd"] +[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="9_oh3e3"] + +[sub_resource type="Environment" id="Environment_w3m2i"] +ambient_light_source = 1 + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_oh3e3"] +data = PackedVector3Array(-3.9, 4, 0.7, -3.9, 0, 0.7, -3.9, 4, -1, -3.9, 4, -1, -3.9, 0, 0.7, -3.9, 0, -1, -3.9, 4, -1, -3.9, 0, -1, 3.9, 4, -1, 3.9, 4, -1, -3.9, 0, -1, 3.9, 0, -1, 3.9, 4, -1, 3.9, 0, -1, 3.9, 4, 0.7, 3.9, 4, 0.7, 3.9, 0, -1, 3.9, 0, 0.7, 3.9, 4, 0.7, 3.9, 0, 0.7, -3.9, 4, 0.7, -3.9, 4, 0.7, 3.9, 0, 0.7, -3.9, 0, 0.7, 3.9, 0, -1, -3.9, 0, -1, 3.9, 0, 0.7, 3.9, 0, 0.7, -3.9, 0, -1, -3.9, 0, 0.7, -3.9, 4, -1, 3.9, 4, -1, -3.9, 4, 0.7, -3.9, 4, 0.7, 3.9, 4, -1, 3.9, 4, 0.7) +backface_collision = true + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_m3ge5"] +data = PackedVector3Array(-3.9, 0, 0, -6.8, 0, 0, 3.9, 0, 0, 3.9, 0, 0, -6.8, 0, 0, 7.6, 0, 0, 7.6, 0, 0, -6.8, 0, 0, 7.6, 0, 8, 7.6, 0, 8, -6.8, 0, 0, -6.8, 0, 8, 7.6, 0, 8, -6.8, 0, 8, 7.6, 4, 8, 7.6, 4, 8, -6.8, 0, 8, -6.8, 4, 8, -6.8, 0, 8, -6.8, 0, 0, -6.8, 4, 8, -6.8, 4, 8, -6.8, 0, 0, -6.8, 4, 0, 7.6, 0, 0, 7.6, 0, 8, 7.6, 4, 0, 7.6, 4, 0, 7.6, 0, 8, 7.6, 4, 8, -6.8, 0, 0, -3.9, 0, 0, -6.8, 4, 0, -6.8, 4, 0, -3.9, 0, 0, -3.9, 4, 0, 3.9, 0, 0, 7.6, 0, 0, 3.9, 4, 0, 3.9, 4, 0, 7.6, 0, 0, 7.6, 4, 0, -6.8, 4, 8, -6.8, 4, 0, 7.6, 4, 8, 7.6, 4, 8, -6.8, 4, 0, 7.6, 4, 0, 7.6, 4, 0, -6.8, 4, 0, 3.9, 4, 0, 3.9, 4, 0, -6.8, 4, 0, -3.9, 4, 0) +backface_collision = true + +[node name="CStage" type="Node3D"] + +[node name="Munch" parent="." instance=ExtResource("1_2ll83")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, 2, 0) +script = ExtResource("2_kxabj") + +[node name="Jasper" parent="." instance=ExtResource("3_kbf8b")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -1.5, 2, 0) +script = ExtResource("2_kxabj") + +[node name="Chuck" parent="." instance=ExtResource("4_0jv2x")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 2, 0) +script = ExtResource("2_kxabj") + +[node name="Helen" parent="." instance=ExtResource("5_scjuh")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 1.5, 2, 0) +script = ExtResource("2_kxabj") + +[node name="Pasqually" parent="." instance=ExtResource("6_p46tt")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, 2, 0) +script = ExtResource("2_kxabj") + +[node name="Spots" type="Node3D" parent="."] +script = ExtResource("7_ygsdq") + +[node name="Chuck" type="SpotLight3D" parent="Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 4, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.5 +shadow_enabled = true +shadow_bias = 0.1 +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.970296, 0.241922, 0, -0.241922, 0.970296, 1.5, 4, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.5 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Jasper" type="SpotLight3D" parent="Spots" groups=["lights"]] +transform = Transform3D(1, -5.67102e-08, 2.31578e-07, -9.98193e-10, 0.970296, 0.241922, -2.38419e-07, -0.241922, 0.970296, -1.5, 4, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.5 +shadow_enabled = true +shadow_bias = 0.1 +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, -3, 4, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.5 +shadow_enabled = true +shadow_bias = 0.1 +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.970296, 0.241922, 0, -0.241922, 0.970296, 3, 4, 5) +visible = false +light_color = Color(1, 0.960784, 0.85098, 1) +light_energy = 0.5 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 5.0 + +[node name="Color Spots" type="Node3D" parent="."] +script = ExtResource("7_ygsdq") + +[node name="Chuck" type="SpotLight3D" parent="Color Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 4, 5) +visible = false +light_color = Color(0.734652, 0.426335, 0.999996, 1) +light_energy = 0.8 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 7.5 + +[node name="Chuck 2" type="SpotLight3D" parent="Color Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 0, 4, 5) +visible = false +light_color = Color(1, 0, 0, 1) +light_energy = 0.8 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 7.5 + +[node name="Helen" type="SpotLight3D" parent="Color Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 1.5, 4, 5) +visible = false +light_color = Color(0.734652, 0.426335, 0.999996, 1) +light_energy = 0.8 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 7.5 + +[node name="Jasper" type="SpotLight3D" parent="Color Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -1.5, 4, 5) +visible = false +light_color = Color(0.734652, 0.426335, 0.999996, 1) +light_energy = 0.8 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 7.5 + +[node name="Munch" type="SpotLight3D" parent="Color Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, -3, 4, 5) +visible = false +light_color = Color(0.734652, 0.426335, 0.999996, 1) +light_energy = 0.8 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 7.5 + +[node name="Pasqually" type="SpotLight3D" parent="Color Spots" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.970296, 0.241922, 0, -0.241922, 0.970296, 3, 4, 5) +visible = false +light_color = Color(0.734652, 0.426335, 0.999996, 1) +light_energy = 0.8 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 8.0 +spot_attenuation = -1.0 +spot_angle = 7.5 + +[node name="Valence" type="Node3D" parent="."] +script = ExtResource("7_ygsdq") + +[node name="L" type="SpotLight3D" parent="Valence" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -2, 3.5, 0.25) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = -1.0 +spot_angle = 15.0 + +[node name="L Center" type="SpotLight3D" parent="Valence" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, -1, 3.5, 0.5) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = -1.0 +spot_angle = 15.0 + +[node name="Center" type="SpotLight3D" parent="Valence" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 3.5, 0.75) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = -1.0 +spot_angle = 15.0 + +[node name="R Center" type="SpotLight3D" parent="Valence" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 1, 3.5, 0.5) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = -1.0 +spot_angle = 15.0 + +[node name="R" type="SpotLight3D" parent="Valence" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 2, 3.5, 0.25) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = -1.0 +spot_angle = 15.0 + +[node name="Backdrop" type="Node3D" parent="."] +script = ExtResource("7_ygsdq") + +[node name="L Blue" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(0.866025, 0.433013, 0.25, -0.482963, 0.595035, 0.642402, 0.12941, -0.677077, 0.724445, -2.5, 4, -0.1) +visible = false +light_color = Color(0, 0, 1, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="L Amber" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(0.866025, 0.433013, 0.25, -0.482963, 0.595035, 0.642402, 0.12941, -0.677077, 0.724445, -2, 4, -0.1) +visible = false +light_color = Color(1, 0.74902, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="L Red" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(0.866025, 0.433013, 0.25, -0.482963, 0.595035, 0.642402, 0.12941, -0.677077, 0.724445, -1.5, 4, -0.1) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="C Blue" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -0.5, 4, -0.1) +visible = false +light_color = Color(0, 0, 1, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="C Amber" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 4, -0.1) +visible = false +light_color = Color(1, 0.74902, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="C Red" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.5, 4, -0.1) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="R Blue" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(0.866025, -0.433013, -0.25, 0.482963, 0.595035, 0.642402, -0.12941, -0.677077, 0.724444, 1.5, 4, -0.1) +visible = false +light_color = Color(0, 0, 1, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="R Amber" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(0.866025, -0.433013, -0.25, 0.482963, 0.595035, 0.642402, -0.12941, -0.677077, 0.724444, 2, 4, -0.1) +visible = false +light_color = Color(1, 0.74902, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="R Red" type="SpotLight3D" parent="Backdrop" groups=["lights"]] +transform = Transform3D(0.866025, -0.433013, -0.25, 0.482963, 0.595035, 0.642402, -0.12941, -0.677077, 0.724444, 2.5, 4, -0.1) +visible = false +light_color = Color(1, 0, 0, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = 2.0 +spot_angle = 30.0 +spot_angle_attenuation = 0.15 + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_w3m2i") + +[node name="Room Lights" type="Node3D" parent="."] + +[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 4, 4, 4) +light_color = Color(1, 0.960784, 0.85098, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 7.0 +spot_angle = 80.0 + +[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, -4, 4, 4) +light_color = Color(1, 0.960784, 0.85098, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 7.0 +spot_angle = 80.0 + +[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights" groups=["lights"]] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 4, 4) +light_color = Color(1, 0.960784, 0.85098, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 7.0 +spot_angle = 80.0 + +[node name="CStage" parent="." instance=ExtResource("8_rlprd")] + +[node name="Player" parent="." instance=ExtResource("9_oh3e3")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3) +current_map = "Generic C-Stage" + +[node name="StaticBody3D" type="StaticBody3D" parent="."] + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_oh3e3") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_m3ge5") diff --git a/Scenes/GUI/MainMenu.tscn b/Scenes/GUI/MainMenu.tscn index 3bcd4a3..e8b2386 100644 --- a/Scenes/GUI/MainMenu.tscn +++ b/Scenes/GUI/MainMenu.tscn @@ -239,30 +239,32 @@ offset_bottom = 152.0 grow_horizontal = 2 grow_vertical = 2 selected = 1 -item_count = 10 +item_count = 11 popup/item_0/text = "Generic Showrooms" popup/item_0/id = 0 popup/item_0/separator = true -popup/item_1/text = "Generic Prototype Road Stage" +popup/item_1/text = "Generic C-Stage" popup/item_1/id = 1 -popup/item_2/text = "Generic 2-Stage" +popup/item_2/text = "Generic Prototype Road Stage" popup/item_2/id = 1 -popup/item_3/text = "Generic Mini Unit 1-Stage" +popup/item_3/text = "Generic 2-Stage" popup/item_3/id = 1 -popup/item_4/text = "Generic 1-Stage w 2-Stage Props" +popup/item_4/text = "Generic Mini Unit 1-Stage" popup/item_4/id = 1 -popup/item_5/text = "Generic 1-Stage" +popup/item_5/text = "Generic 1-Stage w 2-Stage Props" popup/item_5/id = 1 -popup/item_6/text = "Generic Turntable 1-Stage" -popup/item_6/id = 2 -popup/item_7/text = "Generic Cyberamic 3-Stage" +popup/item_6/text = "Generic 1-Stage" +popup/item_6/id = 1 +popup/item_7/text = "Generic Turntable 1-Stage" popup/item_7/id = 2 -popup/item_8/text = "Locations" +popup/item_8/text = "Generic Cyberamic 3-Stage" popup/item_8/id = 2 -popup/item_8/separator = true -popup/item_9/text = "Modded Maps" -popup/item_9/id = 3 +popup/item_9/text = "Locations" +popup/item_9/id = 2 popup/item_9/separator = true +popup/item_10/text = "Modded Maps" +popup/item_10/id = 3 +popup/item_10/separator = true [node name="MapThumbnail" type="TextureRect" parent="FreeRoamChooseScreen/DialogPanel"] layout_mode = 1 diff --git a/Scripts/Configs/FreeRoamMaps.gd b/Scripts/Configs/FreeRoamMaps.gd index 27e1b92..fdf620d 100644 --- a/Scripts/Configs/FreeRoamMaps.gd +++ b/Scripts/Configs/FreeRoamMaps.gd @@ -56,6 +56,14 @@ var GenericProtoRoadStage = { "stage": Stages.ProtoRoadStage, } +var GenericCStage = { + "name": "Generic C-Stage", + "scene": "res://Scenes/FreeRoam/Generic/GenericCStage.tscn", + "description": "A generic showroom featuring the C-Stage.\nInstalled from 1988-1991.", + "thumbnail": "res://UI/FreeroamThumbnails/GenericCStage.png", + "stage": Stages.CStage, +} + var MapIndex = { "Generic 1-Stage": Generic1Stage, "Generic 2-Stage": Generic2Stage, @@ -63,5 +71,6 @@ var MapIndex = { "Generic Turntable 1-Stage": GenericTurntable1Stage, "Generic 1-Stage w 2-Stage Props": Generic12Stage, "Generic Cyberamic 3-Stage": GenericCyber3Stage, - "Generic Prototype Road Stage": GenericProtoRoadStage + "Generic Prototype Road Stage": GenericProtoRoadStage, + "Generic C-Stage": GenericCStage } diff --git a/UI/FreeroamThumbnails/GenericCStage.png b/UI/FreeroamThumbnails/GenericCStage.png new file mode 100644 index 0000000..52cec65 Binary files /dev/null and b/UI/FreeroamThumbnails/GenericCStage.png differ diff --git a/UI/FreeroamThumbnails/GenericCStage.png.import b/UI/FreeroamThumbnails/GenericCStage.png.import new file mode 100644 index 0000000..4bd8c20 --- /dev/null +++ b/UI/FreeroamThumbnails/GenericCStage.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b5icbbeopof8n" +path="res://.godot/imported/GenericCStage.png-06e95ac1cee28d78c8584f1560464ad3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/FreeroamThumbnails/GenericCStage.png" +dest_files=["res://.godot/imported/GenericCStage.png-06e95ac1cee28d78c8584f1560464ad3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +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=1