epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7081 from Mailaender/ignore-missing-npc-objectives

Browse Source 
Removed the need to give NPCs fake objectives to properly end the game
This commit is contained in:
Chris Forbes
2014-12-08 14:05:59 +13:00
parent 51f874fae2 d319a8f506
commit 522c63ff58
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Player/MissionObjectives.cs
View File

@@ -129,7 +129,7 @@ namespace OpenRA.Mods.RA
{
foreach (var inou in inous)
inou.OnPlayerLost(player);
CheckIfGameIsOver(player);
}
}
@@ -139,7 +139,7 @@ namespace OpenRA.Mods.RA
{
var players = player.World.Players.Where(p => !p.NonCombatant);
var gameOver = players.All(p => p.WinState != WinState.Undefined);
var gameOver = players.All(p => p.WinState != WinState.Undefined || !p.HasObjectives);
if (gameOver)
Game.RunAfterDelay(info.GameOverDelay, () =>
{
@@ -181,6 +181,8 @@ namespace OpenRA.Mods.RA
foreach (var p in enemies)
p.PlayerActor.Trait<MissionObjectives>().ForceDefeat(p);
}
CheckIfGameIsOver(player);
}
public void OnPlayerLost(Player player)
@@ -218,6 +220,8 @@ namespace OpenRA.Mods.RA
p.World.OnPlayerWinStateChanged(p);
}
}
CheckIfGameIsOver(player);
}
public void ForceDefeat(Player player)
@@ -227,7 +231,7 @@ namespace OpenRA.Mods.RA
MarkFailed(player, id);
}
public event Action<Player> ObjectiveAdded = player => { };
public event Action<Player> ObjectiveAdded = player => { player.HasObjectives = true; };
public void OnObjectiveAdded(Player player, int id) {}
public void OnObjectiveCompleted(Player player, int id) {}