diff --git a/src/map/dungeon/scenes/Set A/18. Corridor A.tscn b/src/map/dungeon/scenes/Set A/18. Corridor A.tscn index d5df4564..63e3a28c 100644 --- a/src/map/dungeon/scenes/Set A/18. Corridor A.tscn +++ b/src/map/dungeon/scenes/Set A/18. Corridor A.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=4 uid="uid://bn4gslp2gk8ds"] +[gd_scene load_steps=37 format=4 uid="uid://bn4gslp2gk8ds"] [ext_resource type="Script" uid="uid://fk3jis6rsipv" path="res://src/map/dungeon/code/corridor.gd" id="1_lepkf"] [ext_resource type="Texture2D" uid="uid://crsw35eypj6ry" path="res://src/map/dungeon/models/Set A/18. Corridor A/18_A1_CORRIDOR_A_WALL TILE 1.jpg" id="2_jmyyj"] @@ -428,6 +428,9 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_etli6") +[sub_resource type="BoxShape3D" id="BoxShape3D_d16dk"] +size = Vector3(0.236, 5.538, 0.149) + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2qrwe"] transparency = 1 shading_mode = 0 @@ -700,6 +703,24 @@ transform = Transform3D(2, 0, 0, 0, 0.10779, 0, 0, 0, 2, -9.92441, 3.92578, 0.91 mesh = SubResource("ArrayMesh_pjk1a") skeleton = NodePath("") +[node name="StaticBody3D" type="StaticBody3D" parent="18_A1_CORRIDOR_A"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="18_A1_CORRIDOR_A/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.7192, 2.25405, -0.816737) +shape = SubResource("BoxShape3D_d16dk") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="18_A1_CORRIDOR_A/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.13273, 2.03746, -0.752249) +shape = SubResource("BoxShape3D_d16dk") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="18_A1_CORRIDOR_A/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.14647, 1.81901, 2.73139) +shape = SubResource("BoxShape3D_d16dk") + +[node name="CollisionShape3D4" type="CollisionShape3D" parent="18_A1_CORRIDOR_A/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.637, 2.14158, 2.73139) +shape = SubResource("BoxShape3D_d16dk") + [node name="DOOR?_F_CUT" type="CSGBox3D" parent="."] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.0339368, -0.095025, 1.87165) use_collision = true diff --git a/src/map/dungeon/scenes/Set A/19. Floor Exit A.tscn b/src/map/dungeon/scenes/Set A/19. Floor Exit A.tscn index e36ae0c6..97060e26 100644 --- a/src/map/dungeon/scenes/Set A/19. Floor Exit A.tscn +++ b/src/map/dungeon/scenes/Set A/19. Floor Exit A.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=50 format=4 uid="uid://cihbmyo0ltq4m"] [ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_3m472"] -[ext_resource type="Script" path="res://src/map/dungeon/code/ExitRoom.cs" id="2_umdkt"] +[ext_resource type="Script" uid="uid://bd824eigybu51" path="res://src/map/dungeon/code/ExitRoom.cs" id="2_umdkt"] [ext_resource type="Texture2D" uid="uid://ct3qjmo0yg3gc" path="res://src/map/dungeon/models/Set A/19. Floor Exit A/19_A1_FLOOR_EXIT_A_darkbrick.png" id="3_umdkt"] [ext_resource type="Texture2D" uid="uid://q4hj2tj6drv" path="res://src/map/dungeon/models/Set A/19. Floor Exit A/19_A1_FLOOR_EXIT_A_concrete_0003_color_1k.png" id="4_daunu"] [ext_resource type="Texture2D" uid="uid://cuy0ep1w6uxqf" path="res://src/map/dungeon/models/Set A/19. Floor Exit A/19_A1_FLOOR_EXIT_A_TILE4.png" id="5_7230f"] @@ -447,7 +447,7 @@ shadow_mesh = SubResource("ArrayMesh_1s3g5") size = Vector3(0.391602, 21, 37) [sub_resource type="BoxShape3D" id="BoxShape3D_daunu"] -size = Vector3(0.628906, 21, 6.86426) +size = Vector3(0.0434814, 21, 6.864) [sub_resource type="BoxShape3D" id="BoxShape3D_7230f"] size = Vector3(4.66064, 21, 19.2147) @@ -513,7 +513,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.76518, -4, -3) shape = SubResource("BoxShape3D_umdkt") [node name="CollisionShape3D3" type="CollisionShape3D" parent="Floor Exit A/19_A1_FLOOR_EXIT_A/StaticBody3D"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.93701, -4, 14.8145) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.93701, -4, 15.1188) shape = SubResource("BoxShape3D_daunu") [node name="CollisionShape3D4" type="CollisionShape3D" parent="Floor Exit A/19_A1_FLOOR_EXIT_A/StaticBody3D"]