warscript 0.0.1-dev.96a6f7e → 0.0.1-dev.971c803

package/engine/internal/ability.lua

@@ -10,7 +10,10 @@ local ____exports = {}
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____ability = require("engine.internal.item.ability")
+local abilityActionDummy = ____ability.abilityActionDummy
 local doAbilityAction = ____ability.doAbilityAction
+local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
+local startItemCooldown = ____ability.startItemCooldown
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local setUnitAbilityLevel = SetUnitAbilityLevel
 local setAbilityIntegerField = BlzSetAbilityIntegerField
@@ -32,6 +35,9 @@ 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
 local ____tostring = _G.tostring
@@ -295,10 +301,18 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Ability.prototype,
-    "orderId",
+    "orderTypeStringId",
     {get = function(self)
         local field = orderIdFieldByParentTypeId[self.parentTypeId]
-        return order2orderId(field ~= nil and getAbilityStringLevelField(self.handle, ABILITY_SLF_BASE_ORDER_ID_NCL6, self.level) or (orders[self.parentTypeId] or ""))
+        return field ~= nil and getAbilityStringLevelField(self.handle, field, self.level) or (orders[self.parentTypeId] or "")
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Ability.prototype,
+    "orderTypeId",
+    {get = function(self)
+        return order2orderId(self.orderTypeStringId)
     end},
     true
 )
@@ -317,6 +331,17 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Ability.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+        end,
+        set = function(self, cooldownRemaining)
+        end
+    },
+    true
+)
 __TS__ObjectDefineProperty(
     Ability,
     "onCreate",
@@ -340,6 +365,8 @@ function UnrecognizedAbility.prototype.____constructor(self, typeId, owner)
     UnrecognizedAbility.____super.prototype.____constructor(self, nil, typeId)
     self.owner = owner
 end
+function UnrecognizedAbility.prototype.interruptCast(self)
+end
 __TS__SetDescriptor(
     UnrecognizedAbility.prototype,
     "level",
@@ -348,6 +375,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    UnrecognizedAbility.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+            return 0
+        end,
+        set = function(self, _)
+        end
+    },
+    true
+)
 ____exports.UnitAbility = __TS__Class()
 local UnitAbility = ____exports.UnitAbility
 UnitAbility.name = "UnitAbility"
@@ -357,6 +396,15 @@ function UnitAbility.prototype.____constructor(self, handle, typeId, owner)
     self.owner = owner
     self.u = owner.handle
 end
+function UnitAbility.prototype.incrementHideCounter(self)
+    unitHideAbility(self.u, self.typeId, true)
+end
+function UnitAbility.prototype.decrementHideCounter(self)
+    unitHideAbility(self.u, self.typeId, false)
+end
+function UnitAbility.prototype.interruptCast(self)
+    self.owner:interruptCast(self.typeId)
+end
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",
@@ -377,8 +425,8 @@ __TS__SetDescriptor(
         get = function(self)
             return getUnitAbilityCooldownRemaining(self.u, self.typeId)
         end,
-        set = function(self, v)
-            startUnitAbilityCooldown(self.u, self.typeId, v)
+        set = function(self, cooldownRemaining)
+            startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
         end
     },
     true
@@ -403,6 +451,9 @@ end
 local function setAbilityField(_, ability, field, levelOrValue, value)
     return ____exports.Ability.prototype.setField(ability, field, levelOrValue, value)
 end
+local function getAbilityCooldown(_, abilityTypeId)
+    return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
+end
 ____exports.ItemAbility = __TS__Class()
 local ItemAbility = ____exports.ItemAbility
 ItemAbility.name = "ItemAbility"
@@ -430,6 +481,14 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
         value
     )
 end
+function ItemAbility.prototype.interruptCast(self)
+    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,
     "level",
@@ -438,6 +497,27 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    ItemAbility.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+            local item = self.owner
+            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_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
+)
 __TS__ObjectDefineProperty(
     ItemAbility,
     "onCreate",

package/engine/internal/item/ability.lua

@@ -1,16 +1,60 @@
 local ____exports = {}
+local restoreCooldownGroup
 local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
 local dummyUnitId = ____dummy.dummyUnitId
+local ____utility = require("engine.internal.utility")
+local findUnitItemSlot = ____utility.findUnitItemSlot
+local ____blank = require("engine.object-data.entry.item-type.blank")
+local BlankItemType = ____blank.BlankItemType
+local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
+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
 local getItemY = GetItemY
+local setAbilityRealLevelField = BlzSetAbilityRealLevelField
+local setItemIntegerField = BlzSetItemIntegerField
+local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local setItemPosition = SetItemPosition
 local unitAddItem = UnitAddItem
 local unitRemoveItem = UnitRemoveItem
+local unitUseItem = UnitUseItem
+local unitResetCooldown = UnitResetCooldown
+local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
+    if not currentMap then
+        return 0
+    end
+    local abilityType = currentMap.objects.ability:newObject(
+        util.id2s(abilityTypeIdGenerator:next()),
+        "Absk"
+    )
+    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
+    return itemType.id
+end)
 local dummy = assert(CreateUnit(
     Player.neutralVictim.handle,
     dummyUnitId,
@@ -18,10 +62,37 @@ local dummy = assert(CreateUnit(
     0,
     270
 ))
+local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
+local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
 ShowUnit(dummy, false)
+local function startItemCooldownInternal(handle, cooldown)
+    local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
+    setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, COOLDOWN_STARTER_ABILITY_TYPE_ID)
+    setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
+    unitResetCooldown(dummy)
+    unitUseItem(dummy, cooldownStarterItem)
+    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.
+____exports.startItemCooldown = function(handle, owner, cooldown)
+    ____exports.doAbilityActionForceDummy(handle, owner, startItemCooldownInternal, cooldown)
+end
+---
+-- @internal For use by internal systems only.
+____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
@@ -43,6 +114,41 @@ ____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
+---
+-- @internal For use by internal systems only.
+____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
+    if owner == nil then
+        return ____exports.doAbilityAction(handle, action, ...)
+    end
+    local slot = findUnitItemSlot(owner, handle)
+    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)
+        isPowerup = true
+    end
+    unitRemoveItem(owner, handle)
+    unitAddItem(dummy, handle)
+    local result = action(handle, ...)
+    unitRemoveItem(dummy, handle)
+    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/misc/ability-disable-counter.d.ts

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

