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

Refactor PowerManager and RequiresPower to use conditions

Browse Source 
Instead of Actor.IsDisabled.
Added INotifyPowerLevelChanged interface to do so as efficiently as possible.
This commit is contained in:
reaperrr
2017-08-04 13:28:02 +02:00
committed by Pavel Penev
parent 6c02e3f2b7
commit 786a0eb07f
6 changed files with 122 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
View File

@@ -32,6 +32,7 @@ namespace OpenRA.Mods.Common.Traits
readonly DeveloperMode devMode;
readonly Dictionary<Actor, int> powerDrain = new Dictionary<Actor, int>();
[Sync] int totalProvided;
public int PowerProvided { get { return totalProvided; } }
@@ -43,6 +44,11 @@ namespace OpenRA.Mods.Common.Traits
public int PowerOutageRemainingTicks { get; private set; }
public int PowerOutageTotalTicks { get; private set; }
int nextPowerAdviceTime = 0;
bool lowPower = false;
bool wasLowPower = false;
bool wasHackEnabled;
public PowerManager(Actor self, PowerManagerInfo info)
{
this.self = self;
@@ -86,10 +92,6 @@ namespace OpenRA.Mods.Common.Traits
totalDrained += amount;
}
int nextPowerAdviceTime = 0;
bool wasLowPower = false;
bool wasHackEnabled;
void ITick.Tick(Actor self)
{
if (wasHackEnabled != devMode.UnlimitedPower)
@@ -107,15 +109,21 @@ namespace OpenRA.Mods.Common.Traits
wasHackEnabled = devMode.UnlimitedPower;
}
var lowPower = totalProvided < totalDrained;
lowPower = ExcessPower < 0;
if (lowPower != wasLowPower)
UpdateRequiresPowerActors();
if (lowPower && !wasLowPower)
nextPowerAdviceTime = 0;
wasLowPower = lowPower;
if (--nextPowerAdviceTime <= 0)
{
if (lowPower)
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.SpeechNotification, self.Owner.Faction.InternalName);
nextPowerAdviceTime = info.AdviceInterval;
}
@@ -148,6 +156,15 @@ namespace OpenRA.Mods.Common.Traits
p.Trait.UpdateStatus(p.Actor);
}
void UpdateRequiresPowerActors()
{
var traitPairs = self.World.ActorsWithTrait<INotifyPowerLevelChanged>()
.Where(p => !p.Actor.IsDead && p.Actor.IsInWorld && p.Actor.Owner == self.Owner);
foreach (var p in traitPairs)
p.Trait.PowerLevelChanged(p.Actor);
}
void IResolveOrder.ResolveOrder(Actor self, Order order)
{
if (devMode.Enabled && order.OrderString == "PowerOutage")