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

check name for Actor.GrantCondition()

Browse Source
This commit is contained in:
atlimit8
2020-04-26 01:19:31 -05:00
committed by abcdefg30
parent 1d2d8ed107
commit 1ef27d18c1
21 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Cnc/Traits/Attack/AttackLeap.cs
View File

@@ -55,8 +55,7 @@ namespace OpenRA.Mods.Cnc.Traits
public void GrantLeapCondition(Actor self)
{
if (!string.IsNullOrEmpty(info.LeapCondition))
leapToken = self.GrantCondition(info.LeapCondition);
leapToken = self.GrantCondition(info.LeapCondition);
}
public void RevokeLeapCondition(Actor self)

2
OpenRA.Mods.Cnc/Traits/ConyardChronoReturn.cs
View File

@@ -122,7 +122,7 @@ namespace OpenRA.Mods.Cnc.Traits
void TriggerVortex()
{
if (!string.IsNullOrEmpty(info.Condition) && conditionToken == Actor.InvalidConditionToken)
if (conditionToken == Actor.InvalidConditionToken)
conditionToken = self.GrantCondition(info.Condition);
triggered = true;

2
OpenRA.Mods.Cnc/Traits/Disguise.cs
View File

@@ -221,7 +221,7 @@ namespace OpenRA.Mods.Cnc.Traits
if (Disguised != oldDisguiseSetting)
{
if (Disguised && disguisedToken == Actor.InvalidConditionToken && !string.IsNullOrEmpty(info.DisguisedCondition))
if (Disguised && disguisedToken == Actor.InvalidConditionToken)
disguisedToken = self.GrantCondition(info.DisguisedCondition);
else if (!Disguised && disguisedToken != Actor.InvalidConditionToken)
disguisedToken = self.RevokeCondition(disguisedToken);

3
OpenRA.Mods.Cnc/Traits/MadTank.cs
View File

@@ -188,8 +188,7 @@ namespace OpenRA.Mods.Cnc.Traits
if (target.Type == TargetType.Invalid)
return true;
if (!string.IsNullOrEmpty(mad.info.DeployedCondition))
self.GrantCondition(mad.info.DeployedCondition);
self.GrantCondition(mad.info.DeployedCondition);
self.World.AddFrameEndTask(w => EjectDriver());
if (mad.info.ThumpSequence != null)