package/engine/internal/misc/ability-disable-counter.lua

@@ -0,0 +1,13 @@
+local ____exports = {}
+local disableAbility = BlzUnitDisableAbility
+---
+-- @internal For use by internal systems only.
+____exports.increaseAbilityDisableCounter = function(unit, abilityTypeId, times)
+    for _ = 1, times do
+        disableAbility(unit, abilityTypeId, true, false)
+    end
+    for _ = times, -1 do
+        disableAbility(unit, abilityTypeId, false, false)
+    end
+end
+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/ability.d.ts

@@ -3,7 +3,7 @@ import { Ability } from "../ability";
 import { Destructable } from "../../../core/types/destructable";
 import { Item } from "../item";
 import { Widget } from "../../../core/types/widget";
-import { DispatchingEvent } from "../../../event";
+import { DispatchingEvent, Event } from "../../../event";
 declare module "../unit" {
     namespace Unit {
         const abilityCastingStartEvent: DispatchingEvent<[Unit, Ability]>;
@@ -141,3 +141,12 @@ declare module "../unit" {
         const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
+declare module "../unit" {
+    namespace Unit {
+        const abilityCommandEvent: {
+            readonly [abilityTypeId: number]: {
+                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
+            };
+        };
+    }
+}

package/engine/internal/unit/ability.lua

@@ -15,8 +15,15 @@ local UnitTriggerEvent = ____unit.UnitTriggerEvent
 local ____event = require("event")
 local createDispatchingEvent = ____event.createDispatchingEvent
 local DependentInitializingEvent = ____event.DependentInitializingEvent
+local Event = ____event.Event
+local InitializingEvent = ____event.InitializingEvent
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
+local ____lazy = require("utility.lazy")
+local lazyRecord = ____lazy.lazyRecord
+local eventInvoke = Event.invoke
+local condition = Condition
+local createTrigger = CreateTrigger
 local getItemAbility = BlzGetItemAbility
 local getSpellAbility = GetSpellAbility
 local getSpellAbilityId = GetSpellAbilityId
@@ -26,11 +33,10 @@ local getSpellTargetUnit = GetSpellTargetUnit
 local getSpellTargetX = GetSpellTargetX
 local getSpellTargetY = GetSpellTargetY
 local getTriggerUnit = GetTriggerUnit
-local getUnitAbility = BlzGetUnitAbility
-local unitAddAbility = UnitAddAbility
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterCommandEvent = TriggerRegisterCommandEvent
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
-local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
         return __TS__New(
@@ -39,17 +45,6 @@ local function retrieveAbility(unit, ability, abilityId)
             Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -366,4 +361,31 @@ rawset(
         extractAbilityTypeId
     )
 )
+rawset(
+    Unit,
+    "abilityCommandEvent",
+    lazyRecord(function(abilityTypeId)
+        return lazyRecord(function(orderTypeStringId)
+            return __TS__New(
+                InitializingEvent,
+                function(event)
+                    local trigger = createTrigger()
+                    triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
+                    triggerAddCondition(
+                        trigger,
+                        condition(function()
+                            local unit = Unit:of(getTriggerUnit())
+                            if unit ~= nil then
+                                local ability = unit:getAbilityById(abilityTypeId)
+                                if ability ~= nil then
+                                    eventInvoke(event, unit, ability, orderTypeStringId)
+                                end
+                            end
+                        end)
+                    )
+                end
+            )
+        end)
+    end)
+)
 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,50 @@
+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
+local 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(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.d.ts

@@ -11,6 +11,7 @@ export interface UnitItems extends ReadonlyArray<Item | undefined> {
 }
 export declare class UnitItems {
     constructor(handle: junit);
+    findSlot(item: Item): 0 | 1 | 2 | 3 | 4 | 5 | undefined;
     protected __newindex(slot: number, item: Item | undefined): void;
     protected __index(key: string | number): unknown;
     protected __len(): number;

package/engine/internal/unit/item.lua

@@ -7,12 +7,14 @@ local ____item = require("engine.internal.item")
 local Item = ____item.Item
 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
@@ -30,6 +32,9 @@ UnitItems.name = "UnitItems"
 function UnitItems.prototype.____constructor(self, handle)
     handleByUnitItems[self] = handle
 end
+function UnitItems.prototype.findSlot(self, item)
+    return findUnitItemSlot(handleByUnitItems[self], item.handle)
+end
 function UnitItems.prototype.__newindex(self, slot, item)
     local handle = handleByUnitItems[self]
     if slot < 1 or slot > unitInventorySize(handle) then
@@ -42,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/main-selected.d.ts

@@ -0,0 +1,13 @@
+/** @noSelfInFile */
+import { Player } from "../../../core/types/player";
+import { Event } from "../../../event";
+declare module "../unit" {
+    namespace Unit {
+        const mainSelectedUnitChangeEvent: Event<[Player]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const getMainSelectedOf: (player: Player) => Unit | undefined;
+    }
+}