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

Merge ConditionManager trait directly into Actor

Browse Source
This commit is contained in:
atlimit8
2020-04-18 23:25:05 -05:00
committed by reaperrr
parent e12c1dc9aa
commit 259c8d2c98
65 changed files with 466 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Traits/Attack/AttackCharges.cs
View File

@@ -35,8 +35,7 @@ namespace OpenRA.Mods.Common.Traits
public class AttackCharges : AttackOmni, INotifyAttack, INotifySold
{
readonly AttackChargesInfo info;
ConditionManager conditionManager;
int chargingToken = ConditionManager.InvalidConditionToken;
int chargingToken = Actor.InvalidConditionToken;
bool charging;
public int ChargeLevel { get; private set; }
@@ -47,13 +46,6 @@ namespace OpenRA.Mods.Common.Traits
this.info = info;
}
protected override void Created(Actor self)
{
conditionManager = self.TraitOrDefault<ConditionManager>();
base.Created(self);
}
protected override void Tick(Actor self)
{
// Stop charging when we lose our target
@@ -62,12 +54,12 @@ namespace OpenRA.Mods.Common.Traits
var delta = charging ? info.ChargeRate : -info.DischargeRate;
ChargeLevel = (ChargeLevel + delta).Clamp(0, info.ChargeLevel);
if (ChargeLevel > 0 && conditionManager != null && !string.IsNullOrEmpty(info.ChargingCondition)
&& chargingToken == ConditionManager.InvalidConditionToken)
chargingToken = conditionManager.GrantCondition(self, info.ChargingCondition);
if (ChargeLevel > 0 && !string.IsNullOrEmpty(info.ChargingCondition)
&& chargingToken == Actor.InvalidConditionToken)
chargingToken = self.GrantCondition(info.ChargingCondition);
if (ChargeLevel == 0 && conditionManager != null && chargingToken != ConditionManager.InvalidConditionToken)
chargingToken = conditionManager.RevokeCondition(self, chargingToken);
if (ChargeLevel == 0 && chargingToken != Actor.InvalidConditionToken)
chargingToken = self.RevokeCondition(chargingToken);
base.Tick(self);
}