From df6fb82576aa8bcafaefd584bbd9acad94cca7be Mon Sep 17 00:00:00 2001 From: karl Date: Wed, 29 Jan 2020 13:18:27 +0100 Subject: [PATCH] Rename keys / keycards to prevent issues with despawning when in inventory --- Level/InFactory.tscn | 20 ++--------- Level/Labyrinth.tscn | 4 +-- Level/OutsideWorld.tscn | 75 ++++++++++++++++++++--------------------- 3 files changed, 40 insertions(+), 59 deletions(-) diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn index f4918d9..2c1a3f3 100644 --- a/Level/InFactory.tscn +++ b/Level/InFactory.tscn @@ -1608,25 +1608,13 @@ color_cast_left = NodePath("../DecoPipes/Spatial/ColorCast") [node name="KeyThing" type="Spatial" parent="Architecture/FactoryRoomInterior"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5358, 0.603744, -25.6147 ) -[node name="Key" parent="Architecture/FactoryRoomInterior/KeyThing" groups=[ +[node name="PlayerHomeKey" parent="Architecture/FactoryRoomInterior/KeyThing" groups=[ "HideTooltip", ] instance=ExtResource( 1 )] editor/display_folded = true transform = Transform( -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, -0.0859051, -0.085054, 0 ) key_id = 20 -[node name="KeyMesh" parent="Architecture/FactoryRoomInterior/KeyThing/Key" index="0"] -layers = 2 - -[node name="Sparkle" parent="Architecture/FactoryRoomInterior/KeyThing/Key" index="3"] -transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0, 0 ) - -[node name="White" parent="Architecture/FactoryRoomInterior/KeyThing/Key/Sparkle" index="0"] -layers = 2 - -[node name="Yellow" parent="Architecture/FactoryRoomInterior/KeyThing/Key/Sparkle" index="1"] -layers = 2 - [node name="Pipe" parent="Architecture/FactoryRoomInterior/KeyThing" instance=ExtResource( 16 )] editor/display_folded = true transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, 0, 0, 0 ) @@ -2100,7 +2088,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -47 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -2 ) shape = SubResource( 18 ) -[node name="Key" parent="." instance=ExtResource( 1 )] +[node name="BackdoorKey" parent="." instance=ExtResource( 1 )] transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 61.4252, 0.526477, -41.4731 ) key_id = 7 @@ -2172,10 +2160,6 @@ spot_angle = 76.9 [editable path="Architecture/FactoryRoomInterior/FakeStuff/BigFake/FakeLever11"] -[editable path="Architecture/FactoryRoomInterior/KeyThing/Key"] - -[editable path="Architecture/FactoryRoomInterior/KeyThing/Key/Sparkle"] - [editable path="Architecture/FactoryRoomInterior/KeyThing/Pipe"] [editable path="Light/SpotLight5"] diff --git a/Level/Labyrinth.tscn b/Level/Labyrinth.tscn index 692cbbe..439ea9d 100644 --- a/Level/Labyrinth.tscn +++ b/Level/Labyrinth.tscn @@ -237,7 +237,6 @@ stream = ExtResource( 2 ) autoplay = true [node name="WinArea" type="MeshInstance" parent="."] -editor/display_folded = true transform = Transform( 50, 0, 0, 0, 50, 0, 0, 0, 50, -164.98, 40.96, -60.47 ) layers = 3 mesh = SubResource( 10 ) @@ -293,12 +292,11 @@ collision_mask = 3 [node name="CollisionShape" type="CollisionShape" parent="WinArea/StaticBody"] shape = SubResource( 15 ) -[node name="Key" parent="." instance=ExtResource( 7 )] +[node name="WinKey" parent="." instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -109, 2, 30 ) key_id = 1 [node name="Corridors" type="Spatial" parent="."] -editor/display_folded = true [node name="LabyrinthCorridorTrue" parent="Corridors" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 0, 0 ) diff --git a/Level/OutsideWorld.tscn b/Level/OutsideWorld.tscn index 1517e36..9f7c7d2 100644 --- a/Level/OutsideWorld.tscn +++ b/Level/OutsideWorld.tscn @@ -46,13 +46,13 @@ _data = { [sub_resource type="Curve3D" id=6] _data = { -"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, 1.63625, 0, -4.83446, 0, 0, 0, 0, 0, 0, 13.9829, 1.52588e-005, -124.85 ), +"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, 1.63625, 0, -4.83446, 0, 0, 0, 0, 0, 0, 13.9829, 1.52588e-05, -124.85 ), "tilts": PoolRealArray( 0, 0 ) } [sub_resource type="Curve3D" id=7] _data = { -"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, 1.00355, 0, -3.01736, 0, 0, 0, 0, 0, 0, -13.323, 1.52588e-005, -115.861 ), +"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, 1.00355, 0, -3.01736, 0, 0, 0, 0, 0, 0, -13.323, 1.52588e-05, -115.861 ), "tilts": PoolRealArray( 0, 0 ) } @@ -128,7 +128,7 @@ body_nodepath = NodePath("Meldewesen") transform = Transform( -0.5, 0, -0.866026, 0, 1, 0, 0.866026, 0, -0.5, 0.962299, 0.760091, 49.3728 ) [node name="Meldewesen3" parent="Enemies" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 66.7133, 0.850244, 5.86107 ) +transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 66.7133, 0.850244, 5.86107 ) [node name="Meldewesen4" parent="Enemies" instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 56.7007, 0.515385, 22.1842 ) @@ -148,20 +148,19 @@ autoplay = true bus = "True" [node name="Collectibles" type="Spatial" parent="."] -editor/display_folded = true -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 15.0831, 1.63203, 13.0809 ) [node name="ForbiddenArea" type="Area" parent="Collectibles" groups=[ "Forbidden", ]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75.0183, 1.18318, -2.86102e-006 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75.0183, 1.18318, -2.86102e-06 ) [node name="CollisionShape" type="CollisionShape" parent="Collectibles/ForbiddenArea"] -transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-007 ) +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-07 ) shape = SubResource( 3 ) -[node name="Keycard" parent="Collectibles" instance=ExtResource( 7 )] -transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 8.09239, 0, 67.8154 ) +[node name="Keycard1" parent="Collectibles" instance=ExtResource( 7 )] +transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 8.09239, 0, 67.8154 ) [node name="WorkerSpawner" type="Spatial" parent="."] @@ -217,7 +216,7 @@ loop = false editor/display_folded = true [node name="Lever" parent="Touchables" instance=ExtResource( 9 )] -transform = Transform( 1.19249e-008, 0, -1, 0, 1, 0, 1, 0, 1.19249e-008, 25.749, 2.20599, 77.1957 ) +transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 25.749, 2.20599, 77.1957 ) [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] editor/display_folded = true @@ -230,37 +229,37 @@ transform = Transform( 0.9, 0, 0, 0, 1, 0, 0, 0, 1, 14.223, 1.40352, 77.8091 ) "Savehouse", ]] editor/display_folded = true -transform = Transform( -2.76707e-008, 0, 0.633032, 0, 1, 0, -0.385105, 0, -1.68335e-008, -0.163094, 1.63203, -5.18841 ) +transform = Transform( -2.76707e-08, 0, 0.633032, 0, 1, 0, -0.385105, 0, -1.68335e-08, -0.163094, 1.63203, -5.18841 ) [node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/PlayerHouse/SaveArea"] -transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-007 ) +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-07 ) shape = SubResource( 3 ) [node name="MeldewesenHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 82.8181, 0, 14.3189 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 82.8181, 0, 14.3189 ) [node name="ForbiddenArea" type="Area" parent="NavigationMeshInstance/MeldewesenHouse" groups=[ "Forbidden", ]] -transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, 11.3143, 1.63203, -19.6591 ) +transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, 11.3143, 1.63203, -19.6591 ) [node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/MeldewesenHouse/ForbiddenArea"] transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, 0 ) shape = SubResource( 3 ) [node name="Factory" parent="NavigationMeshInstance" instance=ExtResource( 11 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 12.9505, 0, -109.851 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 12.9505, 0, -109.851 ) [node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"] [node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -13 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, -13 ) [node name="BuildingBlock2" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, -13 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 41, 0, -13 ) [node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0.047, 41.124 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 41, 0.047, 41.124 ) [node name="BuildingBlock14" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 62.4331, 0.047, -6.91832 ) @@ -269,43 +268,43 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 62.4331, 0.047, -6.91832 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 62.4331, 0.047, 34.9624 ) [node name="BuildingBlock12" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 14 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, 14 ) [node name="BuildingBlock13" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 41 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, 41 ) [node name="BuildingBlock15" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 95 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 41, 0, 95 ) [node name="BuildingBlock21" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 68 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 41, 0, 68 ) [node name="BuildingBlock16" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 68 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -13, 0, 68 ) [node name="BuildingBlock20" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 95 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -13, 0, 95 ) [node name="BuildingBlock17" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, -2.27536, 0, 116 ) +transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -2.27536, 0, 116 ) [node name="BuildingBlock18" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 25.0542, 0, 116 ) +transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 25.0542, 0, 116 ) [node name="BuildingBlock3" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, -40 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 41, 0, -40 ) [node name="BuildingBlock5" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, -67 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 41, 0, -67 ) [node name="BuildingBlock4" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -40 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, -40 ) [node name="BuildingBlock6" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 12 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -68 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, -68 ) [node name="BuildingBlock7" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, 14 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 41, 0, 14 ) [node name="TreeTentacle" parent="NavigationMeshInstance" instance=ExtResource( 14 )] transform = Transform( 0.422618, 0, -0.906308, 0, 1, 0, 0.906308, 0, 0.422618, 6, 0, 35 ) @@ -320,22 +319,22 @@ transform = Transform( 0.965926, 0, 0.258819, 0, 1, 0, -0.258819, 0, 0.965926, 2 transform = Transform( -0.34202, 0, -0.939693, 0, 1, 0, 0.939693, 0, -0.34202, 5, 0, -6 ) [node name="Street" parent="NavigationMeshInstance" instance=ExtResource( 15 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 16, 0, 17 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 16, 0, 17 ) [node name="Street6" parent="NavigationMeshInstance" instance=ExtResource( 15 )] -transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 66, -0.221518, 17 ) +transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 66, -0.221518, 17 ) [node name="Street4" parent="NavigationMeshInstance" instance=ExtResource( 15 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 16, 0, -33 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 16, 0, -33 ) [node name="Street5" parent="NavigationMeshInstance" instance=ExtResource( 15 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 16, 0, -83 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 16, 0, -83 ) [node name="Street2" parent="NavigationMeshInstance" instance=ExtResource( 15 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 16, 0, 67 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 16, 0, 67 ) [node name="Street3" parent="NavigationMeshInstance" instance=ExtResource( 15 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 16, 0, 117 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 16, 0, 117 ) [node name="Environment" type="Spatial" parent="."] editor/display_folded = true @@ -345,7 +344,7 @@ script = ExtResource( 16 ) environment = SubResource( 10 ) [node name="DirectionalLight" type="DirectionalLight" parent="Environment"] -transform = Transform( 0.642788, -0.262003, -0.719846, -8.21505e-008, -0.939693, 0.34202, -0.766044, -0.219847, -0.604023, 0, 7, 0 ) +transform = Transform( 0.642788, -0.262003, -0.719846, -8.21505e-08, -0.939693, 0.34202, -0.766044, -0.219847, -0.604023, 0, 7, 0 ) layers = 3 shadow_enabled = true