Merge pull request #11391 from Mailaender/flameguy

Added the FLAMEGUY death animation
This commit is contained in:
Paul Chote
2016-06-05 15:20:15 +01:00
6 changed files with 67 additions and 95 deletions

View File

@@ -28,7 +28,9 @@ namespace OpenRA.Mods.Common.Lint
if (!animations.Any())
continue;
var deathTypes = animations.SelectMany(x => x.DeathTypes.Select(y => y.Key)).ToList();
var deathAnimationDeathtypes = animations.SelectMany(x => x.DeathTypes.Select(y => y.Key)).ToList();
var spawnActorDeathtypes = actorInfo.Value.TraitInfos<SpawnActorOnDeathInfo>().Where(s => !string.IsNullOrEmpty(s.DeathType)).Select(a => a.DeathType);
var deathTypes = deathAnimationDeathtypes.Concat(spawnActorDeathtypes).Distinct();
if (!deathTypes.Any())
continue;
@@ -51,7 +53,7 @@ namespace OpenRA.Mods.Common.Lint
continue;
if (!warhead.DamageTypes.Overlaps(deathTypes))
emitError("Actor type `{0}` does not define a death animation for weapon `{1}`!"
emitError("Actor type {0} doesn't define a death animation or spawn an actor on death for weapon {1}!"
.F(actorInfo.Key, weaponInfo.Key));
}
}