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

Merge pull request #9181 from RoosterDragon/field-loader-hashsets

Browse Source 
Support HashSet in FieldLoader/FieldSaver
This commit is contained in:
Pavel Penev
2015-08-28 01:13:33 +03:00
parent 6d183b6d63 2f9ca36506
commit 3d76f76c26
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/FieldLoader.cs
View File

@@ -417,7 +417,7 @@ namespace OpenRA
} }
else if (fieldType == typeof(bool)) else if (fieldType == typeof(bool))
return ParseYesNo(value, fieldType, fieldName); return ParseYesNo(value, fieldType, fieldName);
else if (fieldType.IsArray) else if (fieldType.IsArray && fieldType.GetArrayRank() == 1)
{ {
if (value == null) if (value == null)
return Array.CreateInstance(fieldType.GetElementType(), 0); return Array.CreateInstance(fieldType.GetElementType(), 0);
@@ -429,6 +429,18 @@ namespace OpenRA
ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i); ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
return ret; return ret;
} }
else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(HashSet<>))
{
var set = Activator.CreateInstance(fieldType);
if (value == null)
return set;
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
var addMethod = fieldType.GetMethod("Add", fieldType.GetGenericArguments());
for (var i = 0; i < parts.Length; i++)
addMethod.Invoke(set, new[] { GetValue(fieldName, fieldType.GetGenericArguments()[0], parts[i].Trim(), field) });
return set;
}
else if (fieldType == typeof(Size)) else if (fieldType == typeof(Size))
{ {
if (value != null) if (value != null)

10
OpenRA.Game/FieldSaver.cs
View File

@@ -89,10 +89,14 @@ namespace OpenRA
return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height); return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
} }
if (t.IsArray) if (t.IsArray && t.GetArrayRank() == 1)
{ {
var elems = ((Array)v).OfType<object>(); return ((Array)v).Cast<object>().JoinWith(", ");
return elems.JoinWith(", "); }
if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(HashSet<>))
{
return ((System.Collections.IEnumerable)v).Cast<object>().JoinWith(", ");
} }
if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>)) if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))

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>