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

Change WithDeathAnimation to look up string rather than integers

Browse Source 
For DeathType sequence mapping.
This commit is contained in:
reaperrr
2016-06-05 21:21:50 +02:00
parent 873e2bfce4
commit ce73faaa1f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits.Render
[FieldLoader.LoadUsing("LoadDeathTypes")] [FieldLoader.LoadUsing("LoadDeathTypes")]
[Desc("Death animation to use for each damage type (defined on the warheads).", [Desc("Death animation to use for each damage type (defined on the warheads).",
"Is only used if UseDeathTypeSuffix is `True`.")] "Is only used if UseDeathTypeSuffix is `True`.")]
public readonly Dictionary<string, int> DeathTypes = new Dictionary<string, int>(); public readonly Dictionary<string, string> DeathTypes = new Dictionary<string, string>();
[Desc("Sequence to use when the actor is killed by some non-standard means (e.g. suicide).")] [Desc("Sequence to use when the actor is killed by some non-standard means (e.g. suicide).")]
[SequenceReference] public readonly string FallbackSequence = null; [SequenceReference] public readonly string FallbackSequence = null;
@@ -54,8 +54,8 @@ namespace OpenRA.Mods.Common.Traits.Render
var md = yaml.ToDictionary(); var md = yaml.ToDictionary();
return md.ContainsKey("DeathTypes") return md.ContainsKey("DeathTypes")
? md["DeathTypes"].ToDictionary(my => FieldLoader.GetValue<int>("(value)", my.Value)) ? md["DeathTypes"].ToDictionary(my => FieldLoader.GetValue<string>("(value)", my.Value))
: new Dictionary<string, int>(); : new Dictionary<string, string>();
} }
public object Create(ActorInitializer init) { return new WithDeathAnimation(init.Self, this); } public object Create(ActorInitializer init) { return new WithDeathAnimation(init.Self, this); }