Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace

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/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=1]
-[ext_resource path="res://Level/Buildings/DoorWall.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Level/Interactables/Keycard/Keycard2.tscn" type="PackedScene" id=2]
-[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Level/Buildings/DoubleDoorWall.tscn" type="PackedScene" id=3]
-[ext_resource path="res://Level/Interactables/FactoryMachines/FactoryGameplay.tscn" type="PackedScene" id=4]
+[ext_resource path="res://Level/Buildings/DoorWall.tscn" type="PackedScene" id=4]
-[ext_resource path="res://Level/Decoration/Statue.tscn" type="PackedScene" id=5]
+[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=5]
-[ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=6]
+[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 )]
+[node name="Door" parent="Architecture/FactoryRoomWalls/BackWallTrue" instance=ExtResource( 5 )]
-collision_layer = 2
+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"]

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:

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=5]
-[ext_resource path="res://Particles/Sparkle.tscn" type="PackedScene" id=6]
 
 [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 )]

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 )]

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