warscript 0.0.1-dev.a228cc0 → 0.0.1-dev.a44a461

package/engine/internal/ability.lua

@@ -35,6 +35,8 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
+local getItemBooleanField = BlzGetItemBooleanField
+local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
@@ -452,8 +454,6 @@ end
 local function getAbilityCooldown(_, abilityTypeId)
     return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
 end
-local function doNothing()
-end
 ____exports.ItemAbility = __TS__Class()
 local ItemAbility = ____exports.ItemAbility
 ItemAbility.name = "ItemAbility"
@@ -482,11 +482,12 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
     )
 end
 function ItemAbility.prototype.interruptCast(self)
-    local item = self.owner
-    local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
-    local ____item_handle_3 = item.handle
-    local ____opt_1 = item.owner
-    ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, doNothing)
+    local handle = self.owner.handle
+    local activelyUsed = getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED)
+    if activelyUsed then
+        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, false)
+        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
+    end
 end
 __TS__SetDescriptor(
     ItemAbility.prototype,
@@ -502,17 +503,17 @@ __TS__SetDescriptor(
     {
         get = function(self)
             local item = self.owner
-            local ____doAbilityActionForceDummy_8 = doAbilityActionForceDummy
-            local ____item_handle_7 = item.handle
-            local ____opt_5 = item.owner
-            return ____doAbilityActionForceDummy_8(____item_handle_7, ____opt_5 and ____opt_5.handle, getAbilityCooldown, self.typeId)
+            local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
+            local ____item_handle_3 = item.handle
+            local ____opt_1 = item.owner
+            return ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, getAbilityCooldown, self.typeId)
         end,
         set = function(self, cooldownRemaining)
             local item = self.owner
-            local ____startItemCooldown_12 = startItemCooldown
-            local ____item_handle_11 = item.handle
-            local ____opt_9 = item.owner
-            ____startItemCooldown_12(____item_handle_11, ____opt_9 and ____opt_9.handle, cooldownRemaining)
+            local ____startItemCooldown_8 = startItemCooldown
+            local ____item_handle_7 = item.handle
+            local ____opt_5 = item.owner
+            ____startItemCooldown_8(____item_handle_7, ____opt_5 and ____opt_5.handle, cooldownRemaining)
         end
     },
     true

package/engine/internal/item/ability.lua

@@ -1,4 +1,5 @@
 local ____exports = {}
+local restoreCooldownGroup
 local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
@@ -11,6 +12,12 @@ local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.u
 local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 local ____math = require("math")
 local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
 local isItemOwned = IsItemOwned
 local isItemPowerup = IsItemPowerup
 local getItemX = GetItemX
@@ -21,7 +28,6 @@ local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local setItemPosition = SetItemPosition
 local unitAddItem = UnitAddItem
-local unitDropItemSlot = UnitDropItemSlot
 local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitResetCooldown = UnitResetCooldown
@@ -33,16 +39,17 @@ local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
         util.id2s(abilityTypeIdGenerator:next()),
         "Absk"
     )
-    abilityType.bsk1 = 0
-    abilityType.bsk2 = 0
-    abilityType.bsk3 = 0
-    abilityType.amcs = 0
-    abilityType.adur = MINIMUM_POSITIVE_NORMALIZED_FLOAT
-    abilityType.ahdu = MINIMUM_POSITIVE_NORMALIZED_FLOAT
+    abilityType["bsk1+0"] = 0
+    abilityType["bsk2+0"] = 0
+    abilityType["bsk3+0"] = 0
+    abilityType["amcs+0"] = 0
+    abilityType["adur+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
+    abilityType["ahdu+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
     return util.s2id(abilityType.id)
 end)
 local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
     local itemType = BlankItemType:create()
+    itemType.name = "[Warscript/Dummy] Item Cooldown Starter"
     itemType.abilityTypeIds = {COOLDOWN_STARTER_ABILITY_TYPE_ID}
     itemType.cooldownGroupId = COOLDOWN_STARTER_ABILITY_TYPE_ID
     itemType.activelyUsed = true
@@ -64,7 +71,12 @@ local function startItemCooldownInternal(handle, cooldown)
     setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
     unitResetCooldown(dummy)
     unitUseItem(dummy, cooldownStarterItem)
-    setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, cooldownGroup)
+    Timer:run(restoreCooldownGroup, handle, cooldownGroup)
+end
+restoreCooldownGroup = function(handle, cooldownGroup)
+    if getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP) == COOLDOWN_STARTER_ABILITY_TYPE_ID then
+        setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, cooldownGroup)
+    end
 end
 ---
 -- @internal For use by internal systems only.
