warscript 0.0.1-dev.d690591 → 0.0.1-dev.d6e2c10

package/engine/internal/unit.lua

@@ -58,13 +58,16 @@ 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 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
 local getHeroStr = GetHeroStr
@@ -124,10 +127,6 @@ 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
@@ -140,6 +139,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
@@ -347,6 +347,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
@@ -409,6 +412,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",
@@ -443,6 +459,19 @@ __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,
     "damageBase",
@@ -630,15 +659,15 @@ for ____, player in ipairs(Player.all) do
     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,
@@ -649,15 +678,24 @@ end
 local nextSyncId = 1
 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))
@@ -689,8 +727,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)
+    self[108] = getUnitX(handle)
+    self[109] = getUnitY(handle)
     if not self._owner then
         self._owner = Player:of(getOwningPlayer(handle))
     end
@@ -758,17 +796,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)
@@ -777,13 +815,13 @@ 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_3
     if type(x) == "number" then
-        ____temp_2 = isUnitInRangeXY(self.handle, x, y, range)
+        ____temp_3 = isUnitInRangeXY(self.handle, x, y, range)
     else
-        ____temp_2 = isUnitInRange(self.handle, x.handle, y)
+        ____temp_3 = isUnitInRange(self.handle, x.handle, y)
     end
-    return ____temp_2
+    return ____temp_3
 end
 function Unit.prototype.isAllyOf(self, unit)
     return isUnitAlly(
@@ -801,19 +839,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)
+    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(target, 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)
@@ -830,14 +879,14 @@ 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_6 = ReviveHero
+    local ____array_5 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_4 = doEffect
+    if ____doEffect_4 == nil then
+        ____doEffect_4 = false
     end
-    __TS__SparseArrayPush(____array_4, ____doEffect_3)
-    ____ReviveHero_5(__TS__SparseArraySpread(____array_4))
+    __TS__SparseArrayPush(____array_5, ____doEffect_4)
+    ____ReviveHero_6(__TS__SparseArraySpread(____array_5))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -880,17 +929,16 @@ function Unit.prototype.itemInSlot(self, 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)
@@ -904,31 +952,21 @@ 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
-            end
+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)
+            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)
@@ -942,6 +980,21 @@ end
 function Unit.prototype.endAbilityCooldown(self, abilityId)
     BlzEndUnitAbilityCooldown(self.handle, abilityId)
 end
+function Unit.prototype.interruptMovement(self)
+    local handle = self.handle
+    unitDisableAbility(
+        handle,
+        fourCC("Amov"),
+        true,
+        false
+    )
+    unitDisableAbility(
+        handle,
+        fourCC("Amov"),
+        false,
+        false
+    )
+end
 function Unit.prototype.interruptAttack(self)
     unitInterruptAttack(self.handle)
 end
@@ -1015,18 +1068,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,
@@ -1215,7 +1294,7 @@ __TS__SetDescriptor(
     Unit.prototype,
     "isIllusion",
     {get = function(self)
-        return isUnitIllusion(self.handle)
+        return IsUnitIllusion(self.handle)
     end},
     true
 )
@@ -1434,17 +1513,17 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[106]
+            return not self[107]
         end,
         set = function(self, isTeamGlowVisible)
             BlzShowUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_6
+            local ____temp_7
             if not isTeamGlowVisible then
-                ____temp_6 = true
+                ____temp_7 = true
             else
-                ____temp_6 = nil
+                ____temp_7 = nil
             end
-            self[106] = ____temp_6
+            self[107] = ____temp_7
         end
     },
     true
@@ -1454,7 +1533,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         SetUnitColor(self.handle, color.handle)
-        if self[106] then
+        if self[107] then
             BlzShowUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1478,14 +1557,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
@@ -1527,10 +1606,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
@@ -1606,25 +1685,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 self[107] or getUnitX(self.handle)
+            return self[108] or getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1637,7 +1703,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return self[108] or getUnitY(self.handle)
+            return self[109] or getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)
@@ -1742,14 +1808,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
@@ -1807,20 +1877,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",
@@ -2048,6 +2104,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",
@@ -2183,25 +2247,25 @@ Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_9
+            local ____GetSpellTargetUnit_result_10
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_9 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_10 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_8
+                local ____GetSpellTargetItem_result_9
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_8 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_9 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_7
+                    local ____GetSpellTargetDestructable_result_8
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_7 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_8 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_7 = nil
+                        ____GetSpellTargetDestructable_result_8 = nil
                     end
-                    ____GetSpellTargetItem_result_8 = ____GetSpellTargetDestructable_result_7
+                    ____GetSpellTargetItem_result_9 = ____GetSpellTargetDestructable_result_8
                 end
-                ____GetSpellTargetUnit_result_9 = ____GetSpellTargetItem_result_8
+                ____GetSpellTargetUnit_result_10 = ____GetSpellTargetItem_result_9
             end
-            local target = ____GetSpellTargetUnit_result_9
+            local target = ____GetSpellTargetUnit_result_10
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2420,15 +2484,11 @@ Unit.onDamaging = (function()
                 metadata = metadata,
                 isAttack = BlzGetEventIsAttack(),
                 originalAmount = GetEventDamage(),
-                originalMetadata = metadata
+                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(
@@ -2449,6 +2509,20 @@ Unit.onDamaging = (function()
                         }
                     )
                 )
+                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
@@ -2526,12 +2600,32 @@ Unit.onDamage = __TS__New(
                     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
                     }
@@ -2539,7 +2633,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[105] = (target[105] or 0) + bonusHealth
+                    target[106] = (target[106] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2553,7 +2647,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
@@ -2589,10 +2683,14 @@ Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     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)
+        local unitHandle = getTriggerUnit()
+        local itemHandle = getManipulatedItem()
+        if getUnitTypeId(unitHandle) ~= dummyUnitId and not (ignoreEventsItems[itemHandle] ~= nil) then
+            local unit = ____exports.Unit:of(unitHandle)
+            local item = Item:of(itemHandle)
+            if item.owner ~= unit then
+                return unit, item
+            end
         end
         return IgnoreEvent
     end
@@ -2612,7 +2710,22 @@ Unit.itemUsedEvent = __TS__New(
 Unit.itemStackedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_STACK_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(BlzGetStackingItemTarget()), Item:of(BlzGetStackingItemSource()) end
+)
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemChargesChangedEvent",
+    {get = function(self)
+        local event = __TS__New(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}
 )
 __TS__ObjectDefineProperty(
     Unit,
@@ -2684,6 +2797,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()