warscript 0.0.1-dev.29b3feb → 0.0.1-dev.29e90d8

package/engine/internal/unit.lua

@@ -7,10 +7,10 @@ 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__InstanceOf = ____lualib.__TS__InstanceOf
 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
 local __TS__Spread = ____lualib.__TS__Spread
@@ -47,37 +47,47 @@ local checkNotNull = ____preconditions.checkNotNull
 local ____constants = require("engine.constants")
 local HEALTH_REGENERATION_RATE_BONUS_PER_STRENGTH_POINT = ____constants.HEALTH_REGENERATION_RATE_BONUS_PER_STRENGTH_POINT
 local MANA_REGENERATION_RATE_BONUS_PER_INTELLIGENCE_POINT = ____constants.MANA_REGENERATION_RATE_BONUS_PER_INTELLIGENCE_POINT
-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 isItemIgnoredInEvents = ____ignore_2Devents_2Ditems.isItemIgnoredInEvents
+local ____owner_2Dcache = require("engine.internal.item.owner-cache")
+local ownerByItem = ____owner_2Dcache.ownerByItem
+local ____weapon_2Dsound_2Dtype = require("engine.object-data.auxiliary.weapon-sound-type")
+local nativeToWeaponSoundType = ____weapon_2Dsound_2Dtype.nativeToWeaponSoundType
+local weaponSoundTypeToNative = ____weapon_2Dsound_2Dtype.weaponSoundTypeToNative
+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 ____attributes = require("attributes")
+local isAttribute = ____attributes.isAttribute
+local ____ability = require("engine.internal.item.ability")
+local doUnitAbilityAction = ____ability.doUnitAbilityAction
+local ____synchronization = require("engine.synchronization")
+local synchronizer = ____synchronization.synchronizer
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
-local setUnitAnimationWithRarity = SetUnitAnimationWithRarity
 local setUnitAnimationByIndex = SetUnitAnimationByIndex
-local queueUnitAnimation = QueueUnitAnimation
 local getUnitIntegerField = BlzGetUnitIntegerField
 local getUnitRealField = BlzGetUnitRealField
 local getHeroStr = GetHeroStr
 local getHeroAgi = GetHeroAgi
 local getHeroInt = GetHeroInt
-local setHeroStr = SetHeroStr
-local setHeroAgi = SetHeroAgi
-local setHeroInt = SetHeroInt
 local getUnitBooleanField = BlzGetUnitBooleanField
 local getUnitStringField = BlzGetUnitStringField
 local setUnitIntegerField = BlzSetUnitIntegerField
 local setUnitRealField = BlzSetUnitRealField
 local setUnitBooleanField = BlzSetUnitBooleanField
 local setUnitStringField = BlzSetUnitStringField
-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
@@ -93,15 +103,12 @@ 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
 local setUnitWeaponStringField = BlzSetUnitWeaponStringField
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local unitDisableAbility = BlzUnitDisableAbility
-local unitInterruptAttack = BlzUnitInterruptAttack
 local isUnitInvisible = IsUnitInvisible
 local isUnitVisible = IsUnitVisible
 local getUnitX = GetUnitX
@@ -118,15 +125,9 @@ local getOrderedUnit = GetOrderedUnit
 local getIssuedOrderId = GetIssuedOrderId
 local isUnitInvulnerable = BlzIsUnitInvulnerable
 local unitAlive = UnitAlive
-local unitAddType = UnitAddType
-local unitRemoveType = UnitRemoveType
-local isUnitIllusion = IsUnitIllusion
-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
@@ -136,6 +137,7 @@ do
     UnitClassification.GROUND = UNIT_TYPE_GROUND
     UnitClassification.SUMMONED = UNIT_TYPE_SUMMONED
     UnitClassification.MECHANICAL = UNIT_TYPE_MECHANICAL
+    UnitClassification.WORKER = UNIT_TYPE_PEON
     UnitClassification.ANCIENT = UNIT_TYPE_ANCIENT
     UnitClassification.SUICIDAL = UNIT_TYPE_SAPPER
     UnitClassification.TAUREN = UNIT_TYPE_TAUREN
@@ -343,6 +345,9 @@ local function dispatchAbility(event)
         }
     )
 end
+local function damagingEventPreventRetaliation(self)
+    self[0] = true
+end
 local function damageEventPreventDeath(self, callback, ...)
     if self[0] ~= nil then
         return
