Add DamageTypes to Kill() and make some traits use it.
This commit is contained in:
committed by
reaperrr
parent
b620e8107f
commit
5e7e3bb011
@@ -219,15 +219,13 @@ namespace OpenRA.Mods.Common.Traits
|
||||
break;
|
||||
|
||||
var actor = order.Target.Actor;
|
||||
var health = actor.TraitOrDefault<Health>();
|
||||
var args = order.TargetString.Split(' ');
|
||||
var damageTypes = new HashSet<string>();
|
||||
|
||||
foreach (var damageType in args)
|
||||
damageTypes.Add(damageType);
|
||||
|
||||
if (health != null)
|
||||
health.InflictDamage(actor, actor, new Damage(health.HP, damageTypes), true);
|
||||
actor.Kill(actor, damageTypes);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user