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

Fix timed external conditions being rejected instead of reset.

Browse Source
This commit is contained in:
Paul Chote
2017-01-25 20:45:11 +00:00
parent 248d9df3ab
commit 255214e77c
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Scripting
"If duration > 0 the condition will be automatically revoked after the defined number of ticks")]
public int GrantCondition(string condition, int duration = 0)
{
if (!conditionManager.AcceptsExternalCondition(Self, condition))
if (!conditionManager.AcceptsExternalCondition(Self, condition, duration > 0))
throw new InvalidDataException("Condition `{0}` has not been listed on an ExternalConditions trait".F(condition));
return conditionManager.GrantCondition(Self, condition, true, duration);
@@ -49,9 +49,9 @@ namespace OpenRA.Mods.Common.Scripting
}
[Desc("Check whether this actor accepts a specific external condition.")]
public bool AcceptsCondition(string condition)
public bool AcceptsCondition(string condition, bool timed = false)
{
return conditionManager.AcceptsExternalCondition(Self, condition);
return conditionManager.AcceptsExternalCondition(Self, condition, timed);
}
[Desc("Grant an upgrade to this actor. DEPRECATED! Will be removed.")]