warscript 0.0.1-dev.2af030d → 0.0.1-dev.2bde093

package/engine/internal/unit.lua

@@ -7,6 +7,9 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ArraySetLength = ____lualib.__TS__ArraySetLength
+local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
+local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
+local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local Set = ____lualib.Set
@@ -48,11 +51,19 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____math = require("math")
 local min = ____math.min
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
+local nativeToAttackType = ____attack_2Dtype.nativeToAttackType
+local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage-metadata-by-target")
+local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
 local setUnitAnimationWithRarity = SetUnitAnimationWithRarity
 local setUnitAnimationByIndex = SetUnitAnimationByIndex
+local resetUnitAnimation = ResetUnitAnimation
 local queueUnitAnimation = QueueUnitAnimation
 local getUnitIntegerField = BlzGetUnitIntegerField
 local getUnitRealField = BlzGetUnitRealField
@@ -72,9 +83,9 @@ local setUnitScale = SetUnitScale
 local setUnitPosition = SetUnitPosition
 local setUnitTimeScale = SetUnitTimeScale
 local getHandleId = GetHandleId
+local getUnitCurrentOrder = GetUnitCurrentOrder
 local createUnit = CreateUnit
 local killUnit = KillUnit
-local setUnitExploded = SetUnitExploded
 local removeUnit = RemoveUnit
 local getUnitTypeId = GetUnitTypeId
 local isHeroUnitId = IsHeroUnitId
@@ -90,8 +101,6 @@ local getSpellTargetItem = GetSpellTargetItem
 local getSpellTargetDestructable = GetSpellTargetDestructable
 local isUnitInRangeXY = IsUnitInRangeXY
 local isUnitInRange = IsUnitInRange
-local setResourceAmount = SetResourceAmount
-local getResourceAmount = GetResourceAmount
 local getUnitWeaponRealField = BlzGetUnitWeaponRealField
 local setUnitWeaponRealField = BlzSetUnitWeaponRealField
 local getUnitWeaponStringField = BlzGetUnitWeaponStringField
@@ -122,8 +131,6 @@ local isUnitType = IsUnitType
 local isUnitAlly = IsUnitAlly
 local isUnitEnemy = IsUnitEnemy
 local getOwningPlayer = GetOwningPlayer
-local setUnitColor = SetUnitColor
-local showUnitTeamGlow = BlzShowUnitTeamGlow
 ____exports.UnitClassification = {}
 local UnitClassification = ____exports.UnitClassification
 do
@@ -279,16 +286,14 @@ function UnitTriggerEvent.prototype.____constructor(self, eventType, c)
 end
 local function dispatch(event, idGetter, argsGetter)
     local initialized = false
-    local x = {}
     return setmetatable(
-        x,
+        {},
         {
             __index = function(self, id)
                 if type(id) ~= "number" then
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(...)
                         local id = idGetter(...)
                         local dispatched = rawget(self, id)
@@ -326,7 +331,6 @@ local function dispatchAbility(event)
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(unit, ability, ...)
                         local dispatched = rawget(self, ability.typeId)
                         if dispatched ~= nil then
@@ -354,7 +358,14 @@ local function damageEventPreventDeath(self, callback, ...)
         rawset(self, 1 + i, (select(i, ...)))
     end
 end
-local damageSetters = {amount = BlzSetEventDamage, attackType = BlzSetEventAttackType, damageType = BlzSetEventDamageType, weaponType = BlzSetEventWeaponType}
+local damageSetters = {
+    amount = BlzSetEventDamage,
+    attackType = function(attackType)
+        return BlzSetEventAttackType(attackTypeToNative(attackType))
+    end,
+    damageType = BlzSetEventDamageType,
+    weaponType = BlzSetEventWeaponType
+}
 local jlimitopByOperator = {
     [0] = LESS_THAN_OR_EQUAL,
     [1] = LESS_THAN_OR_EQUAL,
@@ -562,17 +573,6 @@ local function retrieveAbility(unit, ability, abilityId)
             ____exports.Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                ____exports.Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -630,15 +630,15 @@ for ____, player in ipairs(Player.all) do
     dummies[player] = dummy
 end
 local function delayHealthChecksCallback(unit)
-    local counter = (unit[102] or 0) - 1
+    local counter = (unit[103] or 0) - 1
     if counter ~= 0 then
-        unit[102] = counter
+        unit[103] = counter
         return
     end
-    unit[102] = nil
-    local healthBonus = unit[103]
+    unit[103] = nil
+    local healthBonus = unit[104]
     if healthBonus ~= nil then
-        unit[103] = nil
+        unit[104] = nil
         local handle = unit.handle
         BlzSetUnitMaxHP(
             handle,
@@ -646,12 +646,18 @@ local function delayHealthChecksCallback(unit)
         )
     end
 end
+local nextSyncId = 1
+local unitBySyncId = setmetatable({}, {__mode = "v"})
+local damagingEventByTarget = setmetatable({}, {__mode = "k"})
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
 __TS__ClassExtends(Unit, Handle)
 function Unit.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
+    local ____nextSyncId_0 = nextSyncId
+    nextSyncId = ____nextSyncId_0 + 1
+    self.syncId = ____nextSyncId_0
     self._owner = Player:of(getOwningPlayer(handle))
     assert(unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId))
     assert(unitAddAbility(handle, morphDetectAbilityId))
@@ -664,6 +670,7 @@ function Unit.prototype.____constructor(self, handle)
             fourCC("Amrf")
         ))
     end
