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

Change upgradeAvailable to instancesEnabled in SupportPowerManager.

Browse Source
This commit is contained in:
Paul Chote
2016-12-23 15:06:22 +00:00
parent f360c10569
commit cb9178364f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
View File

@@ -160,12 +160,12 @@ namespace OpenRA.Mods.Common.Traits
public int RemainingTime; public int RemainingTime;
public int TotalTime; public int TotalTime;
public bool Active { get; private set; } public bool Active { get; private set; }
public bool Disabled { get { return !prereqsAvailable || !upgradeAvailable; } } public bool Disabled { get { return !prereqsAvailable || !instancesEnabled; } }
public SupportPowerInfo Info { get { return Instances.Select(i => i.Info).FirstOrDefault(); } } public SupportPowerInfo Info { get { return Instances.Select(i => i.Info).FirstOrDefault(); } }
public bool Ready { get { return Active && RemainingTime == 0; } } public bool Ready { get { return Active && RemainingTime == 0; } }
bool upgradeAvailable; bool instancesEnabled;
bool prereqsAvailable = true; bool prereqsAvailable = true;
public SupportPowerInstance(string key, SupportPowerManager manager) public SupportPowerInstance(string key, SupportPowerManager manager)
@@ -188,8 +188,8 @@ namespace OpenRA.Mods.Common.Traits
bool notifiedReady; bool notifiedReady;
public void Tick() public void Tick()
{ {
upgradeAvailable = Instances.Any(i => !i.IsTraitDisabled); instancesEnabled = Instances.Any(i => !i.IsTraitDisabled);
if (!upgradeAvailable) if (!instancesEnabled)
RemainingTime = TotalTime; RemainingTime = TotalTime;
Active = !Disabled && Instances.Any(i => !i.Self.IsDisabled()); Active = !Disabled && Instances.Any(i => !i.Self.IsDisabled());