Wipeout announcements and overlay showing

Author: tilderain

scripts/vscripts/tf2ware_ultimate/main.nut

@@ -1399,7 +1399,7 @@ function Ware_StartMinigameInternal(is_boss)
 	Ware_CriticalZone = true
 
 	local valid_players = Ware_GetValidPlayers(is_boss)
-	
+
 	Ware_MinigameScope.clear()
 
 	local player_count = valid_players.len()
@@ -1847,7 +1847,7 @@ function Ware_FinishMinigameInternal()
 		}
 		else
 		{
-			passed = false
+			passed = true
 		}
 
 		if (all_passed)
@@ -1873,7 +1873,8 @@ function Ware_FinishMinigameInternal()
 
 		Ware_ShowMinigameText(player, "")
 		Ware_PlayGameSound(player, sound)
-		Ware_ShowScreenOverlay(player, overlay)
+		if (participated && !all_passed && !all_failed)
+			Ware_ShowScreenOverlay(player, overlay)
 		if (Ware_MinigameOverlay2Set)
 			Ware_ShowScreenOverlay2(player, null)
 

scripts/vscripts/tf2ware_ultimate/specialrounds/wipeout.nut

@@ -262,14 +262,59 @@ function OnMinigameEnd()
 		local lives = Ware_GetPlayerSpecialRoundData(player).lives
 		if(lives > 0)
 			player.RemoveCond(TF_COND_HALLOWEEN_GHOST_MODE)
-			
+
 		player.SetMoveType(MOVETYPE_WALK, 0)
 		player.SetCollisionGroup(COLLISION_GROUP_PUSHAWAY)
 		player.RemoveCond(TF_COND_HALLOWEEN_KART)
 	}
 	Ware_MinigameHomeLocation.Teleport(Wipeout_Spectators)
+
+	AnnounceKnockouts()
 }
 
+
+function AnnounceKnockouts()
+{
+	local knocked_out = 0
+	
+	foreach (data in Ware_PlayersData)
+	{
+		local player = data.player
+		local idx = Wipeout_ValidPlayers.find(player)
+		if (idx == null)
+			continue
+
+		local lives = Ware_GetPlayerSpecialRoundData(player).lives
+		if (lives <= 0)
+		{
+			knocked_out++
+			Ware_ChatPrint(null, "{player}{color} has been {color}wiped out!", player, "9AB973", COLOR_GREEN);
+			
+			Wipeout_ValidPlayers.remove(idx)
+			if (player.IsAlive())
+				Ware_SuicidePlayer(player)
+		}
+	}
+	
+	local players_len = Wipeout_GetAlivePlayers().len()
+
+	if (knocked_out > 0)
+	{
+		Ware_ChatPrint(null, "{int} {str} been knocked out! There are {int} {str} still standing.", 
+			knocked_out,
+			knocked_out > 1 ? "players have" : "player has",
+			players_len,
+			players_len == 1 ? "player" : "players")
+	}
+	//else
+	//{
+	//	Ware_ChatPrint(null, "No one has been knocked out! There are {int} {str} still standing.", 
+	//		players_len,
+	//		players_len == 1 ? "player" : "players")		
+	//}
+}
+
+
 function OnDeclareWinners(top_players, top_score, winner_count)
 {
 	if (winner_count > 1)
@@ -287,4 +332,12 @@ function OnDeclareWinners(top_players, top_score, winner_count)
 	{
 		Ware_ChatPrint(null, "{color}Nobody won!?", TF_COLOR_DEFAULT)
 	}
-}
+}
+
+function OnEnd()
+{
+	foreach(player in Ware_Players)
+	{
+		player.RemoveCond(TF_COND_HALLOWEEN_GHOST_MODE)
+	}
+}