+    unitBySyncId[self.syncId] = self
     local ____ = self.abilities
 end
 function Unit.prototype.getEvent(self, event, collector)
@@ -682,6 +689,8 @@ function Unit.prototype.getEvent(self, event, collector)
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
+    self[107] = getUnitX(handle)
+    self[108] = getUnitY(handle)
     if not self._owner then
         self._owner = Player:of(getOwningPlayer(handle))
     end
@@ -749,8 +758,8 @@ function Unit.prototype.addModifier(self, property, modifier)
     end}
 end
 function Unit.prototype.hasCombatClassification(self, combatClassification)
-    local ____combatClassification_0 = combatClassification
-    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_0 == ____combatClassification_0
+    local ____combatClassification_1 = combatClassification
+    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_1 == ____combatClassification_1
 end
 function Unit.prototype.addClassification(self, classification)
     return unitAddType(self.handle, classification)
@@ -768,13 +777,13 @@ function Unit.prototype.isInvisibleTo(self, player)
     return isUnitInvisible(self.handle, player.handle)
 end
 function Unit.prototype.isInRangeOf(self, x, y, range)
-    local ____temp_1
+    local ____temp_2
     if type(x) == "number" then
-        ____temp_1 = isUnitInRangeXY(self.handle, x, y, range)
+        ____temp_2 = isUnitInRangeXY(self.handle, x, y, range)
     else
-        ____temp_1 = isUnitInRange(self.handle, x.handle, y)
+        ____temp_2 = isUnitInRange(self.handle, x.handle, y)
     end
-    return ____temp_1
+    return ____temp_2
 end
 function Unit.prototype.isAllyOf(self, unit)
     return isUnitAlly(
@@ -797,11 +806,14 @@ function Unit.prototype.playAnimation(self, animation, rarity)
         setUnitAnimation(self.handle, animation)
     end
 end
+function Unit.prototype.resetAnimation(self)
+    resetUnitAnimation(self.handle)
+end
 function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
 function Unit.prototype.delayHealthChecks(self)
-    self[102] = (self[102] or 0) + 1
+    self[103] = (self[103] or 0) + 1
     Timer:run(delayHealthChecksCallback, self)
 end
 function Unit.prototype.setPosition(self, x, y)
@@ -811,14 +823,21 @@ function Unit.prototype.isSelected(self, player)
     return IsUnitSelected(self.handle, player.handle)
 end
 function Unit.prototype.explode(self)
-    setUnitExploded(self.handle, true)
+    SetUnitExploded(self.handle, true)
     killUnit(self.handle)
 end
 function Unit.prototype.kill(self)
     killUnit(self.handle)
 end
-function Unit.prototype.revive(self, pos, doEffect)
-    ReviveHero(self.handle, pos.x, pos.y, doEffect)
+function Unit.prototype.revive(self, x, y, doEffect)
+    local ____ReviveHero_5 = ReviveHero
+    local ____array_4 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_3 = doEffect
+    if ____doEffect_3 == nil then
+        ____doEffect_3 = false
+    end
+    __TS__SparseArrayPush(____array_4, ____doEffect_3)
+    ____ReviveHero_5(__TS__SparseArraySpread(____array_4))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -858,7 +877,7 @@ function Unit.prototype.dropItemSlot(self, item, slot)
     return UnitDropItemSlot(self.handle, item.handle, slot)
 end
 function Unit.prototype.itemInSlot(self, slot)
-    return Item:of(UnitItemInSlot(self.handle, slot))
+    return Item:of(unitItemInSlot(self.handle, slot))
 end
 function Unit.prototype.addAbility(self, abilityId)
     if unitAddAbility(self.handle, abilityId) then
@@ -914,6 +933,9 @@ end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)
 end
