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

Add death types support to the Lua Kill() API.

Browse Source
This commit is contained in:
Paul Chote
2021-01-10 19:34:44 +00:00
committed by abcdefg30
parent 560c3230cd
commit fea700fb72
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Scripting/Properties/HealthProperties.cs
View File

@@ -9,6 +9,8 @@
*/ */
#endregion #endregion
using Eluant;
using OpenRA.Primitives;
using OpenRA.Scripting; using OpenRA.Scripting;
using OpenRA.Traits; using OpenRA.Traits;
@@ -34,10 +36,18 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Maximum health of the actor.")] [Desc("Maximum health of the actor.")]
public int MaxHealth { get { return health.MaxHP; } } public int MaxHealth { get { return health.MaxHP; } }
[Desc("Kill the actor.")] [Desc("Kill the actor. damageTypes may be omitted, specified as a string, or as table of strings.")]
public void Kill() public void Kill(object damageTypes = null)
{ {
health.InflictDamage(Self, Self, new Damage(health.MaxHP), true); Damage damage;
if (damageTypes is string d)
damage = new Damage(health.MaxHP, new BitSet<DamageType>(new[] { d }));
else if (damageTypes is LuaTable t && t.TryGetClrValue(out string[] ds))
damage = new Damage(health.MaxHP, new BitSet<DamageType>(ds));
else
damage = new Damage(health.MaxHP);
health.InflictDamage(Self, Self, damage, true);
} }
} }
} }