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

17
OpenRA.Mods.Common/Traits/Demolishable.cs
View File

@@ -43,19 +43,12 @@ namespace OpenRA.Mods.Common.Traits
}
}
ConditionManager conditionManager;
List<DemolishAction> actions = new List<DemolishAction>();
List<DemolishAction> removeActions = new List<DemolishAction>();
public Demolishable(DemolishableInfo info)
: base(info) { }
protected override void Created(Actor self)
{
base.Created(self);
conditionManager = self.TraitOrDefault<ConditionManager>();
}
bool IDemolishable.IsValidTarget(Actor self, Actor saboteur)
{
return !IsTraitDisabled;
@@ -66,9 +59,9 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled)
return;
var token = ConditionManager.InvalidConditionToken;
if (conditionManager != null && !string.IsNullOrEmpty(Info.Condition))
token = conditionManager.GrantCondition(self, Info.Condition);
var token = Actor.InvalidConditionToken;
if (!string.IsNullOrEmpty(Info.Condition))
token = self.GrantCondition(Info.Condition);
actions.Add(new DemolishAction(saboteur, delay, token));
}
@@ -88,9 +81,9 @@ namespace OpenRA.Mods.Common.Traits
if (Util.ApplyPercentageModifiers(100, modifiers) > 0)
self.Kill(a.Saboteur);
else if (a.Token != ConditionManager.InvalidConditionToken)
else if (a.Token != Actor.InvalidConditionToken)
{
conditionManager.RevokeCondition(self, a.Token);
self.RevokeCondition(a.Token);
removeActions.Add(a);
}
}