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

Merge pull request #9245 from atlimit8/WarheadTargetHashSets

Browse Source 
Load HashSets in OpenRA.Mods.Common/Warheads/Warhead.cs directly from MiniYaml
This commit is contained in:
Pavel Penev
2015-09-03 21:35:59 +03:00
parent 119023c485 7e31a249ab
commit 4f4bab2cdf
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Warheads/Warhead.cs
View File

@@ -18,10 +18,10 @@ namespace OpenRA.Mods.Common.Warheads
public abstract class Warhead : IWarhead
{
[Desc("What types of targets are affected.")]
public readonly string[] ValidTargets = { "Ground", "Water" };
public readonly HashSet<string> ValidTargets = new HashSet<string> { "Ground", "Water" };
[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
public readonly string[] InvalidTargets = { };
public readonly HashSet<string> InvalidTargets = new HashSet<string>();
[Desc("What diplomatic stances are affected.")]
public readonly Stance ValidStances = Stance.Ally | Stance.Neutral | Stance.Enemy;
@@ -33,16 +33,9 @@ namespace OpenRA.Mods.Common.Warheads
public readonly int Delay = 0;
int IWarhead.Delay { get { return Delay; } }
HashSet<string> validTargetSet;
HashSet<string> invalidTargetSet;
public bool IsValidTarget(IEnumerable<string> targetTypes)
{
if (validTargetSet == null)
validTargetSet = new HashSet<string>(ValidTargets);
if (invalidTargetSet == null)
invalidTargetSet = new HashSet<string>(InvalidTargets);
return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);
}
/// <summary>Applies the warhead's effect against the target.</summary>