@@ -354,7 +359,16 @@ 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,
+    weaponSoundType = function(weaponSoundType)
+        return BlzSetEventWeaponType(weaponSoundTypeToNative(weaponSoundType))
+    end
+}
 local jlimitopByOperator = {
     [0] = LESS_THAN_OR_EQUAL,
     [1] = LESS_THAN_OR_EQUAL,
@@ -372,15 +386,27 @@ local modifiers = {
     end,
     armor = function(unit, value)
         if UnitAddAbility(unit, armorBonusAbilityId) then
-            assert(UnitMakeAbilityPermanent(unit, true, armorBonusAbilityId))
+            assert(
+                UnitMakeAbilityPermanent(unit, true, armorBonusAbilityId),
+                "armor bonus ability must be made permanent",
+                unit
+            )
         end
-        local ability = assert(BlzGetUnitAbility(unit, armorBonusAbilityId))
-        assert(BlzSetAbilityRealLevelField(
-            ability,
-            armorBonusField,
-            0,
-            BlzGetAbilityRealLevelField(ability, armorBonusField, 0) + value
-        ))
+        local ability = assert(
+            BlzGetUnitAbility(unit, armorBonusAbilityId),
+            "armor bonus ability must be existing",
+            unit
+        )
+        assert(
+            BlzSetAbilityRealLevelField(
+                ability,
+                armorBonusField,
+                0,
+                BlzGetAbilityRealLevelField(ability, armorBonusField, 0) + value
+            ),
+            "armor bonus ability field must be set",
+            unit
+        )
     end
 }
 local getters = {
@@ -398,6 +424,19 @@ function UnitWeapon.prototype.____constructor(self, unit, index)
     self.unit = unit
     self.index = index
 end
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "isEnabled",
+    {
+        get = function(self)
+            return BlzGetUnitWeaponBooleanField(self.unit.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, self.index)
+        end,
+        set = function(self, isEnabled)
+            BlzSetUnitWeaponBooleanField(self.unit.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, self.index, isEnabled)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitWeapon.prototype,
     "cooldown",
@@ -432,6 +471,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "allowedTargetCombatClassifications",
+    {
+        get = function(self)
+            return BlzGetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_TARGETS_ALLOWED, self.index)
+        end,
+        set = function(self, allowedTargetCombatClassifications)
+            BlzSetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_TARGETS_ALLOWED, self.index, allowedTargetCombatClassifications)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "type",
+    {
+        get = function(self)
+            return BlzGetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_WEAPON_TYPE, self.index)
+        end,
+        set = function(self, ____type)
+            BlzSetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_WEAPON_TYPE, self.index, ____type)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "soundType",
+    {
+        get = function(self)
+            return BlzGetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_WEAPON_SOUND, self.index)
+        end,
+        set = function(self, soundType)
+            BlzSetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_WEAPON_SOUND, self.index, soundType)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitWeapon.prototype,
     "damageBase",
@@ -543,8 +621,6 @@ __TS__SetDescriptor(
     },
     true
 )
-local unitInventorySize = UnitInventorySize
-local unitItemInSlot = UnitItemInSlot
 local getItemAbility = BlzGetItemAbility
 local getUnitAbility = BlzGetUnitAbility
 local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
