merge gawddammit

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")
@@ -20,6 +20,14 @@ enum BEHAVIOR {
 }
 var _curMood			# current set behavior
 
+var _voice_clips = {
+	"go_to_work": preload("res://Resources/Audio/to-work.wav"),
+	"go_home": preload("res://Resources/Audio/go-home.wav"),
+	"take_pills": preload("res://Resources/Audio/take-pills.wav"),
+	"do_job": preload("res://Resources/Audio/do-job.wav"),
+	"stop": preload("res://Resources/Audio/Stop you violated the law.wav")
+}
+
 var _visibility: Area
 var _interactArea: Area
 var _audioPlayer: AudioStreamPlayer3D
@@ -37,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")
@@ -99,19 +107,19 @@ func _load_sound ():
 			_audioPlayer.stream = null
 		BEHAVIOR.GO_WORK:
 			Logger.info("say go to work")
-			_audioPlayer.stream = load("res://Resources/Audio/to-work.wav")
+			_audioPlayer.stream = _voice_clips.go_to_work
 		BEHAVIOR.GO_HOME:
 			Logger.info("say go home")
-			_audioPlayer.stream = load("res://Resources/Audio/go-home.wav")
+			_audioPlayer.stream = _voice_clips.go_home
 		BEHAVIOR.TAKE_PILLS:
 			Logger.info("say take your pills")
-			_audioPlayer.stream = load("res://Resources/Audio/take-pills.wav")
+			_audioPlayer.stream = _voice_clips.take_pills
 		BEHAVIOR.DO_JOB:
 			Logger.info("say do your job")
-			_audioPlayer.stream = load("res://Resources/Audio/do-job.wav")
+			_audioPlayer.stream = _voice_clips.do_job
 		BEHAVIOR.ANGRY: 
 			Logger.info("say stop!")
-			_audioPlayer.stream = load("res://Resources/Audio/Stop you violated the law.wav")
+			_audioPlayer.stream = _voice_clips.stop
 
 
 func _set_behavior ():
@@ -145,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

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:
@@ -92,6 +93,7 @@ func _ready():
 
 	Daytime.connect("respawn", self, "_on_respawn")
 	
+	if IsOutside:
 		var player = get_node("AudioStreamPlayer3D")
 		player.stream = load("res://Resources/Audio/cock.wav")
 		player.play()
@@ -163,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()
@@ -180,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 # remove after taken
-					_prev_look = null
+					_labelInteract.hide()
 		else:
 			#stop showing interact tooltip and disable outline
 			_labelInteract.hide()
@@ -252,11 +253,9 @@ 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")
 

Characters/Player/Player.tscn

@@ -178,6 +178,7 @@ script = ExtResource( 2 )
 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

Global/PillAudioHandler.gd

@@ -0,0 +1,54 @@
+extends Node
+
+
+export(float) var true_begin_threshold = 0.75
+export(float) var masked_begin_threshold = 0.4
+export(float) var max_volume = 0.15
+export(float) var min_pitch_scale = 0.9  # The pitch won't go down lower than this when the player is sober
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	_update_volumes()
+	
+	set_master_db(linear2db(max_volume))
+
+
+func set_masked_db(db_val):
+	AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Masked"), db_val)
+
+
+func set_true_db(db_val):
+	AudioServer.set_bus_volume_db(AudioServer.get_bus_index("True"), db_val)
+
+
+func set_master_db(db_val):
+	AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Master"), db_val)
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta: float) -> void:
+	_update_volumes()
+
+
+func _update_volumes():
+	var level = Pills.get_normalized_level()
+	
+	if level < masked_begin_threshold:
+		set_masked_db(linear2db(0.0))
+		set_true_db(linear2db(max_volume))
+	elif level < true_begin_threshold:
+		# Get the distance between the masked and true thresholds as a value between 0 and 1
+		var normalized_distance_within_thresholds = inverse_lerp(masked_begin_threshold, true_begin_threshold, level)
+		
+		# Scale volumes accordingly
+		set_masked_db(linear2db(normalized_distance_within_thresholds * max_volume))
+		set_true_db(linear2db((1.0 - normalized_distance_within_thresholds) * max_volume))
+	else:
+		set_masked_db(linear2db(max_volume))
+		set_true_db(linear2db(0.0))
+	
+	# Decrease the pitch when the player is sober
+	var pitch = lerp(min_pitch_scale, 1.0, level)
+	
+	AudioServer.get_bus_effect(AudioServer.get_bus_index("Master"), 0).pitch_scale = pitch

Global/PillAudioHandler.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://Global/PillAudioHandler.gd" type="Script" id=1]
+
+[node name="PillAudioHandler" type="Node"]
+script = ExtResource( 1 )

Level/Buildings/DoubleDoorWall.tscn

@@ -10,8 +10,7 @@
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2 )
 
 [node name="WallPart1" type="StaticBody" parent="."]
-editor/display_folded = true
+transform = Transform( 1, 0, 0, 0, 1.5, 0, 0, 0, 0.2, -3, 1.5, 0 )
-transform = Transform( 2, 0, 0, 0, 1.5, 0, 0, 0, 0.2, -4, 1.5, 0 )
 collision_layer = 3
 
 [node name="MeshInstance" type="MeshInstance" parent="WallPart1"]
@@ -23,8 +22,7 @@ material/0 = null
 shape = SubResource( 2 )
 
 [node name="WallPart2" type="StaticBody" parent="."]
-editor/display_folded = true
+transform = Transform( 1, 0, 0, 0, 1.5, 0, 0, 0, 0.2, 3, 1.5, 0 )
-transform = Transform( 2, 0, 0, 0, 1.5, 0, 0, 0, 0.2, 4, 1.5, 0 )
 collision_layer = 3
 
 [node name="MeshInstance" type="MeshInstance" parent="WallPart2"]
@@ -36,8 +34,7 @@ material/0 = null
 shape = SubResource( 2 )
 
 [node name="WallPart3" type="StaticBody" parent="."]
