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

Support multiple death animation variants.

Browse Source
This commit is contained in:
Paul Chote
2016-08-06 00:36:20 +01:00
parent da3333073f
commit a9bfa553fc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,9 +42,9 @@ namespace OpenRA.Mods.Common.Traits.Render
public readonly bool CrushedPaletteIsPlayerPalette = false; public readonly bool CrushedPaletteIsPlayerPalette = false;
[FieldLoader.LoadUsing("LoadDeathTypes")] [FieldLoader.LoadUsing("LoadDeathTypes")]
[Desc("Death animation to use for each damage type (defined on the warheads).", [Desc("Death animations 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, string> DeathTypes = new Dictionary<string, string>(); 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<string>("(value)", my.Value)) ? md["DeathTypes"].ToDictionary(my => FieldLoader.GetValue<string[]>("(value)", my.Value))
: new Dictionary<string, string>(); : 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); }
@@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (damageType == null) if (damageType == null)
return; return;
sequence += Info.DeathTypes[damageType]; sequence += Info.DeathTypes[damageType].Random(self.World.SharedRandom);
} }
SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), sequence, palette); SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), sequence, palette);