@@ -562,19 +638,8 @@ 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)
+    for i = 0, UnitInventorySize(unit) - 1 do
+        local item = UnitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
             return ItemAbility:of(
                 ability,
@@ -619,26 +684,30 @@ local fieldSetters = {
 }
 local dummies = {}
 for ____, player in ipairs(Player.all) do
-    local dummy = assert(createUnit(
-        player.handle,
-        dummyUnitId,
-        0,
-        0,
-        270
-    ))
+    local dummy = assert(
+        createUnit(
+            player.handle,
+            dummyUnitId,
+            0,
+            0,
+            270
+        ),
+        "dummy must be created",
+        player
+    )
     ShowUnit(dummy, false)
     dummies[player] = dummy
 end
 local function delayHealthChecksCallback(unit)
-    local counter = (unit[103] or 0) - 1
+    local counter = (unit[104] or 0) - 1
     if counter ~= 0 then
-        unit[103] = counter
+        unit[104] = counter
         return
     end
-    unit[103] = nil
-    local healthBonus = unit[104]
+    unit[104] = nil
+    local healthBonus = unit[105]
     if healthBonus ~= nil then
-        unit[104] = nil
+        unit[105] = nil
         local handle = unit.handle
         BlzSetUnitMaxHP(
             handle,
@@ -647,50 +716,78 @@ local function delayHealthChecksCallback(unit)
     end
 end
 local nextSyncId = 1
-local unitBySyncId = setmetatable({}, {__mode = "k"})
+local unitBySyncId = setmetatable({}, {__mode = "v"})
+local damagingEventByTarget = setmetatable({}, {__mode = "k"})
+local function addAbility(unit, abilityTypeId)
+    local ____unitAddAbility_result_0
+    if unitAddAbility(unit, abilityTypeId) then
+        ____unitAddAbility_result_0 = getUnitAbility(unit, abilityTypeId)
+    else
+        ____unitAddAbility_result_0 = nil
+    end
+    return ____unitAddAbility_result_0
+end
 ____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
+    local ____nextSyncId_1 = nextSyncId
+    nextSyncId = ____nextSyncId_1 + 1
+    self.syncId = ____nextSyncId_1
     self._owner = Player:of(getOwningPlayer(handle))
-    assert(unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId))
-    assert(unitAddAbility(handle, morphDetectAbilityId))
+    assert(
+        unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId),
+        "leave detection ability must be added",
+        self
+    )
+    assert(
+        unitAddAbility(handle, morphDetectAbilityId),
+        "morph detection ability must be added",
+        self
+    )
     if unitAddAbility(
         handle,
         fourCC("Amrf")
     ) then
-        assert(unitRemoveAbility(
-            handle,
-            fourCC("Amrf")
-        ))
+        assert(
+            unitRemoveAbility(
+                handle,
+                fourCC("Amrf")
+            ),
+            "fly ability must be removed after addition",
+            self
+        )
     end
     unitBySyncId[self.syncId] = self
     local ____ = self.abilities
 end
-function Unit.prototype.getEvent(self, event, collector)
-    self.events = self.events or ({})
-    local eventId = GetHandleId(event)
-    if not self.events[eventId] then
-        self.events[eventId] = __TS__New(
+function Unit.prototype.getEvent(self, jevent, collector)
+    self.events = self.events or __TS__New(LinkedMap)
+    local eventId = GetHandleId(jevent)
+    local event = self.events:get(eventId)
+    if event == nil then
+        event = __TS__New(
             TriggerEvent,
             function(trigger)
-                TriggerRegisterUnitEvent(trigger, self.handle, event)
+                TriggerRegisterUnitEvent(trigger, self.handle, jevent)
             end,
             collector or (function() return {} end)
         )
+        self.events:put(eventId, event)
     end
-    return self.events[eventId]
+    return event
+end
+function Unit.prototype.saveData(self)
+    local handle = self.handle
+    self[108] = self[108] or getUnitX(handle)
+    self[109] = self[109] or getUnitY(handle)
+    self._owner = self._owner or Player:of(getOwningPlayer(handle))
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
-    if not self._owner then
-        self._owner = Player:of(getOwningPlayer(handle))
-    end
+    self:saveData()
     local abilities = self.abilities
     for ____, ability in ipairs(abilities) do
         ability:destroy()
@@ -708,7 +805,9 @@ function Unit.prototype.onDestroy(self)
     end
     local eventsToDestroy = self._eventsToDestroy
     if eventsToDestroy ~= nil then
-        forEach(eventsToDestroy, "destroy")
+        for ____, event in ipairs(eventsToDestroy) do
+            event:destroy()
+        end
     end
     if getUnitAbilityLevel(handle, leaveDetectAbilityId) > 0 then
         unitRemoveAbility(handle, leaveDetectAbilityId)
@@ -726,7 +825,11 @@ function Unit.prototype.addAttackHandler(self, condition, action)
     self._attackHandlers = handlers
     if #handlers == 1 then
         local handle = self.handle
-        assert(unitAddAbility(handle, attackHandlerAbilityId) and UnitMakeAbilityPermanent(handle, true, attackHandlerAbilityId))
+        assert(
+            unitAddAbility(handle, attackHandlerAbilityId) and UnitMakeAbilityPermanent(handle, true, attackHandlerAbilityId),
+            "attack handler ability must be added",
+            self
+        )
     end
     return handler
 end
@@ -755,17 +858,17 @@ function Unit.prototype.addModifier(self, property, modifier)
     end}
 end
 function Unit.prototype.hasCombatClassification(self, combatClassification)
