diff --git a/Models/GenericRooms/BalconyStage/BalconyStage-RoomCollide.obj b/Models/GenericRooms/BalconyStage/BalconyStage-RoomCollide.obj new file mode 100644 index 0000000..5608061 --- /dev/null +++ b/Models/GenericRooms/BalconyStage/BalconyStage-RoomCollide.obj @@ -0,0 +1,39 @@ +# Blender 4.5.1 LTS +# www.blender.org +o RoomCollide +v -6.800000 0.000000 8.000000 +v -6.800000 4.000000 8.000000 +v -6.800000 0.000000 0.000000 +v -6.800000 4.000000 0.000000 +v 7.600000 4.000000 8.000000 +v 7.600000 0.000000 8.000000 +v -3.800000 0.000000 0.000000 +v -3.800000 4.000000 0.000000 +v 7.600000 4.000000 0.000000 +v 7.600000 0.000000 0.000000 +v 3.800000 4.000000 0.000000 +v 3.800000 0.000000 0.000000 +v -3.800000 1.300000 0.000000 +v 3.800000 1.300000 0.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.000000 0.000000 +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 9/2/2 10/1/2 12/1/2 11/2/2 +f 5/2/3 6/1/3 10/1/3 9/2/3 +f 2/2/4 1/1/4 6/1/4 5/2/4 +f 7/7/4 12/7/4 14/7/4 13/7/4 +f 3/4/5 7/6/5 12/7/5 10/1/5 6/1/5 1/1/5 +f 2/2/6 5/2/6 9/2/6 11/2/6 8/5/6 4/3/6 diff --git a/Models/GenericRooms/BalconyStage/BalconyStage-RoomCollide.obj.import b/Models/GenericRooms/BalconyStage/BalconyStage-RoomCollide.obj.import new file mode 100644 index 0000000..f3cfdbb --- /dev/null +++ b/Models/GenericRooms/BalconyStage/BalconyStage-RoomCollide.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://dw1dh8gjfa6qn" +path="res://.godot/imported/BalconyStage-RoomCollide.obj-29c8f97147540e9e3c5dc9ba2e89d8d0.mesh" + +[deps] + +files=["res://.godot/imported/BalconyStage-RoomCollide.obj-29c8f97147540e9e3c5dc9ba2e89d8d0.mesh"] + +source_file="res://Models/GenericRooms/BalconyStage/BalconyStage-RoomCollide.obj" +dest_files=["res://.godot/imported/BalconyStage-RoomCollide.obj-29c8f97147540e9e3c5dc9ba2e89d8d0.mesh", "res://.godot/imported/BalconyStage-RoomCollide.obj-29c8f97147540e9e3c5dc9ba2e89d8d0.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/BalconyStage/BalconyStage-StageCollide.obj b/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj new file mode 100644 index 0000000..7484601 --- /dev/null +++ b/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj @@ -0,0 +1,62 @@ +# Blender 4.5.1 LTS +# www.blender.org +o StageCollide +v -3.800000 1.300000 0.400000 +v -3.800000 4.000000 0.400000 +v -3.800000 1.300000 -1.000000 +v -3.800000 4.000000 -1.000000 +v -3.500000 4.000000 0.700000 +v -3.500000 1.300000 0.700000 +v 3.800000 1.300000 -1.000000 +v 3.800000 4.000000 -1.000000 +v -2.400000 4.000000 0.700000 +v -2.400000 1.300000 0.700000 +v -2.100000 4.000000 0.400000 +v -2.100000 1.300000 0.400000 +v -0.900000 4.000000 0.400000 +v -0.900000 1.300000 0.400000 +v -0.600000 4.000000 0.700000 +v -0.600000 1.300000 0.700000 +v 0.600000 4.000000 0.700000 +v 0.600000 1.300000 0.700000 +v 0.900000 4.000000 0.400000 +v 0.900000 1.300000 0.400000 +v 2.100000 4.000000 0.400000 +v 2.100000 1.300000 0.400000 +v 2.400000 4.000000 0.700000 +v 2.400000 1.300000 0.700000 +v 3.500000 4.000000 0.700000 +v 3.500000 1.300000 0.700000 +v 3.800000 4.000000 0.400000 +v 3.800000 1.300000 0.400000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.0000 1.0000 +vn -0.7071 -0.0000 0.7071 +vn 1.0000 -0.0000 -0.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 +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 9/2/3 10/1/3 12/1/3 11/2/3 +f 5/2/4 6/1/4 10/1/4 9/2/4 +f 11/2/4 12/1/4 14/1/4 13/2/4 +f 2/2/5 1/1/5 6/1/5 5/2/5 +f 13/2/5 14/1/5 16/1/5 15/2/5 +f 15/2/4 16/1/4 18/1/4 17/2/4 +f 17/2/3 18/1/3 20/1/3 19/2/3 +f 19/2/4 20/1/4 22/1/4 21/2/4 +f 21/2/5 22/1/5 24/1/5 23/2/5 +f 23/2/4 24/1/4 26/1/4 25/2/4 +f 25/2/3 26/1/3 28/1/3 27/2/3 +f 8/5/6 27/2/6 28/1/6 7/6/6 +f 2/2/7 5/2/7 9/2/7 11/2/7 13/2/7 15/2/7 17/2/7 19/2/7 21/2/7 23/2/7 25/2/7 27/2/7 8/5/7 4/3/7 +f 3/4/8 7/6/8 28/1/8 26/1/8 24/1/8 22/1/8 20/1/8 18/1/8 16/1/8 14/1/8 12/1/8 10/1/8 6/1/8 1/1/8 diff --git a/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj.import b/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj.import new file mode 100644 index 0000000..d056d24 --- /dev/null +++ b/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://cq4q2yqx0lh60" +path="res://.godot/imported/BalconyStage-StageCollide.obj-b0b82e7d2c64d78048fc63593b97e91e.mesh" + +[deps] + +files=["res://.godot/imported/BalconyStage-StageCollide.obj-b0b82e7d2c64d78048fc63593b97e91e.mesh"] + +source_file="res://Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj" +dest_files=["res://.godot/imported/BalconyStage-StageCollide.obj-b0b82e7d2c64d78048fc63593b97e91e.mesh", "res://.godot/imported/BalconyStage-StageCollide.obj-b0b82e7d2c64d78048fc63593b97e91e.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/Scenes/EditorStages/Balcony.tscn b/Scenes/EditorStages/BalconyStage.tscn similarity index 66% rename from Scenes/EditorStages/Balcony.tscn rename to Scenes/EditorStages/BalconyStage.tscn index 28d6dfc..9eb65bf 100644 --- a/Scenes/EditorStages/Balcony.tscn +++ b/Scenes/EditorStages/BalconyStage.tscn @@ -1,119 +1,108 @@ [gd_scene load_steps=12 format=3 uid="uid://d2g6chunc572s"] -[ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="1_w3m2i"] -[ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_t4ere"] -[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_ajb2q"] -[ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Animatronics/Cyberamics/Cyber Jasper.glb" id="4_t4ere"] -[ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="5_38ovv"] -[ext_resource type="PackedScene" uid="uid://c6n4otfble154" path="res://Models/Stages/Balcony/BalconyStage.glb" id="5_45mf1"] -[ext_resource type="PackedScene" uid="uid://dmh5upwts8y11" path="res://Models/Animatronics/Cyberamics/Warblettes.glb" id="5_ocq6y"] -[ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Animatronics/Cyberamics/Cyber Munch.glb" id="5_vcb31"] -[ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Animatronics/Cyberamics/Cyber Pasqually.glb" id="6_ajb2q"] -[ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="6_j8jbd"] +[ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Animatronics/Cyberamics/Cyber Munch.glb" id="1_kolfd"] +[ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="2_g0dk4"] +[ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Animatronics/Cyberamics/Cyber Jasper.glb" id="3_k0t3r"] +[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_ek7x4"] +[ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="5_e3w2v"] +[ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Animatronics/Cyberamics/Cyber Pasqually.glb" id="6_xxcrb"] +[ext_resource type="PackedScene" uid="uid://dmh5upwts8y11" path="res://Models/Animatronics/Cyberamics/Warblettes.glb" id="7_rjvjt"] +[ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="8_dsl2r"] +[ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="9_pjnol"] +[ext_resource type="PackedScene" uid="uid://c6n4otfble154" path="res://Models/Stages/Balcony/BalconyStage.glb" id="10_msaqn"] [sub_resource type="Environment" id="Environment_w3m2i"] ambient_light_source = 1 [node name="Balcony" type="Node3D"] -[node name="Munch" parent="." instance=ExtResource("5_vcb31")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 3, -0.5) -script = ExtResource("5_38ovv") +[node name="Munch" parent="." instance=ExtResource("1_kolfd")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, 2, -0.25) +script = ExtResource("2_g0dk4") -[node name="Jasper" parent="." instance=ExtResource("4_t4ere")] -transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, -2.2, 3, -0.5) -script = ExtResource("5_38ovv") +[node name="Jasper" parent="." instance=ExtResource("3_k0t3r")] +transform = Transform3D(0.519615, 0, 0.3, 0, 0.6, 0, -0.3, 0, 0.519615, -1.5, 2, -0.25) +script = ExtResource("2_g0dk4") -[node name="Chuck" parent="." instance=ExtResource("4_ajb2q")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -0.5) -script = ExtResource("5_38ovv") +[node name="Chuck" parent="." instance=ExtResource("4_ek7x4")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 2, 0) +script = ExtResource("2_g0dk4") -[node name="Helen" parent="." instance=ExtResource("1_w3m2i")] -transform = Transform3D(0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, 0.866025, 2.2, 3, -0.5) -script = ExtResource("5_38ovv") +[node name="Helen" parent="." instance=ExtResource("5_e3w2v")] +transform = Transform3D(0.519615, 0, -0.3, 0, 0.6, 0, 0.3, 0, 0.519615, 1.5, 2, -0.25) +script = ExtResource("2_g0dk4") -[node name="Pasqually" parent="." instance=ExtResource("6_ajb2q")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 3, -0.5) -script = ExtResource("5_38ovv") +[node name="Pasqually" parent="." instance=ExtResource("6_xxcrb")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, 2, -0.25) +script = ExtResource("2_g0dk4") -[node name="Warblettes" parent="." instance=ExtResource("5_ocq6y")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -7.5, 3.6, -1) -script = ExtResource("2_t4ere") +[node name="Warblettes" parent="." instance=ExtResource("7_rjvjt")] +transform = Transform3D(-0.6, 0, 9.05975e-08, 0, 0.6, 0, -9.05975e-08, 0, -0.6, -5, 2.4, -0.6) +script = ExtResource("8_dsl2r") [node name="Spots" type="Node3D" parent="."] -script = ExtResource("6_j8jbd") +script = ExtResource("9_pjnol") [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(0.866025, 0.120961, -0.485148, 0, 0.970296, 0.241922, 0.5, -0.209511, 0.840301, -1, 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(0.866025, -0.120961, 0.485148, 0, 0.970296, 0.241922, -0.5, -0.209511, 0.840301, 1, 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 - -[node name="Warblettes" type="SpotLight3D" parent="Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.991445, 0.130526, 0, -0.130526, 0.991445, -7.5, 5.5, 5) -visible = false -light_color = Color(1, 0.960784, 0.85098, 1) -light_energy = 0.8 -shadow_enabled = true -shadow_bias = 0.1 -spot_range = 8.0 -spot_attenuation = -1.0 -spot_angle = 10.0 +spot_angle = 5.0 [node name="Color Spots" type="Node3D" parent="."] -script = ExtResource("6_j8jbd") +script = ExtResource("9_pjnol") [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 @@ -124,7 +113,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 @@ -135,7 +124,7 @@ spot_attenuation = -1.0 spot_angle = 7.5 [node name="Helen" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(0.866025, 0.120961, -0.485148, 0, 0.970296, 0.241922, 0.5, -0.209511, 0.840301, -1, 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 @@ -146,7 +135,7 @@ spot_attenuation = -1.0 spot_angle = 7.5 [node name="Jasper" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(0.866025, -0.120961, 0.485148, 0, 0.970296, 0.241922, -0.5, -0.209511, 0.840301, 1, 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 @@ -157,7 +146,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 @@ -168,7 +157,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 @@ -178,22 +167,11 @@ spot_range = 8.0 spot_attenuation = -1.0 spot_angle = 7.5 -[node name="Warblettes" type="SpotLight3D" parent="Color Spots" groups=["lights"]] -transform = Transform3D(1, 0, 0, 0, 0.991445, 0.130526, 0, -0.130526, 0.991445, -7.5, 5.5, 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 = 10.0 - [node name="Valence" type="Node3D" parent="."] -script = ExtResource("6_j8jbd") +script = ExtResource("9_pjnol") [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.960784, 0.85098, 1) shadow_enabled = true @@ -202,7 +180,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.960784, 0.85098, 1) shadow_enabled = true @@ -211,7 +189,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.960784, 0.85098, 1) shadow_enabled = true @@ -220,7 +198,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.960784, 0.85098, 1) shadow_enabled = true @@ -229,7 +207,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.960784, 0.85098, 1) shadow_enabled = true @@ -238,10 +216,10 @@ spot_attenuation = -1.0 spot_angle = 15.0 [node name="Backdrop" type="Node3D" parent="."] -script = ExtResource("6_j8jbd") +script = ExtResource("9_pjnol") [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, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -2, 2.1, -0.9) visible = false light_color = Color(0, 0, 1, 1) shadow_enabled = true @@ -251,9 +229,9 @@ 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, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -1.5, 2.1, -0.9) visible = false -light_color = Color(1, 0.74902, 0, 1) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 @@ -261,7 +239,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, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -1, 2.1, -0.9) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -271,7 +249,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.5, -0.866025, 0, 0.866025, 0.5, -0.5, 2.1, -0.9) visible = false light_color = Color(0, 0, 1, 1) shadow_enabled = true @@ -281,9 +259,9 @@ 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.5, -0.866025, 0, 0.866025, 0.5, 0, 2.1, -0.9) visible = false -light_color = Color(1, 0.74902, 0, 1) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 @@ -291,7 +269,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.5, -0.866025, 0, 0.866025, 0.5, 0.5, 2.1, -0.9) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -301,7 +279,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, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 1, 2.1, -0.9) visible = false light_color = Color(0, 0, 1, 1) shadow_enabled = true @@ -311,9 +289,9 @@ 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, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 1.5, 2.1, -0.9) visible = false -light_color = Color(1, 0.74902, 0, 1) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 @@ -321,7 +299,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, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 2, 2.1, -0.9) visible = false light_color = Color(1, 0, 0, 1) shadow_enabled = true @@ -336,69 +314,55 @@ 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) +light_energy = 0.5 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, 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) +light_energy = 0.5 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, 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) +light_energy = 0.5 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) -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="BalconyStage" parent="." instance=ExtResource("5_45mf1")] -transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 0, 0) +[node name="BalconyStage" parent="." instance=ExtResource("10_msaqn")] [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) +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, 1, 0, 0, 0, 1, -7.5, 5, 3) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 3.25, 2) fov = 60.0 [node name="Angle 5" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.996195, 0.0871557, 0, -0.0871557, 0.996195, 0, 4.75, 6) +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 6" type="Camera3D" parent="."] -transform = Transform3D(0.965926, -0.0225576, 0.257834, 0, 0.996195, 0.0871557, -0.258819, -0.084186, 0.96225, 2, 4.75, 7) +transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 1.75, 3, 5) fov = 60.0 diff --git a/Scenes/EditorStages/CStage.tscn b/Scenes/EditorStages/CStage.tscn index 611fa57..a52cbb6 100644 --- a/Scenes/EditorStages/CStage.tscn +++ b/Scenes/EditorStages/CStage.tscn @@ -225,7 +225,7 @@ 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) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 @@ -255,7 +255,7 @@ 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) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 @@ -285,7 +285,7 @@ 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) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 diff --git a/Scenes/FreeRoam/Generic/GenericBalconyStage.tscn b/Scenes/FreeRoam/Generic/GenericBalconyStage.tscn new file mode 100644 index 0000000..7eac774 --- /dev/null +++ b/Scenes/FreeRoam/Generic/GenericBalconyStage.tscn @@ -0,0 +1,364 @@ +[gd_scene load_steps=15 format=3 uid="uid://bmc44cia2mq23"] + +[ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Animatronics/Cyberamics/Cyber Munch.glb" id="1_dmiku"] +[ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="2_nryqw"] +[ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Animatronics/Cyberamics/Cyber Jasper.glb" id="3_ocbd4"] +[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_cqmgv"] +[ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="5_opy70"] +[ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Animatronics/Cyberamics/Cyber Pasqually.glb" id="6_w25am"] +[ext_resource type="PackedScene" uid="uid://dmh5upwts8y11" path="res://Models/Animatronics/Cyberamics/Warblettes.glb" id="7_nb7oe"] +[ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="8_wh12y"] +[ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="9_s7uxr"] +[ext_resource type="PackedScene" uid="uid://c6n4otfble154" path="res://Models/Stages/Balcony/BalconyStage.glb" id="10_0faub"] +[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="11_kyqka"] + +[sub_resource type="Environment" id="Environment_w3m2i"] +ambient_light_source = 1 + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_hjn8u"] +data = PackedVector3Array(-3.8, 4, 0.4, -3.8, 1.3, 0.4, -3.8, 4, -1, -3.8, 4, -1, -3.8, 1.3, 0.4, -3.8, 1.3, -1, -3.8, 4, -1, -3.8, 1.3, -1, 3.8, 4, -1, 3.8, 4, -1, -3.8, 1.3, -1, 3.8, 1.3, -1, -2.4, 1.3, 0.7, -2.4, 4, 0.7, -2.1, 1.3, 0.4, -2.1, 1.3, 0.4, -2.4, 4, 0.7, -2.1, 4, 0.4, -3.5, 1.3, 0.7, -3.5, 4, 0.7, -2.4, 1.3, 0.7, -2.4, 1.3, 0.7, -3.5, 4, 0.7, -2.4, 4, 0.7, -2.1, 1.3, 0.4, -2.1, 4, 0.4, -0.9, 1.3, 0.4, -0.9, 1.3, 0.4, -2.1, 4, 0.4, -0.9, 4, 0.4, -3.8, 1.3, 0.4, -3.8, 4, 0.4, -3.5, 1.3, 0.7, -3.5, 1.3, 0.7, -3.8, 4, 0.4, -3.5, 4, 0.7, -0.9, 1.3, 0.4, -0.9, 4, 0.4, -0.6, 1.3, 0.7, -0.6, 1.3, 0.7, -0.9, 4, 0.4, -0.6, 4, 0.7, -0.6, 1.3, 0.7, -0.6, 4, 0.7, 0.6, 1.3, 0.7, 0.6, 1.3, 0.7, -0.6, 4, 0.7, 0.6, 4, 0.7, 0.6, 1.3, 0.7, 0.6, 4, 0.7, 0.9, 1.3, 0.4, 0.9, 1.3, 0.4, 0.6, 4, 0.7, 0.9, 4, 0.4, 0.9, 1.3, 0.4, 0.9, 4, 0.4, 2.1, 1.3, 0.4, 2.1, 1.3, 0.4, 0.9, 4, 0.4, 2.1, 4, 0.4, 2.1, 1.3, 0.4, 2.1, 4, 0.4, 2.4, 1.3, 0.7, 2.4, 1.3, 0.7, 2.1, 4, 0.4, 2.4, 4, 0.7, 2.4, 1.3, 0.7, 2.4, 4, 0.7, 3.5, 1.3, 0.7, 3.5, 1.3, 0.7, 2.4, 4, 0.7, 3.5, 4, 0.7, 3.5, 1.3, 0.7, 3.5, 4, 0.7, 3.8, 1.3, 0.4, 3.8, 1.3, 0.4, 3.5, 4, 0.7, 3.8, 4, 0.4, 3.8, 4, 0.4, 3.8, 4, -1, 3.8, 1.3, 0.4, 3.8, 1.3, 0.4, 3.8, 4, -1, 3.8, 1.3, -1, -3.5, 4, 0.7, -3.8, 4, 0.4, -2.4, 4, 0.7, -2.4, 4, 0.7, -3.8, 4, 0.4, -2.1, 4, 0.4, -2.1, 4, 0.4, -3.8, 4, 0.4, -0.9, 4, 0.4, -0.9, 4, 0.4, -3.8, 4, 0.4, -0.6, 4, 0.7, -0.6, 4, 0.7, -3.8, 4, 0.4, 0.6, 4, 0.7, 0.6, 4, 0.7, -3.8, 4, 0.4, 0.9, 4, 0.4, 0.9, 4, 0.4, -3.8, 4, 0.4, 2.1, 4, 0.4, 2.1, 4, 0.4, -3.8, 4, 0.4, 2.4, 4, 0.7, 2.4, 4, 0.7, -3.8, 4, 0.4, 3.5, 4, 0.7, 3.5, 4, 0.7, -3.8, 4, 0.4, 3.8, 4, 0.4, 3.8, 4, 0.4, -3.8, 4, 0.4, 3.8, 4, -1, 3.8, 4, -1, -3.8, 4, 0.4, -3.8, 4, -1, 3.8, 1.3, -1, -3.8, 1.3, -1, 3.8, 1.3, 0.4, 3.8, 1.3, 0.4, -3.8, 1.3, -1, 3.5, 1.3, 0.7, 3.5, 1.3, 0.7, -3.8, 1.3, -1, 2.4, 1.3, 0.7, 2.4, 1.3, 0.7, -3.8, 1.3, -1, 2.1, 1.3, 0.4, 2.1, 1.3, 0.4, -3.8, 1.3, -1, 0.9, 1.3, 0.4, 0.9, 1.3, 0.4, -3.8, 1.3, -1, 0.6, 1.3, 0.7, 0.6, 1.3, 0.7, -3.8, 1.3, -1, -0.6, 1.3, 0.7, -0.6, 1.3, 0.7, -3.8, 1.3, -1, -0.9, 1.3, 0.4, -0.9, 1.3, 0.4, -3.8, 1.3, -1, -2.1, 1.3, 0.4, -2.1, 1.3, 0.4, -3.8, 1.3, -1, -2.4, 1.3, 0.7, -2.4, 1.3, 0.7, -3.8, 1.3, -1, -3.5, 1.3, 0.7, -3.5, 1.3, 0.7, -3.8, 1.3, -1, -3.8, 1.3, 0.4) +backface_collision = true + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_8i5le"] +data = PackedVector3Array(-6.8, 4, 8, -6.8, 0, 8, -6.8, 4, 0, -6.8, 4, 0, -6.8, 0, 8, -6.8, 0, 0, -6.8, 4, 0, -6.8, 0, 0, -3.8, 4, 0, -3.8, 4, 0, -6.8, 0, 0, -3.8, 0, 0, 7.6, 0, 0, 7.6, 4, 0, 3.8, 0, 0, 3.8, 0, 0, 7.6, 4, 0, 3.8, 4, 0, 7.6, 0, 8, 7.6, 4, 8, 7.6, 0, 0, 7.6, 0, 0, 7.6, 4, 8, 7.6, 4, 0, -6.8, 0, 8, -6.8, 4, 8, 7.6, 0, 8, 7.6, 0, 8, -6.8, 4, 8, 7.6, 4, 8, 3.8, 0, 0, -3.8, 0, 0, 3.8, 1.3, 0, 3.8, 1.3, 0, -3.8, 0, 0, -3.8, 1.3, 0, -3.8, 0, 0, -6.8, 0, 0, 3.8, 0, 0, 7.6, 0, 8, -6.8, 0, 0, -6.8, 0, 8, 7.6, 0, 0, -6.8, 0, 0, 7.6, 0, 8, 3.8, 0, 0, -6.8, 0, 0, 7.6, 0, 0, 7.6, 4, 8, -6.8, 4, 8, 7.6, 4, 0, 7.6, 4, 0, -6.8, 4, 8, 3.8, 4, 0, 3.8, 4, 0, -6.8, 4, 8, -3.8, 4, 0, -3.8, 4, 0, -6.8, 4, 8, -6.8, 4, 0) +backface_collision = true + +[node name="Balcony" type="Node3D"] + +[node name="Munch" parent="." instance=ExtResource("1_dmiku")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, 2, -0.25) +script = ExtResource("2_nryqw") + +[node name="Jasper" parent="." instance=ExtResource("3_ocbd4")] +transform = Transform3D(0.519615, 0, 0.3, 0, 0.6, 0, -0.3, 0, 0.519615, -1.5, 2, -0.25) +script = ExtResource("2_nryqw") + +[node name="Chuck" parent="." instance=ExtResource("4_cqmgv")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 2, 0) +script = ExtResource("2_nryqw") + +[node name="Helen" parent="." instance=ExtResource("5_opy70")] +transform = Transform3D(0.519615, 0, -0.3, 0, 0.6, 0, 0.3, 0, 0.519615, 1.5, 2, -0.25) +script = ExtResource("2_nryqw") + +[node name="Pasqually" parent="." instance=ExtResource("6_w25am")] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, 2, -0.25) +script = ExtResource("2_nryqw") + +[node name="Warblettes" parent="." instance=ExtResource("7_nb7oe")] +transform = Transform3D(-0.6, 0, 9.05975e-08, 0, 0.6, 0, -9.05975e-08, 0, -0.6, -5, 2.4, -0.6) +script = ExtResource("8_wh12y") + +[node name="Spots" type="Node3D" parent="."] +script = ExtResource("9_s7uxr") + +[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("9_s7uxr") + +[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("9_s7uxr") + +[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.960784, 0.85098, 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.960784, 0.85098, 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.960784, 0.85098, 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.960784, 0.85098, 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.960784, 0.85098, 1) +shadow_enabled = true +shadow_bias = 0.1 +spot_attenuation = -1.0 +spot_angle = 15.0 + +[node name="Backdrop" type="Node3D" parent="."] +script = ExtResource("9_s7uxr") + +[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, 2.1, -0.9) +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, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -1.5, 2.1, -0.9) +visible = false +light_color = Color(1, 0.501961, 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, -7.18775e-09, 0.5, -0.866025, -0.5, 0.75, 0.433013, -1, 2.1, -0.9) +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.5, -0.866025, 0, 0.866025, 0.5, -0.5, 2.1, -0.9) +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.5, -0.866025, 0, 0.866025, 0.5, 0, 2.1, -0.9) +visible = false +light_color = Color(1, 0.501961, 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.5, -0.866025, 0, 0.866025, 0.5, 0.5, 2.1, -0.9) +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, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 1, 2.1, -0.9) +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, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 1.5, 2.1, -0.9) +visible = false +light_color = Color(1, 0.501961, 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, 1.82764e-08, 0.5, -0.866025, 0.5, 0.75, 0.433013, 2, 2.1, -0.9) +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) +light_energy = 0.5 +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) +light_energy = 0.5 +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) +light_energy = 0.5 +shadow_enabled = true +shadow_bias = 0.1 +spot_range = 7.0 +spot_angle = 80.0 + +[node name="BalconyStage" parent="." instance=ExtResource("10_0faub")] + +[node name="Player" parent="." instance=ExtResource("11_kyqka")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3) +current_map = "Generic Balcony Stage" + +[node name="StaticBody3D" type="StaticBody3D" parent="."] + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_hjn8u") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_8i5le") diff --git a/Scenes/FreeRoam/Generic/GenericCStage.tscn b/Scenes/FreeRoam/Generic/GenericCStage.tscn index ceb778c..c5875ce 100644 --- a/Scenes/FreeRoam/Generic/GenericCStage.tscn +++ b/Scenes/FreeRoam/Generic/GenericCStage.tscn @@ -234,7 +234,7 @@ 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) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 @@ -264,7 +264,7 @@ 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) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 @@ -294,7 +294,7 @@ 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) +light_color = Color(1, 0.501961, 0, 1) shadow_enabled = true shadow_bias = 0.1 spot_attenuation = 2.0 diff --git a/Scenes/FreeRoam/Generic/GenericProtoRoadStage.tscn b/Scenes/FreeRoam/Generic/GenericProtoRoadStage.tscn index 12d4ffc..91e0c6a 100644 --- a/Scenes/FreeRoam/Generic/GenericProtoRoadStage.tscn +++ b/Scenes/FreeRoam/Generic/GenericProtoRoadStage.tscn @@ -21,6 +21,7 @@ backface_collision = true [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_8h3a3"] data = PackedVector3Array(-7, 4.5, 0, -7, 0, 0, -7, 4.5, -1, -7, 4.5, -1, -7, 0, 0, -7, 0, -1, -7, 4.5, -1, -7, 0, -1, 7, 4.5, -1, 7, 4.5, -1, -7, 0, -1, 7, 0, -1, 7, 4.5, -1, 7, 0, -1, 7, 4.5, 0, 7, 4.5, 0, 7, 0, -1, 7, 0, 0, 7, 4.5, 0, 7, 0, 0, -7, 4.5, 0, -7, 4.5, 0, 7, 0, 0, -7, 0, 0, 7, 0, -1, -7, 0, -1, 7, 0, 0, 7, 0, 0, -7, 0, -1, -7, 0, 0, -7, 4.5, -1, 7, 4.5, -1, -7, 4.5, 0, -7, 4.5, 0, 7, 4.5, -1, 7, 4.5, 0, -1.2, 1.9, 1.2, -1.2, 0, 1.2, -1.2, 1.9, 0, -1.2, 1.9, 0, -1.2, 0, 1.2, -1.2, 0, 0, -1.2, 1.9, 0, -1.2, 0, 0, 3.1998, 1.9, 0, 3.1998, 1.9, 0, -1.2, 0, 0, 3.1998, 0, 0, 3.1998, 1.9, 0, 3.1998, 0, 0, 3.1998, 1.9, 1.2, 3.1998, 1.9, 1.2, 3.1998, 0, 0, 3.1998, 0, 1.2, 3.1998, 1.9, 1.2, 3.1998, 0, 1.2, -1.2, 1.9, 1.2, -1.2, 1.9, 1.2, 3.1998, 0, 1.2, -1.2, 0, 1.2, 3.1998, 0, 0, -1.2, 0, 0, 3.1998, 0, 1.2, 3.1998, 0, 1.2, -1.2, 0, 0, -1.2, 0, 1.2, -1.2, 1.9, 0, 3.1998, 1.9, 0, -1.2, 1.9, 1.2, -1.2, 1.9, 1.2, 3.1998, 1.9, 0, 3.1998, 1.9, 1.2, 0.0999, 1.3, 1.7, 0.0999, 0, 1.7, 0.0999, 1.3, 1.2, 0.0999, 1.3, 1.2, 0.0999, 0, 1.7, 0.0999, 0, 1.2, 0.0999, 1.3, 1.2, 0.0999, 0, 1.2, 1.8999, 1.3, 1.2, 1.8999, 1.3, 1.2, 0.0999, 0, 1.2, 1.8999, 0, 1.2, 1.8999, 1.3, 1.2, 1.8999, 0, 1.2, 1.8999, 1.3, 1.7, 1.8999, 1.3, 1.7, 1.8999, 0, 1.2, 1.8999, 0, 1.7, 1.8999, 1.3, 1.7, 1.8999, 0, 1.7, 0.0999, 1.3, 1.7, 0.0999, 1.3, 1.7, 1.8999, 0, 1.7, 0.0999, 0, 1.7, 1.8999, 0, 1.2, 0.0999, 0, 1.2, 1.8999, 0, 1.7, 1.8999, 0, 1.7, 0.0999, 0, 1.2, 0.0999, 0, 1.7, 0.0999, 1.3, 1.2, 1.8999, 1.3, 1.2, 0.0999, 1.3, 1.7, 0.0999, 1.3, 1.7, 1.8999, 1.3, 1.2, 1.8999, 1.3, 1.7, 5.3, 4, 1, 5.3, 0, 1, 3.7999, 4, -0.5, 3.7999, 4, -0.5, 5.3, 0, 1, 3.7999, 0, -0.5, 3.7999, 4, -0.5, 3.7999, 0, -0.5, 5.7998, 4, -0.5, 5.7998, 4, -0.5, 3.7999, 0, -0.5, 5.7998, 0, -0.5, 5.7998, 4, -0.5, 5.7998, 0, -0.5, 5.7998, 4, 1, 5.7998, 4, 1, 5.7998, 0, -0.5, 5.7998, 0, 1, 5.7998, 4, 1, 5.7998, 0, 1, 5.3, 4, 1, 5.3, 4, 1, 5.7998, 0, 1, 5.3, 0, 1, 5.7998, 0, -0.5, 3.7999, 0, -0.5, 5.7998, 0, 1, 5.7998, 0, 1, 3.7999, 0, -0.5, 5.3, 0, 1, 3.7999, 4, -0.5, 5.7998, 4, -0.5, 5.3, 4, 1, 5.3, 4, 1, 5.7998, 4, -0.5, 5.7998, 4, 1, 3.0998, 1.7999, 1.9, 3.0998, 0, 1.9, 3.0998, 1.7999, 0.6, 3.0998, 1.7999, 0.6, 3.0998, 0, 1.9, 3.0998, 0, 0.6, 3.0998, 1.7999, 0.6, 3.0998, 0, 0.6, 4.8998, 1.7999, 0.6, 4.8998, 1.7999, 0.6, 3.0998, 0, 0.6, 4.8998, 0, 0.6, 4.8998, 1.7999, 0.6, 4.8998, 0, 0.6, 4.8998, 1.7999, 1.9, 4.8998, 1.7999, 1.9, 4.8998, 0, 0.6, 4.8998, 0, 1.9, 4.8998, 1.7999, 1.9, 4.8998, 0, 1.9, 3.0998, 1.7999, 1.9, 3.0998, 1.7999, 1.9, 4.8998, 0, 1.9, 3.0998, 0, 1.9, 4.8998, 0, 0.6, 3.0998, 0, 0.6, 4.8998, 0, 1.9, 4.8998, 0, 1.9, 3.0998, 0, 0.6, 3.0998, 0, 1.9, 3.0998, 1.7999, 0.6, 4.8998, 1.7999, 0.6, 3.0998, 1.7999, 1.9, 3.0998, 1.7999, 1.9, 4.8998, 1.7999, 0.6, 4.8998, 1.7999, 1.9, -5.8001, 2.6, 0.7, -5.8001, 0, 0.7, -5.8001, 2.6, 0, -5.8001, 2.6, 0, -5.8001, 0, 0.7, -5.8001, 0, 0, -5.8001, 2.6, 0, -5.8001, 0, 0, -4.2, 2.6, 0, -4.2, 2.6, 0, -5.8001, 0, 0, -4.2, 0, 0, -4.2, 2.6, 0, -4.2, 0, 0, -4.2, 2.6, 0.7, -4.2, 2.6, 0.7, -4.2, 0, 0, -4.2, 0, 0.7, -4.2, 2.6, 0.7, -4.2, 0, 0.7, -5.8001, 2.6, 0.7, -5.8001, 2.6, 0.7, -4.2, 0, 0.7, -5.8001, 0, 0.7, -4.2, 0, 0, -5.8001, 0, 0, -4.2, 0, 0.7, -4.2, 0, 0.7, -5.8001, 0, 0, -5.8001, 0, 0.7, -5.8001, 2.6, 0, -4.2, 2.6, 0, -5.8001, 2.6, 0.7, -5.8001, 2.6, 0.7, -4.2, 2.6, 0, -4.2, 2.6, 0.7, -5.8001, 0.7, 2, -5.8001, 0, 2, -5.8001, 0.7, 0.7, -5.8001, 0.7, 0.7, -5.8001, 0, 2, -5.8001, 0, 0.7, -5.8001, 0.7, 0.7, -5.8001, 0, 0.7, -4.2, 0.7, 0.7, -4.2, 0.7, 0.7, -5.8001, 0, 0.7, -4.2, 0, 0.7, -4.2, 0.7, 0.7, -4.2, 0, 0.7, -4.2, 0.7, 2, -4.2, 0.7, 2, -4.2, 0, 0.7, -4.2, 0, 2, -4.2, 0.7, 2, -4.2, 0, 2, -5.8001, 0.7, 2, -5.8001, 0.7, 2, -4.2, 0, 2, -5.8001, 0, 2, -4.2, 0, 0.7, -5.8001, 0, 0.7, -4.2, 0, 2, -4.2, 0, 2, -5.8001, 0, 0.7, -5.8001, 0, 2, -5.8001, 0.7, 0.7, -4.2, 0.7, 0.7, -5.8001, 0.7, 2, -5.8001, 0.7, 2, -4.2, 0.7, 0.7, -4.2, 0.7, 2, -6.6001, 4.1999, 0.8, -6.6001, 1.1, 0.8, -6.6001, 4.1999, 0.7, -6.6001, 4.1999, 0.7, -6.6001, 1.1, 0.8, -6.6001, 1.1, 0.7, -6.6001, 4.1999, 0.7, -6.6001, 1.1, 0.7, -3.4002, 4.1999, 0.7, -3.4002, 4.1999, 0.7, -6.6001, 1.1, 0.7, -3.4002, 1.1, 0.7, -3.4002, 4.1999, 0.7, -3.4002, 1.1, 0.7, -3.4002, 4.1999, 0.8, -3.4002, 4.1999, 0.8, -3.4002, 1.1, 0.7, -3.4002, 1.1, 0.8, -3.4002, 4.1999, 0.8, -3.4002, 1.1, 0.8, -6.6001, 4.1999, 0.8, -6.6001, 4.1999, 0.8, -3.4002, 1.1, 0.8, -6.6001, 1.1, 0.8, -3.4002, 1.1, 0.7, -6.6001, 1.1, 0.7, -3.4002, 1.1, 0.8, -3.4002, 1.1, 0.8, -6.6001, 1.1, 0.7, -6.6001, 1.1, 0.8, -6.6001, 4.1999, 0.7, -3.4002, 4.1999, 0.7, -6.6001, 4.1999, 0.8, -6.6001, 4.1999, 0.8, -3.4002, 4.1999, 0.7, -3.4002, 4.1999, 0.8) +backface_collision = true [node name="ProtoRoadStage" type="Node3D"] diff --git a/Scenes/GUI/MainMenu.tscn b/Scenes/GUI/MainMenu.tscn index e8b2386..1c3ebaa 100644 --- a/Scenes/GUI/MainMenu.tscn +++ b/Scenes/GUI/MainMenu.tscn @@ -239,32 +239,34 @@ offset_bottom = 152.0 grow_horizontal = 2 grow_vertical = 2 selected = 1 -item_count = 11 +item_count = 12 popup/item_0/text = "Generic Showrooms" popup/item_0/id = 0 popup/item_0/separator = true -popup/item_1/text = "Generic C-Stage" +popup/item_1/text = "Generic Balcony Stage" popup/item_1/id = 1 -popup/item_2/text = "Generic Prototype Road Stage" +popup/item_2/text = "Generic C-Stage" popup/item_2/id = 1 -popup/item_3/text = "Generic 2-Stage" +popup/item_3/text = "Generic Prototype Road Stage" popup/item_3/id = 1 -popup/item_4/text = "Generic Mini Unit 1-Stage" +popup/item_4/text = "Generic 2-Stage" popup/item_4/id = 1 -popup/item_5/text = "Generic 1-Stage w 2-Stage Props" +popup/item_5/text = "Generic Mini Unit 1-Stage" popup/item_5/id = 1 -popup/item_6/text = "Generic 1-Stage" +popup/item_6/text = "Generic 1-Stage w 2-Stage Props" popup/item_6/id = 1 -popup/item_7/text = "Generic Turntable 1-Stage" -popup/item_7/id = 2 -popup/item_8/text = "Generic Cyberamic 3-Stage" +popup/item_7/text = "Generic 1-Stage" +popup/item_7/id = 1 +popup/item_8/text = "Generic Turntable 1-Stage" popup/item_8/id = 2 -popup/item_9/text = "Locations" +popup/item_9/text = "Generic Cyberamic 3-Stage" popup/item_9/id = 2 -popup/item_9/separator = true -popup/item_10/text = "Modded Maps" -popup/item_10/id = 3 +popup/item_10/text = "Locations" +popup/item_10/id = 2 popup/item_10/separator = true +popup/item_11/text = "Modded Maps" +popup/item_11/id = 3 +popup/item_11/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 fdf620d..66a4aaf 100644 --- a/Scripts/Configs/FreeRoamMaps.gd +++ b/Scripts/Configs/FreeRoamMaps.gd @@ -64,6 +64,14 @@ var GenericCStage = { "stage": Stages.CStage, } +var GenericBalconyStage = { + "name": "Generic Balcony Stage", + "scene": "res://Scenes/FreeRoam/Generic/GenericBalconyStage.tscn", + "description": "A generic showroom featuring the Balcony Stage.\nInstalled from 1980-1986.", + "thumbnail": "res://UI/FreeroamThumbnails/GenericBalconyStage.png", + "stage": Stages.BalconyStage, +} + var MapIndex = { "Generic 1-Stage": Generic1Stage, "Generic 2-Stage": Generic2Stage, @@ -72,5 +80,6 @@ var MapIndex = { "Generic 1-Stage w 2-Stage Props": Generic12Stage, "Generic Cyberamic 3-Stage": GenericCyber3Stage, "Generic Prototype Road Stage": GenericProtoRoadStage, - "Generic C-Stage": GenericCStage + "Generic C-Stage": GenericCStage, + "Generic Balcony Stage": GenericBalconyStage } diff --git a/Scripts/Configs/Stages.gd b/Scripts/Configs/Stages.gd index f4f2e91..8ed27b3 100644 --- a/Scripts/Configs/Stages.gd +++ b/Scripts/Configs/Stages.gd @@ -72,7 +72,7 @@ var ChuckEsCorner = { var BalconyStage = { "bits": 69, - "scene": "res://Scenes/EditorStages/Balcony.tscn", + "scene": "res://Scenes/EditorStages/BalconyStage.tscn", "scene_ref_base": "SubViewport/Balcony/", "camera_count": 6, diff --git a/UI/FreeroamThumbnails/GenericBalconyStage.png b/UI/FreeroamThumbnails/GenericBalconyStage.png new file mode 100644 index 0000000..6fd7f1c Binary files /dev/null and b/UI/FreeroamThumbnails/GenericBalconyStage.png differ diff --git a/UI/FreeroamThumbnails/GenericBalconyStage.png.import b/UI/FreeroamThumbnails/GenericBalconyStage.png.import new file mode 100644 index 0000000..3d36d04 --- /dev/null +++ b/UI/FreeroamThumbnails/GenericBalconyStage.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dojjl815kn5ny" +path="res://.godot/imported/GenericBalconyStage.png-148462fb38f8a3cd3554096db560eb36.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/FreeroamThumbnails/GenericBalconyStage.png" +dest_files=["res://.godot/imported/GenericBalconyStage.png-148462fb38f8a3cd3554096db560eb36.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