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

Cache map option ShortGame at game load

Browse Source 
To reduce MapOptions calls.
This commit is contained in:
reaperrr
2018-03-16 21:59:27 +01:00
committed by Paul Chote
parent 0555ce9321
commit f351f0346f
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/PlayerExtensions.cs
View File

@@ -16,10 +16,9 @@ namespace OpenRA.Mods.Common
{ {
public static class PlayerExtensions public static class PlayerExtensions
{ {
public static bool HasNoRequiredUnits(this Player player) public static bool HasNoRequiredUnits(this Player player, bool shortGame)
{ {
var mapOptions = player.World.WorldActor.Trait<MapOptions>(); if (shortGame)
if (mapOptions.ShortGame)
return !player.World.ActorsHavingTrait<MustBeDestroyed>(t => t.Info.RequiredForShortGame).Any(a => a.Owner == player); return !player.World.ActorsHavingTrait<MustBeDestroyed>(t => t.Info.RequiredForShortGame).Any(a => a.Owner == player);
return !player.World.ActorsHavingTrait<MustBeDestroyed>().Any(a => a.Owner == player && a.IsInWorld); return !player.World.ActorsHavingTrait<MustBeDestroyed>().Any(a => a.Owner == player && a.IsInWorld);
} }

4
OpenRA.Mods.Common/Scripting/Properties/MissionObjectiveProperties.cs
View File

@@ -20,11 +20,13 @@ namespace OpenRA.Mods.Common.Scripting
public class MissionObjectiveProperties : ScriptPlayerProperties, Requires<MissionObjectivesInfo> public class MissionObjectiveProperties : ScriptPlayerProperties, Requires<MissionObjectivesInfo>
{ {
readonly MissionObjectives mo; readonly MissionObjectives mo;
readonly bool shortGame;
public MissionObjectiveProperties(ScriptContext context, Player player) public MissionObjectiveProperties(ScriptContext context, Player player)
: base(context, player) : base(context, player)
{ {
mo = player.PlayerActor.Trait<MissionObjectives>(); mo = player.PlayerActor.Trait<MissionObjectives>();
shortGame = player.World.WorldActor.Trait<MapOptions>().ShortGame;
} }
[ScriptActorPropertyActivity] [ScriptActorPropertyActivity]
@@ -112,7 +114,7 @@ namespace OpenRA.Mods.Common.Scripting
"the MustBeDestroyed trait (according to the short game option).")] "the MustBeDestroyed trait (according to the short game option).")]
public bool HasNoRequiredUnits() public bool HasNoRequiredUnits()
{ {
return Player.HasNoRequiredUnits(); return Player.HasNoRequiredUnits(shortGame);
} }
} }
} }

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

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
readonly ConquestVictoryConditionsInfo info; readonly ConquestVictoryConditionsInfo info;
readonly MissionObjectives mo; readonly MissionObjectives mo;
readonly bool shortGame;
Player[] otherPlayers; Player[] otherPlayers;
int objectiveID = -1; int objectiveID = -1;
@@ -40,6 +41,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
info = cvcInfo; info = cvcInfo;
mo = self.Trait<MissionObjectives>(); mo = self.Trait<MissionObjectives>();
shortGame = self.Owner.World.WorldActor.Trait<MapOptions>().ShortGame;
} }
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
@@ -49,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits
if (objectiveID < 0) if (objectiveID < 0)
objectiveID = mo.Add(self.Owner, info.Objective, 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(shortGame))
mo.MarkFailed(self.Owner, objectiveID); mo.MarkFailed(self.Owner, objectiveID);
// Players, NonCombatants, and IsAlliedWith are all fixed once the game starts, so we can cache the result. // Players, NonCombatants, and IsAlliedWith are all fixed once the game starts, so we can cache the result.

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

@@ -51,6 +51,7 @@ namespace OpenRA.Mods.Common.Traits
[Sync] public int TicksLeft; [Sync] public int TicksLeft;
readonly Player player; readonly Player player;
readonly MissionObjectives mo; readonly MissionObjectives mo;
readonly bool shortGame;
int objectiveID = -1; int objectiveID = -1;
public StrategicVictoryConditions(Actor self, StrategicVictoryConditionsInfo svcInfo) public StrategicVictoryConditions(Actor self, StrategicVictoryConditionsInfo svcInfo)
@@ -59,6 +60,7 @@ namespace OpenRA.Mods.Common.Traits
TicksLeft = info.HoldDuration; TicksLeft = info.HoldDuration;
player = self.Owner; player = self.Owner;
mo = self.Trait<MissionObjectives>(); mo = self.Trait<MissionObjectives>();
shortGame = player.World.WorldActor.Trait<MapOptions>().ShortGame;
} }
public IEnumerable<Actor> AllPoints public IEnumerable<Actor> AllPoints
@@ -78,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits
if (objectiveID < 0) if (objectiveID < 0)
objectiveID = mo.Add(player, info.Objective, 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(shortGame))
mo.MarkFailed(self.Owner, objectiveID); mo.MarkFailed(self.Owner, objectiveID);
var others = self.World.Players.Where(p => !p.NonCombatant var others = self.World.Players.Where(p => !p.NonCombatant