+function Unit.prototype.getAbilityRemainingCooldown(self, abilityId)
+    return BlzGetUnitAbilityCooldownRemaining(self.handle, abilityId)
+end
 function Unit.prototype.startAbilityCooldown(self, abilityId, cooldown)
     BlzStartUnitAbilityCooldown(self.handle, abilityId, cooldown)
 end
@@ -924,8 +946,15 @@ function Unit.prototype.interruptAttack(self)
     unitInterruptAttack(self.handle)
 end
 function Unit.prototype.interruptCast(self, abilityId)
-    unitDisableAbility(self.handle, abilityId, true, false)
-    unitDisableAbility(self.handle, abilityId, false, false)
+    local handle = self.handle
+    unitDisableAbility(handle, abilityId, true, false)
+    Timer:run(
+        unitDisableAbility,
+        handle,
+        abilityId,
+        false,
+        false
+    )
 end
 function Unit.prototype.getDistanceTo(self, target)
     local handle = self.handle
@@ -985,18 +1014,18 @@ function Unit.prototype.unpauseEx(self)
     self:decrementStunCounter()
 end
 function Unit.prototype.incrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 0 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 0 then
         BlzPauseUnitEx(self.handle, true)
     end
-    self[101] = stunCounter + 1
+    self[102] = stunCounter + 1
 end
 function Unit.prototype.decrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 1 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 1 then
         BlzPauseUnitEx(self.handle, false)
     end
-    self[101] = stunCounter - 1
+    self[102] = stunCounter - 1
 end
 function Unit.create(self, owner, id, x, y, facing, skinId)
     local handle = skinId and BlzCreateUnitWithSkin(
@@ -1098,8 +1127,11 @@ function Unit.getInSector(self, pos, range, offsetAngle, centralAngle)
     )
     return targetCollection
 end
-function Unit.getSelectionOf(self, player)
-    targetCollection = {}
+function Unit.getSelectionOf(self, player, target)
+    if target == nil then
+        target = {}
+    end
+    targetCollection = target
     targetCollectionNextIndex = 1
     GroupEnumUnitsSelected(dummyGroup, player.handle, collectIntoTarget)
     return targetCollection
@@ -1121,6 +1153,9 @@ end
 function Unit.prototype.__tostring(self)
     return (((self.constructor.name .. "$") .. util.id2s(self.typeId)) .. "@") .. tostring(getHandleId(self.handle))
 end
+function Unit.getBySyncId(self, syncId)
+    return unitBySyncId[syncId]
+end
 __TS__SetDescriptor(
     Unit.prototype,
     "_deltas",
@@ -1184,6 +1219,14 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "isStunned",
+    {get = function(self)
+        return getUnitCurrentOrder(self.handle) == orderId("stunned")
+    end},
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "combatClassifications",
@@ -1257,6 +1300,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "primaryAttribute",
+    {
+        get = function(self)
+            return getUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE)
+        end,
+        set = function(self, primaryAttribute)
+            setUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE, primaryAttribute)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "strengthBase",
@@ -1378,17 +1434,17 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[105]
+            return not self[106]
         end,
         set = function(self, isTeamGlowVisible)