-    local ____combatClassification_1 = combatClassification
-    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_1 == ____combatClassification_1
+    local ____combatClassification_2 = combatClassification
+    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_2 == ____combatClassification_2
 end
 function Unit.prototype.addClassification(self, classification)
-    return unitAddType(self.handle, classification)
+    return UnitAddType(self.handle, classification)
 end
 function Unit.prototype.removeClassification(self, classification)
-    return unitRemoveType(self.handle, classification)
+    return UnitRemoveType(self.handle, classification)
 end
 function Unit.prototype.hasClassification(self, classification)
-    return isUnitType(self.handle, classification)
+    return IsUnitType(self.handle, classification)
 end
 function Unit.prototype.isVisibleTo(self, player)
     return isUnitVisible(self.handle, player.handle)
@@ -774,13 +877,19 @@ function Unit.prototype.isInvisibleTo(self, player)
     return isUnitInvisible(self.handle, player.handle)
 end
 function Unit.prototype.isInRangeOf(self, x, y, range)
-    local ____temp_2
+    local ____temp_4
     if type(x) == "number" then
-        ____temp_2 = isUnitInRangeXY(self.handle, x, y, range)
+        ____temp_4 = isUnitInRangeXY(self.handle, x, y, range)
     else
-        ____temp_2 = isUnitInRange(self.handle, x.handle, y)
+        local ____temp_3
+        if __TS__InstanceOf(x, ____exports.Unit) then
+            ____temp_3 = isUnitInRange(self.handle, x.handle, y)
+        else
+            ____temp_3 = isUnitInRangeXY(self.handle, x.x, x.y, range)
+        end
+        ____temp_4 = ____temp_3
     end
-    return ____temp_2
+    return ____temp_4
 end
 function Unit.prototype.isAllyOf(self, unit)
     return isUnitAlly(
@@ -798,16 +907,30 @@ function Unit.prototype.playAnimation(self, animation, rarity)
     if type(animation) == "number" then
         setUnitAnimationByIndex(self.handle, animation)
     elseif rarity then
-        setUnitAnimationWithRarity(self.handle, animation, rarity)
+        SetUnitAnimationWithRarity(self.handle, animation, rarity)
     else
         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)
+    QueueUnitAnimation(self.handle, animation)
+end
+function Unit.prototype.chooseWeapon(self, target)
+    local firstWeapon = self.firstWeapon
+    if firstWeapon.isEnabled and target:isAllowedTarget(self, firstWeapon.allowedTargetCombatClassifications) then
+        return firstWeapon
+    end
+    local secondWeapon = self.secondWeapon
+    if secondWeapon.isEnabled and target:isAllowedTarget(self, secondWeapon.allowedTargetCombatClassifications) then
+        return secondWeapon
+    end
+    return nil
 end
 function Unit.prototype.delayHealthChecks(self)
-    self[103] = (self[103] or 0) + 1
+    self[104] = (self[104] or 0) + 1
     Timer:run(delayHealthChecksCallback, self)
 end
 function Unit.prototype.setPosition(self, x, y)
@@ -817,21 +940,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, 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
+    local ____ReviveHero_7 = ReviveHero
+    local ____array_6 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_5 = doEffect
+    if ____doEffect_5 == nil then
+        ____doEffect_5 = false
     end