@@ -77,6 +89,10 @@ ____exports.abilityActionDummy = dummy
 ---
 -- @internal For use by internal systems only.
 ____exports.doAbilityAction = function(handle, action, ...)
+    local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = true
+    end
     local isOwned = isItemOwned(handle)
     local isPowerup
     local x
@@ -98,6 +114,9 @@ ____exports.doAbilityAction = function(handle, action, ...)
             setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
         end
     end
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = nil
+    end
     return result
 end
 ---
@@ -110,6 +129,10 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
     if slot == nil then
         return ____exports.doAbilityAction(handle, action, ...)
     end
+    local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = true
+    end
     local isPowerup
     if isItemPowerup(handle) then
         setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
@@ -119,11 +142,13 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
     unitAddItem(dummy, handle)
     local result = action(handle, ...)
     unitRemoveItem(dummy, handle)
-    unitAddItem(owner, handle)
-    unitDropItemSlot(owner, handle, slot)
+    unitAddItemToSlot(owner, handle, slot)
     if isPowerup then
         setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
     end
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = nil
+    end
     return result
 end
 return ____exports

package/engine/internal/item.d.ts

@@ -5,6 +5,7 @@ import { Event } from "../../event";
 import { ReadonlyRect } from "../../core/types/rect";
 import { ItemAbility } from "./ability";
 import { AbilityTypeId } from "../object-data/entry/ability-type";
