diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn index 06d61f7..ff11a29 100644 --- a/Level/InFactory.tscn +++ b/Level/InFactory.tscn @@ -1,16 +1,17 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://Level/Buildings/DoubleDoorWall.tscn" type="PackedScene" id=1] [ext_resource path="res://Level/Buildings/DoorWall.tscn" type="PackedScene" id=2] -[ext_resource path="res://Level/Interactables/FactoryMachines/FactoryGameplay.tscn" type="PackedScene" id=3] -[ext_resource path="res://Level/Decoration/Statue.tscn" type="PackedScene" id=4] -[ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=5] - -[sub_resource type="BoxShape" id=3] +[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=3] +[ext_resource path="res://Level/Interactables/FactoryMachines/FactoryGameplay.tscn" type="PackedScene" id=4] +[ext_resource path="res://Level/Decoration/Statue.tscn" type="PackedScene" id=5] +[ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=6] [sub_resource type="BoxShape" id=1] -[sub_resource type="CubeMesh" id=2] +[sub_resource type="BoxShape" id=2] + +[sub_resource type="CubeMesh" id=3] [sub_resource type="CubeMesh" id=4] @@ -26,18 +27,18 @@ [node name="CollisionShape" type="CollisionShape" parent="Architecture/OutsideEntry"] transform = Transform( 6.4742, 0, 0, 0, 1, 0, 0, 0, 4.02915, -24.461, 0, 2.21844 ) -shape = SubResource( 3 ) +shape = SubResource( 1 ) [node name="Floor" type="StaticBody" parent="Architecture"] transform = Transform( 100, 0, 0, 0, 1, 0, 0, 0, 100, 0, -1, 0 ) collision_layer = 3 [node name="CollisionShape" type="CollisionShape" parent="Architecture/Floor"] -shape = SubResource( 1 ) +shape = SubResource( 2 ) [node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor"] layers = 3 -mesh = SubResource( 2 ) +mesh = SubResource( 3 ) material/0 = null [node name="EntryHall" type="Spatial" parent="Architecture"] @@ -159,7 +160,8 @@ material/0 = null shape = SubResource( 5 ) [node name="BackWall" type="StaticBody" parent="Architecture/FactoryRoomWalls"] -transform = Transform( 12, 0, 0, 0, 4, 0, 0, 0, 0.2, 0, 4, -33.8 ) +editor/display_folded = true +transform = Transform( 9, 0, 0, 0, 4, 0, 0, 0, 0.2, -3, 4, -33.8 ) collision_layer = 3 [node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/BackWall"] @@ -170,6 +172,60 @@ material/0 = null [node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/BackWall"] shape = SubResource( 5 ) +[node name="BackWall2" type="StaticBody" parent="Architecture/FactoryRoomWalls"] +transform = Transform( 2, 0, 0, 0, 4, 0, 0, 0, 0.2, 10, 4, -33.8 ) +collision_layer = 2 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/BackWall2"] +layers = 2 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/BackWall2"] +shape = SubResource( 5 ) + +[node name="BackWall3" type="StaticBody" parent="Architecture/FactoryRoomWalls"] +transform = Transform( 1, 0, 0, 0, 2.7, 0, 0, 0, 0.2, 7, 5.7, -33.8 ) +collision_layer = 2 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/BackWall3"] +layers = 2 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/BackWall3"] +shape = SubResource( 5 ) + +[node name="BackWallMasked" type="StaticBody" parent="Architecture/FactoryRoomWalls"] +editor/display_folded = true +transform = Transform( 3, 0, 0, 0, 4, 0, 0, 0, 0.2, 9, 4, -33.8 ) + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/BackWallMasked"] +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/BackWallMasked"] +shape = SubResource( 5 ) + +[node name="BackWallTrue" type="Spatial" parent="Architecture/FactoryRoomWalls"] +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 8, 1.5, -33.8 ) + +[node name="Door" parent="Architecture/FactoryRoomWalls/BackWallTrue" instance=ExtResource( 3 )] +collision_layer = 2 +collision_mask = 3 + +[node name="DoorMesh" parent="Architecture/FactoryRoomWalls/BackWallTrue/Door" index="0"] +layers = 2 + +[node name="Outline" parent="Architecture/FactoryRoomWalls/BackWallTrue/Door/DoorMesh" index="0"] +layers = 2 + +[node name="KnobMesh" parent="Architecture/FactoryRoomWalls/BackWallTrue/Door" index="1"] +layers = 2 + +[node name="KnobMesh2" parent="Architecture/FactoryRoomWalls/BackWallTrue/Door" index="2"] +layers = 2 + [node name="Ceiling" type="StaticBody" parent="Architecture/FactoryRoomWalls"] editor/display_folded = true transform = Transform( 12, 0, 0, 0, 0.2, 0, 0, 0, 8.2, 0, 8.2, -25.8 ) @@ -185,7 +241,7 @@ shape = SubResource( 5 ) [node name="FactoryRoomInterior" type="Spatial" parent="Architecture"] -[node name="PipeGame" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 3 )] +[node name="PipeGame" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 2, -34.4 ) [node name="StatueBlock" type="StaticBody" parent="Architecture/FactoryRoomInterior"] @@ -201,8 +257,10 @@ material/0 = null [node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomInterior/StatueBlock"] shape = SubResource( 5 ) -[node name="Statue" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 4 )] +[node name="Statue" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 5 )] transform = Transform( -7.86805e-008, 0, -2.5, 0, 1.8, 0, 1.8, 0, -1.09278e-007, 9.5, 0.5, -25.8 ) -[node name="Player" parent="." instance=ExtResource( 5 )] +[node name="Player" parent="." instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0 ) + +[editable path="Architecture/FactoryRoomWalls/BackWallTrue/Door"]