From a47e2d143ec99f42a4f01d44345b6b210963ce6c Mon Sep 17 00:00:00 2001 From: SyntaX Date: Mon, 27 Jan 2020 14:50:14 +0100 Subject: [PATCH 01/11] cock sounds only outside --- Characters/Player/Player.gd | 7 ++-- Level/InFactory.tscn | 14 ++++--- Level/Labyrinth.tscn | 41 +++++++++---------- Level/World.tscn | 80 ++++++++++++++++++------------------- 4 files changed, 73 insertions(+), 69 deletions(-) diff --git a/Characters/Player/Player.gd b/Characters/Player/Player.gd index d724c51..b164ea8 100644 --- a/Characters/Player/Player.gd +++ b/Characters/Player/Player.gd @@ -92,9 +92,10 @@ func _ready(): Daytime.connect("respawn", self, "_on_respawn") - var player = get_node("AudioStreamPlayer3D") - player.stream = load("res://Resources/Audio/cock.wav") - player.play() + if IsOutside: + var player = get_node("AudioStreamPlayer3D") + player.stream = load("res://Resources/Audio/cock.wav") + player.play() func _physics_process(delta): diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn index 06d61f7..daee1ea 100644 --- a/Level/InFactory.tscn +++ b/Level/InFactory.tscn @@ -6,11 +6,11 @@ [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] - [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 +26,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"] @@ -206,3 +206,5 @@ transform = Transform( -7.86805e-008, 0, -2.5, 0, 1.8, 0, 1.8, 0, -1.09278e-007, [node name="Player" parent="." instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0 ) +IsOutside = false +IsInFactory = true diff --git a/Level/Labyrinth.tscn b/Level/Labyrinth.tscn index f6b21ed..c3bb560 100644 --- a/Level/Labyrinth.tscn +++ b/Level/Labyrinth.tscn @@ -59,28 +59,28 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -105, 0, 30 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75, 0, -30 ) [node name="LabyrinthCorridorTrue5" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 15 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0, 0, 15 ) [node name="LabyrinthCorridorTrue6" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -30, 0, -15 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -30, 0, -15 ) [node name="LabyrinthCorridorTrue17" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -90, 0, -15 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -90, 0, -15 ) [node name="LabyrinthCorridorTrue18" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -90, 0, 15 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -90, 0, 15 ) [node name="LabyrinthCorridorTrue8" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -30, 0, -45 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -30, 0, -45 ) [node name="LabyrinthCorridorTrue12" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -60, 0, -45 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -60, 0, -45 ) [node name="LabyrinthCorridorTrue10" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, -45 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0, 0, -45 ) [node name="LabyrinthCorridorTrue7" parent="." instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -30, 0, 15 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -30, 0, 15 ) [node name="LabyrinthCrossing" parent="." instance=ExtResource( 2 )] @@ -162,25 +162,26 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75, 0, -60 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -105, 0, -60 ) [node name="LabyrinthCorridorMasked2" parent="." instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -60, 0, 15 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -60, 0, 15 ) [node name="LabyrinthCorridorMasked3" parent="." instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -60, 0, -15 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -60, 0, -15 ) [node name="LabyrinthCorridorMasked13" parent="." instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -90, 0, -45 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -90, 0, -45 ) [node name="LabyrinthCorridorMasked8" parent="." instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, -15 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 0, 0, -15 ) [node name="Player" parent="." instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 2, 0 ) +IsOutside = false IsInLabyrinth = true [node name="OuterWalls" type="Spatial" parent="."] [node name="MeshInstance" type="MeshInstance" parent="OuterWalls"] -transform = Transform( -1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, -50, 5, 35 ) +transform = Transform( -1, -8.74228e-008, 3.82137e-015, 0, -4.37114e-008, -1, 8.74228e-008, -1, 4.37114e-008, -50, 5, 35 ) layers = 3 mesh = SubResource( 1 ) material/0 = null @@ -191,7 +192,7 @@ material/0 = null shape = SubResource( 2 ) [node name="MeshInstance2" type="MeshInstance" parent="OuterWalls"] -transform = Transform( 1, 1.74846e-07, -7.64274e-15, 0, -4.37114e-08, -1, -1.74846e-07, 1, -4.37114e-08, -50, 5, -65 ) +transform = Transform( 1, 1.74846e-007, -7.64274e-015, 0, -4.37114e-008, -1, -1.74846e-007, 1, -4.37114e-008, -50, 5, -65 ) layers = 3 mesh = SubResource( 1 ) material/0 = null @@ -202,7 +203,7 @@ material/0 = null shape = SubResource( 3 ) [node name="MeshInstance3" type="MeshInstance" parent="OuterWalls"] -transform = Transform( 1.31134e-07, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, 1.31134e-07, -5.73206e-15, 4.99999, 5, -70 ) +transform = Transform( 1.31134e-007, -1, 4.37114e-008, 0, -4.37114e-008, -1, 1, 1.31134e-007, -5.73206e-015, 4.99999, 5, -70 ) layers = 3 mesh = SubResource( 1 ) material/0 = null @@ -213,7 +214,7 @@ material/0 = null shape = SubResource( 4 ) [node name="MeshInstance4" type="MeshInstance" parent="OuterWalls"] -transform = Transform( 1.31134e-07, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, 1.31134e-07, -5.73206e-15, 4.99999, 5, 70 ) +transform = Transform( 1.31134e-007, -1, 4.37114e-008, 0, -4.37114e-008, -1, 1, 1.31134e-007, -5.73206e-015, 4.99999, 5, 70 ) layers = 3 mesh = SubResource( 1 ) material/0 = null @@ -224,7 +225,7 @@ material/0 = null shape = SubResource( 5 ) [node name="MeshInstance5" type="MeshInstance" parent="OuterWalls"] -transform = Transform( 1.31134e-07, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, 1.31134e-07, -5.73206e-15, 35, 5, -7.62939e-06 ) +transform = Transform( 1.31134e-007, -1, 4.37114e-008, 0, -4.37114e-008, -1, 1, 1.31134e-007, -5.73206e-015, 35, 5, -7.62939e-006 ) layers = 3 mesh = SubResource( 1 ) material/0 = null @@ -235,7 +236,7 @@ material/0 = null shape = SubResource( 6 ) [node name="MeshInstance8" type="MeshInstance" parent="OuterWalls"] -transform = Transform( -7.98311e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -0.49, -1.62921e-07, 7.12149e-15, -95, 5, -15 ) +transform = Transform( -7.98311e-008, 1, -4.37114e-008, 0, -4.37114e-008, -1, -0.49, -1.62921e-007, 7.12149e-015, -95, 5, -15 ) layers = 3 mesh = SubResource( 1 ) material/0 = null @@ -246,7 +247,7 @@ material/0 = null shape = SubResource( 6 ) [node name="MeshInstance6" type="MeshInstance" parent="OuterWalls"] -transform = Transform( -1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, 75, 5, 4.99999 ) +transform = Transform( -1, -8.74228e-008, 3.82137e-015, 0, -4.37114e-008, -1, 8.74228e-008, -1, 4.37114e-008, 75, 5, 4.99999 ) layers = 3 mesh = SubResource( 1 ) material/0 = null @@ -257,7 +258,7 @@ material/0 = null shape = SubResource( 7 ) [node name="MeshInstance7" type="MeshInstance" parent="OuterWalls"] -transform = Transform( 1, 1.74846e-07, -7.64274e-15, 0, -4.37114e-08, -1, -1.74846e-07, 1, -4.37114e-08, 75, 5, -5.00001 ) +transform = Transform( 1, 1.74846e-007, -7.64274e-015, 0, -4.37114e-008, -1, -1.74846e-007, 1, -4.37114e-008, 75, 5, -5.00001 ) layers = 3 mesh = SubResource( 1 ) material/0 = null diff --git a/Level/World.tscn b/Level/World.tscn index 70bde8a..cf6927f 100644 --- a/Level/World.tscn +++ b/Level/World.tscn @@ -56,29 +56,29 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 7 ) [node name="Enemies" type="Spatial" parent="."] [node name="Meldewesen2" parent="Enemies" instance=ExtResource( 2 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -3.88156, 0, 14.5424 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -3.88156, 0, 14.5424 ) _visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") [node name="Meldewesen3" parent="Enemies" instance=ExtResource( 2 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 58.4396, 0, -200.412 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 58.4396, 0, -200.412 ) _visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") [node name="Meldewesen4" parent="Enemies" instance=ExtResource( 2 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -13.0581, 0, -67.0506 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13.0581, 0, -67.0506 ) _visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") [node name="Collectibles" type="Spatial" parent="."] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 15.0831, 1.63203, 13.0809 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 ) [node name="Keycard" parent="Collectibles" groups=[ "Collectibles", ] instance=ExtResource( 2 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 203.861, -0.63203, 110.591 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 203.861, -0.63203, 110.591 ) [node name="Key" parent="Collectibles" groups=[ "Collectibles", ] instance=ExtResource( 3 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75.0183, 0, -2.86102e-06 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75.0183, 0, -2.86102e-006 ) [node name="Area" type="Area" parent="Collectibles/Key" groups=[ "Forbidden", @@ -124,7 +124,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.127018, 0, 0.00287628 ) curve = SubResource( 2 ) [node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"] -transform = Transform( 0.407644, 0.00453845, -0.913129, -0.000999918, 0.99999, 0.00452375, 0.91314, -0.000931021, 0.407643, -15.7672, 0.284373, -190.888 ) +transform = Transform( 0.938844, 0.00179193, 0.344336, -0.00172808, 0.999999, -0.000492296, -0.344337, -0.000132863, 0.938845, -15.7672, 0.284373, -190.888 ) offset = 380.29 [node name="Worker" parent="WorkerSpawner/Path/PathFollow" instance=ExtResource( 5 )] @@ -132,13 +132,13 @@ offset = 380.29 [node name="Touchables" type="Spatial" parent="."] [node name="Lever" parent="Touchables" instance=ExtResource( 6 )] -transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 5.94476, 2, 11.731 ) +transform = Transform( 1.19249e-008, 0, -1, 0, 1, 0, 1, 0, 1.19249e-008, 5.94476, 2, 11.731 ) [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] navmesh = SubResource( 3 ) [node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 7 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 13, 0, 14 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, 14 ) [node name="MeldewesenHouse" parent="NavigationMeshInstance" instance=ExtResource( 7 )] transform = Transform( 0.8, 0, 0, 0, 1, 0, 0, 0, 1, 14.9197, 0, 89.983 ) @@ -147,46 +147,46 @@ transform = Transform( 0.8, 0, 0, 0, 1, 0, 0, 0, 1, 14.9197, 0, 89.983 ) editor/display_folded = true [node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, -13 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -13 ) [node name="BuildingBlock2" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 13, 0, -13 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, -13 ) [node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 13, 0, 41 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, 41 ) [node name="BuildingBlock12" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, 14 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 14 ) [node name="BuildingBlock13" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, 41 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 41 ) [node name="BuildingBlock14" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 34, 0, 47 ) [node name="BuildingBlock15" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 41, 0, 95 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 95 ) [node name="BuildingBlock21" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 41, 0, 68 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 68 ) [node name="BuildingBlock16" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -13, 0, 68 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 68 ) [node name="BuildingBlock20" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -13, 0, 95 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 95 ) [node name="BuildingBlock17" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 8, 0, 116 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 8, 0, 116 ) [node name="BuildingBlock18" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 35, 0, 116 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 35, 0, 116 ) [node name="BuildingBlock3" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 13, 0, -40 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, -40 ) [node name="BuildingBlock4" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, -40 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -40 ) [node name="BuildingBlock5" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -88 ) @@ -195,10 +195,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -88 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -46 ) [node name="BuildingBlock9" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, -94 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -94 ) [node name="BuildingBlock24" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -13, 0, -121 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -121 ) [node name="BuildingBlock25" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -127 ) @@ -225,10 +225,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 100, 0, -211 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 73, 0, -211 ) [node name="BuildingBlock53" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 79, 0, -201.078 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -201.078 ) [node name="BuildingBlock54" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 0.6, 0, -1, 0, -4.37114e-08, 79, 4.83048, -181.541 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 0.6, 0, -1, 0, -4.37114e-008, 79, 4.83048, -181.541 ) [node name="BuildingBlock43" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46, 0, -211 ) @@ -243,19 +243,19 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0, -211 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35, 0, -211 ) [node name="BuildingBlock47" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -56, 0, -217 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -56, 0, -217 ) [node name="BuildingBlock48" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -71, 0, -217 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -71, 0, -217 ) [node name="BuildingBlock50" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -71, 0, -244 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -71, 0, -244 ) [node name="BuildingBlock51" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -92, 0, -250 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, -92, 0, -250 ) [node name="BuildingBlock52" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( 1.31134e-07, 0, 1, 0, 1, 0, -1, 0, 1.31134e-07, -113, 0, -256 ) +transform = Transform( 1.31134e-007, 0, 1, 0, 1, 0, -1, 0, 1.31134e-007, -113, 0, -256 ) [node name="BuildingBlock32" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -169 ) @@ -267,7 +267,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -19, 0, -169 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -46, 0, -169 ) [node name="BuildingBlock35" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -67, 0, -163 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -67, 0, -163 ) [node name="BuildingBlock36" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -76, 0, -142 ) @@ -276,24 +276,24 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -76, 0, -142 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -103, 0, -142 ) [node name="BuildingBlock27" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 41, 0, -148 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, -148 ) [node name="BuildingBlock28" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 79, 0, -109 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -109 ) [node name="BuildingBlock29" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 79, 0, -136 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -136 ) [node name="BuildingBlock30" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 79, 0, -163 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -163 ) [node name="BuildingBlock39" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 133, 0, -190 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 133, 0, -190 ) [node name="MeldewesenHome" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 9 )] [node name="BuildingBlock6" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 13, 0, -67 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, -67 ) [node name="BuildingBlock7" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 0, -88 ) @@ -324,7 +324,7 @@ collision_mask = 7 shape = SubResource( 5 ) [node name="DoorWall" parent="NavigationMeshInstance/Ground" instance=ExtResource( 11 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 156.062, 0, -76.2607 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 156.062, 0, -76.2607 ) [node name="Environment" type="Spatial" parent="."] @@ -332,7 +332,7 @@ transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 156.062 environment = SubResource( 7 ) [node name="DirectionalLight" type="DirectionalLight" parent="Environment"] -transform = Transform( 0.642788, -0.262003, -0.719846, -8.21505e-08, -0.939693, 0.34202, -0.766044, -0.219847, -0.604023, 0, 7, 0 ) +transform = Transform( 0.642788, -0.262003, -0.719846, -8.21505e-008, -0.939693, 0.34202, -0.766044, -0.219847, -0.604023, 0, 7, 0 ) layers = 3 shadow_enabled = true From 73515e04544506fbf733fb59cfd679736427cc3d Mon Sep 17 00:00:00 2001 From: SyntaX Date: Mon, 27 Jan 2020 14:56:54 +0100 Subject: [PATCH 02/11] cock sound only outside --- Level/InFactory.tscn | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn index daee1ea..0ee3164 100644 --- a/Level/InFactory.tscn +++ b/Level/InFactory.tscn @@ -1,10 +1,13 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=14 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] +[ext_resource path="res://Level/FactoryMusicHandler.gd" type="Script" id=6] +[ext_resource path="res://Resources/Audio/FactoryMusic/inactive.wav" type="AudioStream" id=7] +[ext_resource path="res://Resources/Audio/FactoryMusic/active.wav" type="AudioStream" id=8] [sub_resource type="BoxShape" id=1] @@ -208,3 +211,17 @@ transform = Transform( -7.86805e-008, 0, -2.5, 0, 1.8, 0, 1.8, 0, -1.09278e-007, transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0 ) IsOutside = false IsInFactory = true + +[node name="FactoryMusicHandler" type="Node" parent="."] +script = ExtResource( 6 ) +path_to_pipegame = NodePath("../Architecture/FactoryRoomInterior/PipeGame") + +[node name="InactiveMusic" type="AudioStreamPlayer" parent="FactoryMusicHandler"] +stream = ExtResource( 7 ) +bus = "Masked" + +[node name="ActiveMusic" type="AudioStreamPlayer" parent="FactoryMusicHandler"] +stream = ExtResource( 8 ) +bus = "Masked" + +[node name="TrueMusic" type="AudioStreamPlayer" parent="FactoryMusicHandler"] From f63312c7556d94297b3b42a3fb66a7d821e57d28 Mon Sep 17 00:00:00 2001 From: Leon Palluch Date: Mon, 27 Jan 2020 15:10:18 +0100 Subject: [PATCH 03/11] added secret door to factory --- Level/InFactory.tscn | 86 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 72 insertions(+), 14 deletions(-) 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"] From 7322407c1c5358073080ca06226e2fc1e762543b Mon Sep 17 00:00:00 2001 From: Leon Palluch Date: Mon, 27 Jan 2020 15:19:07 +0100 Subject: [PATCH 04/11] fucking mikey 2.0 --- Level/InFactory.tscn | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn index eeb5f2a..ff11a29 100644 --- a/Level/InFactory.tscn +++ b/Level/InFactory.tscn @@ -1,13 +1,11 @@ -[gd_scene load_steps=14 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] -[ext_resource path="res://Level/FactoryMusicHandler.gd" type="Script" id=6] -[ext_resource path="res://Resources/Audio/FactoryMusic/inactive.wav" type="AudioStream" id=7] -[ext_resource path="res://Resources/Audio/FactoryMusic/active.wav" type="AudioStream" id=8] +[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] @@ -265,19 +263,4 @@ transform = Transform( -7.86805e-008, 0, -2.5, 0, 1.8, 0, 1.8, 0, -1.09278e-007, [node name="Player" parent="." instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0 ) -IsOutside = false -IsInFactory = true - -[node name="FactoryMusicHandler" type="Node" parent="."] -script = ExtResource( 6 ) -path_to_pipegame = NodePath("../Architecture/FactoryRoomInterior/PipeGame") - -[node name="InactiveMusic" type="AudioStreamPlayer" parent="FactoryMusicHandler"] -stream = ExtResource( 7 ) -bus = "Masked" - -[node name="ActiveMusic" type="AudioStreamPlayer" parent="FactoryMusicHandler"] -stream = ExtResource( 8 ) -bus = "Masked" - -[node name="TrueMusic" type="AudioStreamPlayer" parent="FactoryMusicHandler"] +[editable path="Architecture/FactoryRoomWalls/BackWallTrue/Door"] From c0221a8259693b22be3047d77f52ed6a3e3cea19 Mon Sep 17 00:00:00 2001 From: Leon Palluch Date: Mon, 27 Jan 2020 15:21:49 +0100 Subject: [PATCH 05/11] fixed player ray cast --- Characters/Player/Player.tscn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Characters/Player/Player.tscn b/Characters/Player/Player.tscn index cb160aa..170d2e7 100644 --- a/Characters/Player/Player.tscn +++ b/Characters/Player/Player.tscn @@ -175,9 +175,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0461721, 1.84617, 0 ) script = ExtResource( 2 ) [node name="LookingAt" type="RayCast" parent="Body/PillCameras"] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 0 ) enabled = true cast_to = Vector3( 0, 0, 2 ) +collision_mask = 3 [node name="Listener" type="Listener" parent="Body/PillCameras"] current = true @@ -273,7 +274,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) script = ExtResource( 11 ) [node name="Pills" parent="PillTaker" instance=ExtResource( 12 )] -transform = Transform( 0.1, 0, 0, 0, -4.37114e-09, 0.1, 0, -0.1, -4.37114e-09, 0, 0.7, 0 ) +transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, 0.1, 0, -0.1, -4.37114e-009, 0, 0.7, 0 ) visible = false [editable path="HUD"] From f1794042439b74b7ace66b71859a444a24ff0f40 Mon Sep 17 00:00:00 2001 From: SyntaX Date: Mon, 27 Jan 2020 16:02:50 +0100 Subject: [PATCH 06/11] @Leom Ihre Bestellung bitte --- Resources/Textures/crosshair.png | Bin 438 -> 492 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/crosshair.png b/Resources/Textures/crosshair.png index 51eec67d47c469189f3c3714867495e7ec30723a..7ecb06e6f8d0e6292a728ce92fe3b316e879ced7 100644 GIT binary patch delta 445 zcmV;u0Yd(^1MCBkB#|)~e-How3lIUVBfWJ1000}A5EVQKA|f&(Gduty zA_9RxL`FnJL?H4g2t*_zB4Yc07j9D8blU0kpV?t=Z~y;p_m;rSf1C*~vU)a~Sy2=U z-Q(U?tCg`w4!J(=$+4`<^W27EP{?5-K;U}4+G4SQ(7_=NIJs+@h8&08ZpUXLP*oK% zhvV^RVHhF;H>f!o^nGvh`5f7^mJxx1W=Ca z$=EP=Z6%zakw2Qye{Q#1xn?vrI2;ack!2aXZ*rd!y^$lxHQVp^7F;eDw}_&M-B-C! ziQdQ&5>Wh(ypH48ZnxXx z8HJkh1PsY2(t46NVvxTKlHf*}@$}eiHhd-mT$_`@>2!LGGcub(OaN71jxZ4*z#cgx n`TjHc1gEAeQP=N(XA9l|F~xd3%hbXC00000NkvXXu0mjfA~?bA delta 388 zcmV-~0ek-J1GWQ@Bnkm@Qb$4nuFf3kks%v@5dZ)S5dnW>Uy%R+0ZU0lK~y+Tol~(+ zgg_L8h1gkum5Ew;7RJ9Yxk3wVPP-&qR{)N?@)m6p>NVGF>II}E9 zJydX#%X`e5c`W40t9BWTw1Jil$5s0LY1I9{!)YPwh~_654hx~?aE%>=dd;KgTbFa~$sl==fFzCjrC4mNQ)GsO-7j{k_T z#RjHg{s)r{=4Dxqn& Date: Mon, 27 Jan 2020 16:40:44 +0100 Subject: [PATCH 07/11] bugfix: hide "press e to..." after taking items --- Characters/Player/Player.gd | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Characters/Player/Player.gd b/Characters/Player/Player.gd index b164ea8..77b2650 100644 --- a/Characters/Player/Player.gd +++ b/Characters/Player/Player.gd @@ -78,6 +78,7 @@ func _ready(): _lookCast.cast_to = Vector3(0, 0, INTERACT_DISTANCE) _inventory = get_node("HUD") + assert(null != _inventory) # Set special fast time when in labyrinth if IsInLabyrinth: @@ -164,7 +165,6 @@ func process_collision_layers(): func check_interact(): if _lookCast.is_colliding(): var collider = _lookCast.get_collider() - if null != collider and collider.is_in_group("Touchables"): #show interact tooltip _labelInteract.show() @@ -181,8 +181,8 @@ func check_interact(): collider.do_interact(self) if collider.is_in_group("Collectibles"): _inventory.add_item(collider.name) - #bugfix: remove _prev_look after taken - _prev_look = null + _prev_look = null # remove after taken + _labelInteract.hide() else: #stop showing interact tooltip and disable outline _labelInteract.hide() @@ -253,14 +253,12 @@ func _on_respawn (): yield(_animationFadeOut, "animation_finished") _animationFadeOut.seek(0, true) - # reset values Daytime._set_time(0) - Logger.info("save areas: " + String(_save_areas)) - + #Logger.info("save areas: " + String(_save_areas)) if _save_areas < 1 and not IsInLabyrinth: Logger.info("reload scene") - + Pills._set_level(Pills.get_max()) get_tree().reload_current_scene() From 2779be0e0ea103c360dc90d3235505f881934097 Mon Sep 17 00:00:00 2001 From: SyntaX Date: Mon, 27 Jan 2020 16:41:33 +0100 Subject: [PATCH 08/11] #31 --- Level/OutsideWorld.tscn | 234 ++++++++++++++++++++++++++++++++++++++++ project.godot | 1 - 2 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 Level/OutsideWorld.tscn diff --git a/Level/OutsideWorld.tscn b/Level/OutsideWorld.tscn new file mode 100644 index 0000000..ab3c4fe --- /dev/null +++ b/Level/OutsideWorld.tscn @@ -0,0 +1,234 @@ +[gd_scene load_steps=23 format=2] + +[ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://Characters/Util/PathNavigatorForNPC.tscn" type="PackedScene" id=2] +[ext_resource path="res://Characters/Meldewesen/Meldewesen.tscn" type="PackedScene" id=3] +[ext_resource path="res://Resources/Audio/Ambience/masked_ambience.wav" type="AudioStream" id=4] +[ext_resource path="res://Resources/Audio/Ambience/melody.wav" type="AudioStream" id=5] +[ext_resource path="res://Resources/Audio/Ambience/true_ambience.wav" type="AudioStream" id=6] +[ext_resource path="res://Level/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=7] +[ext_resource path="res://Level/WorkerSpawner.gd" type="Script" id=8] +[ext_resource path="res://Level/Interactables/Lever/Lever.tscn" type="PackedScene" id=9] +[ext_resource path="res://Level/Buildings/PlayerHouse.tscn" type="PackedScene" id=10] +[ext_resource path="res://Level/Buildings/Factory.tscn" type="PackedScene" id=11] +[ext_resource path="res://Level/Buildings/DoorWall.tscn" type="PackedScene" id=12] +[ext_resource path="res://Level/Buildings/BuildingBlock.tscn" type="PackedScene" id=13] +[ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=14] + +[sub_resource type="Curve3D" id=1] +_data = { +"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, 2.77093, 0, 97.8557, 0, 0, 0, 0, 0, 0, 26.9732, -0.000976562, 98.019, 0, 0, 0, 0, 0, 0, 26.5524, -0.0141602, 64.329, 0, 0, 0, 0, 0, 0, 3.05817, 0, 64.3674 ), +"tilts": PoolRealArray( 0, 0, 0, 0 ) +} + +[sub_resource type="BoxShape" id=2] + +[sub_resource type="Curve3D" id=3] +_data = { +"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, -0.034779, 0, 51.8864, 0, 0, 0, 0, 0, 0, 2.70523, 0, -110.822, 0, 0, 0, 0, 0, 0, 60.8221, 0, -111.624, 0, 0, 0, 0, 0, 0, 63.3144, 0, -190.601, 0, 0, 0, 0, 0, 0, -145.322, 0.750244, -191.357 ), +"tilts": PoolRealArray( 0, 0, 0, 0, 0 ) +} + +[sub_resource type="NavigationMesh" id=4] +vertices = PoolVector3Array( -33.5588, 0.2, -114.639, -24.2588, 0.2, -109.239, -24.2588, 0.2, -114.039, -227.959, 0.2, -264.939, -235.459, 0.2, -264.939, -235.459, 0.2, -253.839, -33.5588, 0.2, -114.639, -24.2588, 0.2, -114.039, -21.8588, 0.2, -123.639, -220.459, 0.2, -264.939, -227.959, 0.2, -264.939, -235.459, 0.2, -253.839, -41.6588, 0.2, -116.739, -33.5588, 0.2, -114.639, -21.8588, 0.2, -123.639, -16.1588, 0.2, -133.239, -212.959, 0.2, -264.939, -220.459, 0.2, -264.939, -235.459, 0.2, -253.839, -5.05879, 0.2, -142.539, -84.5588, 0.2, -264.939, -92.0588, 0.2, -264.939, -212.959, 0.2, -264.939, -235.459, 0.2, -253.839, -235.459, 0.2, -242.439, -205.459, 0.2, -264.939, -107.059, 0.2, -264.939, -114.559, 0.2, -264.939, -235.459, 0.2, -186.339, -235.459, 0.2, -174.939, -41.6588, 0.2, -116.739, -16.1588, 0.2, -133.239, -10.4588, 0.2, -138.939, -52.4588, 0.2, -116.739, -197.959, 0.2, -264.939, -205.459, 0.2, -264.939, -235.459, 0.2, -242.439, -235.459, 0.2, -96.3387, -235.459, 0.2, -84.9387, -83.9588, 0.2, -84.3387, -190.459, 0.2, -264.939, -197.959, 0.2, -264.939, -235.459, 0.2, -242.439, -52.4588, 0.2, -116.739, -10.4588, 0.2, -138.939, -5.05879, 0.2, -142.539, -92.0588, 0.2, -264.939, -99.5588, 0.2, -264.939, -61.1588, 0.2, -114.339, -190.459, 0.2, -264.939, -235.459, 0.2, -242.439, -235.459, 0.2, -231.339, -182.959, 0.2, -264.939, -235.459, 0.2, -107.439, -83.9588, 0.2, -84.3387, -81.5588, 0.2, -93.9387, -235.459, 0.2, -118.839, -235.459, 0.2, -107.439, -235.459, 0.2, -96.3387, -83.9588, 0.2, -84.3387, -175.159, 0.2, -264.939, -182.959, 0.2, -264.939, -235.459, 0.2, -231.339, -175.159, 0.2, -264.939, -235.459, 0.2, -231.339, -235.459, 0.2, -219.939, -167.659, 0.2, -264.939, -107.059, 0.2, -264.939, -235.459, 0.2, -174.939, -235.459, 0.2, -163.839, -160.159, 0.2, -264.939, -167.659, 0.2, -264.939, -235.459, 0.2, -219.939, -160.159, 0.2, -264.939, -235.459, 0.2, -219.939, -235.459, 0.2, -208.839, -152.659, 0.2, -264.939, -235.459, 0.2, -141.339, -81.5588, 0.2, -93.9387, -76.4588, 0.2, -102.639, -235.459, 0.2, -152.439, -144.859, 0.2, -264.939, -152.659, 0.2, -264.939, -235.459, 0.2, -208.839, -144.859, 0.2, -264.939, -235.459, 0.2, -208.839, -235.459, 0.2, -197.439, -137.359, 0.2, -264.939, 6.94121, 0.2, -146.439, 6.3412, 0.2, -264.939, -1.4588, 0.2, -264.939, -235.459, 0.2, -141.339, -235.459, 0.2, -129.939, -81.5588, 0.2, -93.9387, 1.8412, 0.2, -145.539, 6.94121, 0.2, -146.439, -1.4588, 0.2, -264.939, -8.9588, 0.2, -264.939, -61.1588, 0.2, -114.339, -99.5588, 0.2, -264.939, -107.059, 0.2, -264.939, -69.8588, 0.2, -109.239, 1.8412, 0.2, -145.539, -8.9588, 0.2, -264.939, -16.4588, 0.2, -264.939, 1.8412, 0.2, -145.539, -16.4588, 0.2, -264.939, -23.9588, 0.2, -264.939, -5.05879, 0.2, -142.539, 1.8412, 0.2, -145.539, -23.9588, 0.2, -264.939, -31.7588, 0.2, -264.939, -235.459, 0.2, -129.939, -235.459, 0.2, -118.839, -81.5588, 0.2, -93.9387, -129.859, 0.2, -264.939, -137.359, 0.2, -264.939, -235.459, 0.2, -197.439, -5.05879, 0.2, -142.539, -31.7588, 0.2, -264.939, -39.2588, 0.2, -264.939, -5.05879, 0.2, -142.539, -39.2588, 0.2, -264.939, -46.7588, 0.2, -264.939, -129.859, 0.2, -264.939, -235.459, 0.2, -197.439, -235.459, 0.2, -186.339, -122.359, 0.2, -264.939, -5.05879, 0.2, -142.539, -46.7588, 0.2, -264.939, -54.2588, 0.2, -264.939, -5.05879, 0.2, -142.539, -54.2588, 0.2, -264.939, -62.0588, 0.2, -264.939, -76.4588, 0.2, -102.639, -69.8588, 0.2, -109.239, -107.059, 0.2, -264.939, -235.459, 0.2, -163.839, -235.459, 0.2, -152.439, -5.05879, 0.2, -142.539, -62.0588, 0.2, -264.939, -69.5588, 0.2, -264.939, -5.05879, 0.2, -142.539, -69.5588, 0.2, -264.939, -77.0588, 0.2, -264.939, -114.559, 0.2, -264.939, -122.359, 0.2, -264.939, -235.459, 0.2, -186.339, -5.05879, 0.2, -142.539, -77.0588, 0.2, -264.939, -84.5588, 0.2, -264.939, 63.9412, 0.2, -167.139, 69.9412, 0.2, -172.839, 69.3412, 0.2, -181.239, 63.9412, 0.2, -167.139, 69.3412, 0.2, -181.239, 69.6412, 0.2, -191.139, 31.2412, 0.2, -142.239, 35.7412, 0.2, -138.939, 63.9412, 0.2, -167.139, 23.7412, 0.2, -145.539, 31.2412, 0.2, -142.239, 63.9412, 0.2, -167.139, 15.3412, 0.2, -147.039, 23.7412, 0.2, -145.539, 63.9412, 0.2, -167.139, 6.94121, 0.2, -146.439, 15.3412, 0.2, -147.039, 63.9412, 0.2, -167.139, 69.6412, 0.2, -191.139, 14.4412, 0.2, -264.939, 6.3412, 0.2, -264.939, 70.8412, 0.2, -192.639, 72.3412, 0.2, -192.939, 72.3412, 0.2, -264.939, 63.9412, 0.2, -264.939, 69.6412, 0.2, -191.139, 30.9412, 0.2, -264.939, 22.8412, 0.2, -264.939, 70.8412, 0.2, -192.639, 63.9412, 0.2, -264.939, 55.8412, 0.2, -264.939, 69.6412, 0.2, -191.139, 70.8412, 0.2, -192.639, 55.8412, 0.2, -264.939, 47.4412, 0.2, -264.939, 69.6412, 0.2, -191.139, 39.3412, 0.2, -264.939, 30.9412, 0.2, -264.939, 69.6412, 0.2, -191.139, 22.8412, 0.2, -264.939, 14.4412, 0.2, -264.939, 69.6412, 0.2, -191.139, 47.4412, 0.2, -264.939, 39.3412, 0.2, -264.939, 260.441, 0.2, -253.839, 260.441, 0.2, -264.939, 248.441, 0.2, -264.939, 260.441, 0.2, -242.739, 260.441, 0.2, -253.839, 248.441, 0.2, -264.939, 260.441, 0.2, -242.739, 248.441, 0.2, -264.939, 236.741, 0.2, -264.939, 260.441, 0.2, -231.639, 260.441, 0.2, -186.939, 189.641, 0.2, -264.939, 177.941, 0.2, -264.939, 260.441, 0.2, -175.539, 260.441, 0.2, -231.639, 236.741, 0.2, -264.939, 225.041, 0.2, -264.939, 260.441, 0.2, -220.239, 73.5412, 0.2, -171.639, 72.3412, 0.2, -171.339, 72.3412, 0.2, -117.039, 80.4412, 0.2, -116.439, 108.041, 0.2, -92.4387, 260.441, 0.2, -108.639, 260.441, 0.2, -119.739, 74.7412, 0.2, -173.139, 73.5412, 0.2, -171.639, 80.4412, 0.2, -116.439, 86.4412, 0.2, -114.639, 166.241, 0.2, -264.939, 154.241, 0.2, -264.939, 74.7412, 0.2, -191.139, 177.941, 0.2, -264.939, 166.241, 0.2, -264.939, 74.7412, 0.2, -191.139, 108.041, 0.2, -92.4387, 260.441, 0.2, -130.839, 260.441, 0.2, -142.239, 74.7412, 0.2, -173.139, 86.4412, 0.2, -114.639, 93.3412, 0.2, -111.039, 260.441, 0.2, -220.239, 225.041, 0.2, -264.939, 213.341, 0.2, -264.939, 260.441, 0.2, -209.139, 74.7412, 0.2, -173.139, 93.3412, 0.2, -111.039, 97.2412, 0.2, -108.039, 72.3412, 0.2, -264.939, 72.3412, 0.2, -192.939, 73.5412, 0.2, -192.639, 84.0412, 0.2, -264.939, 260.441, 0.2, -164.439, 260.441, 0.2, -175.539, 177.941, 0.2, -264.939, 260.441, 0.2, -153.339, 260.441, 0.2, -164.439, 177.941, 0.2, -264.939, 74.7412, 0.2, -173.139, 97.2412, 0.2, -108.039, 101.141, 0.2, -104.139, 84.0412, 0.2, -264.939, 73.5412, 0.2, -192.639, 74.7412, 0.2, -191.139, 95.7412, 0.2, -264.939, 260.441, 0.2, -142.239, 260.441, 0.2, -153.339, 177.941, 0.2, -264.939, 74.7412, 0.2, -173.139, 101.141, 0.2, -104.139, 105.041, 0.2, -98.7387, 107.441, 0.2, -264.939, 95.7412, 0.2, -264.939, 74.7412, 0.2, -191.139, 260.441, 0.2, -209.139, 213.341, 0.2, -264.939, 201.341, 0.2, -264.939, 260.441, 0.2, -198.039, 119.141, 0.2, -264.939, 107.441, 0.2, -264.939, 74.7412, 0.2, -191.139, 74.7412, 0.2, -173.139, 105.041, 0.2, -98.7387, 108.041, 0.2, -92.4387, 74.7412, 0.2, -181.839, 109.541, 0.2, -85.5387, 260.441, 0.2, -86.1387, 260.441, 0.2, -97.5387, 130.841, 0.2, -264.939, 119.141, 0.2, -264.939, 74.7412, 0.2, -191.139, 108.041, 0.2, -92.4387, 109.541, 0.2, -85.5387, 260.441, 0.2, -97.5387, 260.441, 0.2, -108.639, 260.441, 0.2, -198.039, 201.341, 0.2, -264.939, 189.641, 0.2, -264.939, 260.441, 0.2, -186.939, 142.541, 0.2, -264.939, 130.841, 0.2, -264.939, 74.7412, 0.2, -191.139, 74.7412, 0.2, -191.139, 74.7412, 0.2, -181.839, 108.041, 0.2, -92.4387, 108.041, 0.2, -92.4387, 260.441, 0.2, -119.739, 260.441, 0.2, -130.839, 154.241, 0.2, -264.939, 142.541, 0.2, -264.939, 74.7412, 0.2, -191.139, 49.8412, 0.2, -114.339, 49.8412, 0.2, -108.939, 54.0412, 0.2, -111.939, 70.8412, 0.2, -171.639, 69.9412, 0.2, -172.839, 63.9412, 0.2, -167.139, 72.3412, 0.2, -171.339, 70.8412, 0.2, -171.639, 63.9412, 0.2, -167.139, 39.6412, 0.2, -135.339, 43.8412, 0.2, -130.539, 72.3412, 0.2, -117.039, 49.8412, 0.2, -114.339, 54.0412, 0.2, -111.939, 60.3412, 0.2, -114.939, 48.0412, 0.2, -122.139, 49.8412, 0.2, -114.339, 60.3412, 0.2, -114.939, 65.7412, 0.2, -116.439, 48.0412, 0.2, -122.139, 65.7412, 0.2, -116.439, 72.3412, 0.2, -117.039, 43.8412, 0.2, -130.539, 35.7412, 0.2, -138.939, 39.6412, 0.2, -135.339, 63.9412, 0.2, -167.139, 43.5412, 0.4, -102.639, 44.7412, 0.4, -103.539, 45.3412, 0.4, -109.239, -11.6588, 0.4, -91.5387, -10.7588, 0.4, -87.3387, -7.1588, 0.4, -84.0387, 29.1412, 0.4, -81.6387, 33.9412, 0.4, -84.9387, 36.6412, 0.4, -87.6387, 38.4412, 0.4, -93.9387, 37.8412, 0.4, -130.839, 33.6412, 0.4, -135.039, 29.7412, 0.4, -137.739, -0.558792, 0.4, -80.1387, 3.6412, 0.4, -78.6387, 10.2412, 0.4, -77.4387, 15.3412, 0.4, -77.4387, 21.9412, 0.4, -78.6387, 29.1412, 0.4, -81.6387, -3.55879, 0.4, -138.039, -8.3588, 0.4, -134.739, -12.2588, 0.4, -130.839, 38.4412, 0.4, -93.9387, 40.5412, 0.4, -98.1387, 45.3412, 0.4, -109.239, 29.1412, 0.4, -81.6387, 40.5412, 0.4, -98.1387, 43.5412, 0.4, -102.639, 45.3412, 0.4, -109.239, -15.8588, 0.4, -125.439, -18.2588, 0.4, -119.439, -19.4588, 0.4, -113.739, -19.1588, 0.4, -104.139, -14.6588, 0.4, -98.1387, 21.9412, 0.4, -141.039, 15.9412, 0.4, -142.239, 9.6412, 0.4, -142.239, 43.8412, 0.4, -119.739, 41.1412, 0.4, -126.039, 37.8412, 0.4, -130.839, 29.7412, 0.4, -137.739, 21.9412, 0.4, -141.039, 45.3412, 0.4, -109.239, 9.6412, 0.4, -142.239, 3.6412, 0.4, -141.039, -3.55879, 0.4, -138.039, -12.2588, 0.4, -130.839, -15.8588, 0.4, -125.439, 21.9412, 0.4, -141.039, -14.6588, 0.4, -98.1387, -0.558792, 0.4, -80.1387, 29.1412, 0.4, -81.6387, 45.3412, 0.4, -109.239, 21.9412, 0.4, -141.039, -15.8588, 0.4, -125.439, -11.6588, 0.4, -91.5387, -7.1588, 0.4, -84.0387, -0.558792, 0.4, -80.1387, -14.6588, 0.4, -98.1387, 30.3412, 100.4, -114.939, 28.8412, 100.4, -118.839, 27.0412, 100.4, -121.539, 22.5412, 100.4, -125.439, 0.941208, 100.4, -123.939, -2.05879, 100.4, -120.639, -3.8588, 100.4, -117.339, 7.2412, 100.4, -127.239, 10.5412, 100.4, -91.8387, 15.3412, 100.4, -91.8387, 19.2412, 100.4, -92.7387, 3.6412, 100.4, -93.9387, -3.8588, 100.4, -102.339, -1.1588, 100.4, -97.8387, 3.6412, 100.4, -93.9387, -3.8588, 100.4, -117.339, -5.3588, 100.4, -110.139, 19.2412, 100.4, -92.7387, 24.6412, 100.4, -95.7387, 28.8412, 100.4, -100.839, 30.9412, 100.4, -108.339, 30.3412, 100.4, -114.939, 22.5412, 100.4, -125.439, 15.3412, 100.4, -127.839, 7.2412, 100.4, -127.239, 30.3412, 100.4, -114.939, 22.5412, 100.4, -125.439, 7.2412, 100.4, -127.239, -3.8588, 100.4, -117.339, 3.6412, 100.4, -93.9387, 19.2412, 100.4, -92.7387, -14.6588, 0.4, -82.8387, -15.2588, 0.4, -85.8387, -18.8588, 0.4, -90.3387, -22.7588, 0.4, -98.7387, -23.3588, 0.4, -102.339, -27.8588, 0.4, -106.239, -73.4588, 0.4, -99.0387, -76.1588, 0.4, -94.5387, -77.9588, 0.4, -90.0387, -58.1588, 0.4, -110.439, -62.9588, 0.4, -108.339, -69.2588, 0.4, -103.839, -27.8588, 0.4, -106.239, -32.9588, 0.4, -109.239, -37.7588, 0.4, -111.039, -36.8588, 0.4, -48.9387, -31.7588, 0.4, -51.0387, -26.6588, 0.4, -54.3387, -21.5588, 0.4, -59.4387, -18.5588, 0.4, -63.9387, -16.1588, 0.4, -69.6387, -37.7588, 0.4, -111.039, -44.0588, 0.4, -112.239, -50.0588, 0.4, -112.239, -18.8588, 0.4, -90.3387, -21.2588, 0.4, -94.8387, -27.8588, 0.4, -106.239, -37.7588, 0.4, -111.039, -50.0588, 0.4, -112.239, -58.1588, 0.4, -110.439, -79.4588, 0.4, -82.5387, -79.4588, 0.4, -77.1387, -77.9588, 0.4, -69.6387, -77.9588, 0.4, -90.0387, -57.2588, 0.4, -48.9387, -49.7588, 0.4, -47.4387, -44.3588, 0.4, -47.4387, -36.8588, 0.4, -48.9387, -21.2588, 0.4, -94.8387, -22.7588, 0.4, -98.7387, -27.8588, 0.4, -106.239, -16.1588, 0.4, -69.6387, -14.6588, 0.4, -76.8387, -14.6588, 0.4, -82.8387, -77.9588, 0.4, -69.6387, -75.8588, 0.4, -64.5387, -70.7588, 0.4, -57.3387, -62.3588, 0.4, -51.0387, -57.2588, 0.4, -48.9387, -58.1588, 0.4, -110.439, -77.9588, 0.4, -90.0387, -77.9588, 0.4, -69.6387, -57.2588, 0.4, -48.9387, -36.8588, 0.4, -48.9387, -18.8588, 0.4, -90.3387, -36.8588, 0.4, -48.9387, -26.6588, 0.4, -54.3387, -21.5588, 0.4, -59.4387, -16.1588, 0.4, -69.6387, -14.6588, 0.4, -82.8387, -18.8588, 0.4, -90.3387, 50.7412, 0.4, -103.839, 48.9412, 0.4, -102.039, 47.4412, 0.4, -96.0387, 61.8412, 0.4, -110.439, 57.0412, 0.4, -108.339, 41.1412, 0.4, -86.1387, 40.5412, 0.4, -82.5387, 40.5412, 0.4, -77.1387, 45.0412, 0.4, -91.2387, 101.441, 0.4, -95.7387, 98.4412, 0.4, -100.239, 95.1412, 0.4, -103.839, 105.341, 0.4, -76.8387, 105.341, 0.4, -82.8387, 104.141, 0.4, -89.1387, 83.1412, 0.4, -48.9387, 88.2412, 0.4, -51.0387, 93.3412, 0.4, -54.3387, 98.4412, 0.4, -59.4387, 103.841, 0.4, -69.6387, 105.341, 0.4, -76.8387, 98.4412, 0.4, -59.4387, 101.441, 0.4, -63.9387, 103.841, 0.4, -69.6387, 95.1412, 0.4, -103.839, 61.8412, 0.4, -110.439, 47.4412, 0.4, -96.0387, 49.2412, 0.4, -57.3387, 83.1412, 0.4, -48.9387, 105.341, 0.4, -76.8387, 82.2412, 0.4, -111.039, 75.9412, 0.4, -112.239, 69.9412, 0.4, -112.239, 61.8412, 0.4, -110.439, 95.1412, 0.4, -103.839, 88.8412, 0.4, -108.339, 40.5412, 0.4, -77.1387, 42.0412, 0.4, -69.6387, 44.1412, 0.4, -64.5387, 49.2412, 0.4, -57.3387, 47.4412, 0.4, -96.0387, 45.0412, 0.4, -91.2387, 62.7412, 0.4, -48.9387, 70.2412, 0.4, -47.4387, 75.6412, 0.4, -47.4387, 83.1412, 0.4, -48.9387, 49.2412, 0.4, -57.3387, 57.6412, 0.4, -51.0387, -34.1588, 100.4, -66.6387, -31.7588, 100.4, -69.6387, -30.2588, 100.4, -72.6387, -42.8588, 100.4, -62.1387, -36.8588, 100.4, -64.5387, -36.8588, 100.4, -95.1387, -39.8588, 100.4, -96.6387, -44.3588, 100.4, -97.8387, -49.7588, 100.4, -97.8387, -52.4588, 100.4, -97.2387, -52.4588, 100.4, -97.2387, -62.3588, 100.4, -90.0387, -64.4588, 100.4, -74.4387, -42.8588, 100.4, -62.1387, -30.2588, 100.4, -72.6387, -36.8588, 100.4, -95.1387, -62.3588, 100.4, -90.0387, -63.8588, 100.4, -87.0387, -65.0588, 100.4, -82.2387, -64.4588, 100.4, -74.4387, -64.4588, 100.4, -74.4387, -61.4588, 100.4, -68.4387, -56.6588, 100.4, -64.2387, -49.4588, 100.4, -61.8387, -42.8588, 100.4, -62.1387, -30.2588, 100.4, -72.6387, -29.0588, 100.4, -77.1387, -29.3588, 100.4, -84.0387, -32.3588, 100.4, -90.9387, -36.8588, 100.4, -95.1387, -52.4588, 100.4, -97.2387, -58.4588, 100.4, -94.2387, -62.3588, 100.4, -90.0387, 85.8412, 100.4, -66.6387, 88.2412, 100.4, -69.6387, 89.7412, 100.4, -72.6387, 77.1412, 100.4, -62.1387, 83.1412, 100.4, -64.5387, 83.1412, 100.4, -95.1387, 80.1412, 100.4, -96.6387, 75.6412, 100.4, -97.8387, 70.2412, 100.4, -97.8387, 67.5412, 100.4, -97.2387, 67.5412, 100.4, -97.2387, 57.6412, 100.4, -90.0387, 55.5412, 100.4, -74.4387, 77.1412, 100.4, -62.1387, 89.7412, 100.4, -72.6387, 83.1412, 100.4, -95.1387, 57.6412, 100.4, -90.0387, 56.1412, 100.4, -87.0387, 54.9412, 100.4, -82.2387, 55.5412, 100.4, -74.4387, 55.5412, 100.4, -74.4387, 58.5412, 100.4, -68.4387, 63.3412, 100.4, -64.2387, 70.5412, 100.4, -61.8387, 77.1412, 100.4, -62.1387, 89.7412, 100.4, -72.6387, 90.9412, 100.4, -77.1387, 90.6412, 100.4, -84.0387, 87.6412, 100.4, -90.9387, 83.1412, 100.4, -95.1387, 67.5412, 100.4, -97.2387, 61.5412, 100.4, -94.2387, 57.6412, 100.4, -90.0387, 260.441, 0.2, -86.1387, 109.541, 0.2, -85.5387, 110.141, 0.2, -82.2387, 260.441, 0.2, -79.8387, 110.141, 0.2, -82.2387, 109.541, 0.2, -74.1387, 260.441, 0.2, -73.5387, 260.441, 0.2, -79.8387, -94.7588, 0.2, -20.7387, -74.6588, 0.2, -55.2387, -79.4588, 0.2, -61.5387, -105.259, 0.2, -21.0387, -235.459, 0.2, -51.0387, -235.459, 0.2, -42.6387, -117.859, 0.2, -19.2387, -105.259, 0.2, -21.0387, -79.4588, 0.2, -61.5387, -82.7588, 0.2, -69.0387, -116.059, 0.2, -21.0387, -235.459, 0.2, -59.7387, -235.459, 0.2, -51.0387, -117.859, 0.2, -19.2387, -117.859, 0.2, -19.2387, -116.059, 0.2, -21.0387, -82.7588, 0.2, -69.0387, -84.2588, 0.2, -78.0387, -235.459, 0.2, -68.1387, -235.459, 0.2, -59.7387, -117.859, 0.2, -19.2387, -117.859, 0.2, -19.2387, -84.2588, 0.2, -78.0387, -83.9588, 0.2, -84.3387, -235.459, 0.2, -84.9387, -235.459, 0.2, -76.5387, -235.459, 0.2, -16.8387, -117.859, 0.2, -16.8387, -117.859, 0.2, -19.2387, -235.459, 0.2, -25.5387, -235.459, 0.2, -76.5387, -235.459, 0.2, -68.1387, -117.859, 0.2, -19.2387, -235.459, 0.2, -33.9387, -235.459, 0.2, -25.5387, -117.859, 0.2, -19.2387, -235.459, 0.2, -42.6387, -235.459, 0.2, -33.9387, -117.859, 0.2, -19.2387, 30.6412, 0.2, -77.1387, 26.1412, 0.2, -75.3387, 26.4412, 0.2, -73.8387, 36.3412, 0.2, -72.6387, 35.7412, 0.2, -80.7387, 30.6412, 0.2, -77.1387, 30.6412, 0.2, -77.1387, 26.4412, 0.2, -73.8387, 24.9412, 0.2, -72.3387, 33.6412, 0.2, -55.2387, 45.3412, 0.2, -55.2387, 41.4412, 0.2, -60.0387, 36.3412, 0.2, -72.6387, 30.6412, 0.2, -77.1387, 24.9412, 0.2, -72.3387, 32.1412, 0.2, -53.7387, 33.6412, 0.2, -55.2387, 38.4412, 0.2, -65.7387, 33.6412, 0.2, -55.2387, 41.4412, 0.2, -60.0387, 38.4412, 0.2, -65.7387, -15.8588, 0.2, -59.4387, -19.1588, 0.2, -55.8387, -19.1588, 0.2, -55.2387, -12.5588, 0.2, -55.2387, -4.4588, 0.2, -76.8387, -10.1588, 0.2, -74.4387, -11.9588, 0.2, -67.2387, -5.6588, 0.2, -55.2387, -4.1588, 0.2, -53.7387, 3.0412, 0.2, -72.6387, -4.4588, 0.2, -76.8387, -9.8588, 0.2, -80.4387, -10.1588, 0.2, -74.4387, 3.0412, 0.2, -72.6387, 1.2412, 0.2, -74.7387, -4.4588, 0.2, -76.8387, -15.8588, 0.2, -59.4387, -12.5588, 0.2, -55.2387, -5.6588, 0.2, -55.2387, -11.9588, 0.2, -67.2387, 58.8412, 0.2, -45.3387, 50.1412, 0.2, -50.4387, 50.1412, 0.2, -44.1387, 58.8412, 0.2, -45.3387, 50.1412, 0.2, -44.1387, 50.1412, 0.2, -37.8387, 58.8412, 0.2, -45.3387, 50.1412, 0.2, -37.8387, 50.1412, 0.2, -31.5387, 67.8412, 0.2, -42.9387, 58.8412, 0.2, -45.3387, 50.1412, 0.2, -31.5387, 50.1412, 0.2, -24.9387, 45.9412, 0.2, 2.36133, 45.9412, 0.2, 25.7613, 48.3412, 0.2, 25.7613, 48.3412, 0.2, 2.36133, 260.441, 0.2, 29.0613, 260.441, 0.2, 17.6613, 102.341, 0.2, -57.0387, 260.441, 0.2, 17.6613, 260.441, 0.2, 6.26132, 102.341, 0.2, -57.0387, 50.1412, 0.2, 0.56131, 48.3412, 0.2, 2.36133, 48.3412, 0.2, 25.7613, 50.1412, 0.2, 0.56131, 48.3412, 0.2, 25.7613, 50.1412, 0.2, 27.5613, 102.341, 0.2, -57.0387, 95.7412, 0.2, -50.4387, 67.8412, 0.2, -42.9387, 50.1412, 0.2, -24.9387, 50.1412, 0.2, -18.6387, 67.8412, 0.2, -42.9387, 50.1412, 0.2, -18.6387, 50.1412, 0.2, -12.3387, 67.8412, 0.2, -42.9387, 50.1412, 0.2, -12.3387, 50.1412, 0.2, -6.0387, 78.0412, 0.2, -42.9387, 260.441, 0.2, 51.8613, 260.441, 0.2, 40.4613, 102.341, 0.2, -57.0387, 78.0412, 0.2, -42.9387, 50.1412, 0.2, -6.0387, 50.1412, 0.2, 0.56131, 87.0412, 0.2, -45.3387, 260.441, 0.2, 63.2613, 260.441, 0.2, 51.8613, 102.341, 0.2, -57.0387, 95.7412, 0.2, -50.4387, 87.0412, 0.2, -45.3387, 50.1412, 0.2, 0.56131, 260.441, 0.2, 40.4613, 260.441, 0.2, 29.0613, 102.341, 0.2, -57.0387, 260.441, 0.2, 74.6613, 260.441, 0.2, 63.2613, 102.341, 0.2, -57.0387, 102.341, 0.2, -57.0387, 50.1412, 0.2, 27.5613, 50.1412, 0.2, 37.7613, 102.341, 0.2, -57.0387, 50.1412, 0.2, 37.7613, 50.1412, 0.2, 47.9613, 102.341, 0.2, -57.0387, 50.1412, 0.2, 47.9613, 50.1412, 0.2, 58.1613, 102.341, 0.2, -57.0387, 50.1412, 0.2, 58.1613, 50.1412, 0.2, 68.6613, 102.341, 0.2, -57.0387, 50.1412, 0.2, 68.6613, 50.1412, 0.2, 78.8613, 260.441, 0.2, -62.1387, 260.441, 0.2, -73.5387, 109.541, 0.2, -74.1387, 260.441, 0.2, -50.7387, 260.441, 0.2, -62.1387, 109.541, 0.2, -74.1387, 260.441, 0.2, -50.7387, 109.541, 0.2, -74.1387, 107.441, 0.2, -65.7387, 260.441, 0.2, -39.3387, 102.341, 0.2, -57.0387, 50.1412, 0.2, 78.8613, 50.1412, 0.2, 89.0613, 49.8412, 0.2, 109.161, 260.441, 0.2, 109.161, 260.441, 0.2, 97.4613, 260.441, 0.2, -27.9387, 260.441, 0.2, -39.3387, 107.441, 0.2, -65.7387, 260.441, 0.2, -16.5387, 260.441, 0.2, -27.9387, 107.441, 0.2, -65.7387, 260.441, 0.2, -16.5387, 107.441, 0.2, -65.7387, 102.341, 0.2, -57.0387, 260.441, 0.2, -5.13867, 102.341, 0.2, -57.0387, 50.1412, 0.2, 89.0613, 50.1412, 0.2, 99.2613, 49.8412, 0.2, 109.161, 260.441, 0.2, 97.4613, 260.441, 0.2, 86.0613, 260.441, 0.2, 6.26132, 260.441, 0.2, -5.13867, 102.341, 0.2, -57.0387, 102.341, 0.2, -57.0387, 50.1412, 0.2, 99.2613, 49.8412, 0.2, 109.161, 260.441, 0.2, 86.0613, 260.441, 0.2, 74.6613, 13.2412, 0.2, -72.0387, 3.0412, 0.2, -72.6387, -4.1588, 0.2, -53.7387, -3.8588, 0.2, -47.1387, 31.8412, 0.2, -47.1387, 32.1412, 0.2, -53.7387, 24.9412, 0.2, -72.3387, -3.8588, 0.2, -19.5387, -3.8588, 0.2, -12.6387, 31.8412, 0.2, -12.6387, 31.8412, 0.2, -19.5387, 31.8412, 0.2, -47.1387, 24.9412, 0.2, -72.3387, 13.2412, 0.2, -72.0387, -3.8588, 0.2, -47.1387, -3.8588, 0.2, -40.2387, 31.8412, 0.2, -40.2387, 31.8412, 0.2, -26.4387, 31.8412, 0.2, -33.3387, -3.8588, 0.2, -33.3387, -3.8588, 0.2, -26.4387, -3.8588, 0.2, 1.16132, 32.1412, 0.2, 1.16132, 31.8412, 0.2, -5.73868, -3.8588, 0.2, -5.73868, -3.8588, 0.2, -26.4387, -3.8588, 0.2, -19.5387, 31.8412, 0.2, -19.5387, 31.8412, 0.2, -26.4387, -3.8588, 0.2, -12.6387, -3.8588, 0.2, -5.73868, 31.8412, 0.2, -5.73868, 31.8412, 0.2, -12.6387, 31.8412, 0.2, -33.3387, 31.8412, 0.2, -40.2387, -3.8588, 0.2, -40.2387, -3.8588, 0.2, -33.3387, -71.9588, 0.2, -52.2387, -74.6588, 0.2, -55.2387, -94.7588, 0.2, -20.7387, -93.5588, 0.2, -19.5387, -67.4588, 0.2, -48.9387, -71.9588, 0.2, -52.2387, -94.7588, 0.2, -20.7387, -22.1588, 0.2, -45.0387, -22.1588, 0.2, -52.2387, -26.6588, 0.2, -48.6387, -22.1588, 0.2, -45.0387, -26.6588, 0.2, -48.6387, -32.9588, 0.2, -45.3387, -22.1588, 0.2, -37.8387, -57.8588, 0.2, -44.1387, -93.2588, 0.2, -6.93869, -93.2588, 0.2, -0.638672, -22.1588, 0.2, -30.6387, -22.1588, 0.2, -37.8387, -32.9588, 0.2, -45.3387, -39.8588, 0.2, -43.2387, -57.8588, 0.2, -44.1387, -93.2588, 0.2, -0.638672, -93.2588, 0.2, 5.9613, -22.1588, 0.2, 6.26132, -22.1588, 0.2, -1.23868, -22.1588, 0.2, -30.6387, -39.8588, 0.2, -43.2387, -45.2588, 0.2, -42.6387, -22.1588, 0.2, -23.1387, -57.8588, 0.2, -44.1387, -93.2588, 0.2, -13.5387, -93.2588, 0.2, -6.93869, -22.1588, 0.2, -15.9387, -22.1588, 0.2, -23.1387, -45.2588, 0.2, -42.6387, -52.1588, 0.2, -42.9387, -65.3588, 0.2, -47.4387, -67.4588, 0.2, -48.9387, -93.5588, 0.2, -19.5387, -22.1588, 0.2, -1.23868, -22.1588, 0.2, -8.43869, -57.8588, 0.2, -44.1387, -57.8588, 0.2, -44.1387, -65.3588, 0.2, -47.4387, -93.5588, 0.2, -19.5387, -93.2588, 0.2, -13.5387, -22.1588, 0.2, -15.9387, -52.1588, 0.2, -42.9387, -57.8588, 0.2, -44.1387, -22.1588, 0.2, -8.43869, -17.9588, 12.4, -39.9387, -17.9588, 12.4, -28.8387, -8.05879, 12.4, -28.8387, -8.05879, 12.4, -39.9387, -8.05879, 12.4, -39.9387, -8.05879, 12.4, -51.0387, -17.9588, 12.4, -51.0387, -17.9588, 12.4, -39.9387, 36.0412, 12.4, -39.9387, 36.0412, 12.4, -28.8387, 45.9412, 12.4, -28.8387, 45.9412, 12.4, -39.9387, 45.9412, 12.4, -39.9387, 45.9412, 12.4, -51.0387, 36.0412, 12.4, -51.0387, 36.0412, 12.4, -39.9387, -17.6588, 0.4, -39.9387, -17.6588, 0.4, -29.1387, -8.3588, 0.4, -29.1387, -8.3588, 0.4, -39.9387, -8.3588, 0.4, -39.9387, -8.3588, 0.4, -50.7387, -17.6588, 0.4, -50.7387, -17.6588, 0.4, -39.9387, 36.3412, 0.4, -39.9387, 36.3412, 0.4, -29.1387, 45.6412, 0.4, -29.1387, 45.6412, 0.4, -39.9387, 45.6412, 0.4, -39.9387, 45.6412, 0.4, -50.7387, 36.3412, 0.4, -50.7387, 36.3412, 0.4, -39.9387, -17.9588, 12.4, -12.9387, -17.9588, 12.4, -1.83868, -8.05879, 12.4, -1.83868, -8.05879, 12.4, -12.9387, -8.05879, 12.4, -12.9387, -8.05879, 12.4, -24.0387, -17.9588, 12.4, -24.0387, -17.9588, 12.4, -12.9387, 36.0412, 12.4, -12.9387, 36.0412, 12.4, -1.83868, 45.9412, 12.4, -1.83868, 45.9412, 12.4, -12.9387, 45.9412, 12.4, -12.9387, 45.9412, 12.4, -24.0387, 36.0412, 12.4, -24.0387, 36.0412, 12.4, -12.9387, -17.6588, 0.4, -12.9387, -17.6588, 0.4, -2.13867, -8.3588, 0.4, -2.13867, -8.3588, 0.4, -12.9387, -8.3588, 0.4, -12.9387, -8.3588, 0.4, -23.7387, -17.6588, 0.4, -23.7387, -17.6588, 0.4, -12.9387, 36.3412, 0.4, -12.9387, 36.3412, 0.4, -2.13867, 45.6412, 0.4, -2.13867, 45.6412, 0.4, -12.9387, 45.6412, 0.4, -12.9387, 45.6412, 0.4, -23.7387, 36.3412, 0.4, -23.7387, 36.3412, 0.4, -12.9387, -235.459, 0.2, 5.36133, -117.859, 0.2, 5.36133, -117.859, 0.2, -5.73868, -235.459, 0.2, -5.73868, -235.459, 0.2, -16.8387, -235.459, 0.2, -5.73868, -117.859, 0.2, -5.73868, -117.859, 0.2, -16.8387, -105.559, 19.4, -16.8387, -113.659, 19.4, -5.73868, -113.659, 19.4, 5.36133, -105.559, 19.4, 5.36133, -97.4588, 19.4, -5.73868, -97.4588, 19.4, -16.8387, -105.559, 19.4, 5.36133, -97.4588, 19.4, 5.36133, -97.4588, 19.4, -5.73868, -105.559, 19.4, -16.8387, -113.659, 19.4, -16.8387, -113.659, 19.4, -5.73868, -105.559, 0.2, -16.5387, -113.359, 0.2, -5.73868, -113.359, 0.2, 5.06131, -105.559, 0.2, 5.06131, -97.7588, 0.2, -5.73868, -97.7588, 0.2, -16.5387, -105.559, 0.2, 5.06131, -97.7588, 0.2, 5.06131, -97.7588, 0.2, -5.73868, -105.559, 0.2, -16.5387, -113.359, 0.2, -16.5387, -113.359, 0.2, -5.73868, 36.0412, 0.2, 25.7613, 36.0412, 0.2, 2.36133, 33.6412, 0.2, 2.36133, 33.0412, 0.2, 26.0613, -3.8588, 0.2, 14.9613, -3.8588, 0.2, 21.8613, 31.8412, 0.2, 27.5613, 33.0412, 0.2, 26.0613, 33.6412, 0.2, 2.36133, 32.1412, 0.2, 1.16132, -3.8588, 0.2, 8.06131, -3.8588, 0.2, 14.9613, 31.8412, 0.2, 27.5613, 32.1412, 0.2, 1.16132, -3.8588, 0.2, 1.16132, -3.8588, 0.2, 8.06131, -3.8588, 0.2, 29.0613, 31.8412, 0.2, 29.3613, 31.8412, 0.2, 27.5613, -3.8588, 0.2, 21.8613, 36.0412, 0.2, 25.7613, 45.9412, 0.2, 25.7613, 45.9412, 0.2, 2.36133, 36.0412, 0.2, 2.36133, -17.9588, 12.4, 14.0613, -17.9588, 12.4, 25.1613, -8.05879, 12.4, 25.1613, -8.05879, 12.4, 14.0613, -8.05879, 12.4, 14.0613, -8.05879, 12.4, 2.9613, -17.9588, 12.4, 2.9613, -17.9588, 12.4, 14.0613, -17.6588, 0.4, 14.0613, -17.6588, 0.4, 24.8613, -8.3588, 0.4, 24.8613, -8.3588, 0.4, 14.0613, -8.3588, 0.4, 14.0613, -8.3588, 0.4, 3.26132, -17.6588, 0.4, 3.26132, -17.6588, 0.4, 14.0613, -17.6588, 0.2, 116.961, -17.6588, 0.2, 110.361, -20.3588, 0.2, 110.361, -17.6588, 0.2, 116.961, -20.3588, 0.2, 110.361, -22.1588, 0.2, 108.561, -235.459, 0.2, 223.761, -235.459, 0.2, 230.961, -228.859, 0.2, 230.961, -235.459, 0.2, 223.761, -228.859, 0.2, 230.961, -221.959, 0.2, 230.961, -17.6588, 0.2, 123.561, -17.6588, 0.2, 116.961, -22.1588, 0.2, 108.561, -105.559, 0.2, 9.56131, -116.059, 0.2, 9.56131, -235.459, 0.2, 216.861, -235.459, 0.2, 223.761, -221.959, 0.2, 230.961, -215.059, 0.2, 230.961, -116.059, 0.2, 9.56131, -235.459, 0.2, 54.5613, -235.459, 0.2, 61.7613, -235.459, 0.2, 209.661, -235.459, 0.2, 216.861, -215.059, 0.2, 230.961, -208.159, 0.2, 230.961, -125.659, 0.2, 230.961, -119.059, 0.2, 230.961, -17.6588, 0.2, 123.561, -116.059, 0.2, 9.56131, -235.459, 0.2, 110.961, -235.459, 0.2, 118.161, -235.459, 0.2, 202.761, -235.459, 0.2, 209.661, -208.159, 0.2, 230.961, -201.259, 0.2, 230.961, -116.059, 0.2, 9.56131, -235.459, 0.2, 61.7613, -235.459, 0.2, 68.6613, -235.459, 0.2, 195.561, -235.459, 0.2, 202.761, -201.259, 0.2, 230.961, -194.359, 0.2, 230.961, -98.3588, 0.2, 230.961, -91.4588, 0.2, 230.961, -17.6588, 0.2, 123.561, -235.459, 0.2, 188.661, -235.459, 0.2, 195.561, -194.359, 0.2, 230.961, -187.459, 0.2, 230.961, -91.4588, 0.2, 230.961, -84.5588, 0.2, 230.961, -17.6588, 0.2, 123.561, -235.459, 0.2, 181.461, -235.459, 0.2, 188.661, -187.459, 0.2, 230.961, -180.559, 0.2, 230.961, -22.1588, 0.2, 12.5613, -22.1588, 0.2, 6.26132, -93.2588, 0.2, 5.9613, -22.1588, 0.2, 12.5613, -93.2588, 0.2, 5.9613, -93.5588, 0.2, 8.36133, -22.1588, 0.2, 18.8613, -235.459, 0.2, 132.261, -235.459, 0.2, 139.161, -139.459, 0.2, 230.961, -132.559, 0.2, 230.961, -22.1588, 0.2, 25.1613, -22.1588, 0.2, 18.8613, -93.5588, 0.2, 8.36133, -116.059, 0.2, 9.56131, -235.459, 0.2, 68.6613, -235.459, 0.2, 75.8613, -22.1588, 0.2, 25.1613, -93.5588, 0.2, 8.36133, -95.0588, 0.2, 9.56131, -22.1588, 0.2, 31.7613, -105.259, 0.2, 230.961, -98.3588, 0.2, 230.961, -17.6588, 0.2, 123.561, -22.1588, 0.2, 38.0613, -22.1588, 0.2, 31.7613, -95.0588, 0.2, 9.56131, -235.459, 0.2, 174.561, -235.459, 0.2, 181.461, -180.559, 0.2, 230.961, -173.959, 0.2, 230.961, -22.1588, 0.2, 44.3613, -22.1588, 0.2, 38.0613, -95.0588, 0.2, 9.56131, -116.059, 0.2, 9.56131, -235.459, 0.2, 75.8613, -235.459, 0.2, 82.7613, -22.1588, 0.2, 50.6613, -22.1588, 0.2, 44.3613, -95.0588, 0.2, 9.56131, -22.1588, 0.2, 57.2613, -22.1588, 0.2, 50.6613, -95.0588, 0.2, 9.56131, -235.459, 0.2, 167.361, -235.459, 0.2, 174.561, -173.959, 0.2, 230.961, -167.059, 0.2, 230.961, -22.1588, 0.2, 63.5613, -22.1588, 0.2, 57.2613, -95.0588, 0.2, 9.56131, -116.059, 0.2, 9.56131, -235.459, 0.2, 104.061, -235.459, 0.2, 110.961, -22.1588, 0.2, 69.8613, -22.1588, 0.2, 63.5613, -95.0588, 0.2, 9.56131, -235.459, 0.2, 160.461, -235.459, 0.2, 167.361, -167.059, 0.2, 230.961, -160.159, 0.2, 230.961, -22.1588, 0.2, 76.1613, -22.1588, 0.2, 69.8613, -95.0588, 0.2, 9.56131, -112.159, 0.2, 230.961, -105.259, 0.2, 230.961, -17.6588, 0.2, 123.561, -22.1588, 0.2, 82.7613, -22.1588, 0.2, 76.1613, -95.0588, 0.2, 9.56131, -22.4588, 0.2, 230.961, -15.5588, 0.2, 230.961, -15.5588, 0.2, 125.361, -29.3588, 0.2, 230.961, -22.4588, 0.2, 230.961, -15.5588, 0.2, 125.361, -36.2588, 0.2, 230.961, -29.3588, 0.2, 230.961, -15.5588, 0.2, 125.361, -22.1588, 0.2, 89.0613, -22.1588, 0.2, 82.7613, -95.0588, 0.2, 9.56131, -235.459, 0.2, 153.261, -235.459, 0.2, 160.461, -160.159, 0.2, 230.961, -153.259, 0.2, 230.961, -36.2588, 0.2, 230.961, -15.5588, 0.2, 125.361, -17.6588, 0.2, 123.561, -43.1588, 0.2, 230.961, -235.459, 0.2, 132.261, -132.559, 0.2, 230.961, -125.659, 0.2, 230.961, -235.459, 0.2, 125.061, -50.0588, 0.2, 230.961, -43.1588, 0.2, 230.961, -17.6588, 0.2, 123.561, -22.1588, 0.2, 95.6613, -22.1588, 0.2, 89.0613, -95.0588, 0.2, 9.56131, -116.059, 0.2, 9.56131, -235.459, 0.2, 82.7613, -235.459, 0.2, 89.9613, -56.9588, 0.2, 230.961, -50.0588, 0.2, 230.961, -17.6588, 0.2, 123.561, -63.8588, 0.2, 230.961, -56.9588, 0.2, 230.961, -17.6588, 0.2, 123.561, -117.859, 0.2, 7.76132, -117.859, 0.2, 5.36133, -235.459, 0.2, 5.36133, -235.459, 0.2, 12.2613, -119.059, 0.2, 230.961, -112.159, 0.2, 230.961, -17.6588, 0.2, 123.561, -22.1588, 0.2, 101.961, -22.1588, 0.2, 95.6613, -95.0588, 0.2, 9.56131, -235.459, 0.2, 146.361, -235.459, 0.2, 153.261, -153.259, 0.2, 230.961, -146.359, 0.2, 230.961, -117.859, 0.2, 7.76132, -235.459, 0.2, 12.2613, -235.459, 0.2, 19.4613, -117.859, 0.2, 7.76132, -235.459, 0.2, 19.4613, -235.459, 0.2, 26.3613, -70.7588, 0.2, 230.961, -63.8588, 0.2, 230.961, -17.6588, 0.2, 123.561, -117.859, 0.2, 7.76132, -235.459, 0.2, 26.3613, -235.459, 0.2, 33.5613, -116.059, 0.2, 9.56131, -117.859, 0.2, 7.76132, -235.459, 0.2, 33.5613, -235.459, 0.2, 40.4613, -116.059, 0.2, 9.56131, -235.459, 0.2, 89.9613, -235.459, 0.2, 96.8613, -22.1588, 0.2, 108.561, -22.1588, 0.2, 101.961, -95.0588, 0.2, 9.56131, -105.559, 0.2, 9.56131, -77.6588, 0.2, 230.961, -70.7588, 0.2, 230.961, -17.6588, 0.2, 123.561, -235.459, 0.2, 118.161, -235.459, 0.2, 125.061, -125.659, 0.2, 230.961, -116.059, 0.2, 9.56131, -235.459, 0.2, 40.4613, -235.459, 0.2, 47.6613, -84.5588, 0.2, 230.961, -77.6588, 0.2, 230.961, -17.6588, 0.2, 123.561, -116.059, 0.2, 9.56131, -235.459, 0.2, 47.6613, -235.459, 0.2, 54.5613, -235.459, 0.2, 139.161, -235.459, 0.2, 146.361, -146.359, 0.2, 230.961, -139.459, 0.2, 230.961, -116.059, 0.2, 9.56131, -235.459, 0.2, 96.8613, -235.459, 0.2, 104.061, -3.8588, 0.2, 96.8613, -3.8588, 0.2, 106.761, 3.6412, 0.2, 106.761, 21.3412, 0.2, 106.761, 31.8412, 0.2, 106.761, 31.8412, 0.2, 96.8613, 3.6412, 0.2, 106.761, 11.1412, 0.2, 107.061, 21.3412, 0.2, 106.761, -3.8588, 0.2, 87.2613, -3.8588, 0.2, 96.8613, 3.6412, 0.2, 106.761, 21.3412, 0.2, 106.761, 31.8412, 0.2, 96.8613, 31.8412, 0.2, 87.2613, -3.8588, 0.2, 77.3613, -3.8588, 0.2, 87.2613, 3.6412, 0.2, 106.761, 21.3412, 0.2, 106.761, 31.8412, 0.2, 87.2613, 31.8412, 0.2, 77.6613, 31.8412, 0.2, 29.3613, -3.8588, 0.2, 29.0613, -3.8588, 0.2, 38.6613, 31.8412, 0.2, 38.9613, 31.8412, 0.2, 77.6613, 31.8412, 0.2, 68.0613, -3.8588, 0.2, 67.7613, -3.8588, 0.2, 77.3613, 3.6412, 0.2, 106.761, 21.3412, 0.2, 106.761, 31.8412, 0.2, 38.9613, -3.8588, 0.2, 38.6613, -3.8588, 0.2, 48.2613, 31.8412, 0.2, 48.5613, 31.8412, 0.2, 58.1613, -3.8588, 0.2, 57.8613, -3.8588, 0.2, 67.7613, 31.8412, 0.2, 68.0613, 31.8412, 0.2, 48.5613, -3.8588, 0.2, 48.2613, -3.8588, 0.2, 57.8613, 31.8412, 0.2, 58.1613, -17.9588, 12.4, 41.0613, -17.9588, 12.4, 52.1613, -8.05879, 12.4, 52.1613, -8.05879, 12.4, 41.0613, -8.05879, 12.4, 41.0613, -8.05879, 12.4, 29.9613, -17.9588, 12.4, 29.9613, -17.9588, 12.4, 41.0613, 36.0412, 12.4, 41.0613, 36.0412, 12.4, 52.1613, 45.9412, 12.4, 52.1613, 45.9412, 12.4, 41.0613, 45.9412, 12.4, 41.0613, 45.9412, 12.4, 29.9613, 36.0412, 12.4, 29.9613, 36.0412, 12.4, 41.0613, -17.6588, 0.4, 41.0613, -17.6588, 0.4, 51.8613, -8.3588, 0.4, 51.8613, -8.3588, 0.4, 41.0613, -8.3588, 0.4, 41.0613, -8.3588, 0.4, 30.2613, -17.6588, 0.4, 30.2613, -17.6588, 0.4, 41.0613, 36.3412, 0.4, 41.0613, 36.3412, 0.4, 51.8613, 45.6412, 0.4, 51.8613, 45.6412, 0.4, 41.0613, 45.6412, 0.4, 41.0613, 45.6412, 0.4, 30.2613, 36.3412, 0.4, 30.2613, 36.3412, 0.4, 41.0613, -17.9588, 12.4, 68.0613, -17.9588, 12.4, 79.1613, -8.05879, 12.4, 79.1613, -8.05879, 12.4, 68.0613, -8.05879, 12.4, 68.0613, -8.05879, 12.4, 56.9613, -17.9588, 12.4, 56.9613, -17.9588, 12.4, 68.0613, 36.0412, 12.4, 68.0613, 36.0412, 12.4, 79.1613, 45.9412, 12.4, 79.1613, 45.9412, 12.4, 68.0613, 45.9412, 12.4, 68.0613, 45.9412, 12.4, 56.9613, 36.0412, 12.4, 56.9613, 36.0412, 12.4, 68.0613, -17.6588, 0.4, 68.0613, -17.6588, 0.4, 78.8613, -8.3588, 0.4, 78.8613, -8.3588, 0.4, 68.0613, -8.3588, 0.4, 68.0613, -8.3588, 0.4, 57.2613, -17.6588, 0.4, 57.2613, -17.6588, 0.4, 68.0613, 36.3412, 0.4, 68.0613, 36.3412, 0.4, 78.8613, 45.6412, 0.4, 78.8613, 45.6412, 0.4, 68.0613, 45.6412, 0.4, 68.0613, 45.6412, 0.4, 57.2613, 36.3412, 0.4, 57.2613, 36.3412, 0.4, 68.0613, -17.9588, 12.4, 95.0613, -17.9588, 12.4, 106.161, -8.05879, 12.4, 106.161, -8.05879, 12.4, 95.0613, -8.05879, 12.4, 95.0613, -8.05879, 12.4, 83.9613, -17.9588, 12.4, 83.9613, -17.9588, 12.4, 95.0613, 36.0412, 12.4, 95.0613, 36.0412, 12.4, 106.161, 45.9412, 12.4, 106.161, 45.9412, 12.4, 95.0613, 45.9412, 12.4, 95.0613, 45.9412, 12.4, 83.9613, 36.0412, 12.4, 83.9613, 36.0412, 12.4, 95.0613, -17.6588, 0.4, 95.0613, -17.6588, 0.4, 105.861, -8.3588, 0.4, 105.861, -8.3588, 0.4, 95.0613, -8.3588, 0.4, 95.0613, -8.3588, 0.4, 84.2613, -17.6588, 0.4, 84.2613, -17.6588, 0.4, 95.0613, 36.3412, 0.4, 95.0613, 36.3412, 0.4, 105.861, 45.6412, 0.4, 105.861, 45.6412, 0.4, 95.0613, 45.6412, 0.4, 95.0613, 45.6412, 0.4, 84.2613, 36.3412, 0.4, 84.2613, 36.3412, 0.4, 95.0613, 48.3412, 0.2, 110.361, 40.2412, 0.2, 110.361, 40.2412, 0.2, 116.961, 253.241, 0.2, 230.961, 260.441, 0.2, 230.961, 260.441, 0.2, 223.161, 49.8412, 0.2, 109.161, 48.3412, 0.2, 110.361, 40.2412, 0.2, 116.961, 40.2412, 0.2, 123.561, 246.341, 0.2, 230.961, 253.241, 0.2, 230.961, 260.441, 0.2, 223.161, 149.141, 0.2, 230.961, 156.041, 0.2, 230.961, 260.441, 0.2, 131.661, 260.441, 0.2, 124.161, 246.341, 0.2, 230.961, 260.441, 0.2, 223.161, 260.441, 0.2, 215.661, 239.441, 0.2, 230.961, 40.2412, 0.2, 123.561, 100.541, 0.2, 230.961, 107.441, 0.2, 230.961, 239.441, 0.2, 230.961, 260.441, 0.2, 215.661, 260.441, 0.2, 207.861, 232.541, 0.2, 230.961, 162.941, 0.2, 230.961, 169.841, 0.2, 230.961, 260.441, 0.2, 146.961, 260.441, 0.2, 139.461, 232.541, 0.2, 230.961, 260.441, 0.2, 207.861, 260.441, 0.2, 200.361, 225.341, 0.2, 230.961, 40.2412, 0.2, 123.561, 107.441, 0.2, 230.961, 114.341, 0.2, 230.961, 218.441, 0.2, 230.961, 225.341, 0.2, 230.961, 260.441, 0.2, 200.361, 218.441, 0.2, 230.961, 260.441, 0.2, 200.361, 260.441, 0.2, 192.561, 211.541, 0.2, 230.961, 49.8412, 0.2, 109.161, 40.2412, 0.2, 123.561, 141.941, 0.2, 230.961, 149.141, 0.2, 230.961, 260.441, 0.2, 116.661, 260.441, 0.2, 109.161, 211.541, 0.2, 230.961, 260.441, 0.2, 192.561, 260.441, 0.2, 185.061, 204.641, 0.2, 230.961, 40.2412, 0.2, 123.561, 114.341, 0.2, 230.961, 121.241, 0.2, 230.961, 204.641, 0.2, 230.961, 260.441, 0.2, 185.061, 260.441, 0.2, 177.561, 197.441, 0.2, 230.961, 40.2412, 0.2, 123.561, 121.241, 0.2, 230.961, 128.141, 0.2, 230.961, 197.441, 0.2, 230.961, 260.441, 0.2, 177.561, 260.441, 0.2, 170.061, 190.541, 0.2, 230.961, 156.041, 0.2, 230.961, 162.941, 0.2, 230.961, 260.441, 0.2, 139.461, 260.441, 0.2, 131.661, 190.541, 0.2, 230.961, 260.441, 0.2, 170.061, 260.441, 0.2, 162.261, 183.641, 0.2, 230.961, 40.2412, 0.2, 123.561, 128.141, 0.2, 230.961, 135.041, 0.2, 230.961, 38.1412, 0.2, 125.361, 38.1412, 0.2, 230.961, 45.0412, 0.2, 230.961, 38.1412, 0.2, 125.361, 45.0412, 0.2, 230.961, 51.9412, 0.2, 230.961, 38.1412, 0.2, 125.361, 51.9412, 0.2, 230.961, 58.8412, 0.2, 230.961, 183.641, 0.2, 230.961, 260.441, 0.2, 162.261, 260.441, 0.2, 154.761, 176.741, 0.2, 230.961, 40.2412, 0.2, 123.561, 38.1412, 0.2, 125.361, 58.8412, 0.2, 230.961, 65.7412, 0.2, 230.961, 40.2412, 0.2, 123.561, 135.041, 0.2, 230.961, 141.941, 0.2, 230.961, 40.2412, 0.2, 123.561, 65.7412, 0.2, 230.961, 72.6412, 0.2, 230.961, 149.141, 0.2, 230.961, 260.441, 0.2, 124.161, 260.441, 0.2, 116.661, 40.2412, 0.2, 123.561, 72.6412, 0.2, 230.961, 79.5412, 0.2, 230.961, 40.2412, 0.2, 123.561, 79.5412, 0.2, 230.961, 86.4412, 0.2, 230.961, 169.841, 0.2, 230.961, 176.741, 0.2, 230.961, 260.441, 0.2, 154.761, 260.441, 0.2, 146.961, 40.2412, 0.2, 123.561, 86.4412, 0.2, 230.961, 93.6412, 0.2, 230.961, 40.2412, 0.2, 123.561, 93.6412, 0.2, 230.961, 100.541, 0.2, 230.961, -13.4588, 12.4, 110.961, -13.4588, 12.4, 121.161, -2.3588, 12.4, 121.161, -2.3588, 12.4, 110.961, 8.7412, 12.4, 110.961, -2.3588, 12.4, 110.961, -2.3588, 12.4, 121.161, 8.7412, 12.4, 121.161, 14.1412, 12.4, 110.961, 14.1412, 12.4, 121.161, 24.9412, 12.4, 121.161, 24.9412, 12.4, 110.961, 24.9412, 12.4, 121.161, 36.0412, 12.4, 121.161, 36.0412, 12.4, 110.961, 24.9412, 12.4, 110.961, -13.1588, 0.4, 111.261, -13.1588, 0.4, 120.861, -2.3588, 0.4, 120.861, -2.3588, 0.4, 111.261, 8.44121, 0.4, 111.261, -2.3588, 0.4, 111.261, -2.3588, 0.4, 120.861, 8.44121, 0.4, 120.861, 14.4412, 0.4, 111.261, 14.4412, 0.4, 120.861, 24.9412, 0.4, 120.861, 24.9412, 0.4, 111.261, 24.9412, 0.4, 120.861, 35.7412, 0.4, 120.861, 35.7412, 0.4, 111.261, 24.9412, 0.4, 111.261, 17.4412, 0.2, 125.361, 11.1412, 0.2, 125.061, 4.5412, 0.2, 125.361, 4.2412, 0.2, 230.961, 11.1412, 0.2, 230.961, -15.5588, 0.2, 125.361, -15.5588, 0.2, 230.961, -8.9588, 0.2, 230.961, -8.9588, 0.2, 125.361, 31.2412, 0.2, 230.961, 38.1412, 0.2, 230.961, 38.1412, 0.2, 125.361, 31.2412, 0.2, 125.361, -8.9588, 0.2, 125.361, -8.9588, 0.2, 230.961, -2.3588, 0.2, 230.961, -2.05879, 0.2, 125.361, 24.6412, 0.2, 230.961, 31.2412, 0.2, 230.961, 31.2412, 0.2, 125.361, 24.3412, 0.2, 125.361, -2.05879, 0.2, 125.361, -2.3588, 0.2, 230.961, 4.2412, 0.2, 230.961, 4.5412, 0.2, 125.361, 17.4412, 0.2, 125.361, 11.1412, 0.2, 230.961, 17.7412, 0.2, 230.961, 17.7412, 0.2, 230.961, 24.6412, 0.2, 230.961, 24.3412, 0.2, 125.361, 17.4412, 0.2, 125.361 ) +polygons = [ PoolIntArray( 2, 0, 1 ), PoolIntArray( 5, 3, 4 ), PoolIntArray( 8, 6, 7 ), PoolIntArray( 11, 9, 10 ), PoolIntArray( 15, 12, 14 ), PoolIntArray( 12, 13, 14 ), PoolIntArray( 18, 16, 17 ), PoolIntArray( 21, 19, 20 ), PoolIntArray( 25, 22, 24 ), PoolIntArray( 22, 23, 24 ), PoolIntArray( 29, 26, 28 ), PoolIntArray( 26, 27, 28 ), PoolIntArray( 33, 30, 32 ), PoolIntArray( 30, 31, 32 ), PoolIntArray( 36, 34, 35 ), PoolIntArray( 39, 37, 38 ), PoolIntArray( 42, 40, 41 ), PoolIntArray( 48, 43, 47 ), PoolIntArray( 43, 46, 47 ), PoolIntArray( 43, 44, 46 ), PoolIntArray( 44, 45, 46 ), PoolIntArray( 52, 49, 51 ), PoolIntArray( 49, 50, 51 ), PoolIntArray( 56, 53, 55 ), PoolIntArray( 53, 54, 55 ), PoolIntArray( 59, 57, 58 ), PoolIntArray( 62, 60, 61 ), PoolIntArray( 66, 63, 65 ), PoolIntArray( 63, 64, 65 ), PoolIntArray( 69, 67, 68 ), PoolIntArray( 72, 70, 71 ), PoolIntArray( 76, 73, 75 ), PoolIntArray( 73, 74, 75 ), PoolIntArray( 80, 77, 79 ), PoolIntArray( 77, 78, 79 ), PoolIntArray( 83, 81, 82 ), PoolIntArray( 87, 84, 86 ), PoolIntArray( 84, 85, 86 ), PoolIntArray( 90, 88, 89 ), PoolIntArray( 93, 91, 92 ), PoolIntArray( 97, 94, 96 ), PoolIntArray( 94, 95, 96 ), PoolIntArray( 101, 98, 100 ), PoolIntArray( 98, 99, 100 ), PoolIntArray( 104, 102, 103 ), PoolIntArray( 107, 105, 106 ), PoolIntArray( 111, 108, 110 ), PoolIntArray( 108, 109, 110 ), PoolIntArray( 114, 112, 113 ), PoolIntArray( 117, 115, 116 ), PoolIntArray( 120, 118, 119 ), PoolIntArray( 123, 121, 122 ), PoolIntArray( 127, 124, 126 ), PoolIntArray( 124, 125, 126 ), PoolIntArray( 130, 128, 129 ), PoolIntArray( 133, 131, 132 ), PoolIntArray( 138, 134, 137 ), PoolIntArray( 134, 135, 137 ), PoolIntArray( 135, 136, 137 ), PoolIntArray( 141, 139, 140 ), PoolIntArray( 144, 142, 143 ), PoolIntArray( 147, 145, 146 ), PoolIntArray( 150, 148, 149 ), PoolIntArray( 153, 151, 152 ), PoolIntArray( 156, 154, 155 ), PoolIntArray( 159, 157, 158 ), PoolIntArray( 162, 160, 161 ), PoolIntArray( 165, 163, 164 ), PoolIntArray( 171, 166, 170 ), PoolIntArray( 166, 167, 170 ), PoolIntArray( 167, 169, 170 ), PoolIntArray( 167, 168, 169 ), PoolIntArray( 175, 172, 174 ), PoolIntArray( 172, 173, 174 ), PoolIntArray( 178, 176, 177 ), PoolIntArray( 181, 179, 180 ), PoolIntArray( 185, 182, 184 ), PoolIntArray( 182, 183, 184 ), PoolIntArray( 188, 186, 187 ), PoolIntArray( 191, 189, 190 ), PoolIntArray( 194, 192, 193 ), PoolIntArray( 197, 195, 196 ), PoolIntArray( 200, 198, 199 ), PoolIntArray( 204, 201, 203 ), PoolIntArray( 201, 202, 203 ), PoolIntArray( 208, 205, 207 ), PoolIntArray( 205, 206, 207 ), PoolIntArray( 212, 209, 211 ), PoolIntArray( 209, 210, 211 ), PoolIntArray( 216, 213, 215 ), PoolIntArray( 213, 214, 215 ), PoolIntArray( 219, 217, 218 ), PoolIntArray( 223, 220, 222 ), PoolIntArray( 220, 221, 222 ), PoolIntArray( 226, 224, 225 ), PoolIntArray( 232, 227, 231 ), PoolIntArray( 227, 228, 231 ), PoolIntArray( 228, 229, 231 ), PoolIntArray( 229, 230, 231 ), PoolIntArray( 235, 233, 234 ), PoolIntArray( 239, 236, 238 ), PoolIntArray( 236, 237, 238 ), PoolIntArray( 242, 240, 241 ), PoolIntArray( 246, 243, 245 ), PoolIntArray( 243, 244, 245 ), PoolIntArray( 249, 247, 248 ), PoolIntArray( 252, 250, 251 ), PoolIntArray( 255, 253, 254 ), PoolIntArray( 259, 256, 258 ), PoolIntArray( 256, 257, 258 ), PoolIntArray( 262, 260, 261 ), PoolIntArray( 265, 263, 264 ), PoolIntArray( 268, 266, 267 ), PoolIntArray( 272, 269, 271 ), PoolIntArray( 269, 270, 271 ), PoolIntArray( 275, 273, 274 ), PoolIntArray( 279, 276, 278 ), PoolIntArray( 276, 277, 278 ), PoolIntArray( 282, 280, 281 ), PoolIntArray( 285, 283, 284 ), PoolIntArray( 289, 286, 288 ), PoolIntArray( 286, 287, 288 ), PoolIntArray( 293, 290, 292 ), PoolIntArray( 290, 291, 292 ), PoolIntArray( 296, 294, 295 ), PoolIntArray( 299, 297, 298 ), PoolIntArray( 302, 300, 301 ), PoolIntArray( 305, 303, 304 ), PoolIntArray( 308, 306, 307 ), PoolIntArray( 311, 309, 310 ), PoolIntArray( 317, 312, 316 ), PoolIntArray( 312, 313, 316 ), PoolIntArray( 313, 314, 316 ), PoolIntArray( 314, 315, 316 ), PoolIntArray( 320, 318, 319 ), PoolIntArray( 324, 321, 323 ), PoolIntArray( 321, 322, 323 ), PoolIntArray( 328, 325, 327 ), PoolIntArray( 325, 326, 327 ), PoolIntArray( 331, 329, 330 ), PoolIntArray( 334, 332, 333 ), PoolIntArray( 337, 335, 336 ), PoolIntArray( 341, 338, 340 ), PoolIntArray( 338, 339, 340 ), PoolIntArray( 344, 342, 343 ), PoolIntArray( 350, 345, 349 ), PoolIntArray( 345, 346, 349 ), PoolIntArray( 346, 348, 349 ), PoolIntArray( 346, 347, 348 ), PoolIntArray( 353, 351, 352 ), PoolIntArray( 357, 354, 356 ), PoolIntArray( 354, 355, 356 ), PoolIntArray( 360, 358, 359 ), PoolIntArray( 365, 361, 364 ), PoolIntArray( 361, 362, 364 ), PoolIntArray( 362, 363, 364 ), PoolIntArray( 368, 366, 367 ), PoolIntArray( 374, 369, 373 ), PoolIntArray( 369, 370, 373 ), PoolIntArray( 370, 371, 373 ), PoolIntArray( 371, 372, 373 ), PoolIntArray( 380, 375, 379 ), PoolIntArray( 375, 376, 379 ), PoolIntArray( 376, 378, 379 ), PoolIntArray( 376, 377, 378 ), PoolIntArray( 386, 381, 385 ), PoolIntArray( 381, 382, 385 ), PoolIntArray( 382, 383, 385 ), PoolIntArray( 383, 384, 385 ), PoolIntArray( 390, 387, 389 ), PoolIntArray( 387, 388, 389 ), PoolIntArray( 394, 391, 393 ), PoolIntArray( 391, 392, 393 ), PoolIntArray( 398, 395, 397 ), PoolIntArray( 395, 396, 397 ), PoolIntArray( 402, 399, 401 ), PoolIntArray( 399, 400, 401 ), PoolIntArray( 407, 403, 406 ), PoolIntArray( 403, 404, 406 ), PoolIntArray( 404, 405, 406 ), PoolIntArray( 412, 408, 411 ), PoolIntArray( 408, 409, 411 ), PoolIntArray( 409, 410, 411 ), PoolIntArray( 415, 413, 414 ), PoolIntArray( 421, 416, 420 ), PoolIntArray( 416, 417, 420 ), PoolIntArray( 417, 418, 420 ), PoolIntArray( 418, 419, 420 ), PoolIntArray( 424, 422, 423 ), PoolIntArray( 427, 425, 426 ), PoolIntArray( 433, 428, 432 ), PoolIntArray( 428, 431, 432 ), PoolIntArray( 428, 429, 431 ), PoolIntArray( 429, 430, 431 ), PoolIntArray( 436, 434, 435 ), PoolIntArray( 439, 437, 438 ), PoolIntArray( 442, 440, 441 ), PoolIntArray( 445, 443, 444 ), PoolIntArray( 451, 446, 450 ), PoolIntArray( 446, 447, 450 ), PoolIntArray( 447, 449, 450 ), PoolIntArray( 447, 448, 449 ), PoolIntArray( 455, 452, 454 ), PoolIntArray( 452, 453, 454 ), PoolIntArray( 459, 456, 458 ), PoolIntArray( 456, 457, 458 ), PoolIntArray( 462, 460, 461 ), PoolIntArray( 465, 463, 464 ), PoolIntArray( 470, 466, 469 ), PoolIntArray( 466, 467, 469 ), PoolIntArray( 467, 468, 469 ), PoolIntArray( 476, 471, 475 ), PoolIntArray( 471, 474, 475 ), PoolIntArray( 471, 472, 474 ), PoolIntArray( 472, 473, 474 ), PoolIntArray( 482, 477, 481 ), PoolIntArray( 477, 478, 481 ), PoolIntArray( 478, 479, 481 ), PoolIntArray( 479, 480, 481 ), PoolIntArray( 487, 483, 486 ), PoolIntArray( 483, 484, 486 ), PoolIntArray( 484, 485, 486 ), PoolIntArray( 491, 488, 490 ), PoolIntArray( 488, 489, 490 ), PoolIntArray( 497, 492, 496 ), PoolIntArray( 492, 493, 496 ), PoolIntArray( 493, 494, 496 ), PoolIntArray( 494, 495, 496 ), PoolIntArray( 503, 498, 502 ), PoolIntArray( 498, 499, 502 ), PoolIntArray( 499, 500, 502 ), PoolIntArray( 500, 501, 502 ), PoolIntArray( 506, 504, 505 ), PoolIntArray( 512, 507, 511 ), PoolIntArray( 507, 508, 511 ), PoolIntArray( 508, 509, 511 ), PoolIntArray( 509, 510, 511 ), PoolIntArray( 518, 513, 517 ), PoolIntArray( 513, 514, 517 ), PoolIntArray( 514, 515, 517 ), PoolIntArray( 515, 516, 517 ), PoolIntArray( 524, 519, 523 ), PoolIntArray( 519, 520, 523 ), PoolIntArray( 520, 521, 523 ), PoolIntArray( 521, 522, 523 ), PoolIntArray( 530, 525, 529 ), PoolIntArray( 525, 526, 529 ), PoolIntArray( 526, 527, 529 ), PoolIntArray( 527, 528, 529 ), PoolIntArray( 535, 531, 534 ), PoolIntArray( 531, 532, 534 ), PoolIntArray( 532, 533, 534 ), PoolIntArray( 540, 536, 539 ), PoolIntArray( 536, 537, 539 ), PoolIntArray( 537, 538, 539 ), PoolIntArray( 546, 541, 545 ), PoolIntArray( 541, 542, 545 ), PoolIntArray( 542, 543, 545 ), PoolIntArray( 543, 544, 545 ), PoolIntArray( 550, 547, 549 ), PoolIntArray( 547, 548, 549 ), PoolIntArray( 555, 551, 554 ), PoolIntArray( 551, 552, 554 ), PoolIntArray( 552, 553, 554 ), PoolIntArray( 560, 556, 559 ), PoolIntArray( 556, 557, 559 ), PoolIntArray( 557, 558, 559 ), PoolIntArray( 563, 561, 562 ), PoolIntArray( 568, 564, 567 ), PoolIntArray( 564, 565, 567 ), PoolIntArray( 565, 566, 567 ), PoolIntArray( 573, 569, 572 ), PoolIntArray( 569, 570, 572 ), PoolIntArray( 570, 571, 572 ), PoolIntArray( 579, 574, 578 ), PoolIntArray( 574, 575, 578 ), PoolIntArray( 575, 576, 578 ), PoolIntArray( 576, 577, 578 ), PoolIntArray( 583, 580, 582 ), PoolIntArray( 580, 581, 582 ), PoolIntArray( 588, 584, 587 ), PoolIntArray( 584, 585, 587 ), PoolIntArray( 585, 586, 587 ), PoolIntArray( 593, 589, 592 ), PoolIntArray( 589, 590, 592 ), PoolIntArray( 590, 591, 592 ), PoolIntArray( 596, 594, 595 ), PoolIntArray( 600, 597, 599 ), PoolIntArray( 597, 598, 599 ), PoolIntArray( 604, 601, 603 ), PoolIntArray( 601, 602, 603 ), PoolIntArray( 608, 605, 607 ), PoolIntArray( 605, 606, 607 ), PoolIntArray( 611, 609, 610 ), PoolIntArray( 615, 612, 614 ), PoolIntArray( 612, 613, 614 ), PoolIntArray( 618, 616, 617 ), PoolIntArray( 622, 619, 621 ), PoolIntArray( 619, 620, 621 ), PoolIntArray( 625, 623, 624 ), PoolIntArray( 630, 626, 629 ), PoolIntArray( 626, 627, 629 ), PoolIntArray( 627, 628, 629 ), PoolIntArray( 634, 631, 633 ), PoolIntArray( 631, 632, 633 ), PoolIntArray( 637, 635, 636 ), PoolIntArray( 640, 638, 639 ), PoolIntArray( 643, 641, 642 ), PoolIntArray( 646, 644, 645 ), PoolIntArray( 649, 647, 648 ), PoolIntArray( 652, 650, 651 ), PoolIntArray( 655, 653, 654 ), PoolIntArray( 661, 656, 660 ), PoolIntArray( 656, 659, 660 ), PoolIntArray( 656, 657, 659 ), PoolIntArray( 657, 658, 659 ), PoolIntArray( 664, 662, 663 ), PoolIntArray( 668, 665, 667 ), PoolIntArray( 665, 666, 667 ), PoolIntArray( 674, 669, 673 ), PoolIntArray( 669, 672, 673 ), PoolIntArray( 669, 671, 672 ), PoolIntArray( 669, 670, 671 ), PoolIntArray( 677, 675, 676 ), PoolIntArray( 680, 678, 679 ), PoolIntArray( 684, 681, 683 ), PoolIntArray( 681, 682, 683 ), PoolIntArray( 687, 685, 686 ), PoolIntArray( 690, 688, 689 ), PoolIntArray( 693, 691, 692 ), PoolIntArray( 697, 694, 696 ), PoolIntArray( 694, 695, 696 ), PoolIntArray( 701, 698, 700 ), PoolIntArray( 698, 699, 700 ), PoolIntArray( 704, 702, 703 ), PoolIntArray( 707, 705, 706 ), PoolIntArray( 710, 708, 709 ), PoolIntArray( 715, 711, 714 ), PoolIntArray( 711, 712, 714 ), PoolIntArray( 712, 713, 714 ), PoolIntArray( 718, 716, 717 ), PoolIntArray( 721, 719, 720 ), PoolIntArray( 725, 722, 724 ), PoolIntArray( 722, 723, 724 ), PoolIntArray( 728, 726, 727 ), PoolIntArray( 732, 729, 731 ), PoolIntArray( 729, 730, 731 ), PoolIntArray( 735, 733, 734 ), PoolIntArray( 738, 736, 737 ), PoolIntArray( 741, 739, 740 ), PoolIntArray( 744, 742, 743 ), PoolIntArray( 747, 745, 746 ), PoolIntArray( 750, 748, 749 ), PoolIntArray( 753, 751, 752 ), PoolIntArray( 756, 754, 755 ), PoolIntArray( 759, 757, 758 ), PoolIntArray( 762, 760, 761 ), PoolIntArray( 765, 763, 764 ), PoolIntArray( 769, 766, 768 ), PoolIntArray( 766, 767, 768 ), PoolIntArray( 772, 770, 771 ), PoolIntArray( 775, 773, 774 ), PoolIntArray( 778, 776, 777 ), PoolIntArray( 781, 779, 780 ), PoolIntArray( 785, 782, 784 ), PoolIntArray( 782, 783, 784 ), PoolIntArray( 788, 786, 787 ), PoolIntArray( 791, 789, 790 ), PoolIntArray( 794, 792, 793 ), PoolIntArray( 799, 795, 798 ), PoolIntArray( 795, 796, 798 ), PoolIntArray( 796, 797, 798 ), PoolIntArray( 803, 800, 802 ), PoolIntArray( 800, 801, 802 ), PoolIntArray( 806, 804, 805 ), PoolIntArray( 810, 807, 809 ), PoolIntArray( 807, 808, 809 ), PoolIntArray( 816, 811, 815 ), PoolIntArray( 811, 814, 815 ), PoolIntArray( 811, 813, 814 ), PoolIntArray( 811, 812, 813 ), PoolIntArray( 820, 817, 819 ), PoolIntArray( 817, 818, 819 ), PoolIntArray( 824, 821, 823 ), PoolIntArray( 821, 822, 823 ), PoolIntArray( 828, 825, 827 ), PoolIntArray( 825, 826, 827 ), PoolIntArray( 832, 829, 831 ), PoolIntArray( 829, 830, 831 ), PoolIntArray( 836, 833, 835 ), PoolIntArray( 833, 834, 835 ), PoolIntArray( 839, 837, 838 ), PoolIntArray( 843, 840, 842 ), PoolIntArray( 840, 841, 842 ), PoolIntArray( 846, 844, 845 ), PoolIntArray( 850, 847, 849 ), PoolIntArray( 847, 848, 849 ), PoolIntArray( 853, 851, 852 ), PoolIntArray( 857, 854, 856 ), PoolIntArray( 854, 855, 856 ), PoolIntArray( 862, 858, 861 ), PoolIntArray( 858, 859, 861 ), PoolIntArray( 859, 860, 861 ), PoolIntArray( 866, 863, 865 ), PoolIntArray( 863, 864, 865 ), PoolIntArray( 869, 867, 868 ), PoolIntArray( 873, 870, 872 ), PoolIntArray( 870, 871, 872 ), PoolIntArray( 876, 874, 875 ), PoolIntArray( 879, 877, 878 ), PoolIntArray( 883, 880, 882 ), PoolIntArray( 880, 881, 882 ), PoolIntArray( 887, 884, 886 ), PoolIntArray( 884, 885, 886 ), PoolIntArray( 891, 888, 890 ), PoolIntArray( 888, 889, 890 ), PoolIntArray( 895, 892, 894 ), PoolIntArray( 892, 893, 894 ), PoolIntArray( 899, 896, 898 ), PoolIntArray( 896, 897, 898 ), PoolIntArray( 903, 900, 902 ), PoolIntArray( 900, 901, 902 ), PoolIntArray( 907, 904, 906 ), PoolIntArray( 904, 905, 906 ), PoolIntArray( 911, 908, 910 ), PoolIntArray( 908, 909, 910 ), PoolIntArray( 915, 912, 914 ), PoolIntArray( 912, 913, 914 ), PoolIntArray( 919, 916, 918 ), PoolIntArray( 916, 917, 918 ), PoolIntArray( 923, 920, 922 ), PoolIntArray( 920, 921, 922 ), PoolIntArray( 927, 924, 926 ), PoolIntArray( 924, 925, 926 ), PoolIntArray( 931, 928, 930 ), PoolIntArray( 928, 929, 930 ), PoolIntArray( 935, 932, 934 ), PoolIntArray( 932, 933, 934 ), PoolIntArray( 939, 936, 938 ), PoolIntArray( 936, 937, 938 ), PoolIntArray( 943, 940, 942 ), PoolIntArray( 940, 941, 942 ), PoolIntArray( 947, 944, 946 ), PoolIntArray( 944, 945, 946 ), PoolIntArray( 951, 948, 950 ), PoolIntArray( 948, 949, 950 ), PoolIntArray( 955, 952, 954 ), PoolIntArray( 952, 953, 954 ), PoolIntArray( 959, 956, 958 ), PoolIntArray( 956, 957, 958 ), PoolIntArray( 965, 960, 964 ), PoolIntArray( 960, 961, 964 ), PoolIntArray( 961, 963, 964 ), PoolIntArray( 961, 962, 963 ), PoolIntArray( 968, 966, 967 ), PoolIntArray( 971, 969, 970 ), PoolIntArray( 977, 972, 976 ), PoolIntArray( 972, 973, 976 ), PoolIntArray( 973, 975, 976 ), PoolIntArray( 973, 974, 975 ), PoolIntArray( 980, 978, 979 ), PoolIntArray( 983, 981, 982 ), PoolIntArray( 987, 984, 986 ), PoolIntArray( 984, 985, 986 ), PoolIntArray( 990, 988, 989 ), PoolIntArray( 996, 991, 995 ), PoolIntArray( 991, 994, 995 ), PoolIntArray( 991, 993, 994 ), PoolIntArray( 991, 992, 993 ), PoolIntArray( 999, 997, 998 ), PoolIntArray( 1003, 1000, 1002 ), PoolIntArray( 1000, 1001, 1002 ), PoolIntArray( 1007, 1004, 1006 ), PoolIntArray( 1004, 1005, 1006 ), PoolIntArray( 1011, 1008, 1010 ), PoolIntArray( 1008, 1009, 1010 ), PoolIntArray( 1015, 1012, 1014 ), PoolIntArray( 1012, 1013, 1014 ), PoolIntArray( 1019, 1016, 1018 ), PoolIntArray( 1016, 1017, 1018 ), PoolIntArray( 1023, 1020, 1022 ), PoolIntArray( 1020, 1021, 1022 ), PoolIntArray( 1026, 1024, 1025 ), PoolIntArray( 1029, 1027, 1028 ), PoolIntArray( 1032, 1030, 1031 ), PoolIntArray( 1035, 1033, 1034 ), PoolIntArray( 1040, 1036, 1039 ), PoolIntArray( 1036, 1038, 1039 ), PoolIntArray( 1036, 1037, 1038 ), PoolIntArray( 1044, 1041, 1043 ), PoolIntArray( 1041, 1042, 1043 ), PoolIntArray( 1047, 1045, 1046 ), PoolIntArray( 1051, 1048, 1050 ), PoolIntArray( 1048, 1049, 1050 ), PoolIntArray( 1057, 1052, 1056 ), PoolIntArray( 1052, 1053, 1056 ), PoolIntArray( 1053, 1054, 1056 ), PoolIntArray( 1054, 1055, 1056 ), PoolIntArray( 1061, 1058, 1060 ), PoolIntArray( 1058, 1059, 1060 ), PoolIntArray( 1064, 1062, 1063 ), PoolIntArray( 1068, 1065, 1067 ), PoolIntArray( 1065, 1066, 1067 ), PoolIntArray( 1071, 1069, 1070 ), PoolIntArray( 1075, 1072, 1074 ), PoolIntArray( 1072, 1073, 1074 ), PoolIntArray( 1078, 1076, 1077 ), PoolIntArray( 1082, 1079, 1081 ), PoolIntArray( 1079, 1080, 1081 ), PoolIntArray( 1085, 1083, 1084 ), PoolIntArray( 1089, 1086, 1088 ), PoolIntArray( 1086, 1087, 1088 ), PoolIntArray( 1093, 1090, 1092 ), PoolIntArray( 1090, 1091, 1092 ), PoolIntArray( 1096, 1094, 1095 ), PoolIntArray( 1099, 1097, 1098 ), PoolIntArray( 1103, 1100, 1102 ), PoolIntArray( 1100, 1101, 1102 ), PoolIntArray( 1106, 1104, 1105 ), PoolIntArray( 1109, 1107, 1108 ), PoolIntArray( 1113, 1110, 1112 ), PoolIntArray( 1110, 1111, 1112 ), PoolIntArray( 1116, 1114, 1115 ), PoolIntArray( 1119, 1117, 1118 ), PoolIntArray( 1122, 1120, 1121 ), PoolIntArray( 1125, 1123, 1124 ), PoolIntArray( 1129, 1126, 1128 ), PoolIntArray( 1126, 1127, 1128 ), PoolIntArray( 1132, 1130, 1131 ), PoolIntArray( 1135, 1133, 1134 ), PoolIntArray( 1138, 1136, 1137 ), PoolIntArray( 1142, 1139, 1141 ), PoolIntArray( 1139, 1140, 1141 ), PoolIntArray( 1145, 1143, 1144 ), PoolIntArray( 1148, 1146, 1147 ), PoolIntArray( 1151, 1149, 1150 ), PoolIntArray( 1154, 1152, 1153 ), PoolIntArray( 1157, 1155, 1156 ), PoolIntArray( 1160, 1158, 1159 ), PoolIntArray( 1163, 1161, 1162 ), PoolIntArray( 1167, 1164, 1166 ), PoolIntArray( 1164, 1165, 1166 ), PoolIntArray( 1171, 1168, 1170 ), PoolIntArray( 1168, 1169, 1170 ), PoolIntArray( 1175, 1172, 1174 ), PoolIntArray( 1172, 1173, 1174 ), PoolIntArray( 1178, 1176, 1177 ), PoolIntArray( 1181, 1179, 1180 ), PoolIntArray( 1184, 1182, 1183 ), PoolIntArray( 1187, 1185, 1186 ), PoolIntArray( 1190, 1188, 1189 ), PoolIntArray( 1194, 1191, 1193 ), PoolIntArray( 1191, 1192, 1193 ), PoolIntArray( 1197, 1195, 1196 ), PoolIntArray( 1200, 1198, 1199 ), PoolIntArray( 1204, 1201, 1203 ), PoolIntArray( 1201, 1202, 1203 ), PoolIntArray( 1207, 1205, 1206 ), PoolIntArray( 1210, 1208, 1209 ), PoolIntArray( 1213, 1211, 1212 ), PoolIntArray( 1216, 1214, 1215 ), PoolIntArray( 1220, 1217, 1219 ), PoolIntArray( 1217, 1218, 1219 ), PoolIntArray( 1223, 1221, 1222 ), PoolIntArray( 1227, 1224, 1226 ), PoolIntArray( 1224, 1225, 1226 ), PoolIntArray( 1230, 1228, 1229 ), PoolIntArray( 1233, 1231, 1232 ), PoolIntArray( 1236, 1234, 1235 ), PoolIntArray( 1239, 1237, 1238 ), PoolIntArray( 1242, 1240, 1241 ), PoolIntArray( 1246, 1243, 1245 ), PoolIntArray( 1243, 1244, 1245 ), PoolIntArray( 1249, 1247, 1248 ), PoolIntArray( 1252, 1250, 1251 ), PoolIntArray( 1255, 1253, 1254 ), PoolIntArray( 1258, 1256, 1257 ), PoolIntArray( 1261, 1259, 1260 ), PoolIntArray( 1264, 1262, 1263 ), PoolIntArray( 1267, 1265, 1266 ), PoolIntArray( 1270, 1268, 1269 ), PoolIntArray( 1274, 1271, 1273 ), PoolIntArray( 1271, 1272, 1273 ), PoolIntArray( 1280, 1275, 1279 ), PoolIntArray( 1275, 1276, 1279 ), PoolIntArray( 1276, 1278, 1279 ), PoolIntArray( 1276, 1277, 1278 ), PoolIntArray( 1284, 1281, 1283 ), PoolIntArray( 1281, 1282, 1283 ), PoolIntArray( 1288, 1285, 1287 ), PoolIntArray( 1285, 1286, 1287 ), PoolIntArray( 1292, 1289, 1291 ), PoolIntArray( 1289, 1290, 1291 ), PoolIntArray( 1296, 1293, 1295 ), PoolIntArray( 1293, 1294, 1295 ), PoolIntArray( 1300, 1297, 1299 ), PoolIntArray( 1297, 1298, 1299 ), PoolIntArray( 1304, 1301, 1303 ), PoolIntArray( 1301, 1302, 1303 ), PoolIntArray( 1308, 1305, 1307 ), PoolIntArray( 1305, 1306, 1307 ), PoolIntArray( 1312, 1309, 1311 ), PoolIntArray( 1309, 1310, 1311 ), PoolIntArray( 1316, 1313, 1315 ), PoolIntArray( 1313, 1314, 1315 ), PoolIntArray( 1320, 1317, 1319 ), PoolIntArray( 1317, 1318, 1319 ), PoolIntArray( 1324, 1321, 1323 ), PoolIntArray( 1321, 1322, 1323 ), PoolIntArray( 1328, 1325, 1327 ), PoolIntArray( 1325, 1326, 1327 ), PoolIntArray( 1332, 1329, 1331 ), PoolIntArray( 1329, 1330, 1331 ), PoolIntArray( 1336, 1333, 1335 ), PoolIntArray( 1333, 1334, 1335 ), PoolIntArray( 1340, 1337, 1339 ), PoolIntArray( 1337, 1338, 1339 ), PoolIntArray( 1344, 1341, 1343 ), PoolIntArray( 1341, 1342, 1343 ), PoolIntArray( 1348, 1345, 1347 ), PoolIntArray( 1345, 1346, 1347 ), PoolIntArray( 1352, 1349, 1351 ), PoolIntArray( 1349, 1350, 1351 ), PoolIntArray( 1356, 1353, 1355 ), PoolIntArray( 1353, 1354, 1355 ), PoolIntArray( 1360, 1357, 1359 ), PoolIntArray( 1357, 1358, 1359 ), PoolIntArray( 1364, 1361, 1363 ), PoolIntArray( 1361, 1362, 1363 ), PoolIntArray( 1368, 1365, 1367 ), PoolIntArray( 1365, 1366, 1367 ), PoolIntArray( 1372, 1369, 1371 ), PoolIntArray( 1369, 1370, 1371 ), PoolIntArray( 1376, 1373, 1375 ), PoolIntArray( 1373, 1374, 1375 ), PoolIntArray( 1380, 1377, 1379 ), PoolIntArray( 1377, 1378, 1379 ), PoolIntArray( 1384, 1381, 1383 ), PoolIntArray( 1381, 1382, 1383 ), PoolIntArray( 1388, 1385, 1387 ), PoolIntArray( 1385, 1386, 1387 ), PoolIntArray( 1391, 1389, 1390 ), PoolIntArray( 1394, 1392, 1393 ), PoolIntArray( 1398, 1395, 1397 ), PoolIntArray( 1395, 1396, 1397 ), PoolIntArray( 1401, 1399, 1400 ), PoolIntArray( 1405, 1402, 1404 ), PoolIntArray( 1402, 1403, 1404 ), PoolIntArray( 1409, 1406, 1408 ), PoolIntArray( 1406, 1407, 1408 ), PoolIntArray( 1412, 1410, 1411 ), PoolIntArray( 1416, 1413, 1415 ), PoolIntArray( 1413, 1414, 1415 ), PoolIntArray( 1420, 1417, 1419 ), PoolIntArray( 1417, 1418, 1419 ), PoolIntArray( 1424, 1421, 1423 ), PoolIntArray( 1421, 1422, 1423 ), PoolIntArray( 1427, 1425, 1426 ), PoolIntArray( 1430, 1428, 1429 ), PoolIntArray( 1434, 1431, 1433 ), PoolIntArray( 1431, 1432, 1433 ), PoolIntArray( 1440, 1435, 1439 ), PoolIntArray( 1435, 1436, 1439 ), PoolIntArray( 1436, 1438, 1439 ), PoolIntArray( 1436, 1437, 1438 ), PoolIntArray( 1444, 1441, 1443 ), PoolIntArray( 1441, 1442, 1443 ), PoolIntArray( 1447, 1445, 1446 ), PoolIntArray( 1451, 1448, 1450 ), PoolIntArray( 1448, 1449, 1450 ), PoolIntArray( 1454, 1452, 1453 ), PoolIntArray( 1458, 1455, 1457 ), PoolIntArray( 1455, 1456, 1457 ), PoolIntArray( 1462, 1459, 1461 ), PoolIntArray( 1459, 1460, 1461 ), PoolIntArray( 1466, 1463, 1465 ), PoolIntArray( 1463, 1464, 1465 ), PoolIntArray( 1469, 1467, 1468 ), PoolIntArray( 1472, 1470, 1471 ), PoolIntArray( 1475, 1473, 1474 ), PoolIntArray( 1478, 1476, 1477 ), PoolIntArray( 1482, 1479, 1481 ), PoolIntArray( 1479, 1480, 1481 ), PoolIntArray( 1486, 1483, 1485 ), PoolIntArray( 1483, 1484, 1485 ), PoolIntArray( 1489, 1487, 1488 ), PoolIntArray( 1492, 1490, 1491 ), PoolIntArray( 1495, 1493, 1494 ), PoolIntArray( 1498, 1496, 1497 ), PoolIntArray( 1501, 1499, 1500 ), PoolIntArray( 1505, 1502, 1504 ), PoolIntArray( 1502, 1503, 1504 ), PoolIntArray( 1508, 1506, 1507 ), PoolIntArray( 1511, 1509, 1510 ), PoolIntArray( 1515, 1512, 1514 ), PoolIntArray( 1512, 1513, 1514 ), PoolIntArray( 1519, 1516, 1518 ), PoolIntArray( 1516, 1517, 1518 ), PoolIntArray( 1523, 1520, 1522 ), PoolIntArray( 1520, 1521, 1522 ), PoolIntArray( 1527, 1524, 1526 ), PoolIntArray( 1524, 1525, 1526 ), PoolIntArray( 1531, 1528, 1530 ), PoolIntArray( 1528, 1529, 1530 ), PoolIntArray( 1535, 1532, 1534 ), PoolIntArray( 1532, 1533, 1534 ), PoolIntArray( 1539, 1536, 1538 ), PoolIntArray( 1536, 1537, 1538 ), PoolIntArray( 1543, 1540, 1542 ), PoolIntArray( 1540, 1541, 1542 ), PoolIntArray( 1548, 1544, 1547 ), PoolIntArray( 1544, 1545, 1547 ), PoolIntArray( 1545, 1546, 1547 ), PoolIntArray( 1552, 1549, 1551 ), PoolIntArray( 1549, 1550, 1551 ), PoolIntArray( 1556, 1553, 1555 ), PoolIntArray( 1553, 1554, 1555 ), PoolIntArray( 1560, 1557, 1559 ), PoolIntArray( 1557, 1558, 1559 ), PoolIntArray( 1564, 1561, 1563 ), PoolIntArray( 1561, 1562, 1563 ), PoolIntArray( 1568, 1565, 1567 ), PoolIntArray( 1565, 1566, 1567 ), PoolIntArray( 1571, 1569, 1570 ), PoolIntArray( 1575, 1572, 1574 ), PoolIntArray( 1572, 1573, 1574 ) ] +agent/radius = 2.0 + +[sub_resource type="PlaneMesh" id=5] +size = Vector2( 500, 500 ) + +[sub_resource type="ConcavePolygonShape" id=6] +data = PoolVector3Array( 250, 0, 250, -250, 0, 250, 250, 0, -250, -250, 0, 250, -250, 0, -250, 250, 0, -250 ) + +[sub_resource type="ProceduralSky" id=7] + +[sub_resource type="Environment" id=8] +background_mode = 2 +background_sky = SubResource( 7 ) + +[node name="World" type="Navigation"] + +[node name="Player" parent="." instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5724, 0, 79.2998 ) + +[node name="PathNavigatorForNPC" parent="." instance=ExtResource( 2 )] +editor/display_folded = true +curve = SubResource( 1 ) +body_nodepath = NodePath("Meldewesen") + +[node name="Meldewesen" parent="PathNavigatorForNPC" instance=ExtResource( 3 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 93.2622 ) + +[node name="Enemies" type="Spatial" parent="."] +editor/display_folded = true + +[node name="Meldewesen2" parent="Enemies" instance=ExtResource( 3 )] +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -0.600893, 0, 30.3683 ) +_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") + +[node name="MaskedAmbience" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) +autoplay = true +bus = "Masked" + +[node name="Melody" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) +autoplay = true + +[node name="TrueAmbience" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 6 ) +autoplay = true +bus = "True" + +[node name="Collectibles" type="Spatial" parent="."] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 ) + +[node name="Keycard" parent="Collectibles" instance=ExtResource( 7 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -32.6122, 0, -88.5269 ) + +[node name="Key" parent="Collectibles" groups=[ +"Collectibles", +] instance=ExtResource( 7 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75.0183, 0, -2.86102e-006 ) + +[node name="ForbiddenArea" type="Area" parent="Collectibles/Key" groups=[ +"Forbidden", +]] + +[node name="CollisionShape" type="CollisionShape" parent="Collectibles/Key/ForbiddenArea"] +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-007 ) +shape = SubResource( 2 ) + +[node name="WorkerSpawner" type="Spatial" parent="."] +editor/display_folded = true + +[node name="WorkerSpawner" type="Spatial" parent="WorkerSpawner"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.83828, 0, -19.6123 ) +script = ExtResource( 8 ) +_nodepath = NodePath("../Path") +_offset = 96.0 + +[node name="WorkerSpawner2" type="Spatial" parent="WorkerSpawner"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 31.1216, 0, -36.1276 ) +script = ExtResource( 8 ) +_nodepath = NodePath("../Path") +_offset = 157.0 + +[node name="WorkerSpawner3" type="Spatial" parent="WorkerSpawner"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.36571, 0, 52.7015 ) +script = ExtResource( 8 ) +_nodepath = NodePath("../Path") + +[node name="WorkerSpawner4" type="Spatial" parent="WorkerSpawner"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 31.4463, 0, 43.5124 ) +script = ExtResource( 8 ) +_nodepath = NodePath("../Path") +_offset = 250.0 + +[node name="Path" type="Path" parent="WorkerSpawner"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.127018, 0, 0.00287628 ) +curve = SubResource( 3 ) + +[node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"] +transform = Transform( -0.998276, 0.00481672, 0.0584792, 0.0049628, 0.999985, 0.00235273, -0.0584662, 0.00263891, -0.998284, -15.7672, 0.284373, -190.888 ) +offset = 380.29 + +[node name="Touchables" type="Spatial" parent="."] +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, 27.0918, 2.20599, 77.1957 ) + +[node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] +navmesh = SubResource( 4 ) + +[node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )] +transform = Transform( 0.9, 0, 0, 0, 1, 0, 0, 0, 1, 16.3266, 0, 77.8091 ) + +[node name="SaveArea" type="Area" parent="NavigationMeshInstance/PlayerHouse" groups=[ +"Savehouse", +]] +transform = Transform( -2.76707e-008, 0, 0.633032, 0, 1, 0, -0.385105, 0, -1.68335e-008, -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 ) +shape = SubResource( 2 ) + +[node name="MeldewesenHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )] +transform = Transform( 0.8, 0, 0, 0, 1, 0, 0, 0, 1, 82.1951, 0, 13.5105 ) + +[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 ) + +[node name="DoorWall" parent="NavigationMeshInstance" instance=ExtResource( 12 )] +transform = Transform( -6.15088e-008, 0, 1.40716, 0, 1.40716, 0, -1.40716, 0, -6.15088e-008, 72.1424, -0.0216179, 48.7983 ) + +[node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"] +editor/display_folded = true + +[node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -13 ) + +[node name="BuildingBlock2" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, -13 ) + +[node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0.047, 41.124 ) + +[node name="BuildingBlock12" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 14 ) + +[node name="BuildingBlock13" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 41 ) + +[node name="BuildingBlock15" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 95 ) + +[node name="BuildingBlock21" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 68 ) + +[node name="BuildingBlock16" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 68 ) + +[node name="BuildingBlock20" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 95 ) + +[node name="BuildingBlock17" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, -2.27536, 0, 116 ) + +[node name="BuildingBlock18" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 25.0542, 0, 116 ) + +[node name="BuildingBlock3" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, -40 ) + +[node name="BuildingBlock4" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -40 ) + +[node name="Ground" type="MeshInstance" parent="NavigationMeshInstance"] +editor/display_folded = true +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.4412, -0.0216179, -17.0387 ) +layers = 3 +mesh = SubResource( 5 ) +material/0 = null + +[node name="StaticBody" type="StaticBody" parent="NavigationMeshInstance/Ground"] +collision_layer = 7 +collision_mask = 7 + +[node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/Ground/StaticBody"] +shape = SubResource( 6 ) + +[node name="Environment" type="Spatial" parent="."] + +[node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"] +environment = SubResource( 8 ) + +[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 ) +layers = 3 +shadow_enabled = true + +[node name="NodeGroupNotifier" parent="." instance=ExtResource( 14 )] +group_name = "Navigator" +node_to_send = NodePath("..") diff --git a/project.godot b/project.godot index 2fd49e8..cf57a99 100644 --- a/project.godot +++ b/project.godot @@ -78,7 +78,6 @@ PillAudioHandler="*res://Global/PillAudioHandler.tscn" window/size/width=1600 window/size/height=900 window/size/borderless=true -window/size/fullscreen=true [input] From af6ba98abff3cc57a6dd627e575a8b06cd5c1edf Mon Sep 17 00:00:00 2001 From: Leon Palluch Date: Mon, 27 Jan 2020 16:44:17 +0100 Subject: [PATCH 09/11] added model for lvl2 keycard --- Level/InFactory.tscn | 137 ++++++++++++++++-- Level/Interactables/Door/Door.gd | 4 +- Level/Interactables/Keycard/Keycard.tscn | 13 +- Level/Interactables/Keycard/Keycard2.tscn | 76 ++++++++++ Level/World.tscn | 2 +- ...erial_002.material => card1_face.material} | Bin Resources/Models/keycard/card2_face.material | Bin 0 -> 753 bytes Resources/Models/keycard/lvl2_keycard.png | Bin 0 -> 563 bytes .../Models/keycard/lvl2_keycard.png.import | 36 +++++ 9 files changed, 241 insertions(+), 27 deletions(-) create mode 100644 Level/Interactables/Keycard/Keycard2.tscn rename Resources/Models/keycard/{Material_002.material => card1_face.material} (100%) create mode 100644 Resources/Models/keycard/card2_face.material create mode 100644 Resources/Models/keycard/lvl2_keycard.png create mode 100644 Resources/Models/keycard/lvl2_keycard.png.import diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn index ff11a29..6e9f866 100644 --- a/Level/InFactory.tscn +++ b/Level/InFactory.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=14 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/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] +[ext_resource path="res://Level/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=1] +[ext_resource path="res://Level/Interactables/Keycard/Keycard2.tscn" type="PackedScene" id=2] +[ext_resource path="res://Level/Buildings/DoubleDoorWall.tscn" type="PackedScene" id=3] +[ext_resource path="res://Level/Buildings/DoorWall.tscn" type="PackedScene" id=4] +[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=5] +[ext_resource path="res://Level/Interactables/FactoryMachines/FactoryGameplay.tscn" type="PackedScene" id=6] +[ext_resource path="res://Level/Decoration/Statue.tscn" type="PackedScene" id=7] +[ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=8] [sub_resource type="BoxShape" id=1] @@ -21,9 +23,19 @@ [node name="Architecture" type="Spatial" parent="."] +[node name="Cheat (delete later)" type="Spatial" parent="Architecture"] + +[node name="Keycard" parent="Architecture/Cheat (delete later)" instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1, -3 ) +card_lvl = 1 + +[node name="Keycard2" parent="Architecture/Cheat (delete later)" instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 1, -38 ) + [node name="OutsideEntry" type="Area" parent="Architecture" groups=[ "OutsideEntry", ]] +editor/display_folded = true [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 ) @@ -44,10 +56,10 @@ material/0 = null [node name="EntryHall" type="Spatial" parent="Architecture"] editor/display_folded = true -[node name="DoubleDoorWall" parent="Architecture/EntryHall" instance=ExtResource( 1 )] +[node name="DoubleDoorWall" parent="Architecture/EntryHall" instance=ExtResource( 3 )] transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 1.8 ) -[node name="DoorWall" parent="Architecture/EntryHall" instance=ExtResource( 2 )] +[node name="DoorWall" parent="Architecture/EntryHall" instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 0, 2 ) visible = false @@ -90,12 +102,13 @@ material/0 = null [node name="CollisionShape" type="CollisionShape" parent="Architecture/EntryHall/Ceiling"] shape = SubResource( 5 ) -[node name="DoubleDoorWall2" parent="Architecture/EntryHall" instance=ExtResource( 1 )] +[node name="DoubleDoorWall2" parent="Architecture/EntryHall" instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -17.8 ) [node name="FactoryRoomWalls" type="Spatial" parent="Architecture"] [node name="SideWall" type="StaticBody" parent="Architecture/FactoryRoomWalls"] +editor/display_folded = true transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 0.2, 8, 4, -17.8 ) collision_layer = 3 @@ -173,6 +186,7 @@ material/0 = null shape = SubResource( 5 ) [node name="BackWall2" type="StaticBody" parent="Architecture/FactoryRoomWalls"] +editor/display_folded = true transform = Transform( 2, 0, 0, 0, 4, 0, 0, 0, 0.2, 10, 4, -33.8 ) collision_layer = 2 @@ -185,6 +199,7 @@ material/0 = null shape = SubResource( 5 ) [node name="BackWall3" type="StaticBody" parent="Architecture/FactoryRoomWalls"] +editor/display_folded = true transform = Transform( 1, 0, 0, 0, 2.7, 0, 0, 0, 0.2, 7, 5.7, -33.8 ) collision_layer = 2 @@ -199,6 +214,8 @@ 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 ) +collision_layer = 0 +collision_mask = 0 [node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/BackWallMasked"] mesh = SubResource( 4 ) @@ -210,9 +227,12 @@ 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 +[node name="Door" parent="Architecture/FactoryRoomWalls/BackWallTrue" instance=ExtResource( 5 )] +collision_layer = 3 collision_mask = 3 +invert_open = true +card_door = true +door_lvl = 1 [node name="DoorMesh" parent="Architecture/FactoryRoomWalls/BackWallTrue/Door" index="0"] layers = 2 @@ -240,8 +260,9 @@ material/0 = null shape = SubResource( 5 ) [node name="FactoryRoomInterior" type="Spatial" parent="Architecture"] +editor/display_folded = true -[node name="PipeGame" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 4 )] +[node name="PipeGame" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 6 )] 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"] @@ -257,10 +278,96 @@ material/0 = null [node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomInterior/StatueBlock"] shape = SubResource( 5 ) -[node name="Statue" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 5 )] +[node name="Statue" parent="Architecture/FactoryRoomInterior" instance=ExtResource( 7 )] 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( 6 )] +[node name="Hallway" type="Spatial" parent="Architecture"] + +[node name="Wall" type="StaticBody" parent="Architecture/Hallway"] +editor/display_folded = true +transform = Transform( 11, 0, 0, 0, 2, 0, 0, 0, 0.2, 4, 2, -36.8 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Hallway/Wall"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Hallway/Wall"] +shape = SubResource( 5 ) + +[node name="Wall2" type="StaticBody" parent="Architecture/Hallway"] +editor/display_folded = true +transform = Transform( 0.2, 0, 0, 0, 2, 0, 0, 0, 3, -10.3, 2, -36.8 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Hallway/Wall2"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Hallway/Wall2"] +shape = SubResource( 5 ) + +[node name="Wall3" type="StaticBody" parent="Architecture/Hallway"] +editor/display_folded = true +transform = Transform( 0.2, 0, 0, 0, 2, 0, 0, 0, 1.5, -6.8, 2, -38.2 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Hallway/Wall3"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Hallway/Wall3"] +shape = SubResource( 5 ) + +[node name="Wall4" type="StaticBody" parent="Architecture/Hallway"] +editor/display_folded = true +transform = Transform( 0.3, 0, 0, 0, 2, 0, 0, 0, 0.2, -7.25, 2, -39.4 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Hallway/Wall4"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Hallway/Wall4"] +shape = SubResource( 5 ) + +[node name="Wall5" type="StaticBody" parent="Architecture/Hallway"] +editor/display_folded = true +transform = Transform( 0.3, 0, 0, 0, 2, 0, 0, 0, 0.2, -9.85, 2, -39.4 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Hallway/Wall5"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Hallway/Wall5"] +shape = SubResource( 5 ) + +[node name="Wall6" type="StaticBody" parent="Architecture/Hallway"] +editor/display_folded = true +transform = Transform( 1, 0, 0, 0, 0.5, 0, 0, 0, 0.2, -8.55, 3.5, -39.4 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Hallway/Wall6"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Hallway/Wall6"] +shape = SubResource( 5 ) + +[node name="Door" parent="Architecture/Hallway" instance=ExtResource( 5 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -9.55, 1.5, -39.5 ) +invert_open = true +card_door = true +door_lvl = 2 + +[node name="Player" parent="." instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0 ) [editable path="Architecture/FactoryRoomWalls/BackWallTrue/Door"] diff --git a/Level/Interactables/Door/Door.gd b/Level/Interactables/Door/Door.gd index 8e1fd66..dd2c815 100644 --- a/Level/Interactables/Door/Door.gd +++ b/Level/Interactables/Door/Door.gd @@ -49,10 +49,10 @@ func do_interact(var player): # opens or closes the door func _door_move(delta): if _isOpening: - if _degrees < 120: + if _degrees < 105: _degrees += OPENING_SPEED * delta else: - _degrees = 120 + _degrees = 105 _isMoving = false else: if _degrees > 0: diff --git a/Level/Interactables/Keycard/Keycard.tscn b/Level/Interactables/Keycard/Keycard.tscn index 4bb5ac1..0481e7f 100644 --- a/Level/Interactables/Keycard/Keycard.tscn +++ b/Level/Interactables/Keycard/Keycard.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://Level/Interactables/Keycard/Keycard.gd" type="Script" id=1] -[ext_resource path="res://Resources/Models/keycard/Material_002.material" type="Material" id=2] +[ext_resource path="res://Resources/Models/keycard/card1_face.material" type="Material" id=2] [ext_resource path="res://Resources/Models/keycard/Material.material" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=4] -[ext_resource path="res://Resources/Models/keycard/keycard.dae" type="PackedScene" id=5] -[ext_resource path="res://Particles/Sparkle.tscn" type="PackedScene" id=6] +[ext_resource path="res://Particles/Sparkle.tscn" type="PackedScene" id=5] [sub_resource type="ArrayMesh" id=1] resource_name = "Cube" @@ -69,12 +68,8 @@ layers = 3 mesh = SubResource( 2 ) material/0 = ExtResource( 4 ) -[node name="weirdModel" parent="." instance=ExtResource( 5 )] -transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 ) -visible = false - [node name="CollisionShape" type="CollisionShape" parent="."] transform = Transform( 0.02, 0, 0, 0, 0.08, 0, 0, 0, 0.12, 0, 0, 0 ) shape = SubResource( 3 ) -[node name="Sparkle" parent="." instance=ExtResource( 6 )] +[node name="Sparkle" parent="." instance=ExtResource( 5 )] diff --git a/Level/Interactables/Keycard/Keycard2.tscn b/Level/Interactables/Keycard/Keycard2.tscn new file mode 100644 index 0000000..45fd659 --- /dev/null +++ b/Level/Interactables/Keycard/Keycard2.tscn @@ -0,0 +1,76 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://Level/Interactables/Keycard/Keycard.gd" type="Script" id=1] +[ext_resource path="res://Resources/Models/keycard/card2_face.material" type="Material" id=2] +[ext_resource path="res://Resources/Models/keycard/Material.material" type="Material" id=3] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=4] +[ext_resource path="res://Particles/Sparkle.tscn" type="PackedScene" id=5] + +[sub_resource type="ArrayMesh" id=1] +resource_name = "Cube" +surfaces/0 = { +"aabb": AABB( 1, -1, -1, 1.00136e-005, 2, 2.00001 ), +"array_data": PoolByteArray( 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 51, 59, 0, 0, 128, 63, 0, 0, 128, 191, 129, 202, 89, 63, 127, 0, 0, 0, 0, 0, 129, 127, 198, 44, 0, 60, 0, 0, 128, 63, 0, 0, 128, 191, 154, 153, 89, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 60, 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 191, 127, 0, 0, 0, 0, 0, 129, 127, 0, 60, 51, 59, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 191, 127, 0, 0, 0, 0, 0, 130, 127, 0, 60, 102, 46, 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 0, 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 63, 127, 0, 0, 0, 0, 0, 129, 127, 204, 44, 0, 0, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 102, 46 ), +"array_index_data": PoolByteArray( 0, 0, 2, 0, 1, 0, 2, 0, 0, 0, 3, 0, 3, 0, 0, 0, 4, 0, 4, 0, 6, 0, 5, 0, 6, 0, 4, 0, 7, 0, 7, 0, 4, 0, 0, 0 ), +"blend_shape_data": [ ], +"format": 97559, +"index_count": 18, +"material": ExtResource( 2 ), +"name": "Material.002", +"primitive": 4, +"skeleton_aabb": [ ], +"vertex_count": 8 +} +surfaces/1 = { +"aabb": AABB( -1, -1, -1, 2.00001, 2.00001, 2 ), +"array_data": PoolByteArray( 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 63, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 191, 0, 0, 128, 63, 154, 153, 89, 191, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 191, 0, 0, 128, 63, 154, 153, 89, 63, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 57, 0, 58, 0, 0, 128, 191, 0, 0, 128, 63, 154, 153, 89, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 0, 0, 60, 0, 0, 128, 191, 205, 204, 76, 63, 0, 0, 128, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 57, 0, 56, 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 0, 0, 60, 0, 0, 128, 191, 205, 204, 76, 63, 0, 0, 128, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 57, 0, 56, 0, 0, 128, 191, 205, 204, 76, 191, 0, 0, 128, 63, 0, 0, 127, 0, 127, 0, 0, 129, 0, 0, 0, 60, 0, 0, 128, 191, 205, 204, 76, 191, 0, 0, 128, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 54, 0, 52, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 57, 0, 52, 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 191, 205, 204, 76, 63, 0, 0, 128, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 191, 0, 0, 128, 63, 154, 153, 89, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 57, 0, 52, 0, 0, 128, 191, 0, 0, 128, 191, 154, 153, 89, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 54, 104, 48, 0, 0, 128, 191, 205, 204, 76, 191, 0, 0, 128, 191, 0, 180, 155, 0, 127, 0, 0, 127, 0, 54, 0, 52, 0, 0, 128, 63, 0, 0, 128, 191, 129, 202, 89, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 57, 117, 38, 0, 0, 128, 191, 205, 204, 76, 191, 0, 0, 128, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 0, 0, 60, 0, 0, 128, 191, 0, 0, 128, 191, 178, 104, 89, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 54, 130, 38, 0, 0, 128, 191, 0, 0, 128, 191, 178, 104, 89, 63, 0, 129, 0, 0, 237, 0, 131, 129, 0, 54, 130, 38, 0, 0, 128, 63, 0, 0, 128, 191, 154, 153, 89, 191, 0, 129, 0, 0, 237, 0, 131, 129, 0, 0, 0, 60, 0, 0, 128, 63, 0, 0, 128, 191, 129, 202, 89, 63, 0, 129, 0, 0, 126, 0, 0, 127, 0, 57, 117, 38, 0, 0, 128, 191, 205, 204, 76, 191, 0, 0, 128, 191, 129, 0, 0, 0, 0, 59, 112, 129, 0, 54, 0, 52, 0, 0, 128, 191, 0, 0, 128, 191, 154, 153, 89, 191, 129, 0, 0, 0, 127, 0, 0, 127, 0, 54, 104, 48, 0, 0, 128, 191, 0, 0, 128, 191, 178, 104, 89, 63, 129, 0, 0, 0, 0, 10, 130, 127, 0, 54, 130, 38, 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 191, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 63, 0, 76, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 57, 0, 58, 0, 0, 128, 191, 205, 204, 76, 63, 0, 0, 128, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 63, 0, 0, 128, 191, 154, 153, 89, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 0, 0, 60, 0, 0, 128, 63, 0, 0, 128, 191, 129, 202, 89, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 57, 117, 38, 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 0, 0, 128, 191, 205, 204, 76, 191, 0, 0, 128, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 0, 0, 128, 191, 0, 0, 128, 191, 154, 153, 89, 191, 0, 129, 0, 0, 237, 0, 131, 129, 0, 54, 104, 48, 0, 0, 128, 191, 205, 204, 76, 191, 0, 0, 128, 63, 129, 0, 0, 0, 0, 126, 8, 127, 0, 0, 0, 60, 0, 0, 128, 191, 205, 204, 76, 63, 0, 0, 128, 63, 129, 0, 0, 0, 0, 59, 112, 129, 0, 57, 0, 56, 0, 0, 128, 191, 0, 0, 128, 63, 154, 153, 89, 63, 129, 0, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 191, 0, 0, 128, 63, 154, 153, 89, 191, 129, 0, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 0, 0, 128, 191, 205, 204, 76, 63, 0, 0, 128, 191, 129, 0, 0, 0, 0, 59, 112, 129, 0, 0, 0, 60 ), +"array_index_data": PoolByteArray( 0, 0, 2, 0, 1, 0, 3, 0, 5, 0, 4, 0, 6, 0, 8, 0, 7, 0, 9, 0, 11, 0, 10, 0, 12, 0, 14, 0, 13, 0, 15, 0, 17, 0, 16, 0, 18, 0, 20, 0, 19, 0, 21, 0, 23, 0, 22, 0, 24, 0, 26, 0, 25, 0, 0, 0, 1, 0, 27, 0, 3, 0, 4, 0, 28, 0, 6, 0, 7, 0, 29, 0, 9, 0, 10, 0, 30, 0, 12, 0, 13, 0, 31, 0, 15, 0, 16, 0, 32, 0, 33, 0, 35, 0, 34, 0, 21, 0, 22, 0, 36, 0, 26, 0, 24, 0, 37, 0, 37, 0, 24, 0, 38, 0, 38, 0, 40, 0, 39, 0, 40, 0, 38, 0, 41, 0, 41, 0, 38, 0, 24, 0 ), +"blend_shape_data": [ ], +"format": 97559, +"index_count": 66, +"material": ExtResource( 3 ), +"name": "Material", +"primitive": 4, +"skeleton_aabb": [ ], +"vertex_count": 42 +} + +[sub_resource type="ArrayMesh" id=2] +surfaces/0 = { +"aabb": AABB( -1.06509, -1.07632, -1.07551, 2.13023, 2.15263, 2.15104 ), +"array_data": PoolByteArray( 14, 86, 136, 63, 174, 199, 78, 191, 170, 169, 137, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 51, 59, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 127, 0, 0, 0, 0, 0, 129, 127, 198, 44, 0, 60, 187, 224, 135, 63, 191, 196, 137, 191, 79, 164, 94, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 60, 4, 85, 136, 63, 185, 204, 78, 191, 76, 170, 137, 191, 127, 0, 0, 0, 0, 0, 129, 127, 0, 60, 51, 59, 4, 85, 136, 63, 185, 204, 78, 63, 76, 170, 137, 191, 127, 0, 0, 0, 0, 0, 130, 127, 0, 60, 102, 46, 187, 224, 135, 63, 187, 224, 135, 63, 95, 52, 102, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 0, 187, 224, 135, 63, 191, 196, 137, 63, 79, 164, 94, 63, 127, 0, 0, 0, 0, 0, 129, 127, 204, 44, 0, 0, 4, 85, 136, 63, 107, 204, 86, 63, 4, 85, 136, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 102, 46, 187, 224, 135, 63, 191, 196, 137, 63, 79, 164, 94, 63, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 191, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 63, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 107, 204, 86, 63, 4, 85, 136, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 57, 0, 58, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 57, 0, 56, 14, 86, 136, 63, 174, 199, 78, 191, 170, 169, 137, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 57, 0, 56, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 0, 0, 127, 0, 127, 0, 0, 129, 0, 0, 0, 60, 4, 85, 136, 191, 185, 204, 78, 191, 76, 170, 137, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 54, 0, 52, 4, 85, 136, 63, 185, 204, 78, 63, 76, 170, 137, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 185, 204, 78, 191, 76, 170, 137, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 57, 0, 52, 187, 224, 135, 63, 187, 224, 135, 63, 95, 52, 102, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 185, 204, 78, 191, 76, 170, 137, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 57, 0, 52, 187, 224, 135, 191, 187, 224, 135, 191, 95, 52, 102, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 54, 104, 48, 4, 85, 136, 191, 185, 204, 78, 191, 76, 170, 137, 191, 0, 180, 155, 0, 127, 0, 0, 127, 0, 54, 0, 52, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 57, 117, 38, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 0, 0, 60, 155, 225, 135, 191, 155, 225, 135, 191, 22, 255, 101, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 54, 130, 38, 155, 225, 135, 191, 155, 225, 135, 191, 22, 255, 101, 63, 0, 129, 0, 0, 237, 0, 131, 129, 0, 54, 130, 38, 187, 224, 135, 63, 191, 196, 137, 191, 79, 164, 94, 191, 0, 129, 0, 0, 237, 0, 131, 129, 0, 0, 0, 60, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 0, 129, 0, 0, 126, 0, 0, 127, 0, 57, 117, 38, 4, 85, 136, 191, 185, 204, 78, 191, 76, 170, 137, 191, 129, 0, 0, 0, 0, 59, 112, 129, 0, 54, 0, 52, 187, 224, 135, 191, 187, 224, 135, 191, 95, 52, 102, 191, 129, 0, 0, 0, 127, 0, 0, 127, 0, 54, 104, 48, 155, 225, 135, 191, 155, 225, 135, 191, 22, 255, 101, 63, 129, 0, 0, 0, 0, 10, 130, 127, 0, 54, 130, 38, 187, 224, 135, 63, 187, 224, 135, 63, 95, 52, 102, 191, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 63, 191, 196, 137, 63, 79, 164, 94, 63, 0, 76, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 4, 85, 136, 63, 107, 204, 86, 63, 4, 85, 136, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 57, 0, 58, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 185, 204, 78, 63, 76, 170, 137, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 63, 191, 196, 137, 191, 79, 164, 94, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 0, 0, 60, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 57, 117, 38, 14, 86, 136, 63, 174, 199, 78, 191, 170, 169, 137, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 187, 224, 135, 191, 187, 224, 135, 191, 95, 52, 102, 191, 0, 129, 0, 0, 237, 0, 131, 129, 0, 54, 104, 48, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 129, 0, 0, 0, 0, 126, 8, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 63, 129, 0, 0, 0, 0, 59, 112, 129, 0, 57, 0, 56, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 63, 129, 0, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 191, 129, 0, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 191, 129, 0, 0, 0, 0, 59, 112, 129, 0, 0, 0, 60 ), +"array_index_data": PoolByteArray( 0, 0, 1, 0, 2, 0, 2, 0, 3, 0, 0, 0, 3, 0, 4, 0, 0, 0, 4, 0, 5, 0, 6, 0, 6, 0, 7, 0, 4, 0, 7, 0, 0, 0, 4, 0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0, 16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22, 0, 23, 0, 24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30, 0, 31, 0, 32, 0, 33, 0, 34, 0, 8, 0, 35, 0, 9, 0, 11, 0, 36, 0, 12, 0, 14, 0, 37, 0, 15, 0, 17, 0, 38, 0, 18, 0, 20, 0, 39, 0, 21, 0, 23, 0, 40, 0, 24, 0, 41, 0, 42, 0, 43, 0, 29, 0, 44, 0, 30, 0, 34, 0, 45, 0, 32, 0, 45, 0, 46, 0, 32, 0, 46, 0, 47, 0, 48, 0, 48, 0, 49, 0, 46, 0, 49, 0, 32, 0, 46, 0 ), +"blend_shape_data": [ ], +"format": 97559, +"index_count": 84, +"primitive": 4, +"skeleton_aabb": [ ], +"vertex_count": 50 +} + +[sub_resource type="BoxShape" id=3] + +[node name="Keycard" type="StaticBody" groups=[ +"Touchables", +]] +script = ExtResource( 1 ) +card_lvl = 2 + +[node name="KeycardMesh" type="MeshInstance" parent="."] +transform = Transform( 0.003, 0, 0, 0, 0.06, 0, 0, 0, 0.1, 0, 0, 0 ) +layers = 3 +mesh = SubResource( 1 ) +material/0 = null +material/1 = null + +[node name="Outline" type="MeshInstance" parent="KeycardMesh"] +visible = false +layers = 3 +mesh = SubResource( 2 ) +material/0 = ExtResource( 4 ) + +[node name="CollisionShape" type="CollisionShape" parent="."] +transform = Transform( 0.02, 0, 0, 0, 0.08, 0, 0, 0, 0.12, 0, 0, 0 ) +shape = SubResource( 3 ) + +[node name="Sparkle" parent="." instance=ExtResource( 5 )] diff --git a/Level/World.tscn b/Level/World.tscn index cf6927f..a920568 100644 --- a/Level/World.tscn +++ b/Level/World.tscn @@ -124,7 +124,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.127018, 0, 0.00287628 ) curve = SubResource( 2 ) [node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"] -transform = Transform( 0.938844, 0.00179193, 0.344336, -0.00172808, 0.999999, -0.000492296, -0.344337, -0.000132863, 0.938845, -15.7672, 0.284373, -190.888 ) +transform = Transform( -0.998276, 0.00481672, 0.0584792, 0.0049628, 0.999985, 0.00235273, -0.0584669, 0.0026389, -0.998284, -15.7672, 0.284373, -190.888 ) offset = 380.29 [node name="Worker" parent="WorkerSpawner/Path/PathFollow" instance=ExtResource( 5 )] diff --git a/Resources/Models/keycard/Material_002.material b/Resources/Models/keycard/card1_face.material similarity index 100% rename from Resources/Models/keycard/Material_002.material rename to Resources/Models/keycard/card1_face.material diff --git a/Resources/Models/keycard/card2_face.material b/Resources/Models/keycard/card2_face.material new file mode 100644 index 0000000000000000000000000000000000000000..8180c3edd5f41cfabeb57121c58f18537c1c4bef GIT binary patch literal 753 zcmV@*dbBu?9zmiIFzSOPUDN zKFYZNDgJMG-dgO-$Xk7FV&(R5bnba zo8elVLzv6)QY=w~k%b8twKAm2!k1=Q88pF0s&L7(P&ipk#P`@`TiZzGssukQM$MKs zg#1W&Gd6;B3ko`#ZYwVap-~gw`xM>lOhzuTqO4L2^};x zG&q0&5#qn_2T(9DE`9<73RpN7n2te8hK98Zq+}!?YAdRHpAp@F=43-;%%a*!V#qj}XT=m= za2+S=y$smKwWU-w24Wx@peLJ^6bYuJr@D# z$NA+`HHrG&UJUW0_&HL4rdiFSc4wo#*fDhHa)iacX7V`oM4rC{vBx_~Xx96vq#%N^ jFe+^qyK+3=n>MFRqLrvklr{N)zLl?fhMTVvQd2`i*jQGv literal 0 HcmV?d00001 diff --git a/Resources/Models/keycard/lvl2_keycard.png b/Resources/Models/keycard/lvl2_keycard.png new file mode 100644 index 0000000000000000000000000000000000000000..83b23365b1582d92b0d43609799b588dd92b7488 GIT binary patch literal 563 zcmeAS@N?(olHy`uVBq!ia0vp^DL`z)!3HEJ*vp>-Qk(@Ik;M!Qe1|}oQB=dL0Vt@D z>=ES4z)+>iz|hdl!0_`wkbcR)P-?)y@G60U!D}s+6?3)S$HpL_7_vNdJ=NowNE3(A(J+{~vU|zI? zL4iYo!I6QHgNego!p54s=J)s0Km6Rcwj$Wk+iPhZ>qD;tD|e(kJv3pPBd2%RiH!?y z@-sB6zJBv$N~*`DG_j?AaZ{Jf`}L?cx_j}{y?;3zlE3Y%JH0XaqFtSSr_kESYf>&J zkA$svUcx7%$?ti5)}?d3ISNy)3>H1UyZ!5b|E%@-FCRoEv@qK%?-1LpZt}IRUrTNdMRb^`zeyp7Mq-~vfrycXE)DIr! zZD%L#N)@fE`>y`(*doDCC*vn>2?`8a{_e#RKF8h$gU!}=Qx&J_G$;Te0}CSyI8@y} zoj%X3FQ5nu;S*0DHFa@-0(;Uceg=mB|Ct$9+mSOx}9S3j3^P6 Date: Mon, 27 Jan 2020 17:15:22 +0100 Subject: [PATCH 10/11] #31 so far... --- Level/OutsideWorld.tscn | 47 ++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/Level/OutsideWorld.tscn b/Level/OutsideWorld.tscn index ab3c4fe..00bf247 100644 --- a/Level/OutsideWorld.tscn +++ b/Level/OutsideWorld.tscn @@ -17,8 +17,8 @@ [sub_resource type="Curve3D" id=1] _data = { -"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, 2.77093, 0, 97.8557, 0, 0, 0, 0, 0, 0, 26.9732, -0.000976562, 98.019, 0, 0, 0, 0, 0, 0, 26.5524, -0.0141602, 64.329, 0, 0, 0, 0, 0, 0, 3.05817, 0, 64.3674 ), -"tilts": PoolRealArray( 0, 0, 0, 0 ) +"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, -2.79141, 0, 64.3776, 0, 0, 0, 0, 0, 0, 3.92828, 0, 58.7873, 0, 0, 0, 0, 0, 0, 25.1256, 0, 59.1506, 0, 0, 0, 0, 0, 0, 31.6821, 0, 65.5338, 0, 0, 0, 0, 0, 0, 31.843, 0, 89.6361, 0, 0, 0, 0, 0, 0, 25.1319, 7.62939e-006, 95.8734, 0, 0, 0, 0, 0, 0, 3.93893, 1.52588e-005, 95.8336, 0, 0, 0, 0, 0, 0, -2.78792, 2.28882e-005, 88.8055, 0, 0, 0, 0, 0, 0, -2.79141, 0, 64.3776 ), +"tilts": PoolRealArray( 0, 0, 0, 0, 0, 0, 0, 0, 0 ) } [sub_resource type="BoxShape" id=2] @@ -52,18 +52,24 @@ background_sky = SubResource( 7 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5724, 0, 79.2998 ) [node name="PathNavigatorForNPC" parent="." instance=ExtResource( 2 )] -editor/display_folded = true curve = SubResource( 1 ) body_nodepath = NodePath("Meldewesen") [node name="Meldewesen" parent="PathNavigatorForNPC" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 93.2622 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.14131, 0, 101.825 ) [node name="Enemies" type="Spatial" parent="."] -editor/display_folded = true [node name="Meldewesen2" parent="Enemies" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -0.600893, 0, 30.3683 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 14.9623, 0, 52.3728 ) +_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") + +[node name="Meldewesen3" parent="Enemies" instance=ExtResource( 3 )] +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 70.7133, 0, 4.86107 ) +_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") + +[node name="Meldewesen4" parent="Enemies" instance=ExtResource( 3 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 56.7007, 0, 24.1842 ) _visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") [node name="MaskedAmbience" type="AudioStreamPlayer" parent="."] @@ -84,7 +90,7 @@ bus = "True" transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 ) [node name="Keycard" parent="Collectibles" instance=ExtResource( 7 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -32.6122, 0, -88.5269 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8.09239, 0, 67.8154 ) [node name="Key" parent="Collectibles" groups=[ "Collectibles", @@ -130,24 +136,25 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.127018, 0, 0.00287628 ) curve = SubResource( 3 ) [node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"] -transform = Transform( -0.998276, 0.00481672, 0.0584792, 0.0049628, 0.999985, 0.00235273, -0.0584662, 0.00263891, -0.998284, -15.7672, 0.284373, -190.888 ) +transform = Transform( 0.981009, 0.00261139, -0.193941, -0.00238476, 0.999996, 0.00140191, 0.193943, -0.000912789, 0.98101, -15.7672, 0.284373, -190.888 ) offset = 380.29 [node name="Touchables" type="Spatial" parent="."] 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, 27.0918, 2.20599, 77.1957 ) +transform = Transform( 1.19249e-008, 0, -1, 0, 1, 0, 1, 0, 1.19249e-008, 25.749, 2.20599, 77.1957 ) [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] navmesh = SubResource( 4 ) [node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )] -transform = Transform( 0.9, 0, 0, 0, 1, 0, 0, 0, 1, 16.3266, 0, 77.8091 ) +transform = Transform( 0.9, 0, 0, 0, 1, 0, 0, 0, 1, 15.0218, 0, 77.8091 ) [node name="SaveArea" type="Area" parent="NavigationMeshInstance/PlayerHouse" groups=[ "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 ) [node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/PlayerHouse/SaveArea"] @@ -155,13 +162,22 @@ transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-007 ) shape = SubResource( 2 ) [node name="MeldewesenHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )] -transform = Transform( 0.8, 0, 0, 0, 1, 0, 0, 0, 1, 82.1951, 0, 13.5105 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 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 ) + +[node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/MeldewesenHouse/ForbiddenArea"] +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-007 ) +shape = SubResource( 2 ) [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 ) [node name="DoorWall" parent="NavigationMeshInstance" instance=ExtResource( 12 )] -transform = Transform( -6.15088e-008, 0, 1.40716, 0, 1.40716, 0, -1.40716, 0, -6.15088e-008, 72.1424, -0.0216179, 48.7983 ) +transform = Transform( -6.15088e-008, 0, 1.40716, 0, 1.40716, 0, -1.40716, 0, -6.15088e-008, 72.1424, -0.0216179, 64.9277 ) [node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"] editor/display_folded = true @@ -175,6 +191,12 @@ transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0 [node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0.047, 41.124 ) +[node name="BuildingBlock14" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 62.4331, 0.047, -6.91832 ) + +[node name="BuildingBlock19" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] +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( 13 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 14 ) @@ -220,6 +242,7 @@ collision_mask = 7 shape = SubResource( 6 ) [node name="Environment" type="Spatial" parent="."] +editor/display_folded = true [node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"] environment = SubResource( 8 ) From 37b558d7de6e7615685946dee77484eef081ff5d Mon Sep 17 00:00:00 2001 From: SyntaX Date: Mon, 27 Jan 2020 17:24:18 +0100 Subject: [PATCH 11/11] fixed Meldewesen behavior \ o / --- Characters/Meldewesen/Meldewesen.gd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Characters/Meldewesen/Meldewesen.gd b/Characters/Meldewesen/Meldewesen.gd index 3f78ece..ad459b5 100644 --- a/Characters/Meldewesen/Meldewesen.gd +++ b/Characters/Meldewesen/Meldewesen.gd @@ -1,7 +1,7 @@ extends NPC -export(NodePath) var _visibility_path: NodePath +#export(NodePath) var _visibility_path: NodePath export(int) var _player_follow_pill_level = 3 onready var visibility_cone_mesh = get_node("Visibility/VisibilityCone") @@ -45,7 +45,7 @@ func _ready(): _audioPlayer = get_node("AudioStreamPlayer3D") as AudioStreamPlayer3D assert(null != _audioPlayer) - _visibility = get_node(_visibility_path) as Area + _visibility = get_node("Visibility") as Area assert(null != _visibility) _visibility.connect("body_entered", self, "_on_body_entered_visibility") _visibility.connect("body_exited", self, "_on_body_exited_visibility") @@ -153,7 +153,7 @@ func _set_behavior (): if Pills.get_round_level() <= _player_follow_pill_level: Logger.info("The player's pill level is too low - following!") _followingPlayer = true - change_visibility_cone_color(Color.yellowgreen) + change_visibility_cone_color(Color.yellow) if _huntingPlayer or _followingPlayer: current_target = _playerRef.transform.origin