-    __TS__SparseArrayPush(____array_4, ____doEffect_3)
-    ____ReviveHero_5(__TS__SparseArraySpread(____array_4))
+    __TS__SparseArrayPush(____array_6, ____doEffect_5)
+    ____ReviveHero_7(__TS__SparseArraySpread(____array_6))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -871,20 +994,19 @@ 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
-        local ability = UnitAbility:of(
-            checkNotNull(getUnitAbility(self.handle, abilityId)),
-            abilityId,
-            self
-        )
+    local ability = UnitAbility:of(
+        doUnitAbilityAction(self.handle, abilityId, addAbility, abilityId),
+        abilityId,
+        self
+    )
+    if ability ~= nil then
         local abilities = self.abilities
         abilities[#abilities + 1] = ability
-        return ability
     end
-    return nil
+    return ability
 end
 function Unit.prototype.makeAbilityPermanent(self, abilityId, permanent)
     return UnitMakeAbilityPermanent(self.handle, permanent, abilityId)
@@ -898,31 +1020,24 @@ end
 function Unit.prototype.hasAbility(self, abilityId)
     return getUnitAbilityLevel(self.handle, abilityId) > 0
 end
-function Unit.prototype.getAbilityById(self, abilityId)
-    local handle = self.handle
-    if unitAddAbility(handle, abilityId) then
-        assert(unitRemoveAbility(handle, abilityId))
-        return nil
-    end
-    return UnitAbility:of(
-        getUnitAbility(self.handle, abilityId),
-        abilityId,
-        self
-    )
+function Unit.prototype.getAbility(self, abilityId)
+    local ability = doUnitAbilityAction(self.handle, abilityId, getUnitAbility, abilityId)
+    return UnitAbility:of(ability, abilityId, self)
 end
-function Unit.prototype.removeAbility(self, abilityId)
-    if unitRemoveAbility(self.handle, abilityId) then
-        local abilities = self.abilities
-        for i = 1, #abilities do
-            if abilities[i].typeId == abilityId then
-                abilities[i]:destroy()
-                tremove(abilities, i)
-                return true
+function Unit.prototype.removeAbility(self, abilityTypeId)
+    local abilities = self.abilities
+    for i = 1, #abilities do
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
+            tremove(abilities, i)
+            if ability.state == 2 then
+                break
             end
+            ability:destroy()
+            return true
         end
-        return true
     end
-    return false
+    return doUnitAbilityAction(self.handle, abilityTypeId, unitRemoveAbility, abilityTypeId)
 end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)
@@ -936,12 +1051,16 @@ end
 function Unit.prototype.endAbilityCooldown(self, abilityId)
     BlzEndUnitAbilityCooldown(self.handle, abilityId)
 end
-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
@@ -1002,18 +1121,44 @@ function Unit.prototype.unpauseEx(self)
 end
 function Unit.prototype.incrementStunCounter(self)
     local stunCounter = self[102] or 0
-    if not self[101] or stunCounter >= 0 then
+    if not self[101] and (self[103] or 0) <= 0 or stunCounter >= 0 then
         BlzPauseUnitEx(self.handle, true)
     end
     self[102] = stunCounter + 1
 end
 function Unit.prototype.decrementStunCounter(self)
     local stunCounter = self[102] or 0
-    if not self[101] or stunCounter >= 1 then
+    if not self[101] and (self[103] or 0) <= 0 or stunCounter >= 1 then
         BlzPauseUnitEx(self.handle, false)
     end
     self[102] = stunCounter - 1
 end
+function Unit.prototype.incrementForceStunCounter(self)
+    local forceStunCounter = self[103] or 0
+    if forceStunCounter == 0 then
+        local handle = self.handle
+        if not self[101] then
+            for _ = self[102] or 0, -1 do
+                BlzPauseUnitEx(handle, true)
+            end
+        end
+        BlzPauseUnitEx(handle, true)
+    end
+    self[103] = forceStunCounter + 1
+end
+function Unit.prototype.decrementForceStunCounter(self)
+    local forceStunCounter = self[103] or 0
+    if forceStunCounter == 1 then
+        local handle = self.handle
+        if not self[101] then
+            for _ = self[102] or 0, -1 do
+                BlzPauseUnitEx(handle, false)
+            end
+        end
+        BlzPauseUnitEx(handle, false)
+    end
+    self[103] = forceStunCounter - 1
+end
 function Unit.create(self, owner, id, x, y, facing, skinId)
     local handle = skinId and BlzCreateUnitWithSkin(
         owner.handle,
@@ -1202,7 +1347,15 @@ __TS__SetDescriptor(
     Unit.prototype,
     "isIllusion",
     {get = function(self)
-        return isUnitIllusion(self.handle)
+        return IsUnitIllusion(self.handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Unit.prototype,
+    "isStunned",
+    {get = function(self)
+        return getUnitCurrentOrder(self.handle) == 851973
     end},
     true
 )
@@ -1281,13 +1434,13 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Unit.prototype,
-    "strengthBase",
+    "primaryAttribute",
     {
         get = function(self)
-            return getHeroStr(self.handle, false)
+            return getUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE)
         end,
-        set = function(self, strengthBase)
-            setHeroStr(self.handle, strengthBase, true)
+        set = function(self, primaryAttribute)
+            setUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE, primaryAttribute)
         end
     },
     true
@@ -1309,19 +1462,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "agilityBase",
-    {
-        get = function(self)
-            return getHeroAgi(self.handle, false)
-        end,
-        set = function(self, agilityBase)
-            setHeroAgi(self.handle, agilityBase, true)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "agilityBonus",
@@ -1339,19 +1479,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "intelligenceBase",
-    {
-        get = function(self)
-            return getHeroInt(self.handle, false)
-        end,
-        set = function(self, intelligenceBase)
-            setHeroInt(self.handle, intelligenceBase, true)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "intelligenceBonus",
@@ -1400,17 +1527,17 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[106]
+            return not self[107]
         end,
         set = function(self, isTeamGlowVisible)
-            showUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_6
+            BlzShowUnitTeamGlow(self.handle, isTeamGlowVisible)
+            local ____temp_8
             if not isTeamGlowVisible then
-                ____temp_6 = true
+                ____temp_8 = true
             else
-                ____temp_6 = nil
+                ____temp_8 = nil
             end
-            self[106] = ____temp_6
+            self[107] = ____temp_8
         end
     },
     true
@@ -1419,9 +1546,9 @@ __TS__SetDescriptor(
     Unit.prototype,
     "color",
     {set = function(self, color)
-        setUnitColor(self.handle, color.handle)
-        if self[106] then
-            showUnitTeamGlow(self.handle, false)
+        SetUnitColor(self.handle, color.handle)
+        if self[107] then
+            BlzShowUnitTeamGlow(self.handle, false)
         end
     end},
     true
@@ -1444,14 +1571,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[104] or 0) - (self[105] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[105] or 0) - (self[106] or 0)
         end,
         set = function(self, maxHealth)
-            if maxHealth < 1 and self[103] ~= nil then
-                self[104] = (self[104] or 0) + (1 - maxHealth)
+            if maxHealth < 1 and self[104] ~= nil then
+                self[105] = (self[105] or 0) + (1 - maxHealth)
                 maxHealth = 1
             end
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[105] or 0))
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[106] or 0))
         end
     },
     true
