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

4
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeploy.cs
View File

@@ -323,7 +323,7 @@ namespace OpenRA.Mods.Common.Traits
void OnDeployCompleted()
{
if (!string.IsNullOrEmpty(Info.DeployedCondition) && deployedToken == Actor.InvalidConditionToken)
if (deployedToken == Actor.InvalidConditionToken)
deployedToken = self.GrantCondition(Info.DeployedCondition);
deployState = DeployState.Deployed;
@@ -339,7 +339,7 @@ namespace OpenRA.Mods.Common.Traits
void OnUndeployCompleted()
{
if (!string.IsNullOrEmpty(Info.UndeployedCondition) && undeployedToken == Actor.InvalidConditionToken)
if (undeployedToken == Actor.InvalidConditionToken)
undeployedToken = self.GrantCondition(Info.UndeployedCondition);
deployState = DeployState.Undeployed;

5
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnLineBuildDirection.cs
View File

@@ -40,10 +40,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
if (direction != info.Direction)
return;
if (!string.IsNullOrEmpty(info.Condition))
if (direction == info.Direction)
self.GrantCondition(info.Condition);
}
}