From af6ba98abff3cc57a6dd627e575a8b06cd5c1edf Mon Sep 17 00:00:00 2001
From: Leon Palluch <privat@computerzentrum.org>
Date: Mon, 27 Jan 2020 16:44:17 +0100
Subject: [PATCH] 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<N0uKFBQ$s@n000005C8yq1^@ur0ssIgwJ-f(c?EqI02ZZbEg+GS0s$BRxML%P
z>@*db<VHo3y_1wvAL3&H1Q$@e3|we}szAy|CI3U&WBgbESpZxBsF1P<Z`f)`vl30P
z7b6o_s1CyHaqwoi*O=Wl;^vb1FLCB;s3*w&CwND%)wK;RDu#>Bu?9zmiIFzSOPUDN
zKFYZNDgJMG-dgO-$Xk7F<NpHy{{{R32^*tQhhd!CYrJkXHT|z}&U027>V&(R5bnba
zo8elVLzv6)QY=w~k%b8twKAm2!k1=Q88pF0s&L7(P&ipk#P`@`TiZzGssukQM$MKs
zg#1W&Gd6;B3ko`#ZYwVap-<BuW^&dl%;gv&ri*zwNa4sJ&7+&h*g+DiNGtOio&N}q
z`}BVXUu9m2(Lq{X#U;AUf@5A{)DSr=_H@Zy3#8SOAY>~gw`xM>lOhzuTqO4L2^};x
zG&q0&5#qn_2T(9DE`9<73RpN7n2te8hK98Zq+}!?YA<yl$Ac4<W;|Hq@zB7CaS#6w
zbX%MFzX43_nwLU#4C?6RtcmV~q9{sRibiG_#l#SK)-|e5w+!xLH?t2f4{LygsBxt-
z2+a&k0AK?U1W*EiGgZX{5+FoDN)oA}0l0#G=>dRHpAp@F=43-;%%a*!V#qj}XT=m=
za2+S=y$smKw<iy!0oN?lEOY@#YaC<oTlV8{_d3vCt@O$AgLe3b?Fe?ZyiKe)Tn%Kj
zw@86`qymo)gFt#c;16q<ItTBvHA1XnP;);cEtfqt4-n?V)AaqIbNw9LNhSvN4B==(
zG%%td%6NNBK6mVi7vmY2{?OQBTa)7v3@9^r@EEByL>WU-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<ErgLwX=_@izN42(NHT^vIyZoQdx
zw(y7ok6Ut^*qtWt;=rBDR+ntp>}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@q<M_w?3_Y^eaF;I#9O
z;rj}8=NJk1?Dq9}r*{0S&^HfB53j$BJd0&6{W_uYyk$X3&O*DSpAJTxI~N#fR2AQQ
zth4yAQPI0sjBoc;d~<#g`ITd$PUzzK4EJ^Y%N5?eDW7JL)_Cczp0{#mKaZ=`H?8G+
zXIX1;YrL<`_%?m=;-Y`ow>K%?-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+<KAEXxj>mSOx}9S3j3^P6<r_*E;K!

literal 0
HcmV?d00001

diff --git a/Resources/Models/keycard/lvl2_keycard.png.import b/Resources/Models/keycard/lvl2_keycard.png.import
new file mode 100644
index 0000000..c9c63bf
--- /dev/null
+++ b/Resources/Models/keycard/lvl2_keycard.png.import
@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/lvl2_keycard.png-abd9f0428d4ceacb66ec11b99e39a28d.s3tc.stex"
+path.etc2="res://.import/lvl2_keycard.png-abd9f0428d4ceacb66ec11b99e39a28d.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Resources/Models/keycard/lvl2_keycard.png"
+dest_files=[ "res://.import/lvl2_keycard.png-abd9f0428d4ceacb66ec11b99e39a28d.s3tc.stex", "res://.import/lvl2_keycard.png-abd9f0428d4ceacb66ec11b99e39a28d.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0