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

Change *VictoryConditions to use customizable objective descriptions

Browse Source
This commit is contained in:
Oliver Brakmann
2015-05-26 11:45:28 +02:00
parent 34f382ec57
commit 4e010bd6e6
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,10 @@ namespace OpenRA.Mods.Common.Traits
public class ConquestVictoryConditionsInfo : ITraitInfo, Requires<MissionObjectivesInfo> public class ConquestVictoryConditionsInfo : ITraitInfo, Requires<MissionObjectivesInfo>
{ {
[Desc("Delay for the end game notification in milliseconds.")] [Desc("Delay for the end game notification in milliseconds.")]
public int NotificationDelay = 1500; public readonly int NotificationDelay = 1500;
[Desc("Description of the objective.")]
[Translate] public readonly string Objective = "Destroy all opposition!";
public object Create(ActorInitializer init) { return new ConquestVictoryConditions(init.Self, this); } public object Create(ActorInitializer init) { return new ConquestVictoryConditions(init.Self, this); }
} }
@@ -38,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits
if (self.Owner.WinState != WinState.Undefined || self.Owner.NonCombatant) return; if (self.Owner.WinState != WinState.Undefined || self.Owner.NonCombatant) return;
if (objectiveID < 0) if (objectiveID < 0)
objectiveID = mo.Add(self.Owner, "Destroy all opposition!", ObjectiveType.Primary, true); objectiveID = mo.Add(self.Owner, info.Objective, ObjectiveType.Primary, true);
if (!self.Owner.NonCombatant && self.Owner.HasNoRequiredUnits()) if (!self.Owner.NonCombatant && self.Owner.HasNoRequiredUnits())
mo.MarkFailed(self.Owner, objectiveID); mo.MarkFailed(self.Owner, objectiveID);

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

@@ -31,7 +31,10 @@ namespace OpenRA.Mods.Common.Traits
public readonly float RatioRequired = 0.5f; public readonly float RatioRequired = 0.5f;
[Desc("Delay for the end game notification in milliseconds.")] [Desc("Delay for the end game notification in milliseconds.")]
public int NotificationDelay = 1500; public readonly int NotificationDelay = 1500;
[Desc("Description of the objective")]
[Translate] public readonly string Objective = "Hold all the strategic positions!";
public object Create(ActorInitializer init) { return new StrategicVictoryConditions(init.Self, this); } public object Create(ActorInitializer init) { return new StrategicVictoryConditions(init.Self, this); }
} }
@@ -68,7 +71,7 @@ namespace OpenRA.Mods.Common.Traits
if (player.WinState != WinState.Undefined || player.NonCombatant) return; if (player.WinState != WinState.Undefined || player.NonCombatant) return;
if (objectiveID < 0) if (objectiveID < 0)
objectiveID = mo.Add(player, "Hold all the strategic positions for a specified time!", ObjectiveType.Primary, true); objectiveID = mo.Add(player, info.Objective, ObjectiveType.Primary, true);
if (!self.Owner.NonCombatant && self.Owner.HasNoRequiredUnits()) if (!self.Owner.NonCombatant && self.Owner.HasNoRequiredUnits())
mo.MarkFailed(self.Owner, objectiveID); mo.MarkFailed(self.Owner, objectiveID);

5
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View File

@@ -27,6 +27,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
checkbox.IsChecked = () => lp.WinState != WinState.Undefined; checkbox.IsChecked = () => lp.WinState != WinState.Undefined;
checkbox.GetCheckType = () => lp.WinState == WinState.Won ? checkbox.GetCheckType = () => lp.WinState == WinState.Won ?
"checked" : "crossed"; "checked" : "crossed";
if (lp.HasObjectives)
{
var mo = lp.PlayerActor.Trait<MissionObjectives>();
checkbox.GetText = () => mo.Objectives.First().Description;
}
var statusLabel = widget.Get<LabelWidget>("STATS_STATUS"); var statusLabel = widget.Get<LabelWidget>("STATS_STATUS");