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

Clean ProvidesPrerequisite.cs of "race"

Browse Source
This commit is contained in:
Pavel Penev
2015-07-31 05:20:54 +03:00
parent 1e9cc50805
commit a8dae72409
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Player/ProvidesPrerequisite.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly string[] RequiresPrerequisites = { }; public readonly string[] RequiresPrerequisites = { };
[Desc("Only grant this prerequisite for certain factions.")] [Desc("Only grant this prerequisite for certain factions.")]
public readonly string[] Race = { }; public readonly string[] Factions = { };
[Desc("Should it recheck everything when it is captured?")] [Desc("Should it recheck everything when it is captured?")]
public readonly bool ResetOnOwnerChange = false; public readonly bool ResetOnOwnerChange = false;
@@ -45,9 +45,9 @@ namespace OpenRA.Mods.Common.Traits
if (string.IsNullOrEmpty(prerequisite)) if (string.IsNullOrEmpty(prerequisite))
prerequisite = init.Self.Info.Name; prerequisite = init.Self.Info.Name;
var race = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName; var faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
Update(init.Self.Owner, race); Update(init.Self.Owner, faction);
} }
public IEnumerable<string> ProvidesPrerequisites public IEnumerable<string> ProvidesPrerequisites
@@ -67,12 +67,12 @@ namespace OpenRA.Mods.Common.Traits
Update(newOwner, newOwner.Faction.InternalName); Update(newOwner, newOwner.Faction.InternalName);
} }
void Update(Player owner, string race) void Update(Player owner, string faction)
{ {
enabled = true; enabled = true;
if (info.Race.Any()) if (info.Factions.Any())
enabled = info.Race.Contains(race); enabled = info.Factions.Contains(faction);
if (info.RequiresPrerequisites.Any() && enabled) if (info.RequiresPrerequisites.Any() && enabled)
enabled = owner.PlayerActor.Trait<TechTree>().HasPrerequisites(info.RequiresPrerequisites); enabled = owner.PlayerActor.Trait<TechTree>().HasPrerequisites(info.RequiresPrerequisites);