-            showUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_2
+            BlzShowUnitTeamGlow(self.handle, isTeamGlowVisible)
+            local ____temp_6
             if not isTeamGlowVisible then
-                ____temp_2 = true
+                ____temp_6 = true
             else
-                ____temp_2 = nil
+                ____temp_6 = nil
             end
-            self[105] = ____temp_2
+            self[106] = ____temp_6
         end
     },
     true
@@ -1397,9 +1453,9 @@ __TS__SetDescriptor(
     Unit.prototype,
     "color",
     {set = function(self, color)
-        setUnitColor(self.handle, color.handle)
-        if self[105] then
-            showUnitTeamGlow(self.handle, false)
+        SetUnitColor(self.handle, color.handle)
+        if self[106] then
+            BlzShowUnitTeamGlow(self.handle, false)
         end
     end},
     true
@@ -1422,14 +1478,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[103] or 0) - (self[104] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[104] or 0) - (self[105] or 0)
         end,
         set = function(self, maxHealth)
-            if maxHealth < 1 and self[102] ~= nil then
-                self[103] = (self[103] or 0) + (1 - maxHealth)
+            if maxHealth < 1 and self[103] ~= nil then
+                self[104] = (self[104] or 0) + (1 - maxHealth)
                 maxHealth = 1
             end
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[104] or 0))
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[105] or 0))
         end
     },
     true
@@ -1471,10 +1527,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[104] or 0)
+            return GetWidgetLife(self.handle) - (self[105] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[104] or 0))
+            SetWidgetLife(self.handle, health + (self[105] or 0))
         end
     },
     true
@@ -1568,7 +1624,7 @@ __TS__SetDescriptor(
     "x",
     {
         get = function(self)
-            return getUnitX(self.handle)
+            return self[107] or getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1581,7 +1637,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return getUnitY(self.handle)
+            return self[108] or getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)
@@ -1667,10 +1723,10 @@ __TS__SetDescriptor(
     "gold",
     {
         get = function(self)
-            return getResourceAmount(self.handle)
+            return GetResourceAmount(self.handle)
         end,
         set = function(self, gold)
-            setResourceAmount(self.handle, gold)
+            SetResourceAmount(self.handle, gold)
         end
     },
     true
@@ -1685,17 +1741,17 @@ __TS__SetDescriptor(
         set = function(self, isPaused)
             local handle = self.handle
             if isPaused and not IsUnitPaused(handle) then
-                self[100] = true
-                for _ = self[101] or 0, -1 do
+                self[101] = true
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, true)
                 end
                 PauseUnit(handle, true)
             elseif not isPaused and IsUnitPaused(handle) then
                 PauseUnit(handle, false)
-                for _ = self[101] or 0, -1 do
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, false)
                 end
-                self[100] = nil
+                self[101] = nil
             end
         end
     },
