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

Convert AffectedByPowerOutage from disabler to conditional condition granter.

Browse Source
This commit is contained in:
atlimit8
2017-03-16 16:16:23 -05:00
parent 61b84e0c5a
commit 0dfdea1826
7 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs
View File

@@ -15,23 +15,39 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Disables the actor when a power outage is triggered (see `InfiltrateForPowerOutage` for more information).")]
public class AffectedByPowerOutageInfo : ITraitInfo
public class AffectedByPowerOutageInfo : ConditionalTraitInfo
{
public object Create(ActorInitializer init) { return new AffectedByPowerOutage(init.Self); }
[GrantedConditionReference]
[Desc("The condition to grant while there is a power outage.")]
public readonly string Condition = null;
public override object Create(ActorInitializer init) { return new AffectedByPowerOutage(init.Self, this); }
}
public class AffectedByPowerOutage : INotifyOwnerChanged, ISelectionBar, IPowerModifier, IDisable
public class AffectedByPowerOutage : ConditionalTrait<AffectedByPowerOutageInfo>, INotifyOwnerChanged, ISelectionBar, INotifyCreated, INotifyAddedToWorld
{
PowerManager playerPower;
ConditionManager conditionManager;
int token = ConditionManager.InvalidConditionToken;
public AffectedByPowerOutage(Actor self)
public AffectedByPowerOutage(Actor self, AffectedByPowerOutageInfo info)
: base(info)
{
playerPower = self.Owner.PlayerActor.Trait<PowerManager>();
}
void INotifyAddedToWorld.AddedToWorld(Actor self) { UpdateStatus(self); }
protected override void TraitEnabled(Actor self) { UpdateStatus(self); }
protected override void TraitDisabled(Actor self) { Revoke(self); }
void INotifyCreated.Created(Actor self)
{
conditionManager = self.TraitOrDefault<ConditionManager>();
}
float ISelectionBar.GetValue()
{
if (playerPower.PowerOutageRemainingTicks <= 0)
if (IsTraitDisabled || playerPower.PowerOutageRemainingTicks <= 0)
return 0;
return (float)playerPower.PowerOutageRemainingTicks / playerPower.PowerOutageTotalTicks;
@@ -44,19 +60,30 @@ namespace OpenRA.Mods.Common.Traits
bool ISelectionBar.DisplayWhenEmpty { get { return false; } }
int IPowerModifier.GetPowerModifier()
public void UpdateStatus(Actor self)
{
return playerPower.PowerOutageRemainingTicks > 0 ? 0 : 100;
if (!IsTraitDisabled && playerPower.PowerOutageRemainingTicks > 0)
Grant(self);
else
Revoke(self);
}
public bool Disabled
void Grant(Actor self)
{
get { return playerPower.PowerOutageRemainingTicks > 0; }
if (token == ConditionManager.InvalidConditionToken)
token = conditionManager.GrantCondition(self, Info.Condition);
}
void Revoke(Actor self)
{
if (token != ConditionManager.InvalidConditionToken)
token = conditionManager.RevokeCondition(self, token);
}
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
playerPower = newOwner.PlayerActor.Trait<PowerManager>();
UpdateStatus(self);
}
}
}

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

@@ -141,11 +141,11 @@ namespace OpenRA.Mods.Common.Traits
void UpdatePowerOutageActors()
{
var actors = self.World.ActorsHavingTrait<AffectedByPowerOutage>()
.Where(a => !a.IsDead && a.IsInWorld && a.Owner == self.Owner);
var traitPairs = self.World.ActorsWithTrait<AffectedByPowerOutage>()
.Where(p => !p.Actor.IsDead && p.Actor.IsInWorld && p.Actor.Owner == self.Owner);
foreach (var a in actors)
UpdateActor(a);
foreach (var p in traitPairs)
p.Trait.UpdateStatus(p.Actor);
}
void IResolveOrder.ResolveOrder(Actor self, Order order)