smaller bugfixes

Src/HUD/GUI.gd

@@ -52,6 +52,7 @@ func _process(delta: float) -> void:
 func updateLives(type) -> void:
 	if type == Types.DetectionLevels.Sure:
 		lives -= 1
+		lives = max(lives, 0)
 		$BottomBar/Life.set_text(str(lives))
 
 		Global.lives = lives

Src/HUD/HUD.gd

@@ -144,8 +144,9 @@ func showMissionBriefing(level):
 	$HUDLayer/Display/MissionBriefing.setLevel(level)
 	$HUDLayer/Display/MissionBriefing.show()
 	inMissionBriefing = true
-	if get_tree():
-		yield(get_tree().create_timer(0.1), "timeout")
+	if get_owner():
+		if get_tree():
+			yield(get_tree().create_timer(0.1), "timeout")
 	$HUDLayer/Display/MissionBriefing/StartMissionButton.grab_focus()
 
 

Src/Levels/BaseLevel.gd

@@ -52,7 +52,8 @@ func _ready():
 	Events.connect("hud_mission_briefing_exited", self, "onHudMissionBriefingExited")
 	Events.connect("hud_mission_progress_exited", self, "onHudMissionProgressExited")
 
-	if Global.game_manager.getCurrentLevelIndex() != 0:
+	var levelId = Global.game_manager.getCurrentLevelIndex()
+	if levelId != 0 and levelId != 20:
 		Events.emit_signal("hud_mission_briefing",level_nation_type)
 		get_tree().paused = true
 	else:

Src/Levels/Level13.tscn

@@ -62,16 +62,16 @@ extents = Vector2( 95, 57 )
 [sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 257, 88.375 )
 
-[sub_resource type="RectangleShape2D" id=7]
+[sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 17, 10 )
 
-[sub_resource type="RectangleShape2D" id=4]
+[sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 10, 48 )
 
-[sub_resource type="RectangleShape2D" id=5]
+[sub_resource type="RectangleShape2D" id=6]
 extents = Vector2( 10, 32 )
 
-[sub_resource type="RectangleShape2D" id=6]
+[sub_resource type="RectangleShape2D" id=7]
 extents = Vector2( 90.3735, 4.84781 )
 
 [node name="Level13" type="Node2D"]
