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/Parachutable.cs
View File

@@ -57,15 +57,14 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new Parachutable(init.Self, this); }
}
public class Parachutable : INotifyCreated, INotifyParachute
public class Parachutable : INotifyParachute
{
readonly ParachutableInfo info;
readonly IPositionable positionable;
public Actor IgnoreActor;
ConditionManager conditionManager;
int parachutingToken = ConditionManager.InvalidConditionToken;
int parachutingToken = Actor.InvalidConditionToken;
public Parachutable(Actor self, ParachutableInfo info)
{
@@ -75,17 +74,12 @@ namespace OpenRA.Mods.Common.Traits
public bool IsInAir { get; private set; }
void INotifyCreated.Created(Actor self)
{
conditionManager = self.TraitOrDefault<ConditionManager>();
}
void INotifyParachute.OnParachute(Actor self)
{
IsInAir = true;
if (conditionManager != null && parachutingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.ParachutingCondition))
parachutingToken = conditionManager.GrantCondition(self, info.ParachutingCondition);
if (parachutingToken == Actor.InvalidConditionToken && !string.IsNullOrEmpty(info.ParachutingCondition))
parachutingToken = self.GrantCondition(info.ParachutingCondition);
self.NotifyBlocker(self.Location);
}
@@ -94,8 +88,8 @@ namespace OpenRA.Mods.Common.Traits
{
IsInAir = false;
if (parachutingToken != ConditionManager.InvalidConditionToken)
parachutingToken = conditionManager.RevokeCondition(self, parachutingToken);
if (parachutingToken != Actor.InvalidConditionToken)
parachutingToken = self.RevokeCondition(parachutingToken);
if (!info.KilledOnImpassableTerrain)
return;