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

Add SuppressNotifications flag for scripted maps.

Browse Source
This commit is contained in:
Paul Chote
2017-01-29 16:51:58 +00:00
parent 7a1d1092bd
commit aa0e65d425
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Player/ConquestVictoryConditions.cs
View File

@@ -23,6 +23,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Description of the objective.")] [Desc("Description of the objective.")]
[Translate] public readonly string Objective = "Destroy all opposition!"; [Translate] public readonly string Objective = "Destroy all opposition!";
[Desc("Disable the win/loss messages and audio notifications?")]
public readonly bool SuppressNotifications = false;
public object Create(ActorInitializer init) { return new ConquestVictoryConditions(init.Self, this); } public object Create(ActorInitializer init) { return new ConquestVictoryConditions(init.Self, this); }
} }
@@ -59,11 +62,13 @@ namespace OpenRA.Mods.Common.Traits
public void OnPlayerLost(Player player) public void OnPlayerLost(Player player)
{ {
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is defeated.");
foreach (var a in player.World.Actors.Where(a => a.Owner == player)) foreach (var a in player.World.Actors.Where(a => a.Owner == player))
a.Kill(a); a.Kill(a);
if (info.SuppressNotifications)
return;
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is defeated.");
Game.RunAfterDelay(info.NotificationDelay, () => Game.RunAfterDelay(info.NotificationDelay, () =>
{ {
if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer) if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer)
@@ -73,8 +78,10 @@ namespace OpenRA.Mods.Common.Traits
public void OnPlayerWon(Player player) public void OnPlayerWon(Player player)
{ {
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is victorious."); if (info.SuppressNotifications)
return;
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is victorious.");
Game.RunAfterDelay(info.NotificationDelay, () => Game.RunAfterDelay(info.NotificationDelay, () =>
{ {
if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer) if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer)

13
OpenRA.Mods.Common/Traits/Player/StrategicVictoryConditions.cs
View File

@@ -38,6 +38,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Description of the objective")] [Desc("Description of the objective")]
[Translate] public readonly string Objective = "Hold all the strategic positions!"; [Translate] public readonly string Objective = "Hold all the strategic positions!";
[Desc("Disable the win/loss messages and audio notifications?")]
public readonly bool SuppressNotifications = false;
public object Create(ActorInitializer init) { return new StrategicVictoryConditions(init.Self, this); } public object Create(ActorInitializer init) { return new StrategicVictoryConditions(init.Self, this); }
} }
@@ -104,11 +107,13 @@ namespace OpenRA.Mods.Common.Traits
public void OnPlayerLost(Player player) public void OnPlayerLost(Player player)
{ {
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is defeated.");
foreach (var a in player.World.Actors.Where(a => a.Owner == player)) foreach (var a in player.World.Actors.Where(a => a.Owner == player))
a.Kill(a); a.Kill(a);
if (info.SuppressNotifications)
return;
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is defeated.");
Game.RunAfterDelay(info.NotificationDelay, () => Game.RunAfterDelay(info.NotificationDelay, () =>
{ {
if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer) if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer)
@@ -118,8 +123,10 @@ namespace OpenRA.Mods.Common.Traits
public void OnPlayerWon(Player player) public void OnPlayerWon(Player player)
{ {
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is victorious."); if (info.SuppressNotifications)
return;
Game.AddChatLine(Color.White, "Battlefield Control", player.PlayerName + " is victorious.");
Game.RunAfterDelay(info.NotificationDelay, () => Game.RunAfterDelay(info.NotificationDelay, () =>
{ {
if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer) if (Game.IsCurrentWorld(player.World) && player == player.World.LocalPlayer)