@@ -1493,10 +1620,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[105] or 0)
+            return GetWidgetLife(self.handle) - (self[106] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[105] or 0))
+            SetWidgetLife(self.handle, health + (self[106] or 0))
         end
     },
     true
@@ -1572,25 +1699,12 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "flyHeight",
-    {
-        get = function(self)
-            return getUnitFlyHeight(self.handle)
-        end,
-        set = function(self, v)
-            SetUnitFlyHeight(self.handle, v, 100000)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "x",
     {
         get = function(self)
-            return getUnitX(self.handle)
+            return self[108] or getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1603,7 +1717,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return getUnitY(self.handle)
+            return self[109] or getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)
@@ -1689,10 +1803,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
@@ -1708,14 +1822,18 @@ __TS__SetDescriptor(
             local handle = self.handle
             if isPaused and not IsUnitPaused(handle) then
                 self[101] = true
-                for _ = self[102] or 0, -1 do
-                    BlzPauseUnitEx(handle, true)
+                if (self[103] or 0) <= 0 then
+                    for _ = self[102] or 0, -1 do
+                        BlzPauseUnitEx(handle, true)
+                    end
                 end
                 PauseUnit(handle, true)
             elseif not isPaused and IsUnitPaused(handle) then
                 PauseUnit(handle, false)
-                for _ = self[102] or 0, -1 do
-                    BlzPauseUnitEx(handle, false)
+                if (self[103] or 0) <= 0 then
+                    for _ = self[102] or 0, -1 do
+                        BlzPauseUnitEx(handle, false)
+                    end
                 end
                 self[101] = nil
             end
@@ -1773,20 +1891,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "scale",
-    {
-        get = function(self)
-            return getUnitRealField(self.handle, UNIT_RF_SCALING_VALUE)
-        end,
-        set = function(self, v)
-            setUnitScale(self.handle, v, v, v)
-            setUnitRealField(self.handle, UNIT_RF_SCALING_VALUE, v)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "timeScale",
@@ -1813,13 +1917,26 @@ __TS__SetDescriptor(
     Unit.prototype,
     "pathingCollisionRange",
     {get = function(self)
-        return 16 * (min(
+        return 16 * (math.min(
             getUnitCollisionSize(self.handle) // 16,
             3
         ) + 1)
     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",
@@ -1910,30 +2027,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "onUnitInRange",
-    {get = function(self)
-        local handle = self.handle
-        local onUnitInRange = setmetatable(
-            {},
-            {__index = function(self, value)
-                local event = __TS__New(
-                    TriggerEvent,
-                    function(trigger)
-                        TriggerRegisterUnitInRangeSimple(trigger, value, handle)
-                    end,
-                    function() return ____exports.Unit:of(handle) end
-                )
-                rawset(self, value, event)
-                return event
-            end}
-        )
-        rawset(self, "onUnitInRange", onUnitInRange)
-        return onUnitInRange
-    end},
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "onManaEqual",
@@ -2001,6 +2094,14 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "targetAcquiredEvent",
+    {get = function(self)
+        return self:getEvent(EVENT_UNIT_ACQUIRED_TARGET)
+    end},
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "onSelect",
@@ -2061,6 +2162,11 @@ __TS__SetDescriptor(
     end},
     true
 )
+Unit.levelChangedEvent = __TS__New(
+    ____exports.UnitTriggerEvent,
+    EVENT_PLAYER_HERO_LEVEL,
+    function() return ____exports.Unit:of(getTriggerUnit()) end
+)
 Unit.deathEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_DEATH,
@@ -2078,7 +2184,7 @@ Unit.onResurrect = __TS__New(
         ____exports.Unit.deathEvent:addListener(function(unit)
             dead[unit] = true
         end)
-        ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
+        ____exports.Unit.onImmediateOrder[852056]:addListener(function(unit)
             if dead[unit] and not IsUnitType(unit.handle, UNIT_TYPE_DEAD) then
                 dead[unit] = false
                 invoke(event, unit)
@@ -2095,7 +2201,7 @@ Unit.morphEvent = __TS__New(
                 invoke(event, unit)
             end
         end
-        ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
+        ____exports.Unit.onImmediateOrder[852056]:addListener(function(unit)
             if getUnitAbilityLevel(unit.handle, morphDetectAbilityId) == 0 then
                 Timer:run(ifNotLeft, unit)
             end
@@ -2136,25 +2242,25 @@ Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_9
+            local ____GetSpellTargetUnit_result_11
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_9 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_11 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_8
+                local ____GetSpellTargetItem_result_10
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_8 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_10 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_7
+                    local ____GetSpellTargetDestructable_result_9
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_7 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_9 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_7 = nil
+                        ____GetSpellTargetDestructable_result_9 = nil
                     end
-                    ____GetSpellTargetItem_result_8 = ____GetSpellTargetDestructable_result_7
+                    ____GetSpellTargetItem_result_10 = ____GetSpellTargetDestructable_result_9
                 end
-                ____GetSpellTargetUnit_result_9 = ____GetSpellTargetItem_result_8
+                ____GetSpellTargetUnit_result_11 = ____GetSpellTargetItem_result_10
             end
-            local target = ____GetSpellTargetUnit_result_9
+            local target = ____GetSpellTargetUnit_result_11
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2326,10 +2432,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
@@ -2360,38 +2468,57 @@ 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()
+                weaponSoundType = nativeToWeaponSoundType(BlzGetEventWeaponType()),
+                metadata = metadata,
+                isAttack = BlzGetEventIsAttack(),
+                originalAmount = GetEventDamage(),
+                originalMetadata = metadata,
+                preventRetaliation = damagingEventPreventRetaliation
             }
             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
-                if weapon == -1 then
-                    local targetsAllowed = BlzGetUnitWeaponIntegerField(source.handle, UNIT_WEAPON_IF_ATTACK_TARGETS_ALLOWED, 0)
-                    weapon = 0
-                end
-                data.weapon = assert(source.weapons[weapon + 1])
+                data.weapon = source:chooseWeapon(target)
             end
             if not data.isAttack or not source or not source._attackHandlers then
                 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
                         }
                     )
                 )
+                if data[0] and source then
+                    local sourceOwner = source.owner.handle
+                    data[1] = sourceOwner
+                    local targetOwner = target.owner.handle
+                    data[2] = targetOwner
+                    if not GetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE) then
+                        SetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE, true)
+                        data[3] = true
+                    end
+                    if not GetPlayerAlliance(targetOwner, sourceOwner, ALLIANCE_PASSIVE) then
+                        SetPlayerAlliance(targetOwner, sourceOwner, ALLIANCE_PASSIVE, true)
+                        data[4] = true
+                    end
+                end
+                damagingEventByTarget[target] = data
                 return
             end
             BlzSetEventDamage(0)
@@ -2399,7 +2526,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()
@@ -2415,25 +2542,21 @@ 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
+                                    weaponSoundTypeToNative(data.weaponSoundType)
                                 )
                             end},
                             {__index = data, __newindex = data}
@@ -2458,30 +2581,54 @@ 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(),
+                    weaponSoundType = nativeToWeaponSoundType(BlzGetEventWeaponType()),
+                    metadata = damagingEvent and damagingEvent.metadata,
                     isAttack = BlzGetEventIsAttack(),
-                    originalAmount = GetEventDamage(),
+                    originalAmount = damagingEvent and damagingEvent.originalAmount or GetEventDamage(),
+                    originalMetadata = damagingEvent and damagingEvent.originalMetadata,
                     preventDeath = damageEventPreventDeath
                 }
+                if damagingEvent then
+                    for key, value in pairs(damagingEvent) do
+                        if isAttribute(key) then
+                            data[key] = value
+                        end
+                    end
+                    local sourceOwner = damagingEvent[1]
+                    if sourceOwner then
+                        local targetOwner = damagingEvent[2]
+                        if damagingEvent[3] then
+                            SetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE, false)
+                        end
+                        if damagingEvent[4] then
+                            SetPlayerAlliance(targetOwner, sourceOwner, ALLIANCE_PASSIVE, false)
+                        end
+                    end
+                end
                 local evData = 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
                     }
                 )