@@ -1798,6 +1854,19 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "movementType",
+    {
+        get = function(self)
+            return getUnitIntegerField(self.handle, UNIT_IF_MOVE_TYPE)
+        end,
+        set = function(self, movementType)
+            setUnitIntegerField(self.handle, UNIT_IF_MOVE_TYPE, movementType)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "pathing",
@@ -2052,7 +2121,6 @@ Unit.onDecay = __TS__New(
 Unit.onResurrect = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local dead = setmetatable({}, {__mode = "k"})
         ____exports.Unit.deathEvent:addListener(function(unit)
             dead[unit] = true
@@ -2068,10 +2136,15 @@ Unit.onResurrect = __TS__New(
 Unit.morphEvent = __TS__New(
     InitializingEvent,
     function(event)
+        local function ifNotLeft(unit)
+            local handle = unit.handle
+            if getUnitAbilityLevel(handle, leaveDetectAbilityId) ~= 0 and unitAddAbility(handle, morphDetectAbilityId) then
+                invoke(event, unit)
+            end
+        end
         ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
             if getUnitAbilityLevel(unit.handle, morphDetectAbilityId) == 0 then
-                assert(unitAddAbility(unit.handle, morphDetectAbilityId))
-                Timer:run(Event.invoke, event, unit)
+                Timer:run(ifNotLeft, unit)
             end
         end)
     end
@@ -2109,27 +2182,26 @@ Unit.onSpellEffect = dispatchId(__TS__New(
 Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_5
+            local ____GetSpellTargetUnit_result_9
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_5 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_9 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_4
+                local ____GetSpellTargetItem_result_8
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_4 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_8 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_3
+                    local ____GetSpellTargetDestructable_result_7
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_3 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_7 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_3 = nil
+                        ____GetSpellTargetDestructable_result_7 = nil
                     end
-                    ____GetSpellTargetItem_result_4 = ____GetSpellTargetDestructable_result_3
+                    ____GetSpellTargetItem_result_8 = ____GetSpellTargetDestructable_result_7
                 end
-                ____GetSpellTargetUnit_result_5 = ____GetSpellTargetItem_result_4
+                ____GetSpellTargetUnit_result_9 = ____GetSpellTargetItem_result_8
             end
-            local target = ____GetSpellTargetUnit_result_5
+            local target = ____GetSpellTargetUnit_result_9
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2301,10 +2373,12 @@ Unit.onImmediateOrder = dispatchId(__TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_ISSUED_ORDER,
     function()
-        local unit = ____exports.Unit:of(getOrderedUnit())
-        local issuedOrderId = getIssuedOrderId()
-        if unit ~= nil and unit.state == 1 then
-            return unit, issuedOrderId
+        local handle = getOrderedUnit()
+        if handle ~= nil and getUnitTypeId(handle) ~= dummyUnitId then
+            local unit = ____exports.Unit:of(handle)
+            if unit.state == 1 then
+                return unit, getIssuedOrderId()
+            end
         end
         return IgnoreEvent
     end
@@ -2326,7 +2400,6 @@ Unit.autoAttackStartEvent = __TS__New(
 )
 Unit.onDamaging = (function()
     local event = __TS__New(Event)
-    local invoke = Event.invoke
     local trigger = CreateTrigger()
     TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGING)
     TriggerAddCondition(
@@ -2336,13 +2409,18 @@ Unit.onDamaging = (function()
             if source and source.typeId == dummyUnitId then
                 source = nil
             end
-            local target = BlzGetEventDamageTarget()
+            local target = ____exports.Unit:of(BlzGetEventDamageTarget())
+            local metadata = damageMetadataByTarget[target]
+            damageMetadataByTarget[target] = nil
             local data = {
                 amount = GetEventDamage(),
-                attackType = BlzGetEventAttackType(),
+                attackType = nativeToAttackType(BlzGetEventAttackType()),
                 damageType = BlzGetEventDamageType(),
                 weaponType = BlzGetEventWeaponType(),
-                isAttack = BlzGetEventIsAttack()
+                metadata = metadata,
+                isAttack = BlzGetEventIsAttack(),
+                originalAmount = GetEventDamage(),
+                originalMetadata = metadata
             }
             if data.isAttack and source then
                 local weapon = BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 1) and (BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 0) and -1 or 1) or 0
@@ -2356,18 +2434,22 @@ Unit.onDamaging = (function()
                 invoke(
                     event,
                     source,
-                    ____exports.Unit:of(target),
+                    target,
                     setmetatable(
                         {},
                         {
                             __index = data,
                             __newindex = function(self, key, value)
-                                damageSetters[key](value)
+                                local damageSetter = damageSetters[key]
+                                if damageSetter ~= nil then
+                                    damageSetter(value)
+                                end
                                 data[key] = value
                             end
                         }
                     )
                 )
+                damagingEventByTarget[target] = data
                 return
             end
             BlzSetEventDamage(0)
@@ -2375,7 +2457,7 @@ Unit.onDamaging = (function()
             BlzSetEventDamageType(DAMAGE_TYPE_UNKNOWN)
             BlzSetEventWeaponType(WEAPON_TYPE_WHOKNOWS)
             local sourceOwner = source.owner.handle
-            local targetOwner = GetOwningPlayer(target)
+            local targetOwner = target.owner.handle
             if not GetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE) then
                 SetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE, true)
                 Timer:run(function()
@@ -2391,23 +2473,19 @@ Unit.onDamaging = (function()
             for ____, ____value in ipairs(source._attackHandlers) do
                 local condition = ____value[1]
                 local action = ____value[2]
-                if condition(
-                    source,
-                    ____exports.Unit:of(target),
-                    data
-                ) then
+                if condition(source, target, data) then
                     action(
                         source,
-                        ____exports.Unit:of(target),
+                        target,
                         setmetatable(
                             {fire = function()
                                 UnitDamageTarget(
                                     source.handle,
-                                    target,
+                                    target.handle,
                                     data.amount,
                                     true,
                                     true,
-                                    data.attackType,
+                                    attackTypeToNative(data.attackType),
                                     data.damageType,
                                     data.weaponType
                                 )
@@ -2425,7 +2503,6 @@ end)()
 Unit.onDamage = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local trigger = CreateTrigger()
         TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGED)
         TriggerAddCondition(
@@ -2435,12 +2512,18 @@ Unit.onDamage = __TS__New(
                 if source and source.typeId == dummyUnitId then
                     source = nil
                 end
+                local target = ____exports.Unit:of(BlzGetEventDamageTarget())
+                local damagingEvent = damagingEventByTarget[target]
+                damagingEventByTarget[target] = nil
                 local data = {
                     amount = GetEventDamage(),
-                    attackType = BlzGetEventAttackType(),
+                    attackType = nativeToAttackType(BlzGetEventAttackType()),
                     damageType = BlzGetEventDamageType(),
                     weaponType = BlzGetEventWeaponType(),
+                    metadata = damagingEvent and damagingEvent.metadata,
                     isAttack = BlzGetEventIsAttack(),
+                    originalAmount = damagingEvent and damagingEvent.originalAmount or GetEventDamage(),
+                    originalMetadata = damagingEvent and damagingEvent.originalMetadata,
                     preventDeath = damageEventPreventDeath
                 }
                 local evData = setmetatable(
@@ -2453,11 +2536,10 @@ Unit.onDamage = __TS__New(
                         end
                     }
                 )
-                local target = ____exports.Unit:of(BlzGetEventDamageTarget())
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)
-                    target[104] = (target[104] or 0) + bonusHealth
+                    target[105] = (target[105] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2471,7 +2553,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[104] = (target[104] or 0) - bonusHealth
+                        target[105] = (target[105] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth
@@ -2491,32 +2573,91 @@ Unit.onDamage = __TS__New(
         DestroyTrigger(trigger)
     end
 )
-Unit.onItemDrop = __TS__New(
+Unit.itemDroppedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_DROP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
 )
-Unit.onItemPickup = __TS__New(
+Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
 )
-Unit.onItemUse = __TS__New(
+Unit.itemUsedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_USE_ITEM,
-    function() return ____exports.Unit:of(GetTriggerUnit()), Item:of(GetManipulatedItem()) end
+    function()
+        local unit = getTriggerUnit()
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
+        end
+        return IgnoreEvent
+    end
+)
+Unit.itemStackedEvent = __TS__New(
+    ____exports.UnitTriggerEvent,
+    EVENT_PLAYER_UNIT_STACK_ITEM,
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+)
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemUseOrderEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        for order = orderId("useslot0"), orderId("useslot5") do
+            local slot = order - orderId("useslot0")
+            local function listener(unit)
+                local item = unit.items[slot + 1]
+                if item ~= nil then
+                    invoke(event, unit, item)
+                end
+            end
+            self.onImmediateOrder[order]:addListener(listener)
+            self.onTargetOrder[order]:addListener(listener)
+            self.onPointOrder[order]:addListener(listener)
+        end
+        rawset(self, "itemUseOrderEvent", event)
+        return event
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemMoveOrderEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        for order = orderId("moveslot0"), orderId("moveslot5") do
+            local slotTo = order - orderId("moveslot0")
+            self.onTargetOrder[order]:addListener(function(unit, item)
+                local slotFrom = unit.items:findSlot(item)
+                if slotFrom ~= nil then
+                    invoke(
+                        event,
+                        unit,
+                        item,
+                        slotFrom,
+                        slotTo
+                    )
+                end
+            end)
+        end
+        rawset(self, "itemMoveOrderEvent", event)
+        return event
+    end}
 )
 __TS__ObjectDefineProperty(
     Unit,