From 2e36db1d68106a0c8380b4b63426c992b3db9101 Mon Sep 17 00:00:00 2001 From: April John Date: Sat, 2 Dec 2023 14:12:09 +0100 Subject: [PATCH] [fix] change invisible walls prevent crashes --- .../youth_room/youth_room.tscn | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 8aebe5c..8900118 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=115 format=3 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=117 format=3 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" path="res://base-environments/youth_room/room_handle.gd" id="1_aitp0"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"] @@ -51,6 +51,9 @@ size = Vector3(1.30429, 0.270057, 2.5769) [sub_resource type="BoxShape3D" id="BoxShape3D_qck8u"] size = Vector3(0.510823, 1.21862, 1.61497) +[sub_resource type="BoxShape3D" id="BoxShape3D_cdjmm"] +size = Vector3(0.0770401, 1, 0.540749) + [sub_resource type="SphereShape3D" id="SphereShape3D_srxfv"] radius = 0.379997 @@ -78,6 +81,9 @@ size = Vector3(0.25896, 2.51771, 0.244169) [sub_resource type="BoxShape3D" id="BoxShape3D_js8wo"] size = Vector3(0.56931, 1.23778, 1.62664) +[sub_resource type="BoxShape3D" id="BoxShape3D_ychlh"] +size = Vector3(0.851473, 1, 0.428864) + [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_f1g8m"] radius = 0.156739 height = 1.0 @@ -2123,6 +2129,10 @@ shape = SubResource("BoxShape3D_r40dp") transform = Transform3D(0.999866, 0, 0.0163991, 0, 1, 0, -0.016399, 0, 0.999865, -1.30004, 0.523912, 0.0332471) shape = SubResource("BoxShape3D_qck8u") +[node name="shelf2" type="CollisionShape3D" parent="logic/colission/Bed_Colission"] +transform = Transform3D(0.999463, 0, 0.0327938, 0, 1, 0, -0.0327936, 0, 0.999461, -1.46453, 0.719302, -0.377773) +shape = SubResource("BoxShape3D_cdjmm") + [node name="beanbag" type="CollisionShape3D" parent="logic/colission/Bed_Colission"] transform = Transform3D(1, 0, 0, 0, 1, 0, 2.98023e-08, 0, 1, -1.02669, 0.222592, 1.01232) shape = SubResource("SphereShape3D_srxfv") @@ -2166,7 +2176,7 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.3481 shape = SubResource("BoxShape3D_3lwkl") [node name="Wall5" type="CollisionShape3D" parent="logic/colission/Room_Colission"] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.83265, 1.06708, -0.147208) +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.93595, 1.06708, -0.147208) shape = SubResource("BoxShape3D_3lwkl") [node name="Wall7" type="CollisionShape3D" parent="logic/colission/Room_Colission"] @@ -2185,6 +2195,10 @@ shape = SubResource("BoxShape3D_eq1fk") transform = Transform3D(0.98956, 0, -0.144121, 0, 1, 0, 0.144121, 0, 0.98956, 2.60628, 0.308069, 1.91136) shape = SubResource("BoxShape3D_js8wo") +[node name="Crate" type="CollisionShape3D" parent="logic/colission/Room_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.04802, -0.243445, -0.711172) +shape = SubResource("BoxShape3D_ychlh") + [node name="Bed and Ladders" type="Node3D" parent="logic"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.84538, 0, 0.803611) @@ -2878,7 +2892,7 @@ transform = Transform3D(1, 0, 2.98023e-08, 0, 1, 0, -2.98023e-08, 0, 1, 0, -0.23 shape = SubResource("CapsuleShape3D_72g2i") [node name="Comic-interaction" type="Area3D" parent="logic" groups=["interactables"]] -transform = Transform3D(0.86043, 0, -0.509567, 0, 1, 0, 0.509567, 0, 0.86043, 3.5364, 0.447547, -0.697444) +transform = Transform3D(0.969944, 0, 0.243327, 0, 1, 0, -0.243327, 0, 0.969944, 2.91664, 0.665948, -0.857358) collision_layer = 16 script = ExtResource("11_6fwv8") @@ -3069,7 +3083,7 @@ omni_range = 2.17653 omni_attenuation = 0.450626 [node name="OmniLight3D4" type="OmniLight3D" parent="visuals/lights"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.81313, 1.48654, -0.894076) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.55029, 1.48654, -0.513123) light_color = Color(0.894118, 0.87451, 0.686275, 1) light_energy = 0.1 light_size = 0.05