@@ -324,7 +324,7 @@ texture = ExtResource( 9 )
 script = ExtResource( 52 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelObjects/Objects/ObservatoryTerminal/Goal"]
-shape = SubResource( 7 )
+shape = SubResource( 4 )
 
 [node name="Doors" type="Node2D" parent="LevelObjects"]
 
@@ -1120,18 +1120,18 @@ z_index = 50
 position = Vector2( 736, 256 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D2"]
-shape = SubResource( 4 )
+shape = SubResource( 5 )
 
 [node name="StaticBody2D" type="StaticBody2D" parent="."]
 position = Vector2( -104, 256 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
 position = Vector2( 134, -32 )
-shape = SubResource( 5 )
+shape = SubResource( 6 )
 
 [node name="CollisionShape2D2" type="CollisionShape2D" parent="StaticBody2D"]
 position = Vector2( 558, -60 )
-shape = SubResource( 6 )
+shape = SubResource( 7 )
 
 [node name="NPCS" type="Node2D" parent="."]
 

Src/Levels/Level16.tscn

@@ -325,6 +325,22 @@ points = PoolVector2Array( 392, -8 )
 script = ExtResource( 23 )
 distractWaitTime = 15.0
 
+[node name="Guard3" parent="LevelObjects/Objects/Trains/Wagons/WagonGuards2" instance=ExtResource( 22 )]
+position = Vector2( -104, -24 )
+startingDirection = 1
+
+[node name="PathLine" type="Line2D" parent="LevelObjects/Objects/Trains/Wagons/WagonGuards2/Guard3"]
+points = PoolVector2Array( 0, -8, 0, -8, -96, -8 )
+script = ExtResource( 23 )
+
+[node name="Guard4" parent="LevelObjects/Objects/Trains/Wagons/WagonGuards2" instance=ExtResource( 22 )]
+position = Vector2( 464, -24 )
+startingDirection = 1
+
+[node name="PathLine" type="Line2D" parent="LevelObjects/Objects/Trains/Wagons/WagonGuards2/Guard4"]
+points = PoolVector2Array( 0, -8, 0, -8, -120, -8 )
+script = ExtResource( 23 )
+
 [node name="DoorWall" parent="LevelObjects/Objects/Trains/Wagons/WagonGuards2" instance=ExtResource( 25 )]
 position = Vector2( 16, -24 )
 doorType = 2

Src/Levels/Level18.tscn

@@ -83,7 +83,7 @@ cell_size = Vector2( 8, 8 )
 cell_quadrant_size = 32
 occluder_light_mask = 3
 format = 1
-tile_data = PoolIntArray( 262222, 1, 0, 393235, 41, 0, 393236, 41, 0, 393237, 41, 0, 393238, 41, 0, 393239, 41, 0, 393240, 41, 0, 393241, 41, 0, 393242, 41, 0, 393243, 41, 0, 393244, 41, 0, 393245, 41, 0, 393246, 41, 0, 393247, 41, 0, 393248, 41, 0, 393249, 41, 0, 393250, 41, 0, 393251, 41, 0, 393252, 41, 0, 393253, 41, 0, 393254, 41, 0, 393255, 41, 0, 393256, 41, 0, 393257, 41, 0, 393258, 41, 0, 393259, 41, 0, 393260, 41, 0, 393261, 41, 0, 393262, 41, 0, 393263, 41, 0, 393264, 41, 0, 393265, 41, 0, 393266, 41, 0, 393267, 41, 0, 393268, 41, 0, 393269, 41, 0, 393270, 41, 0, 393271, 41, 0, 393272, 41, 0, 393273, 41, 0, 393274, 41, 0, 393275, 41, 0, 393276, 41, 0, 393277, 41, 0, 393278, 41, 0, 393279, 41, 0, 393280, 41, 0, 393281, 41, 0, 393282, 41, 0, 393283, 41, 0, 393284, 41, 0, 393285, 41, 0, 393286, 41, 0, 393287, 41, 0, 393288, 41, 0, 393289, 41, 0, 393290, 41, 0, 393291, 41, 0, 393292, 41, 0, 393293, 41, 0, 524307, 40, 0, 524310, 37, 0, 524311, 37, 0, 524312, 37, 0, 524313, 37, 0, 524314, 37, 0, 524315, 40, 0, 524318, 37, 0, 524319, 37, 0, 524321, 37, 0, 524322, 37, 0, 524323, 40, 0, 524326, 37, 0, 524327, 37, 0, 524328, 37, 0, 524329, 37, 0, 524330, 37, 0, 524331, 40, 0, 524334, 37, 0, 524335, 37, 0, 524337, 37, 0, 524338, 37, 0, 524339, 32, 0, 524341, 33, 0, 524342, 37, 0, 524343, 37, 0, 524344, 37, 0, 524345, 37, 0, 524346, 37, 0, 524347, 32, 0, 524349, 33, 0, 524350, 37, 0, 524351, 37, 0, 524353, 37, 0, 524354, 37, 0, 524355, 40, 0, 524358, 37, 0, 524359, 37, 0, 524360, 37, 0, 524361, 37, 0, 524362, 37, 0, 524363, 40, 0, 786464, 1, 0, 786480, 1, 0, 786496, 1, 0, 786510, 1, 0, 1048595, 34, 0, 1048597, 35, 0, 1048598, 32, 0, 1048600, 34, 0, 1048602, 36, 0, 1048603, 32, 0, 1048605, 34, 0, 1048607, 36, 0, 1048609, 35, 0, 1048610, 34, 0, 1048612, 32, 0, 1048614, 33, 0, 1048615, 34, 0, 1048617, 32, 0, 1048619, 33, 0, 1048620, 34, 0, 1048622, 32, 0, 1048625, 34, 0, 1048627, 35, 0, 1048628, 32, 0, 1048630, 35, 0, 1048631, 36, 0, 1048632, 36, 0, 1048633, 32, 0, 1048635, 34, 0, 1048637, 32, 0, 1048639, 33, 0, 1048641, 32, 0, 1048643, 34, 0, 1048645, 32, 0, 1048647, 35, 0, 1048648, 36, 0, 1048649, 36, 0, 1048650, 32, 0, 1048652, 34, 0, 1310752, 1, 0, 1310768, 1, 0, 1310784, 1, 0, 1310798, 1, 0, 1572883, 0, 0, 1572885, 0, 0, 1572887, 0, 0, 1572889, 0, 0, 1572891, 2, 0, 1572892, 4, 0, 1572893, 0, 0, 1572895, 0, 0, 1572897, 0, 0, 1572899, 0, 0, 1572901, 0, 0, 1572903, 0, 0, 1572905, 0, 0, 1572907, 0, 0, 1572909, 0, 0, 1572911, 5, 0, 1572912, 0, 0, 1572914, 0, 0, 1572916, 0, 0, 1572919, 17, 0, 1572920, 18, 0, 1572921, 18, 0, 1572922, 18, 0, 1572923, 18, 0, 1572924, 18, 0, 1572925, 18, 0, 1572926, 18, 0, 1572927, 19, 0, 1572928, 17, 0, 1572929, 18, 0, 1572930, 18, 0, 1572931, 18, 0, 1572932, 18, 0, 1572933, 18, 0, 1572934, 18, 0, 1572935, 18, 0, 1572936, 18, 0, 1572937, 18, 0, 1572938, 18, 0, 1572939, 18, 0, 1572940, 18, 0, 1572941, 19, 0, 1769476, 22, 0, 1769477, 23, 0, 1769478, 23, 0, 1769479, 23, 0, 1769480, 23, 0, 1769481, 23, 0, 1769482, 23, 0, 1769483, 23, 0, 1769484, 23, 0, 1769485, 23, 0, 1769486, 23, 0, 1769487, 23, 0, 1769488, 23, 0, 1769489, 23, 0, 1769558, 23, 0, 1769559, 23, 0, 1769560, 23, 0, 1769561, 23, 0, 1769562, 23, 0, 1769563, 23, 0, 1769564, 23, 0, 1769565, 23, 0, 1769566, 23, 0, 1769567, 23, 0, 1769568, 23, 0, 1769569, 24, 0, 1835026, 1, 0, 1835062, 1, 0, 1835086, 1, 0, 2097171, 60, 0, 2097172, 60, 0, 2097173, 60, 0, 2097174, 60, 0, 2097175, 60, 0, 2097176, 60, 0, 2097177, 60, 0, 2097178, 60, 0, 2097179, 60, 0, 2097180, 60, 0, 2097181, 60, 0, 2097182, 60, 0, 2097183, 60, 0, 2097184, 60, 0, 2097185, 60, 0, 2097186, 60, 0, 2097187, 60, 0, 2097188, 60, 0, 2097189, 60, 0, 2097190, 60, 0, 2097191, 60, 0, 2097192, 60, 0, 2097193, 60, 0, 2097194, 60, 0, 2097195, 60, 0, 2097196, 60, 0, 2097197, 60, 0, 2097198, 60, 0, 2097199, 60, 0, 2097200, 60, 0, 2097201, 51, 0, 2097203, 50, 0, 2097205, 50, 0, 2097207, 51, 0, 2097209, 50, 0, 2097211, 50, 0, 2097213, 51, 0, 2097215, 50, 0, 2097218, 54, 0, 2097221, 54, 0, 2097224, 54, 0, 2097227, 54, 0, 2228285, 57, 0, 2359363, 56, 0, 2424906, 57, 0, 2621459, 47, 0, 2621460, 47, 0, 2621461, 47, 0, 2621462, 47, 0, 2621463, 47, 0, 2621464, 47, 0, 2621465, 47, 0, 2621466, 47, 0, 2621467, 47, 0, 2621468, 47, 0, 2621469, 47, 0, 2621470, 47, 0, 2621471, 47, 0, 2621472, 47, 0, 2621473, 47, 0, 2621474, 47, 0, 2621475, 47, 0, 2621476, 47, 0, 2621477, 47, 0, 2621478, 47, 0, 2621479, 47, 0, 2621480, 47, 0, 2621481, 47, 0, 2621482, 47, 0, 2621483, 47, 0, 2621484, 47, 0, 2621485, 47, 0, 2621486, 47, 0, 2621487, 47, 0, 2621488, 44, 0, 2621489, 45, 0, 2621490, 45, 0, 2621491, 45, 0, 2621492, 45, 0, 2621493, 45, 0, 2621494, 45, 0, 2621495, 45, 0, 2621496, 45, 0, 2621497, 45, 0, 2621498, 45, 0, 2621499, 45, 0, 2621500, 45, 0, 2621501, 45, 0, 2621502, 45, 0, 2621503, 45, 0, 2621504, 46, 0, 2621505, 43, 0, 2621506, 44, 0, 2621507, 45, 0, 2621508, 45, 0, 2621509, 45, 0, 2621510, 45, 0, 2621511, 45, 0, 2621512, 45, 0, 2621513, 45, 0, 2621514, 45, 0, 2621515, 45, 0, 2621516, 45, 0, 2621517, 45, 0, 2621518, 45, 0, 2621519, 45, 0, 2621520, 46, 0, 2621521, 54, 0, 2621524, 53, 0 )
+tile_data = PoolIntArray( 262222, 82, 0, 393235, 41, 0, 393236, 41, 0, 393237, 41, 0, 393238, 41, 0, 393239, 41, 0, 393240, 41, 0, 393241, 41, 0, 393242, 41, 0, 393243, 41, 0, 393244, 41, 0, 393245, 41, 0, 393246, 41, 0, 393247, 41, 0, 393248, 41, 0, 393249, 41, 0, 393250, 41, 0, 393251, 41, 0, 393252, 41, 0, 393253, 41, 0, 393254, 41, 0, 393255, 41, 0, 393256, 41, 0, 393257, 41, 0, 393258, 41, 0, 393259, 41, 0, 393260, 41, 0, 393261, 41, 0, 393262, 41, 0, 393263, 41, 0, 393264, 41, 0, 393265, 41, 0, 393266, 41, 0, 393267, 41, 0, 393268, 41, 0, 393269, 41, 0, 393270, 41, 0, 393271, 41, 0, 393272, 41, 0, 393273, 41, 0, 393274, 41, 0, 393275, 41, 0, 393276, 41, 0, 393277, 41, 0, 393278, 41, 0, 393279, 41, 0, 393280, 41, 0, 393281, 41, 0, 393282, 41, 0, 393283, 41, 0, 393284, 41, 0, 393285, 41, 0, 393286, 41, 0, 393287, 41, 0, 393288, 41, 0, 393289, 41, 0, 393290, 41, 0, 393291, 41, 0, 393292, 41, 0, 393293, 41, 0, 524307, 40, 0, 524310, 37, 0, 524311, 37, 0, 524312, 37, 0, 524313, 37, 0, 524314, 37, 0, 524315, 40, 0, 524318, 37, 0, 524319, 37, 0, 524321, 37, 0, 524322, 37, 0, 524323, 40, 0, 524326, 37, 0, 524327, 37, 0, 524328, 37, 0, 524329, 37, 0, 524330, 37, 0, 524331, 40, 0, 524334, 37, 0, 524335, 37, 0, 524337, 37, 0, 524338, 37, 0, 524339, 32, 0, 524341, 33, 0, 524342, 37, 0, 524343, 37, 0, 524344, 37, 0, 524345, 37, 0, 524346, 37, 0, 524347, 32, 0, 524349, 33, 0, 524350, 37, 0, 524351, 37, 0, 524353, 37, 0, 524354, 37, 0, 524355, 40, 0, 524358, 37, 0, 524359, 37, 0, 524360, 37, 0, 524361, 37, 0, 524362, 37, 0, 524363, 40, 0, 786464, 1, 0, 786480, 1, 0, 786496, 1, 0, 786510, 82, 0, 1048595, 34, 0, 1048597, 35, 0, 1048598, 32, 0, 1048600, 34, 0, 1048602, 36, 0, 1048603, 32, 0, 1048605, 34, 0, 1048607, 36, 0, 1048609, 35, 0, 1048610, 34, 0, 1048612, 32, 0, 1048614, 33, 0, 1048615, 34, 0, 1048617, 32, 0, 1048619, 33, 0, 1048620, 34, 0, 1048622, 32, 0, 1048625, 34, 0, 1048627, 35, 0, 1048628, 32, 0, 1048630, 35, 0, 1048631, 36, 0, 1048632, 36, 0, 1048633, 32, 0, 1048635, 34, 0, 1048637, 32, 0, 1048639, 33, 0, 1048641, 32, 0, 1048643, 34, 0, 1048645, 32, 0, 1048647, 35, 0, 1048648, 36, 0, 1048649, 36, 0, 1048650, 32, 0, 1048652, 34, 0, 1310752, 1, 0, 1310768, 1, 0, 1310784, 1, 0, 1310798, 82, 0, 1572883, 0, 0, 1572885, 0, 0, 1572887, 0, 0, 1572889, 0, 0, 1572891, 2, 0, 1572892, 4, 0, 1572893, 0, 0, 1572895, 0, 0, 1572897, 0, 0, 1572899, 0, 0, 1572901, 0, 0, 1572903, 0, 0, 1572905, 0, 0, 1572907, 0, 0, 1572909, 0, 0, 1572911, 5, 0, 1572912, 0, 0, 1572914, 0, 0, 1572916, 0, 0, 1572919, 17, 0, 1572920, 18, 0, 1572921, 18, 0, 1572922, 18, 0, 1572923, 18, 0, 1572924, 18, 0, 1572925, 18, 0, 1572926, 18, 0, 1572927, 19, 0, 1572928, 17, 0, 1572929, 18, 0, 1572930, 18, 0, 1572931, 18, 0, 1572932, 18, 0, 1572933, 18, 0, 1572934, 18, 0, 1572935, 18, 0, 1572936, 18, 0, 1572937, 18, 0, 1572938, 18, 0, 1572939, 18, 0, 1572940, 18, 0, 1572941, 19, 0, 1769476, 22, 0, 1769477, 23, 0, 1769478, 23, 0, 1769479, 23, 0, 1769480, 23, 0, 1769481, 23, 0, 1769482, 23, 0, 1769483, 23, 0, 1769484, 23, 0, 1769485, 23, 0, 1769486, 23, 0, 1769487, 23, 0, 1769488, 23, 0, 1769489, 23, 0, 1769558, 23, 0, 1769559, 23, 0, 1769560, 23, 0, 1769561, 23, 0, 1769562, 23, 0, 1769563, 23, 0, 1769564, 23, 0, 1769565, 23, 0, 1769566, 23, 0, 1769567, 23, 0, 1769568, 23, 0, 1769569, 24, 0, 1835026, 1, 0, 1835062, 1, 0, 1835086, 82, 0, 2097171, 60, 0, 2097172, 60, 0, 2097173, 60, 0, 2097174, 60, 0, 2097175, 60, 0, 2097176, 60, 0, 2097177, 60, 0, 2097178, 60, 0, 2097179, 60, 0, 2097180, 60, 0, 2097181, 60, 0, 2097182, 60, 0, 2097183, 60, 0, 2097184, 60, 0, 2097185, 60, 0, 2097186, 60, 0, 2097187, 60, 0, 2097188, 60, 0, 2097189, 60, 0, 2097190, 60, 0, 2097191, 60, 0, 2097192, 60, 0, 2097193, 60, 0, 2097194, 60, 0, 2097195, 60, 0, 2097196, 60, 0, 2097197, 60, 0, 2097198, 60, 0, 2097199, 60, 0, 2097200, 60, 0, 2097201, 51, 0, 2097203, 50, 0, 2097205, 50, 0, 2097207, 51, 0, 2097209, 50, 0, 2097211, 50, 0, 2097213, 51, 0, 2097215, 50, 0, 2097218, 54, 0, 2097221, 54, 0, 2097224, 54, 0, 2097227, 54, 0, 2228285, 57, 0, 2359363, 56, 0, 2359374, 82, 0, 2424906, 57, 0, 2621459, 47, 0, 2621460, 47, 0, 2621461, 47, 0, 2621462, 47, 0, 2621463, 47, 0, 2621464, 47, 0, 2621465, 47, 0, 2621466, 47, 0, 2621467, 47, 0, 2621468, 47, 0, 2621469, 47, 0, 2621470, 47, 0, 2621471, 47, 0, 2621472, 47, 0, 2621473, 47, 0, 2621474, 47, 0, 2621475, 47, 0, 2621476, 47, 0, 2621477, 47, 0, 2621478, 47, 0, 2621479, 47, 0, 2621480, 47, 0, 2621481, 47, 0, 2621482, 47, 0, 2621483, 47, 0, 2621484, 47, 0, 2621485, 47, 0, 2621486, 47, 0, 2621487, 47, 0, 2621488, 44, 0, 2621489, 45, 0, 2621490, 45, 0, 2621491, 45, 0, 2621492, 45, 0, 2621493, 45, 0, 2621494, 45, 0, 2621495, 45, 0, 2621496, 45, 0, 2621497, 45, 0, 2621498, 45, 0, 2621499, 45, 0, 2621500, 45, 0, 2621501, 45, 0, 2621502, 45, 0, 2621503, 45, 0, 2621504, 46, 0, 2621505, 43, 0, 2621506, 44, 0, 2621507, 45, 0, 2621508, 45, 0, 2621509, 45, 0, 2621510, 45, 0, 2621511, 45, 0, 2621512, 45, 0, 2621513, 45, 0, 2621514, 45, 0, 2621515, 45, 0, 2621516, 45, 0, 2621517, 45, 0, 2621518, 45, 0, 2621519, 45, 0, 2621520, 46, 0, 2621521, 54, 0, 2621524, 53, 0 )
 
 [node name="Walls" type="TileMap" parent="."]
 tile_set = ExtResource( 17 )
@@ -319,6 +319,10 @@ position = Vector2( 512, 128 )
 position = Vector2( 624, 192 )
 doorType = 1
 
+[node name="DoorWall13" parent="LevelObjects/Doors" instance=ExtResource( 2 )]
+position = Vector2( 624, 128 )
+doorType = 1
+
 [node name="DoorWall10" parent="LevelObjects/Doors" instance=ExtResource( 2 )]
 position = Vector2( 624, 256 )
 doorType = 1
@@ -523,7 +527,7 @@ script = ExtResource( 19 )
 position = Vector2( 584, 128 )
 
 [node name="GuardPathLine" type="Line2D" parent="Guard3"]
-points = PoolVector2Array( 0, -16, -56, -16, 32, -16 )
+points = PoolVector2Array( 0, -16, -112, -16, 80, -16 )
 script = ExtResource( 19 )
 
 [node name="MinigameHolder" type="CanvasLayer" parent="."]

Src/Levels/Level19.tscn

@@ -641,4 +641,5 @@ shape = SubResource( 3 )
 [node name="Note" parent="." instance=ExtResource( 1 )]
 position = Vector2( 760, 188 )
 text = "LEVEL6_NOTE"
+highlight = true
 tresorPath = NodePath("../LevelObjects/Tresor")

Src/Levels/Level20.gd

@@ -14,12 +14,12 @@ func _ready():
 
 # Intro functions
 func dialogue_finished():
-	$DialogueBlocker.position = Vector2(-100,-100)
 	$NPCS/Secretary/WalkAnimationPlayer.play("walk")
 	Events.emit_signal("player_block_movement")
 
 func _on_WalkAnimationPlayer_animation_finished(anim_name):
 	Events.emit_signal("player_unblock_movement")
+	$DialogueBlocker.position = Vector2(-100,-100)
 	$AdditionalHUD/Overlay/BombTimer.show()
 	timerStarted = true