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

Add VariableExpression.NoVariables

Browse Source
This commit is contained in:
atlimit8
2017-05-27 12:37:53 -05:00
committed by reaperrr
parent 2ccba3768b
commit 8a825f2999
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Support/VariableExpression.cs
View File

@@ -20,6 +20,8 @@ namespace OpenRA.Support
{ {
public abstract class VariableExpression public abstract class VariableExpression
{ {
public static readonly IReadOnlyDictionary<string, int> NoVariables = new ReadOnlyDictionary<string, int>(new Dictionary<string, int>());
public readonly string Expression; public readonly string Expression;
readonly HashSet<string> variables = new HashSet<string>(); readonly HashSet<string> variables = new HashSet<string>();
public IEnumerable<string> Variables { get { return variables; } } public IEnumerable<string> Variables { get { return variables; } }

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

@@ -18,8 +18,6 @@ namespace OpenRA.Mods.Common.Traits
/// <summary>Use as base class for *Info to subclass of ConditionalTrait. (See ConditionalTrait.)</summary> /// <summary>Use as base class for *Info to subclass of ConditionalTrait. (See ConditionalTrait.)</summary>
public abstract class ConditionalTraitInfo : IObservesVariablesInfo, IRulesetLoaded public abstract class ConditionalTraitInfo : IObservesVariablesInfo, IRulesetLoaded
{ {
protected static readonly IReadOnlyDictionary<string, int> NoConditions = new ReadOnlyDictionary<string, int>(new Dictionary<string, int>());
[ConsumedConditionReference] [ConsumedConditionReference]
[Desc("Boolean expression defining the condition to enable this trait.")] [Desc("Boolean expression defining the condition to enable this trait.")]
public readonly BooleanExpression RequiresCondition = null; public readonly BooleanExpression RequiresCondition = null;
@@ -33,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits
public virtual void RulesetLoaded(Ruleset rules, ActorInfo ai) public virtual void RulesetLoaded(Ruleset rules, ActorInfo ai)
{ {
EnabledByDefault = RequiresCondition == null || RequiresCondition.Evaluate(NoConditions); EnabledByDefault = RequiresCondition == null || RequiresCondition.Evaluate(VariableExpression.NoVariables);
} }
} }

2
OpenRA.Mods.Common/Traits/Conditions/PausableConditionalTrait.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
public override void RulesetLoaded(Ruleset rules, ActorInfo ai) public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{ {
base.RulesetLoaded(rules, ai); base.RulesetLoaded(rules, ai);
PausedByDefault = PauseOnCondition != null && PauseOnCondition.Evaluate(NoConditions); PausedByDefault = PauseOnCondition != null && PauseOnCondition.Evaluate(VariableExpression.NoVariables);
} }
} }