From b1bd2d8436859e7c218e7edc3e90ea64d791d569 Mon Sep 17 00:00:00 2001 From: KawaiiZenbo Date: Sat, 25 Oct 2025 21:08:23 -0700 Subject: [PATCH] wip furniture in showrooms --- Scenes/FreeRoam/Generic/Generic1Stage.tscn | 64 +++++++++++++++++++++- Scenes/GUI/MainMenu.tscn | 2 +- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/Scenes/FreeRoam/Generic/Generic1Stage.tscn b/Scenes/FreeRoam/Generic/Generic1Stage.tscn index 450715d..e37d24d 100644 --- a/Scenes/FreeRoam/Generic/Generic1Stage.tscn +++ b/Scenes/FreeRoam/Generic/Generic1Stage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=3 uid="uid://b6rem1te85htp"] +[gd_scene load_steps=37 format=3 uid="uid://b6rem1te85htp"] [ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_8m4fm"] [ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/Stages/1-Stage/1StageGeneric.glb" id="2_ncqi6"] @@ -27,6 +27,8 @@ [ext_resource type="Texture2D" uid="uid://c3orc2ig7n2rc" path="res://Models/Props/CECGOBO.png" id="22_1oq0m"] [ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="26_6rkbs"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="27_xpgff"] +[ext_resource type="PackedScene" uid="uid://dwv4f6bls2btr" path="res://Scenes/Props/StaticFurniture/90sShowroomBoothDouble.tscn" id="28_xsano"] +[ext_resource type="PackedScene" uid="uid://b3y3v2k05s3qx" path="res://Scenes/Props/StaticFurniture/90sShowroomBoothSingle.tscn" id="29_xsano"] [sub_resource type="Environment" id="Environment_0tsrs"] ambient_light_source = 1 @@ -500,4 +502,62 @@ script = ExtResource("27_xpgff") [node name="Booths" type="Node3D" parent="."] -[editable path="StageModel"] +[node name="90sShowroomBoothDouble7" parent="Booths" instance=ExtResource("29_xsano")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -9, 0, 0.95) + +[node name="90sShowroomBoothDouble8" parent="Booths" instance=ExtResource("29_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -9, 0, 9.95) + +[node name="90sShowroomBoothDouble9" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -9, 0, 2.6) + +[node name="90sShowroomBoothDouble10" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -9, 0, 4.5) + +[node name="90sShowroomBoothDouble11" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -9, 0, 6.4) + +[node name="90sShowroomBoothDouble12" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -9, 0, 8.3) + +[node name="90sShowroomBoothDouble14" parent="Booths" instance=ExtResource("29_xsano")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 9, 0, 0.95) + +[node name="90sShowroomBoothDouble15" parent="Booths" instance=ExtResource("29_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9, 0, 9.95) + +[node name="90sShowroomBoothDouble20" parent="Booths" instance=ExtResource("29_xsano")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.9, 0, 12) + +[node name="90sShowroomBoothDouble27" parent="Booths" instance=ExtResource("29_xsano")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -6.9, 0, 12) + +[node name="90sShowroomBoothDouble16" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9, 0, 2.6) + +[node name="90sShowroomBoothDouble17" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9, 0, 4.5) + +[node name="90sShowroomBoothDouble18" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9, 0, 6.4) + +[node name="90sShowroomBoothDouble19" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9, 0, 8.3) + +[node name="90sShowroomBoothDouble21" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 4.25, 0, 12) + +[node name="90sShowroomBoothDouble22" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 2.35, 0, 12) + +[node name="90sShowroomBoothDouble23" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.45, 0, 12) + +[node name="90sShowroomBoothDouble24" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.45, 0, 12) + +[node name="90sShowroomBoothDouble25" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -3.35, 0, 12) + +[node name="90sShowroomBoothDouble26" parent="Booths" instance=ExtResource("28_xsano")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -5.25, 0, 12) diff --git a/Scenes/GUI/MainMenu.tscn b/Scenes/GUI/MainMenu.tscn index fbb6b43..4676d63 100644 --- a/Scenes/GUI/MainMenu.tscn +++ b/Scenes/GUI/MainMenu.tscn @@ -668,7 +668,7 @@ Settings System: Pizza Perpetrator Models: KawaiiZenbo: Helen House, Cyberamics, Cyberamic Stages, -3-Stage, 3-Stage Bots, Free Roam Maps +3-Stage, 3-Stage Bots, Free Roam Maps, Furniture Luigigamin212: Chuck E's Corner Avery: Cyberamic Iris Textures