+import type { ItemTypeId } from "../object-data/entry/item-type";
 type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
 export declare const addAndGetAbility: (handle: jitem, abilityTypeId: AbilityTypeId) => jability | null;
 declare const enum ItemPropertyKey {
@@ -17,7 +18,7 @@ export declare class Item extends Handle<jitem> {
     constructor(handle: jitem);
     protected onDestroy(): HandleDestructor;
     static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;
-    get typeId(): number;
+    get typeId(): ItemTypeId;
     set skinId(v: number);
     get skinId(): number;
     set name(v: string);
@@ -78,9 +79,9 @@ export declare class Item extends Handle<jitem> {
     hasAbility(abilityTypeId: AbilityTypeId): boolean;
     getAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
     get abilities(): readonly ItemAbility[];
-    static getInRange(pos: Vec2, range: number): Item[];
+    static getInRange(x: number, y: number, range: number): Item[];
     static getInRect(rect: ReadonlyRect): Item[];
     static get onCreate(): Event<[Item]>;
-    static get onDestroy(): Event<[Item]>;
+    static get destroyEvent(): Event<[Item]>;
 }
 export {};

package/engine/internal/item.lua

@@ -15,6 +15,12 @@ local ____ability = require("engine.internal.ability")
 local ItemAbility = ____ability.ItemAbility
 local ____ability = require("engine.internal.item.ability")
 local doAbilityAction = ____ability.doAbilityAction
+local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
+local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
+local ____vec2 = require("math.vec2")
+local distance = ____vec2.distance
 local itemAddAbility = BlzItemAddAbility
 local itemRemoveAbility = BlzItemRemoveAbility
 local getItemAbility = BlzGetItemAbility
@@ -24,6 +30,12 @@ local getAbilityId = BlzGetAbilityId
 local getWidgetLife = GetWidgetLife
 local removeItem = RemoveItem
 local getHandleId = GetHandleId
+local setRect = SetRect
+local enumItemsInRect = EnumItemsInRect
+local getEnumItem = GetEnumItem
+local getItemTypeId = GetItemTypeId
+local getItemX = GetItemX
+local getItemY = GetItemY
 local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local getItemBooleanField = BlzGetItemBooleanField
@@ -53,6 +65,32 @@ local function getItemAbilities(handle, item)
     end
     return abilities
 end
+local targetCollection
+local targetCollectionNextIndex
+local centerX
+local centerY
+local enumRange
+local function collectIntoTarget()
+    local item = getEnumItem()
+    local typeId = getItemTypeId(item)
+    if typeId ~= DUMMY_ITEM_ID and typeId ~= SLOT_FILLER_ITEM_TYPE_ID then
+        targetCollection[targetCollectionNextIndex] = ____exports.Item:of(item)
+        targetCollectionNextIndex = targetCollectionNextIndex + 1
+    end
+end
+local function collectIntoTargetRange()
+    local item = getEnumItem()
+    local typeId = getItemTypeId(item)
+    if distance(
+        getItemX(item),
+        getItemY(item),
+        centerX,
+        centerY
+    ) <= enumRange and typeId ~= DUMMY_ITEM_ID and typeId ~= SLOT_FILLER_ITEM_TYPE_ID then
+        targetCollection[targetCollectionNextIndex] = ____exports.Item:of(item)
+        targetCollectionNextIndex = targetCollectionNextIndex + 1
+    end
+end
 ____exports.Item = __TS__Class()
 local Item = ____exports.Item
 Item.name = "Item"
@@ -111,34 +149,27 @@ function Item.prototype.getAbility(self, abilityTypeId)
     local ability = self[101][abilityTypeId] ~= nil and doAbilityAction(self.handle, getItemAbility, abilityTypeId)
     return ability and ItemAbility:of(ability, abilityTypeId, self) or nil
 end
-function Item.getInRange(self, pos, range)
-    local collection = {}
-    SetRect(
+function Item.getInRange(self, x, y, range)
+    targetCollection = {}
+    targetCollectionNextIndex = 1
+    centerX = x
+    centerY = y
+    enumRange = range
+    setRect(
         enumRect,
-        pos.x - range,
-        pos.y - range,
-        pos.x + range,
-        pos.y + range
+        x - range,
+        y - range,
+        x + range,
+        y + range
     )
-    EnumItemsInRect(
-        enumRect,
-        nil,
-        function()
-            collection[#collection + 1] = self:of(GetEnumItem())
-        end
-    )
-    return collection
+    enumItemsInRect(enumRect, nil, collectIntoTargetRange)
+    return targetCollection
 end
 function Item.getInRect(self, rect)
-    local collection = {}
-    EnumItemsInRect(
-        rect.handle,
-        nil,
-        function()
-            collection[#collection + 1] = self:of(GetEnumItem())
-        end
-    )
-    return collection
+    targetCollection = {}
+    targetCollectionNextIndex = 1
+    enumItemsInRect(rect.handle, nil, collectIntoTarget)
+    return targetCollection
 end
 __TS__SetDescriptor(
     Item.prototype,
@@ -551,7 +582,7 @@ __TS__ObjectDefineProperty(
 )
 __TS__ObjectDefineProperty(
     Item,
-    "onDestroy",
+    "destroyEvent",
     {get = function(self)
         return self.onDestroyEvent
     end}

package/engine/internal/mechanics/ability-duration.lua

@@ -8,6 +8,6 @@ local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_AB
 -- @internal For use by internal systems only.
 ____exports.getAbilityDuration = function(ability, target)
     local level = ability.level
-    return target ~= nil and target:hasClassification(UnitClassification.RESISTANT) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
+    return target ~= nil and (target.isHero or target:getField(UNIT_IF_LEVEL) >= 6 or target:hasClassification(UnitClassification.RESISTANT)) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
 end
 return ____exports

package/engine/internal/misc/damage-metadata-by-target.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/misc/damage-metadata-by-target.lua

@@ -0,0 +1,5 @@
+local ____exports = {}
+---
+-- @internal For use by internal systems only.
+____exports.damageMetadataByTarget = setmetatable({}, {__mode = "k"})
+return ____exports

package/engine/internal/object-data/auto-attack-speed-increase.d.ts

@@ -1,2 +1,2 @@
 /** @noSelfInFile */
-export declare const AUTO_ATTACK_SPEED_INCREASE_FACTOR_ABILITY_FIELD: jabilityreallevelfield;
+export {};

package/engine/internal/object-data/auto-attack-speed-increase.lua

@@ -10,5 +10,7 @@ ____exports.AUTO_ATTACK_SPEED_INCREASE_DUMMY_ABILITY_TYPE_ID = compiletime(funct
     abilityType.autoAttackSpeedIncreaseFactor = 0
     return abilityType.id
 end)
+---
+-- @internal For use by internal systems.
 ____exports.AUTO_ATTACK_SPEED_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_ATTACK_SPEED_INCREASE_ISX1
 return ____exports

package/engine/internal/object-data/evasion-probability.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/evasion-probability.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____evasion = require("engine.object-data.entry.ability-type.evasion")
+local EvasionAbilityType = ____evasion.EvasionAbilityType
+---
+-- @internal For use by internal systems.
+____exports.EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = EvasionAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.evasionProbability = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.EVASION_PROBABILITY_ABILITY_FIELD = ABILITY_RLF_CHANCE_TO_EVADE_EEV1
+return ____exports

package/engine/internal/unit/add-item-to-slot-init.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/unit/add-item-to-slot-init.lua

@@ -0,0 +1,23 @@
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local fillerItems = ____add_2Ditem_2Dto_2Dslot.fillerItems
+local unitsWithFillerItems = ____add_2Ditem_2Dto_2Dslot.unitsWithFillerItems
+local setItemVisible = SetItemVisible
+local unitRemoveItem = UnitRemoveItem
+Unit.itemPickedUpEvent:addListener(
+    4,
+    function(unit)
+        local handle = unit.handle
+        if unitsWithFillerItems[handle] ~= nil then
+            for previousSlot = 1, 6 do
+                local fillerItem = fillerItems[previousSlot]
+                unitRemoveItem(handle, fillerItem)
+                setItemVisible(fillerItem, false)
+            end
+            unitsWithFillerItems[handle] = nil
+        end
+    end
+)
+return ____exports

package/engine/internal/unit/add-item-to-slot.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/unit/add-item-to-slot.lua

@@ -0,0 +1,52 @@
+local ____exports = {}
+local ____blank = require("engine.object-data.entry.item-type.blank")
+local BlankItemType = ____blank.BlankItemType
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local setItemVisible = SetItemVisible
+local unitAddItem = UnitAddItem
+local unitItemInSlot = UnitItemInSlot
+local unitRemoveItem = UnitRemoveItem
+---
+-- @internal For use by internal systems only.
+____exports.SLOT_FILLER_ITEM_TYPE_ID = compiletime(function()
+    local itemType = BlankItemType:create()
+    itemType.name = "[Warscript/Dummy] Slot Filler"
+    return itemType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.fillerItems = array(
+    6,
+    function()
+        local item = CreateItem(____exports.SLOT_FILLER_ITEM_TYPE_ID, 0, 0)
+        setItemVisible(item, false)
+        ignoreEventsItems[item] = true
+        return item
+    end
+)
+---
+-- @internal For use by internal systems only.
+____exports.unitsWithFillerItems = {}
+---
+-- @internal For use by internal systems only.
+____exports.unitAddItemToSlot = function(unit, item, slot)
+    for previousSlot = 0, slot - 1 do
+        if unitItemInSlot(unit, previousSlot) == nil then
+            unitAddItem(unit, ____exports.fillerItems[previousSlot + 1])
+            ____exports.unitsWithFillerItems[unit] = true
+        end
+    end
+    unitAddItem(unit, item)
+    if ____exports.unitsWithFillerItems[unit] ~= nil then
+        for previousSlot = 0, slot - 1 do
+            local fillerItem = ____exports.fillerItems[previousSlot + 1]
+            unitRemoveItem(unit, fillerItem)
+            setItemVisible(fillerItem, false)
+        end
+        ____exports.unitsWithFillerItems[unit] = nil
+    end
+end
+return ____exports

package/engine/internal/unit/bonus.d.ts

@@ -11,6 +11,7 @@ export type UnitMovementSpeedFactorBonusId = UnitBonusId<"movementSpeedFactor">;
 export type UnitAutoAttackDamageBonusId = UnitBonusId<"autoAttackDamage">;
 export type UnitDamageFactorBonusId = UnitBonusId<"damageFactor">;
 export type UnitReceivedDamageFactorBonusId = UnitBonusId<"receivedDamageFactor">;
+export type UnitEvasionProbabilityBonusId = UnitBonusId<"evasionProbability">;
 export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     abilityTypeId: AbilityTypeId;
     field: jabilityintegerlevelfield;
@@ -34,6 +35,7 @@ export declare namespace UnitBonusType {
     const AUTO_ATTACK_DAMAGE: UnitBonusType<UnitAutoAttackDamageBonusId>;
     const DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
+    const EVASION_PROBABILITY: UnitBonusType<UnitEvasionProbabilityBonusId>;
 }
 export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
 export declare const removeUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;

package/engine/internal/unit/bonus.lua

@@ -21,8 +21,18 @@ local AUTO_ATTACK_DAMAGE_INCREASE_DUMMY_ABILITY_TYPE_ID = ____auto_2Dattack_2Dda
 local ____movement_2Dspeed_2Dincrease_2Dfactor = require("engine.internal.object-data.movement-speed-increase-factor")
 local MOVEMENT_SPEED_INCREASE_FACTOR_ABILITY_FIELD = ____movement_2Dspeed_2Dincrease_2Dfactor.MOVEMENT_SPEED_INCREASE_FACTOR_ABILITY_FIELD
 local MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____movement_2Dspeed_2Dincrease_2Dfactor.MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID
+local ____evasion_2Dprobability = require("engine.internal.object-data.evasion-probability")
+local EVASION_PROBABILITY_ABILITY_FIELD = ____evasion_2Dprobability.EVASION_PROBABILITY_ABILITY_FIELD
+local EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID = ____evasion_2Dprobability.EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID
 local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
+local function atLeastOnceProbability(array)
+    local oppositeEventProbability = 1
+    for i = 1, #array do
+        oppositeEventProbability = oppositeEventProbability * (1 - array[i])
+    end
+    return 1 - oppositeEventProbability
+end
 ____exports.UnitBonusType = {}
 local UnitBonusType = ____exports.UnitBonusType
 do
@@ -56,6 +66,13 @@ do
     }
     UnitBonusType.DAMAGE_FACTOR = {reduce = product, valueByUnit = damageFactorByUnit, initialValue = 1}
     UnitBonusType.RECEIVED_DAMAGE_FACTOR = {reduce = product, valueByUnit = receivedDamageFactorByUnit, initialValue = 1}
+    UnitBonusType.EVASION_PROBABILITY = {
+        abilityTypeId = EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID,
+        field = EVASION_PROBABILITY_ABILITY_FIELD,
+        integer = false,
+        reduce = atLeastOnceProbability,
+        initialValue = 0
+    }
 end
 local bonusesByUnitByBonusType = {}
 local nextId = 1

package/engine/internal/unit/ignore-events-items.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/unit/ignore-events-items.lua

@@ -0,0 +1,5 @@
+local ____exports = {}
+---
+-- @internal For use by internal systems only.
+____exports.ignoreEventsItems = {}
+return ____exports

package/engine/internal/unit/item.lua

@@ -9,12 +9,12 @@ local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____utility = require("engine.internal.utility")
 local findUnitItemSlot = ____utility.findUnitItemSlot
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
 local rawset = _G.rawset
 local ____type = _G.type
 local isItemPowerup = IsItemPowerup
 local setItemBooleanField = BlzSetItemBooleanField
-local unitAddItem = UnitAddItem
-local unitDropItemSlot = UnitDropItemSlot
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
 local unitRemoveItemFromSlot = UnitRemoveItemFromSlot
@@ -47,8 +47,7 @@ function UnitItems.prototype.__newindex(self, slot, item)
         if isPowerup then
             setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
         end
-        unitAddItem(handle, itemHandle)
-        unitDropItemSlot(handle, itemHandle, slot - 1)
+        unitAddItemToSlot(handle, itemHandle, slot - 1)
         if isPowerup then
             setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
         end

package/engine/internal/unit+damage.d.ts

@@ -1,15 +1,6 @@
 /** @noSelfInFile */
 import { Widget } from "../../core/types/widget";
-export type AttackType = jattacktype;
-export declare namespace AttackType {
-    const SPELL: jattacktype;
-    const NORMAL: jattacktype;
-    const PIERCE: jattacktype;
-    const SIEGE: jattacktype;
-    const MAGIC: jattacktype;
-    const CHAOS: jattacktype;
-    const HERO: jattacktype;
-}
+import { AttackType } from "../object-data/auxiliary/attack-type";
 export type DamageType = jdamagetype;
 export declare namespace DamageType {
     const UNKNOWN: jdamagetype;
@@ -64,6 +55,6 @@ export declare namespace WeaponType {
 }
 declare module "./unit" {
     interface Unit {
-        damageTarget(target: Widget, amount: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType): boolean;
+        damageTarget(target: Widget, amount: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType, metadata?: unknown): boolean;
     }
 }

package/engine/internal/unit+damage.lua

@@ -7,21 +7,14 @@ local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
 local dummyUnitId = ____dummy.dummyUnitId
+local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
+local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage-metadata-by-target")
+local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
 local createUnit = CreateUnit
 local getOwningPlayer = GetOwningPlayer
 local showUnit = ShowUnit
 local unitDamageTarget = UnitDamageTarget
-____exports.AttackType = {}
-local AttackType = ____exports.AttackType
-do
-    AttackType.SPELL = ATTACK_TYPE_NORMAL
-    AttackType.NORMAL = ATTACK_TYPE_MELEE
-    AttackType.PIERCE = ATTACK_TYPE_PIERCE
-    AttackType.SIEGE = ATTACK_TYPE_SIEGE
-    AttackType.MAGIC = ATTACK_TYPE_MAGIC
-    AttackType.CHAOS = ATTACK_TYPE_CHAOS
-    AttackType.HERO = ATTACK_TYPE_HERO
-end
 ____exports.DamageType = {}
 local DamageType = ____exports.DamageType
 do
@@ -88,7 +81,7 @@ for ____, player in ipairs(Player.all) do
     showUnit(dummy, false)
     dummies[player] = dummy
 end
-Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, attackType, damageType, weaponType)
+Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, attackType, damageType, weaponType, metadata)
     if attack == nil then
         attack = false
     end
@@ -96,7 +89,7 @@ Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, att
         ranged = false
     end
     if attackType == nil then
-        attackType = ____exports.AttackType.SPELL
+        attackType = 0
     end
     if damageType == nil then
         damageType = ____exports.DamageType.MAGIC
@@ -109,13 +102,16 @@ Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, att
     if not getOwningPlayer(handle) then
         handle = dummies[__TS__InstanceOf(target, Unit) and target.owner or (self._owner or Player.neutralAggressive)]
     end
+    if __TS__InstanceOf(target, Unit) then
+        damageMetadataByTarget[target] = metadata
+    end
     return unitDamageTarget(
         handle,
         targetHandle,
         amount,
         attack,
         ranged,
-        attackType,
+        attackTypeToNative(attackType),
         damageType,
         weaponType
     )

package/engine/internal/unit+spellSteal.lua

@@ -6,7 +6,6 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____unit_2Bdamage = require("engine.internal.unit+damage")
-local AttackType = ____unit_2Bdamage.AttackType
 local DamageType = ____unit_2Bdamage.DamageType
 local ____event = require("event")
 local Event = ____event.Event
@@ -33,7 +32,7 @@ local spellStealEventStack = {}
 Unit.onDamaging:addListener(function(source, target, event)
     if event.amount == 0 and source ~= nil then
         local count = countByUnit[source] or 0
-        if count > 0 and event.attackType == AttackType.SPELL then
+        if count > 0 and event.attackType == 0 then
             if event.damageType == DamageType.UNKNOWN then
                 spellStealEventStack[#spellStealEventStack + 1] = {
                     sourceBuffIds = source.buffIds,