warscript 0.0.1-dev.58c74da → 0.0.1-dev.5e8f6c0

package/engine/internal/unit.lua

@@ -5,9 +5,12 @@ local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__New = ____lualib.__TS__New
 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__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
@@ -92,6 +95,10 @@ local isUnitInRangeXY = IsUnitInRangeXY
 local isUnitInRange = IsUnitInRange
 local setResourceAmount = SetResourceAmount
 local getResourceAmount = GetResourceAmount
+local getUnitWeaponRealField = BlzGetUnitWeaponRealField
+local setUnitWeaponRealField = BlzSetUnitWeaponRealField
+local getUnitWeaponStringField = BlzGetUnitWeaponStringField
+local setUnitWeaponStringField = BlzSetUnitWeaponStringField
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local unitDisableAbility = BlzUnitDisableAbility
 local unitInterruptAttack = BlzUnitInterruptAttack
@@ -275,16 +282,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)
@@ -322,7 +327,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
@@ -387,51 +391,158 @@ local getters = {
         return BlzGetUnitArmor(unit)
     end
 }
-local weaponGetters = {
-    index = function(self, handle, index)
-        return index
-    end,
-    cooldown = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, index)
-    end,
-    projectileArc = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, index)
-    end,
-    projectileArt = function(self, handle, index)
-        return BlzGetUnitWeaponStringField(handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, index)
-    end,
-    projectileSpeed = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, index)
-    end,
-    attackPoint = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, index)
-    end
-}
-local weaponSetters = {
-    cooldown = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, index, value))
-    end,
-    projectileArc = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, index, value))
-    end,
-    projectileArt = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponStringField(handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, index, value))
-    end,
-    projectileSpeed = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, index, value))
-    end,
-    attackPoint = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, index, value))
-    end
-}
-local weaponMetatable = {
-    __index = function(self, key)
-        return weaponGetters[key](weaponGetters, self.h, self.i)
-    end,
-    __newindex = function(self, key, value)
-        weaponSetters[key](weaponSetters, self.h, self.i, value)
-    end
-}
+____exports.UnitWeapon = __TS__Class()
+local UnitWeapon = ____exports.UnitWeapon
+UnitWeapon.name = "UnitWeapon"
+function UnitWeapon.prototype.____constructor(self, unit, index)
+    self.unit = unit
+    self.index = index
+end
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "cooldown",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, self.index)
+        end,
+        set = function(self, cooldown)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, self.index, cooldown)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damage",
+    {
+        get = function(self)
+            local minimumDamage = self.damageBase + self.damageDiceCount
+            local maximumDamage = self.damageBase + self.damageDiceCount * self.damageDiceSideCount
+            return {minimumDamage, maximumDamage}
+        end,
+        set = function(self, ____bindingPattern0)
+            local maximumDamage
+            local minimumDamage
+            minimumDamage = ____bindingPattern0[1]
+            maximumDamage = ____bindingPattern0[2]
+            self.damageBase = minimumDamage - 1
+            self.damageDiceCount = 1
+            self.damageDiceSideCount = maximumDamage - minimumDamage + 1
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageBase",
+    {
+        get = function(self)
+            return BlzGetUnitBaseDamage(self.unit.handle, self.index)
+        end,
+        set = function(self, damageBase)
+            BlzSetUnitBaseDamage(self.unit.handle, self.index, damageBase)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageDiceCount",
+    {
+        get = function(self)
+            return BlzGetUnitDiceNumber(self.unit.handle, self.index)
+        end,
+        set = function(self, damageDiceCount)
+            BlzSetUnitDiceNumber(self.unit.handle, self.index, damageDiceCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageDiceSideCount",
+    {
+        get = function(self)
+            return BlzGetUnitDiceSides(self.unit.handle, self.index)
+        end,
+        set = function(self, damageDiceSideCount)
+            BlzSetUnitDiceSides(self.unit.handle, self.index, damageDiceSideCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "range",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_RANGE, self.index)
+        end,
+        set = function(self, range)
+            local handle = self.unit.handle
+            local index = self.index
+            setUnitWeaponRealField(
+                handle,
+                UNIT_WEAPON_RF_ATTACK_RANGE,
+                index + 1,
+                getUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_RANGE, index + 1) + (range - getUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_RANGE, index))
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "impactDelay",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, self.index)
+        end,
+        set = function(self, impactDelay)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, self.index, impactDelay)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileArc",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, self.index)
+        end,
+        set = function(self, missileArc)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, self.index, missileArc)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileModelPath",
+    {
+        get = function(self)
+            return getUnitWeaponStringField(self.unit.handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, self.index)
+        end,
+        set = function(self, missileModelPath)
+            setUnitWeaponStringField(self.unit.handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, self.index, missileModelPath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileSpeed",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, self.index)
+        end,
+        set = function(self, missileSpeed)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, self.index, missileSpeed)
+        end
+    },
+    true
+)
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
 local getItemAbility = BlzGetItemAbility
