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

Extracted Win and Lose and Leave notifications MissionObjectives.

Browse Source
This commit is contained in:
Andre Mohren
2018-07-22 14:36:47 +02:00
committed by abcdefg30
parent fac758f38e
commit d7f81d4a20
8 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits
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)
Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Lose", player.Faction.InternalName); Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", mo.Info.LoseNotification, player.Faction.InternalName);
}); });
} }
@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Traits
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)
Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Win", player.Faction.InternalName); Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", mo.Info.WinNotification, player.Faction.InternalName);
}); });
} }

4
OpenRA.Mods.Common/Traits/Player/MissionObjectives.cs
View File

@@ -48,6 +48,10 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Delay between the game over condition being met, and the game actually ending, in milliseconds.")] [Desc("Delay between the game over condition being met, and the game actually ending, in milliseconds.")]
public readonly int GameOverDelay = 1500; public readonly int GameOverDelay = 1500;
public readonly string WinNotification = null;
public readonly string LoseNotification = null;
public readonly string LeaveNotification = null;
public object Create(ActorInitializer init) { return new MissionObjectives(init.World, this); } public object Create(ActorInitializer init) { return new MissionObjectives(init.World, this); }
} }

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

@@ -119,7 +119,7 @@ namespace OpenRA.Mods.Common.Traits
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)
Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Lose", player.Faction.InternalName); Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", mo.Info.LoseNotification, player.Faction.InternalName);
}); });
} }
@@ -132,7 +132,7 @@ namespace OpenRA.Mods.Common.Traits
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)
Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Win", player.Faction.InternalName); Game.Sound.PlayNotification(player.World.Map.Rules, player, "Speech", mo.Info.WinNotification, player.Faction.InternalName);
}); });
} }

9
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
View File

@@ -44,7 +44,14 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Action onQuit = () => Action onQuit = () =>
{ {
if (world.Type == WorldType.Regular) if (world.Type == WorldType.Regular)
Game.Sound.PlayNotification(world.Map.Rules, null, "Speech", "Leave", world.LocalPlayer == null ? null : world.LocalPlayer.Faction.InternalName); {
var moi = world.Map.Rules.Actors["player"].TraitInfoOrDefault<MissionObjectivesInfo>();
if (moi != null)
{
var faction = world.LocalPlayer == null ? null : world.LocalPlayer.Faction.InternalName;
Game.Sound.PlayNotification(world.Map.Rules, null, "Speech", moi.LeaveNotification, faction);
}
}
leaving = true; leaving = true;

3
mods/cnc/rules/player.yaml
View File

@@ -14,6 +14,9 @@ Player:
SupportPowerManager: SupportPowerManager:
ScriptTriggers: ScriptTriggers:
MissionObjectives: MissionObjectives:
WinNotification: Win
LoseNotification: Lose
LeaveNotification: Leave
ConquestVictoryConditions: ConquestVictoryConditions:
PowerManager: PowerManager:
SpeechNotification: LowPower SpeechNotification: LowPower

3
mods/d2k/rules/player.yaml
View File

@@ -81,6 +81,9 @@ Player:
SupportPowerManager: SupportPowerManager:
ScriptTriggers: ScriptTriggers:
MissionObjectives: MissionObjectives:
WinNotification: Win
LoseNotification: Lose
LeaveNotification: Leave
ConquestVictoryConditions: ConquestVictoryConditions:
PowerManager: PowerManager:
AdviceInterval: 650 AdviceInterval: 650

3
mods/ra/rules/player.yaml
View File

@@ -75,6 +75,9 @@ Player:
SupportPowerManager: SupportPowerManager:
ScriptTriggers: ScriptTriggers:
MissionObjectives: MissionObjectives:
WinNotification: Win
LoseNotification: Lose
LeaveNotification: Leave
ConquestVictoryConditions: ConquestVictoryConditions:
PowerManager: PowerManager:
SpeechNotification: LowPower SpeechNotification: LowPower

3
mods/ts/rules/player.yaml
View File

@@ -67,6 +67,9 @@ Player:
SupportPowerManager: SupportPowerManager:
ScriptTriggers: ScriptTriggers:
MissionObjectives: MissionObjectives:
WinNotification: Win
LoseNotification: Lose
LeaveNotification: Leave
ConquestVictoryConditions: ConquestVictoryConditions:
PowerManager: PowerManager:
SpeechNotification: LowPower SpeechNotification: LowPower