-                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[105] = (target[105] or 0) + bonusHealth
+                    target[106] = (target[106] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2495,7 +2642,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[105] = (target[105] or 0) - bonusHealth
+                        target[106] = (target[106] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth
@@ -2520,8 +2667,9 @@ Unit.itemDroppedEvent = __TS__New(
     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 isItemIgnoredInEvents(item) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
@@ -2530,9 +2678,14 @@ 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 unitHandle = getTriggerUnit()
+        local itemHandle = getManipulatedItem()
+        if getUnitTypeId(unitHandle) ~= dummyUnitId and not isItemIgnoredInEvents(itemHandle) then
+            local unit = ____exports.Unit:of(unitHandle)
+            local item = Item:of(itemHandle)
+            if ownerByItem[item] ~= unit then
+                return unit, item
+            end
         end
         return IgnoreEvent
     end
@@ -2540,34 +2693,27 @@ Unit.itemPickedUpEvent = __TS__New(
 Unit.itemUsedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_USE_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
-)
-Unit.itemStackedEvent = __TS__New(
-    ____exports.UnitTriggerEvent,
-    EVENT_PLAYER_UNIT_STACK_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+    function()
+        local unit = getTriggerUnit()
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not isItemIgnoredInEvents(item) then
+            return ____exports.Unit:of(unit), Item:of(item)
+        end
+        return IgnoreEvent
+    end
 )
 __TS__ObjectDefineProperty(
     Unit,
-    "itemMovedEvent",
+    "itemChargesChangedEvent",
     {get = function(self)
         local event = __TS__New(Event)
-        for order = orderId("moveslot1"), orderId("moveslot5") do
-            local slotTo = order - orderId("moveslot1")
-            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, "itemMovedEvent", event)
+        Item.chargesChangedEvent:addListener(function(item)
+            local unit = item.owner
+            if unit ~= nil then
+                invoke(event, unit, item)
+            end
+        end)
+        rawset(self, "itemChargesChangedEvent", event)
         return event
     end}
 )
@@ -2596,6 +2742,10 @@ __TS__ObjectDefineProperty(
         rawset(self, "destroyEvent", destroyEvent)
         return destroyEvent
     end}
+)
+Unit.synchronize = synchronizer(
+    function(unit) return unit.syncId end,
+    function(syncId) return unitBySyncId[syncId] end
 );
 (function(self)
     local leaveAbilityIds = postcompile(function()
@@ -2613,11 +2763,7 @@ __TS__ObjectDefineProperty(
             function(____, id) return fourCC(id) end
         )
     end)
-    for ____, leaveOrderId in ipairs({
-        orderId("undefend"),
-        orderId("magicundefense"),
-        orderId("unimmolation")
-    }) do
+    for ____, leaveOrderId in ipairs({852056, 852479, 852178}) do
         ____exports.Unit.onImmediateOrder[leaveOrderId]:addListener(function(unit)
             local handle = unit.handle
             for i = 1, #leaveAbilityIds do
@@ -2625,7 +2771,8 @@ __TS__ObjectDefineProperty(
                     return
                 end
             end
-            unit:destroy()
+            unit:saveData()
+            Timer:run(unit, "destroy")
         end)
     end
 end)(Unit)