@@ -442,8 +553,6 @@ local getAbilityName = GetAbilityName
 local unitAddAbility = UnitAddAbility
 local getUnitGoldCost = GetUnitGoldCost
 local getUnitLumberCost = GetUnitWoodCost
-local unitMakeAbilityPermanent = UnitMakeAbilityPermanent
-local unitAddItem = UnitAddItem
 local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
@@ -453,17 +562,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
@@ -521,15 +619,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,
@@ -537,12 +635,17 @@ local function delayHealthChecksCallback(unit)
         )
     end
 end
+local nextSyncId = 1
+local unitBySyncId = 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))
@@ -555,6 +658,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)
@@ -640,8 +744,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)
@@ -659,13 +763,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(
@@ -692,7 +796,7 @@ 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)
@@ -708,8 +812,15 @@ 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
@@ -749,7 +860,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
@@ -805,6 +916,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
@@ -815,8 +929,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
@@ -876,18 +997,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(
@@ -989,8 +1110,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
@@ -1012,6 +1136,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",
@@ -1092,12 +1219,27 @@ __TS__SetDescriptor(
     Unit.prototype,
     "weapons",
     {get = function(self)
-        local weapons = {
-            setmetatable({h = self.handle, i = 0}, weaponMetatable),
-            setmetatable({h = self.handle, i = 1}, weaponMetatable)
-        }
-        rawset(self, "weapons", weapons)
-        return weapons
+        return {self.firstWeapon, self.secondWeapon}
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Unit.prototype,
+    "firstWeapon",
+    {get = function(self)
+        local weapon = __TS__New(____exports.UnitWeapon, self, 0)
+        rawset(self, "firstWeapon", weapon)
+        return weapon
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Unit.prototype,
+    "secondWeapon",
+    {get = function(self)
+        local weapon = __TS__New(____exports.UnitWeapon, self, 1)
+        rawset(self, "secondWeapon", weapon)
+        return weapon
     end},
     true
 )
@@ -1254,17 +1396,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
+            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
@@ -1274,7 +1416,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         setUnitColor(self.handle, color.handle)
-        if self[105] then
+        if self[106] then
             showUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1298,14 +1440,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
@@ -1347,10 +1489,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
@@ -1561,17 +1703,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
     },
@@ -1928,7 +2070,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
@@ -1944,10 +2085,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
@@ -1985,27 +2131,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
@@ -2177,10 +2322,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
@@ -2202,7 +2349,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(
@@ -2301,7 +2447,6 @@ end)()
 Unit.onDamage = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local trigger = CreateTrigger()
         TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGED)
         TriggerAddCondition(
@@ -2317,6 +2462,7 @@ Unit.onDamage = __TS__New(
                     damageType = BlzGetEventDamageType(),
                     weaponType = BlzGetEventWeaponType(),
                     isAttack = BlzGetEventIsAttack(),
+                    originalAmount = GetEventDamage(),
                     preventDeath = damageEventPreventDeath
                 }
                 local evData = setmetatable(
@@ -2333,7 +2479,7 @@ Unit.onDamage = __TS__New(
                 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
@@ -2347,7 +2493,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
@@ -2367,7 +2513,7 @@ Unit.onDamage = __TS__New(
         DestroyTrigger(trigger)
     end
 )
-Unit.onItemDrop = __TS__New(
+Unit.itemDroppedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_DROP_ITEM,
     function()
@@ -2378,7 +2524,7 @@ Unit.onItemDrop = __TS__New(
         return IgnoreEvent
     end
 )
-Unit.onItemPickup = __TS__New(
+Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
@@ -2389,10 +2535,66 @@ Unit.onItemPickup = __TS__New(
         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()
+        if getUnitTypeId(unit) ~= dummyUnitId then
+            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        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,