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

Update WeaponInfo to use HashSets for some fields directly.

Browse Source
This commit is contained in:
RoosterDragon
2015-08-27 19:14:30 +01:00
parent 5a177a889c
commit 2f9ca36506
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -47,10 +47,10 @@ namespace OpenRA.GameRules
public readonly bool Charges = false; public readonly bool Charges = false;
[Desc("What types of targets are affected.")] [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.")] [Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
public readonly string[] InvalidTargets = { }; public readonly HashSet<string> InvalidTargets = new HashSet<string>();
[Desc("Delay in ticks between firing shots from the same ammo magazine.")] [Desc("Delay in ticks between firing shots from the same ammo magazine.")]
public readonly int BurstDelay = 5; public readonly int BurstDelay = 5;
@@ -64,14 +64,9 @@ namespace OpenRA.GameRules
[FieldLoader.LoadUsing("LoadWarheads")] [FieldLoader.LoadUsing("LoadWarheads")]
public readonly List<IWarhead> Warheads = new List<IWarhead>(); public readonly List<IWarhead> Warheads = new List<IWarhead>();
readonly HashSet<string> validTargetSet;
readonly HashSet<string> invalidTargetSet;
public WeaponInfo(string name, MiniYaml content) public WeaponInfo(string name, MiniYaml content)
{ {
FieldLoader.Load(this, content); FieldLoader.Load(this, content);
validTargetSet = new HashSet<string>(ValidTargets);
invalidTargetSet = new HashSet<string>(InvalidTargets);
} }
static object LoadProjectile(MiniYaml yaml) static object LoadProjectile(MiniYaml yaml)
@@ -99,7 +94,7 @@ namespace OpenRA.GameRules
public bool IsValidTarget(IEnumerable<string> targetTypes) public bool IsValidTarget(IEnumerable<string> targetTypes)
{ {
return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes); return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);
} }
/// <summary>Checks if the weapon is valid against (can target) the target.</summary> /// <summary>Checks if the weapon is valid against (can target) the target.</summary>