-editor/display_folded = true
+transform = Transform( 4, 0, 0, 0, 1, 0, 0, 0, 0.2, 0, 4, 0 )
-transform = Transform( 6, 0, 0, 0, 1, 0, 0, 0, 0.2, 0, 4, 0 )
 collision_layer = 3
 
 [node name="MeshInstance" type="MeshInstance" parent="WallPart3"]

Level/FactoryMusicHandler.gd

@@ -0,0 +1,22 @@
+extends Node
+
+
+onready var inactive_music = get_node("InactiveMusic")
+onready var active_music = get_node("ActiveMusic")
+
+export(NodePath) var path_to_pipegame
+
+var pipegame
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	inactive_music.play()
+	
+	pipegame = get_node(path_to_pipegame)
+	
+	pipegame.get_node("Lever").connect("start_machine", self, "activate_active_music")
+
+
+func activate_active_music():
+	active_music.play(inactive_music.get_playback_position())
+	inactive_music.stop()

Level/InFactory.tscn

@@ -1,47 +1,439 @@
-[gd_scene load_steps=7 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://Characters/Player/Player.tscn" type="PackedScene" id=3]
+[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]
 
-[sub_resource type="CubeMesh" id=2]
+[sub_resource type="BoxShape" id=2]
 
-[sub_resource type="BoxShape" id=3]
+[sub_resource type="CubeMesh" id=3]
+
+[sub_resource type="CubeMesh" id=4]
+
+[sub_resource type="BoxShape" id=5]
 
 [node name="InFactory" type="Spatial"]
 
 [node name="Architecture" type="Spatial" parent="."]
 
-[node name="EntryHall" type="Spatial" parent="Architecture"]
+[node name="Cheat (delete later)" type="Spatial" parent="Architecture"]
-editor/display_folded = true
 
-[node name="DoubleDoorWall" parent="Architecture/EntryHall" instance=ExtResource( 1 )]
+[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="DoorWall" parent="Architecture/EntryHall" instance=ExtResource( 2 )]
+[node name="Keycard2" parent="Architecture/Cheat (delete later)" instance=ExtResource( 2 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 0, 2 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 1, -38 )
-
-[node name="Floor" type="StaticBody" parent="Architecture"]
-editor/display_folded = true
-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 )
-
-[node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor"]
-layers = 3
-mesh = SubResource( 2 )
-material/0 = null
 
 [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 )
-shape = SubResource( 3 )
+shape = SubResource( 1 )
 
-[node name="Player" parent="." instance=ExtResource( 3 )]
+[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( 2 )
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor"]
+layers = 3
+mesh = SubResource( 3 )
+material/0 = null
+
+[node name="EntryHall" type="Spatial" parent="Architecture"]
+editor/display_folded = true
+
+[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( 4 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 0, 2 )
+visible = false
+
+[node name="SideWall1" type="StaticBody" parent="Architecture/EntryHall"]
+editor/display_folded = true
+transform = Transform( 0.2, 0, 0, 0, 2.5, 0, 0, 0, 10, 4, 2.5, -8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/EntryHall/SideWall1"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/EntryHall/SideWall1"]
+shape = SubResource( 5 )
+
+[node name="SideWall2" type="StaticBody" parent="Architecture/EntryHall"]
+editor/display_folded = true
+transform = Transform( 0.2, 0, 0, 0, 2.5, 0, 0, 0, 10, -4, 2.5, -8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/EntryHall/SideWall2"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/EntryHall/SideWall2"]
+shape = SubResource( 5 )
+
+[node name="Ceiling" type="StaticBody" parent="Architecture/EntryHall"]
+editor/display_folded = true
+transform = Transform( 4.2, 0, 0, 0, 0.2, 0, 0, 0, 10, 0, 5.2, -8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/EntryHall/Ceiling"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/EntryHall/Ceiling"]
+shape = SubResource( 5 )
+
+[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
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/SideWall"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/SideWall"]
+shape = SubResource( 5 )
+
+[node name="SideWall2" 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
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/SideWall2"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/SideWall2"]
+shape = SubResource( 5 )
+
+[node name="SideWall3" type="StaticBody" parent="Architecture/FactoryRoomWalls"]
+editor/display_folded = true
+transform = Transform( 4, 0, 0, 0, 1.5, 0, 0, 0, 0.2, 0, 6.5, -17.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/SideWall3"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/SideWall3"]
+shape = SubResource( 5 )
+
+[node name="SideWall4" type="StaticBody" parent="Architecture/FactoryRoomWalls"]
+editor/display_folded = true
+transform = Transform( 0.2, 0, 0, 0, 4, 0, 0, 0, 8.2, 11.8, 4, -25.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/SideWall4"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/SideWall4"]
+shape = SubResource( 5 )
+
+[node name="SideWall5" type="StaticBody" parent="Architecture/FactoryRoomWalls"]
+editor/display_folded = true
+transform = Transform( 0.2, 0, 0, 0, 4, 0, 0, 0, 8.2, -11.8, 4, -25.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/SideWall5"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/SideWall5"]
+shape = SubResource( 5 )
+
+[node name="BackWall" type="StaticBody" parent="Architecture/FactoryRoomWalls"]
+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"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/BackWall"]
+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
+
+[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"]
+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
+
+[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 )
+collision_layer = 0
+collision_mask = 0
+
+[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( 5 )]
+editor/display_folded = true
+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"]
+editor/display_folded = true
+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 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomWalls/Ceiling"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomWalls/Ceiling"]
+shape = SubResource( 5 )
+
+[node name="FactoryRoomInterior" type="Spatial" parent="Architecture"]
+editor/display_folded = true
+
+[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"]
+editor/display_folded = true
+transform = Transform( 1.2, 0, 0, 0, 0.25, 0, 0, 0, 1.5, 9.5, 0.25, -25.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/FactoryRoomInterior/StatueBlock"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/FactoryRoomInterior/StatueBlock"]
+shape = SubResource( 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="OfficeSpace" type="Spatial" parent="Architecture"]
+
+[node name="Wall" type="StaticBody" parent="Architecture/OfficeSpace"]
+editor/display_folded = true
+transform = Transform( 23, 0, 0, 0, 2, 0, 0, 0, 0.2, 16, 2, -36.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/OfficeSpace/Wall"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall"]
+shape = SubResource( 5 )
+
+[node name="Wall2" type="StaticBody" parent="Architecture/OfficeSpace"]
+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/OfficeSpace/Wall2"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall2"]
+shape = SubResource( 5 )
+
+[node name="Wall3" type="StaticBody" parent="Architecture/OfficeSpace"]
+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/OfficeSpace/Wall3"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall3"]
+shape = SubResource( 5 )
+
+[node name="Wall4" type="StaticBody" parent="Architecture/OfficeSpace"]
+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/OfficeSpace/Wall4"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall4"]
+shape = SubResource( 5 )
+
+[node name="Wall5" type="StaticBody" parent="Architecture/OfficeSpace"]
+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/OfficeSpace/Wall5"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall5"]
+shape = SubResource( 5 )
+
+[node name="Wall6" type="StaticBody" parent="Architecture/OfficeSpace"]
+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/OfficeSpace/Wall6"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall6"]
+shape = SubResource( 5 )
+
+[node name="Wall7" type="StaticBody" parent="Architecture/OfficeSpace"]
+editor/display_folded = true
+transform = Transform( 4, 0, 0, 0, 2, 0, 0, 0, 0.2, 16, 2, -33.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/OfficeSpace/Wall7"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall7"]
+shape = SubResource( 5 )
+
+[node name="Wall8" type="StaticBody" parent="Architecture/OfficeSpace"]
+editor/display_folded = true
+transform = Transform( 0.2, 0, 0, 0, 2, 0, 0, 0, 16.5, 38.8, 2, -20.5 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/OfficeSpace/Wall8"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall8"]
+shape = SubResource( 5 )
+
+[node name="Wall9" type="StaticBody" parent="Architecture/OfficeSpace"]
+editor/display_folded = true
+transform = Transform( 0.2, 0, 0, 0, 2, 0, 0, 0, 6.8, 11.8, 2, -10.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/OfficeSpace/Wall9"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall9"]
+shape = SubResource( 5 )
+
+[node name="Wall10" type="StaticBody" parent="Architecture/OfficeSpace"]
+transform = Transform( 13.5, 0, 0, 0, 2, 0, 0, 0, 0.2, 25.2, 2, -4.2 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/OfficeSpace/Wall10"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Wall10"]
+shape = SubResource( 5 )
+
+[node name="Ceiling" type="StaticBody" parent="Architecture/OfficeSpace"]
+editor/display_folded = true
+transform = Transform( 15.2, 0, 0, 0, 0.2, 0, 0, 0, 3, 4.8, 3.8, -36.8 )
+collision_layer = 3
+
+[node name="MeshInstance" type="MeshInstance" parent="Architecture/OfficeSpace/Ceiling"]
+layers = 3
+mesh = SubResource( 4 )
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="Architecture/OfficeSpace/Ceiling"]
+shape = SubResource( 5 )
+
+[node name="Door" parent="Architecture/OfficeSpace" 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

@@ -8,7 +8,7 @@ export(int) var door_lvl
 var outline: MeshInstance
 
 # const
-const OPENING_SPEED = 50
+const OPENING_SPEED = 150
 
 # private members
 var _startingRotY : float
@@ -49,10 +49,10 @@ func do_interact(var player):
 # opens or closes the door
 func _door_move(delta):
 	if _isOpening:
-		if _degrees < 100:
+		if _degrees < 105:
 			_degrees += OPENING_SPEED * delta
 		else:
-			_degrees = 100
+			_degrees = 105
 			_isMoving = false
 	else:
 		if _degrees > 0:

Level/Interactables/FactoryMachines/FactoryGameplay.tscn

@@ -71,7 +71,7 @@ mesh = SubResource( 3 )
 material/0 = SubResource( 4 )
 
 [node name="ExitCast" type="RayCast" parent="IO Boxes/Output1"]
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.00011, 0.341612, -0.167214 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.00011, 0.341612, -0.167214 )
 enabled = true
 cast_to = Vector3( 0, -0.5, 0 )
 collision_mask = 3
