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

Remove LoadUsing where FieldLoader.GetValue works for the dictionaries

Browse Source
This commit is contained in:
atlimit8
2017-04-19 09:51:06 -05:00
parent 843ac85c92
commit 4767b91037
3 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Warheads/DamageWarhead.cs
View File

@@ -24,9 +24,8 @@ namespace OpenRA.Mods.Common.Warheads
[Desc("Types of damage that this warhead causes. Leave empty for no damage.")]
public readonly HashSet<string> DamageTypes = new HashSet<string>();
[FieldLoader.LoadUsing("LoadVersus")]
[Desc("Damage percentage versus each armortype.")]
public readonly Dictionary<string, int> Versus;
public readonly Dictionary<string, int> Versus = new Dictionary<string, int>();
public override bool IsValidAgainst(Actor victim, Actor firedBy)
{
@@ -36,14 +35,6 @@ namespace OpenRA.Mods.Common.Warheads
return base.IsValidAgainst(victim, firedBy);
}
public static object LoadVersus(MiniYaml yaml)
{
var nd = yaml.ToDictionary();
return nd.ContainsKey("Versus")
? nd["Versus"].ToDictionary(my => FieldLoader.GetValue<int>("(value)", my.Value))
: new Dictionary<string, int>();
}
public int DamageVersus(Actor victim)
{
var armor = victim.TraitsImplementing<Armor>()