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

18
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnFaction.cs
View File

@@ -33,8 +33,7 @@ namespace OpenRA.Mods.Common.Traits
class GrantConditionOnFaction : ConditionalTrait<GrantConditionOnFactionInfo>, INotifyOwnerChanged
{
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
int conditionToken = Actor.InvalidConditionToken;
string faction;
public GrantConditionOnFaction(ActorInitializer init, GrantConditionOnFactionInfo info)
@@ -43,13 +42,6 @@ namespace OpenRA.Mods.Common.Traits
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
}
protected override void Created(Actor self)
{
conditionManager = self.Trait<ConditionManager>();
base.Created(self);
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
if (Info.ResetOnOwnerChange && faction != newOwner.Faction.InternalName)
@@ -63,16 +55,16 @@ namespace OpenRA.Mods.Common.Traits
protected override void TraitEnabled(Actor self)
{
if (conditionToken == ConditionManager.InvalidConditionToken && Info.Factions.Contains(faction))
conditionToken = conditionManager.GrantCondition(self, Info.Condition);
if (conditionToken == Actor.InvalidConditionToken && Info.Factions.Contains(faction))
conditionToken = self.GrantCondition(Info.Condition);
}
protected override void TraitDisabled(Actor self)
{
if (conditionToken == ConditionManager.InvalidConditionToken)
if (conditionToken == Actor.InvalidConditionToken)
return;
conditionToken = conditionManager.RevokeCondition(self, conditionToken);
conditionToken = self.RevokeCondition(conditionToken);
}
}
}