@@ -83,7 +83,7 @@ mesh = SubResource( 3 )
 material/0 = SubResource( 4 )
 
 [node name="ExitCast" type="RayCast" parent="IO Boxes/Output2"]
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.00011, 0.341612, 0.0168505 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.00011, 0.341612, 0.0168505 )
 enabled = true
 cast_to = Vector3( 0, -0.5, 0 )
 collision_mask = 3
@@ -95,7 +95,7 @@ mesh = SubResource( 3 )
 material/0 = SubResource( 4 )
 
 [node name="ExitCast" type="RayCast" parent="IO Boxes/Output3"]
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -0.922591, 0.341612, 0.145537 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -0.922591, 0.341612, 0.145537 )
 enabled = true
 cast_to = Vector3( 0, -0.5, 0 )
 collision_mask = 3
@@ -104,168 +104,168 @@ collision_mask = 3
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 )
 
 [node name="Pipe1_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, -0.8 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, -0.8 )
 mesh_path = NodePath("../Pipe1_1/Mesh")
 color_cast_left = NodePath("../Pipe1_1/ColorCast")
 
 [node name="Pipe2_1" parent="Pipes" instance=ExtResource( 3 )]
 editor/display_folded = true
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, -0.8 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, -0.8 )
 mesh_path = NodePath("../Pipe2_1/Mesh")
 color_cast_left = NodePath("../Pipe2_1/ColorCast")
 
 [node name="Pipe3_1" parent="Pipes" instance=ExtResource( 3 )]
 editor/display_folded = true
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.55, 1.25, -0.8 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.55, 1.25, -0.8 )
 mesh_path = NodePath("../Pipe3_1/Mesh")
 color_cast_left = NodePath("../Pipe3_1/ColorCast")
 
 [node name="Pipe4_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, -0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, -0.4 )
 mesh_path = NodePath("../Pipe4_1/Mesh")
 color_cast_left = NodePath("../Pipe4_1/ColorCast")
 
 [node name="Pipe5_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, 0 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, 0 )
 mesh_path = NodePath("../Pipe5_1/Mesh")
 color_cast_left = NodePath("../Pipe5_1/ColorCast")
 
 [node name="Pipe6_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, 0 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, 0 )
 mesh_path = NodePath("../Pipe6_1/Mesh")
 color_cast_left = NodePath("../Pipe6_1/ColorCast")
 
 [node name="Fork1_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.55, 1.25, 0 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -1.55, 1.25, 0 )
 x_rot = 90
 
 [node name="Pipe7_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.55, 1.65, 0 )
+transform = Transform( 1, 0, 0, 0, -4.37114e-008, 1, 0, -1, -4.37114e-008, -1.55, 1.65, 0 )
 mesh_path = NodePath("../Pipe7_1/Mesh")
 color_cast_left = NodePath("../Pipe7_1/ColorCast")
 
 [node name="Pipe8_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.55, 1.25, 0.4 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.55, 1.25, 0.4 )
 mesh_path = NodePath("../Pipe8_1/Mesh")
 color_cast_left = NodePath("../Pipe8_1/ColorCast")
 
 [node name="Pipe9_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.15, 1.25, 0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.15, 1.25, 0.4 )
 mesh_path = NodePath("../Pipe9_1/Mesh")
 color_cast_left = NodePath("../Pipe9_1/ColorCast")
 
 [node name="Pipe10_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, 0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, 0.4 )
 mesh_path = NodePath("../Pipe10_1/Mesh")
 color_cast_left = NodePath("../Pipe10_1/ColorCast")
 
 [node name="Fork2_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, 0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, 0.4 )
 x_rot = -90
 
 [node name="Pipe11_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, 0.8 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, 0.8 )
 mesh_path = NodePath("../Pipe11_1/Mesh")
 color_cast_left = NodePath("../Pipe11_1/ColorCast")
 
 [node name="Pipe12_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -1.95, 1.25, 0.8 )
+transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -1.95, 1.25, 0.8 )
 mesh_path = NodePath("../Pipe12_1/Mesh")
 color_cast_left = NodePath("../Pipe12_1/ColorCastLeft")
 
 [node name="Fork3_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.55, 1.25, 0.8 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -1.55, 1.25, 0.8 )
 x_rot = 90
 
 [node name="Pipe13_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.55, 1.25, 1.2 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.55, 1.25, 1.2 )
 mesh_path = NodePath("../Pipe13_1/Mesh")
 color_cast_left = NodePath("../Pipe13_1/ColorCast")
 
 [node name="Pipe14_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -1.15, 1.25, 1.2 )
+transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -1.15, 1.25, 1.2 )
 mesh_path = NodePath("../Pipe14_1/Mesh")
 color_cast_left = NodePath("../Pipe14_1/ColorCast")
 
 [node name="Pipe15_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( 4.37114e-08, 1, -8.74228e-08, 1, -4.37114e-08, 0, -3.82137e-15, -8.74228e-08, -1, -1.15, 1.25, 0.8 )
+transform = Transform( 4.37114e-008, 1, -8.74228e-008, 1, -4.37114e-008, 0, -3.82137e-015, -8.74228e-008, -1, -1.15, 1.25, 0.8 )
 mesh_path = NodePath("../Pipe15_1/Mesh")
 color_cast_left = NodePath("../Pipe15_1/ColorCast")
 
 [node name="Fork4_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -0.75, 1.25, 0.8 )
+transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -0.75, 1.25, 0.8 )
 x_rot = -90
 
 [node name="Pipe16_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( -4.37114e-08, 1, 4.37114e-08, 0, -4.37114e-08, 1, 1, 4.37114e-08, 1.91069e-15, -0.75, 1.65, 0.8 )
+transform = Transform( -4.37114e-008, 1, 4.37114e-008, 0, -4.37114e-008, 1, 1, 4.37114e-008, 1.91069e-015, -0.75, 1.65, 0.8 )
 mesh_path = NodePath("../Pipe16_1/Mesh")
 color_cast_left = NodePath("../Pipe16_1/ColorCast")
 
 [node name="Pipe17_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( 4.37114e-08, -3.82137e-15, 1, -8.74228e-08, -1, 0, 1, -8.74228e-08, -4.37114e-08, -0.35, 1.65, 0.8 )
+transform = Transform( 4.37114e-008, -3.82137e-015, 1, -8.74228e-008, -1, 0, 1, -8.74228e-008, -4.37114e-008, -0.35, 1.65, 0.8 )
 mesh_path = NodePath("../Pipe17_1/Mesh")
 color_cast_left = NodePath("../Pipe17_1/ColorCast")
 
 [node name="Pipe18_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( -4.37114e-08, -1, -4.37114e-08, 0, -4.37114e-08, 1, -1, 4.37114e-08, 1.91069e-15, -1.55, 1.65, 0.8 )
+transform = Transform( -4.37114e-008, -1, -4.37114e-008, 0, -4.37114e-008, 1, -1, 4.37114e-008, 1.91069e-015, -1.55, 1.65, 0.8 )
 mesh_path = NodePath("../Pipe18_1/Mesh")
 color_cast_left = NodePath("../Pipe18_1/ColorCast")
 
 [node name="Pipe19_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, -1, 1, -4.37114e-08, 0, -4.37114e-08, -1, -4.37114e-08, -1.95, 1.65, 0.8 )
+transform = Transform( 1.91069e-015, 4.37114e-008, -1, 1, -4.37114e-008, 0, -4.37114e-008, -1, -4.37114e-008, -1.95, 1.65, 0.8 )
 mesh_path = NodePath("../Pipe19_1/Mesh")
 color_cast_left = NodePath("../Pipe19_1/ColorCast")
 
 [node name="Pipe20_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( 1, -8.74228e-08, -8.74228e-08, -8.74228e-08, -1, 0, -8.74228e-08, 7.64274e-15, -1, -1.95, 1.65, 0.4 )
+transform = Transform( 1, -8.74228e-008, -8.74228e-008, -8.74228e-008, -1, 0, -8.74228e-008, 7.64274e-015, -1, -1.95, 1.65, 0.4 )
 mesh_path = NodePath("../Pipe20_1/Mesh")
 color_cast_left = NodePath("../Pipe20_1/ColorCastLeft")
 
 [node name="Pipe21_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -1.95, 1.65, 0 )
+transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, -1.95, 1.65, 0 )
 mesh_path = NodePath("../Pipe21_1/Mesh")
 color_cast_left = NodePath("../Pipe21_1/ColorCast")
 
 [node name="Fork5_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1, 8.74228e-08, -8.74228e-08, 8.74228e-08, -1, 0, -8.74228e-08, -7.64274e-15, -1, -1.95, 1.65, -0.4 )
+transform = Transform( 1, 8.74228e-008, -8.74228e-008, 8.74228e-008, -1, 0, -8.74228e-008, -7.64274e-015, -1, -1.95, 1.65, -0.4 )
 mesh_path = NodePath("../Fork5_1/Mesh")
 color_cast_left = NodePath("../Fork5_1/ColorCast")
 z_rot = -90
 
 [node name="Pipe22_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, -0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, -0.4 )
 mesh_path = NodePath("../Pipe22_1/Mesh")
 color_cast_left = NodePath("../Pipe22_1/ColorCastLeft")
 
 [node name="Pipe23_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.55, 1.25, -0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.55, 1.25, -0.4 )
 mesh_path = NodePath("../Pipe23_1/Mesh")
 color_cast_left = NodePath("../Pipe23_1/ColorCast")
 
 [node name="Fork6_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -1.15, 1.25, -0.4 )
+transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -1.15, 1.25, -0.4 )
 x_rot = 180
 
 [node name="Pipe24_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.15, 1.25, -0.8 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -1.15, 1.25, -0.8 )
 mesh_path = NodePath("../Pipe24_1/Mesh")
 color_cast_left = NodePath("../Pipe24_1/ColorCastLeft")
 
 [node name="Pipe25_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.75, 1.25, -0.8 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.75, 1.25, -0.8 )
 mesh_path = NodePath("../Pipe25_1/Mesh")
 color_cast_left = NodePath("../Pipe25_1/ColorCast")
 
 [node name="Fork7_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -0.35, 1.25, -0.8 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -0.35, 1.25, -0.8 )
 mesh_path = NodePath("../Fork7_1/Mesh")
 color_cast_left = NodePath("../Fork7_1/ColorCast")
 x_rot = 90
 
 [node name="Pipe26_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( -1, 8.74228e-08, 3.82137e-15, 0, -4.37114e-08, 1, 8.74228e-08, 1, 4.37114e-08, -0.35, 1.65, -0.8 )
+transform = Transform( -1, 8.74228e-008, 3.82137e-015, 0, -4.37114e-008, 1, 8.74228e-008, 1, 4.37114e-008, -0.35, 1.65, -0.8 )
 mesh_path = NodePath("../Pipe26_1/Mesh")
 color_cast_left = NodePath("../Pipe26_1/ColorCast")
 
@@ -275,28 +275,28 @@ mesh_path = NodePath("../Pipe27_1/Mesh")
 color_cast_left = NodePath("../Pipe27_1/ColorCast")
 
 [node name="Pipe28_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, -0.35, 1.65, 0 )
+transform = Transform( -1, 8.74228e-008, 0, -8.74228e-008, -1, 0, 0, 0, 1, -0.35, 1.65, 0 )
 mesh_path = NodePath("../Pipe28_1/Mesh")
 color_cast_left = NodePath("../Pipe28_1/ColorCast")
 
 [node name="Pipe29_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -0.35, 1.25, -0.4 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -0.35, 1.25, -0.4 )
 mesh_path = NodePath("../Pipe29_1/Mesh")
 color_cast_left = NodePath("../Pipe29_1/ColorCast")
 
 [node name="Fork8_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0.05, 1.25, -0.4 )
+transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, 0.05, 1.25, -0.4 )
 x_rot = -90
 
 [node name="Pipe30_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( 4.37114e-08, 1, 8.74228e-08, 1, -4.37114e-08, 0, 3.82137e-15, 8.74228e-08, -1, 0.05, 1.25, -0.8 )
+transform = Transform( 4.37114e-008, 1, 8.74228e-008, 1, -4.37114e-008, 0, 3.82137e-015, 8.74228e-008, -1, 0.05, 1.25, -0.8 )
 mesh_path = NodePath("../Pipe30_1/Mesh")
 color_cast_left = NodePath("../Pipe30_1/ColorCast")
 
 [node name="Pipe31_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( -1, 8.74228e-08, 3.82137e-15, 0, -4.37114e-08, 1, 8.74228e-08, 1, 4.37114e-08, 0.05, 1.65, -0.4 )
+transform = Transform( -1, 8.74228e-008, 3.82137e-015, 0, -4.37114e-008, 1, 8.74228e-008, 1, 4.37114e-008, 0.05, 1.65, -0.4 )
 mesh_path = NodePath("../Pipe31_1/Mesh")
 color_cast_left = NodePath("../Pipe31_1/ColorCast")
 
@@ -307,69 +307,69 @@ color_cast_left = NodePath("../Pipe32_1/ColorCast")
 
 [node name="Pipe33_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.15, 1.25, 0 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.15, 1.25, 0 )
 mesh_path = NodePath("../Pipe33_1/Mesh")
 color_cast_left = NodePath("../Pipe33_1/ColorCast")
 
 [node name="Pipe34_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.75, 1.25, 0 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.75, 1.25, 0 )
 mesh_path = NodePath("../Pipe34_1/Mesh")
 color_cast_left = NodePath("../Pipe34_1/ColorCast")
 
 [node name="Pipe35_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.25, 0 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.25, 0 )
 mesh_path = NodePath("../Pipe35_1/Mesh")
 color_cast_left = NodePath("../Pipe35_1/ColorCastLeft")
 
 [node name="Pipe36_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( 4.37114e-08, -1, -8.74228e-08, -1, -4.37114e-08, 0, -3.82137e-15, 8.74228e-08, -1, -1.55, 1.65, -0.4 )
+transform = Transform( 4.37114e-008, -1, -8.74228e-008, -1, -4.37114e-008, 0, -3.82137e-015, 8.74228e-008, -1, -1.55, 1.65, -0.4 )
 mesh_path = NodePath("../Pipe36_1/Mesh")
 color_cast_left = NodePath("../Pipe36_1/ColorCastLeft")
 
 [node name="Pipe37_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( 4.37114e-08, 1, -8.74228e-08, 1, -4.37114e-08, 0, -3.82137e-15, -8.74228e-08, -1, -1.55, 1.65, -0.8 )
+transform = Transform( 4.37114e-008, 1, -8.74228e-008, 1, -4.37114e-008, 0, -3.82137e-015, -8.74228e-008, -1, -1.55, 1.65, -0.8 )
 mesh_path = NodePath("../Pipe37_1/Mesh")
 color_cast_left = NodePath("../Pipe37_1/ColorCast")
 
 [node name="Pipe38_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.15, 1.65, -0.8 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.15, 1.65, -0.8 )
 mesh_path = NodePath("../Pipe38_1/Mesh")
 color_cast_left = NodePath("../Pipe38_1/ColorCast")
 
 [node name="Fork9_1" parent="Pipes" instance=ExtResource( 4 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -0.75, 1.65, -0.8 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -0.75, 1.65, -0.8 )
 x_rot = 180
 
 [node name="Pipe39_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( 4.37114e-08, 1, -8.74228e-08, 1, -4.37114e-08, 0, -3.82137e-15, -8.74228e-08, -1, -0.75, 1.65, -1.2 )
+transform = Transform( 4.37114e-008, 1, -8.74228e-008, 1, -4.37114e-008, 0, -3.82137e-015, -8.74228e-008, -1, -0.75, 1.65, -1.2 )
 mesh_path = NodePath("../Pipe39_1/Mesh")
 color_cast_left = NodePath("../Pipe39_1/ColorCast")
 
 [node name="Pipe40_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.65, -1.2 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.65, -1.2 )
 mesh_path = NodePath("../Pipe40_1/Mesh")
 color_cast_left = NodePath("../Pipe40_1/ColorCast")
 
 [node name="Pipe41_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.05, 1.65, -1.2 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0.05, 1.65, -1.2 )
 mesh_path = NodePath("../Pipe41_1/Mesh")
 color_cast_left = NodePath("../Pipe41_1/ColorCast")
 
 [node name="Pipe42_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, 0.45, 1.65, -1.2 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, 0.45, 1.65, -1.2 )
 mesh_path = NodePath("../Pipe42_1/Mesh")
 color_cast_left = NodePath("../Pipe42_1/ColorCast")
 
 [node name="Pipe43_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, 0.45, 1.65, -0.8 )
+transform = Transform( -1, 8.74228e-008, 0, -8.74228e-008, -1, 0, 0, 0, 1, 0.45, 1.65, -0.8 )
 mesh_path = NodePath("../Pipe43_1/Mesh")
 color_cast_left = NodePath("../Pipe43_1/ColorCast")
 
 [node name="Pipe44_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.45, 1.25, -0.8 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0.45, 1.25, -0.8 )
 mesh_path = NodePath("../Pipe44_1/Mesh")
 color_cast_left = NodePath("../Pipe44_1/ColorCastLeft")
 
@@ -385,64 +385,64 @@ color_cast_left = NodePath("../Pipe46_1/ColorCast")
 
 [node name="Pipe47_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -0.75, 1.65, 0.4 )
+transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -0.75, 1.65, 0.4 )
 mesh_path = NodePath("../Pipe47_1/Mesh")
 color_cast_left = NodePath("../Pipe47_1/ColorCast")
 
 [node name="Pipe48_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.65, 0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.65, 0.4 )
 mesh_path = NodePath("../Pipe48_1/Mesh")
 color_cast_left = NodePath("../Pipe48_1/ColorCast")
 
 [node name="Pipe49_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -0.75, 1.25, 0.4 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -0.75, 1.25, 0.4 )
 mesh_path = NodePath("../Pipe49_1/Mesh")
 color_cast_left = NodePath("../Pipe49_1/ColorCastLeft")
 
 [node name="Pipe50_1" parent="Pipes" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.25, 0.4 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.25, 0.4 )
 mesh_path = NodePath("../Pipe50_1/Mesh")
 color_cast_left = NodePath("../Pipe50_1/ColorCast")
 
 [node name="Pipe51_1" parent="Pipes" instance=ExtResource( 5 )]
 editor/display_folded = true
-transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0.05, 1.25, 0.4 )
+transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, 0.05, 1.25, 0.4 )
 mesh_path = NodePath("../Pipe51_1/Mesh")
 color_cast_left = NodePath("../Pipe51_1/ColorCast")
 
 [node name="Pipe52_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, 0.05, 1.25, 0 )
+transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, 0.05, 1.25, 0 )
 mesh_path = NodePath("../Pipe52_1/Mesh")
 color_cast_left = NodePath("../Pipe52_1/ColorCastLeft")
 
 [node name="Pipe53_1" parent="Pipes" instance=ExtResource( 3 )]
 editor/display_folded = true
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.45, 1.25, 0 )
+transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0.45, 1.25, 0 )
 mesh_path = NodePath("../Pipe53_1/Mesh")
 color_cast_left = NodePath("../Pipe53_1/ColorCast")
 
 [node name="Pipe54_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 0.05, 1.65, 0.4 )
+transform = Transform( -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 0, 0, 1, 0.05, 1.65, 0.4 )
 mesh_path = NodePath("../Pipe54_1/Mesh")
 color_cast_left = NodePath("../Pipe54_1/ColorCastLeft")
 
 [node name="Pipe55_1" parent="Pipes" instance=ExtResource( 6 )]
-transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0.05, 1.65, 0.8 )
+transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, 0.05, 1.65, 0.8 )
 mesh_path = NodePath("../Pipe55_1/Mesh")
 color_cast_left = NodePath("../Pipe55_1/ColorCastLeft")
 
 [node name="Pipe56_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( 4.37114e-08, 3.82137e-15, 1, 8.74228e-08, -1, 0, 1, 8.74228e-08, -4.37114e-08, 0.45, 1.65, 0.8 )
+transform = Transform( 4.37114e-008, 3.82137e-015, 1, 8.74228e-008, -1, 0, 1, 8.74228e-008, -4.37114e-008, 0.45, 1.65, 0.8 )
 mesh_path = NodePath("../Pipe56_1/Mesh")
 color_cast_left = NodePath("../Pipe56_1/ColorCast")
 
 [node name="Pipe57_1" parent="Pipes" instance=ExtResource( 5 )]
-transform = Transform( -4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, 0.45, 1.25, 0.8 )
+transform = Transform( -4.37114e-008, 1, -4.37114e-008, 0, -4.37114e-008, -1, -1, -4.37114e-008, 1.91069e-015, 0.45, 1.25, 0.8 )
 mesh_path = NodePath("../Pipe57_1/Mesh")
 color_cast_left = NodePath("../Pipe57_1/ColorCast")
 
 [node name="Lever" parent="." instance=ExtResource( 7 )]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 2.35, 1.1, 0 )
+transform = Transform( 1, 0, 0, 0, -4.37114e-008, 1, 0, -1, -4.37114e-008, 2.35, 1.1, 0 )
 is_machine_start = true
 
 [node name="Lights" type="Spatial" parent="."]

Level/Interactables/FactoryMachines/PipeGame.gd

@@ -54,13 +54,10 @@ func _physics_process(delta: float) -> void:
 		p.update_content_color(_all_colors)
 	
 	if _is_running and not _exit_box_num == null:
-		print(_exit_box_num)
 		var collider = _out_boxes[_exit_box_num].get_node("ExitCast").get_collider()
 		if collider.is_in_group("Pipes"):
 			var new_color = collider.content_color
 			if new_color != null:
-				print(new_color)
-				print(_req_exit_color)
 				if _col_compare(new_color, _req_exit_color):
 					_lever.blocked = false
 					_lever.flick()
@@ -106,12 +103,16 @@ func _gen_next_col():
 func _set_exit_colors(var box_path):
 	var material = SpatialMaterial.new()
 	material.albedo_color = OUT_BOX_HIGHLIGHT_COLOR
+	material.emission_enabled = true
+	material.emission = OUT_BOX_HIGHLIGHT_COLOR
 	box_path.material_override = material
 	
 	var counter = 0
 	for l in _lights:
 		var material2 = SpatialMaterial.new()
 		material2.albedo_color = _all_colors[_out_colors[counter]]
+		material2.emission_enabled = true
+		material2.emission = _all_colors[_out_colors[counter]]
 		l.material_override = material2
 		
 		_req_exit_color += material2.albedo_color / 3

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/Interactables/Pipes/InputBoxScript.gd

@@ -21,6 +21,9 @@ func _ready():
 func load_content_color():
 	var material = SpatialMaterial.new()
 	_mesh.material_override = material
+	material.emission_enabled = true
+	material.emission = content_color
+	material.emission_energy = 0.5
 	material.albedo_color = content_color
 
 func update_content_color(var unused):

Level/Interactables/Pipes/PipeScript.gd

@@ -33,7 +33,6 @@ func _ready():
 	_up_cast = get_node(color_cast_up) as RayCast
 	_mesh = get_node(mesh_path) as MeshInstance
 
-
 func do_interact(var player):
 	if(is_turned):
 		rotate_x(x_rot * PI/180)
@@ -94,15 +93,16 @@ func update_content_color(var _all_colors: Array):
 		content_color = NULL_COLOR
 	
 	if _mesh != null:
-		var material = _mesh.get_surface_material(0)
+		var material = SpatialMaterial.new()
 		
 		if content_color != NULL_COLOR:
-			if material == null:
-				material = SpatialMaterial.new()
-				_mesh.material_override = material
 			material.albedo_color = content_color
+			material.emission_enabled = true
+			material.emission = content_color
+			
+			#print(get_name())
 		else:
 			if can_turn:
-				_mesh.material_override = fork_material
+				material = fork_material
-			else:
+
-				_mesh.material_override = null
+		_mesh.material_override = material

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

Level/World.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=2]
+[gd_scene load_steps=25 format=2]
 
 [ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Characters/Meldewesen/Meldewesen.tscn" type="PackedScene" id=2]
@@ -13,7 +13,9 @@
 [ext_resource path="res://Level/Buildings/DoorWall.tscn" type="PackedScene" id=11]
 [ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=12]
 [ext_resource path="res://Characters/Util/PathNavigatorForNPC.tscn" type="PackedScene" id=13]
-[ext_resource path="res://Util/AmbiencePlayer.tscn" type="PackedScene" id=14]
+[ext_resource path="res://Resources/Audio/Ambience/melody.wav" type="AudioStream" id=14]
+[ext_resource path="res://Resources/Audio/Ambience/true_ambience.wav" type="AudioStream" id=15]
+[ext_resource path="res://Resources/Audio/Ambience/masked_ambience.wav" type="AudioStream" id=16]
 
 [sub_resource type="BoxShape" id=1]
 
@@ -122,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.510583, 0.00566525, -0.85981, 0.00234889, 0.999984, 0.005194, 0.859825, 0.000632378, -0.510588, -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 )]
@@ -344,8 +346,16 @@ body_nodepath = NodePath("Meldewesen")
 
 [node name="Meldewesen" parent="PathNavigatorForNPC" instance=ExtResource( 2 )]
 
-[node name="AmbiencePlayer" parent="." instance=ExtResource( 14 )]
+[node name="Melody" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 14 )
+autoplay = true
 
-[node name="AmbiencePlayer" parent="." instance=ExtResource( 12 )]
+[node name="TrueAmbience" type="AudioStreamPlayer" parent="."]
-group_name = ""
+stream = ExtResource( 15 )
-node_to_send = NodePath("")
+autoplay = true
+bus = "True"
+
+[node name="MaskedAmbience" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 16 )
+autoplay = true
+bus = "Masked"

Resources/Audio/FactoryMusic/active.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/active.wav-4ab4c359a21097fa24ca1d75209d89dc.sample"
+
+[deps]
+
+source_file="res://Resources/Audio/FactoryMusic/active.wav"
+dest_files=[ "res://.import/active.wav-4ab4c359a21097fa24ca1d75209d89dc.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=true
+edit/normalize=true
+edit/loop=true
+compress/mode=0

Resources/Audio/FactoryMusic/inactive.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/inactive.wav-e8c09df3ca5d758dc631b5c90a37fd8c.sample"
+
+[deps]
+
+source_file="res://Resources/Audio/FactoryMusic/inactive.wav"
+dest_files=[ "res://.import/inactive.wav-e8c09df3ca5d758dc631b5c90a37fd8c.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=true
+edit/normalize=true
+edit/loop=true
+compress/mode=0

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

Util/AmbiencePlayer.gd

@@ -1,58 +0,0 @@
-extends Node
-
-
-export(float) var true_ambience_begin_threshold = 0.75
-export(float) var masked_ambience_begin_threshold = 0.4
-export(float) var max_volume = 0.15
-export(float) var min_pitch_scale = 0.97  # The pitch won't go down lower than this when the player is sober
-export(float) var sync_threshold = 0.1  # If audio streams are further apart than this (in seconds), they are re-synced
-
-onready var melody = get_node("Melody") as AudioStreamPlayer
-onready var true_ambience = get_node("TrueAmbience") as AudioStreamPlayer
-onready var masked_ambience = get_node("MaskedAmbience") as AudioStreamPlayer
-
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	_update_volumes()
-	melody.volume_db = linear2db(max_volume)  # This one is constant, so it's only set once here
-	
-	melody.playing = true
-	true_ambience.playing = true
-	masked_ambience.playing = true
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	_update_volumes()
-
-
-func _update_volumes():
-	var level = Pills.get_normalized_level()
-	
-	if level < masked_ambience_begin_threshold:
-		masked_ambience.volume_db = linear2db(0.0)
-		true_ambience.volume_db = linear2db(max_volume)
-	elif level < true_ambience_begin_threshold:
-		# Get the distance between the masked and true thresholds as a value between 0 and 1
-		var normalized_distance_within_thresholds = inverse_lerp(masked_ambience_begin_threshold, true_ambience_begin_threshold, level)
-		
-		# Scale volumes accordingly
-		masked_ambience.volume_db = linear2db(normalized_distance_within_thresholds * max_volume)
-		true_ambience.volume_db = linear2db((1.0 - normalized_distance_within_thresholds) * max_volume)
-	else:
-		masked_ambience.volume_db = linear2db(max_volume)
-		true_ambience.volume_db = linear2db(0.0)
-	
-	# Decrease the pitch when the player is sober
-	var pitch = lerp(min_pitch_scale, 1.0, level)
-	
-	melody.pitch_scale = pitch
-	masked_ambience.pitch_scale = pitch
-	true_ambience.pitch_scale = pitch
-	
-	# Make sure that everything stays in sync - the melody is the leader
-	if abs(true_ambience.get_playback_position() - melody.get_playback_position()) > sync_threshold:
-		true_ambience.seek(melody.get_playback_position())
-		
-	if abs(masked_ambience.get_playback_position() - melody.get_playback_position()) > sync_threshold:
-		masked_ambience.seek(melody.get_playback_position())

Util/AmbiencePlayer.tscn

@@ -1,18 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://Util/AmbiencePlayer.gd" type="Script" id=1]
-[ext_resource path="res://Resources/Audio/Ambience/melody.wav" type="AudioStream" id=2]
-[ext_resource path="res://Resources/Audio/Ambience/true_ambience.wav" type="AudioStream" id=3]
-[ext_resource path="res://Resources/Audio/Ambience/masked_ambience.wav" type="AudioStream" id=4]
-
-[node name="AmbiencePlayer" type="Node"]
-script = ExtResource( 1 )
-
-[node name="Melody" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 2 )
-
-[node name="TrueAmbience" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 3 )
-
-[node name="MaskedAmbience" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 4 )

default_bus_layout.tres

@@ -0,0 +1,20 @@
+[gd_resource type="AudioBusLayout" load_steps=2 format=2]
+
+[sub_resource type="AudioEffectPitchShift" id=1]
+resource_name = "PitchShift"
+
+[resource]
+bus/0/effect/0/effect = SubResource( 1 )
+bus/0/effect/0/enabled = true
+bus/1/name = "Masked"
+bus/1/solo = false
+bus/1/mute = false
+bus/1/bypass_fx = false
+bus/1/volume_db = 0.0
+bus/1/send = "Master"
+bus/2/name = "True"
+bus/2/solo = false
+bus/2/mute = false
+bus/2/bypass_fx = false
+bus/2/volume_db = 0.0
+bus/2/send = "Master"

project.godot

@@ -71,13 +71,13 @@ config/icon="res://icon.png"
 Logger="*res://Util/gs-logger-3.1-R3/gs_logger/logger.gd"
 Pills="*res://Global/Pills.gd"
 Daytime="*res://Global/Daytime.gd"
+PillAudioHandler="*res://Global/PillAudioHandler.tscn"
 
 [display]
 
 window/size/width=1600
 window/size/height=900
 window/size/borderless=true
-window/size/fullscreen=true
 
 [input]