warscript 0.0.1-dev.f48f7bb → 0.0.1-dev.f9166a3

package/engine/internal/ability.d.ts

@@ -55,9 +55,13 @@ export declare class UnrecognizedAbility extends Ability {
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
+    private d?;
     constructor(handle: jability, typeId: number, owner: Unit);
     incrementHideCounter(): void;
     decrementHideCounter(): void;
+    incrementDisableCounter(): void;
+    decrementDisableCounter(): void;
+    get isDisabled(): boolean;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;

package/engine/internal/ability.lua

@@ -38,6 +38,7 @@ local getHandleId = GetHandleId
 local getItemBooleanField = BlzGetItemBooleanField
 local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
+local unitDisableAbility = BlzUnitDisableAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -402,9 +403,25 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.incrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, true, false)
+    self.d = (self.d or 0) + 1
+end
+function UnitAbility.prototype.decrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, false, false)
+    self.d = (self.d or 0) - 1
+end
 function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
+__TS__SetDescriptor(
+    UnitAbility.prototype,
+    "isDisabled",
+    {get = function(self)
+        return self.d ~= nil and self.d > 0
+    end},
+    true
+)
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",
@@ -454,8 +471,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"

package/engine/internal/item/ability.lua

@@ -16,6 +16,8 @@ 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
@@ -26,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
@@ -54,22 +55,24 @@ local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
     itemType.activelyUsed = true
     return itemType.id
 end)
-local dummy = assert(CreateUnit(
+---
+-- @internal For use by internal systems only.
+____exports.itemAbilityDummy = assert(CreateUnit(
     Player.neutralVictim.handle,
     dummyUnitId,
     0,
     0,
     270
 ))
-local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
+local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
 local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
-ShowUnit(dummy, false)
+ShowUnit(____exports.itemAbilityDummy, 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)
+    unitResetCooldown(____exports.itemAbilityDummy)
+    unitUseItem(____exports.itemAbilityDummy, cooldownStarterItem)
     Timer:run(restoreCooldownGroup, handle, cooldownGroup)
 end
 restoreCooldownGroup = function(handle, cooldownGroup)
@@ -84,7 +87,7 @@ ____exports.startItemCooldown = function(handle, owner, cooldown)
 end
 ---
 -- @internal For use by internal systems only.
-____exports.abilityActionDummy = dummy
+____exports.abilityActionDummy = ____exports.itemAbilityDummy
 ---
 -- @internal For use by internal systems only.
 ____exports.doAbilityAction = function(handle, action, ...)
@@ -103,11 +106,11 @@ ____exports.doAbilityAction = function(handle, action, ...)
         end
         x = getItemX(handle)
         y = getItemY(handle)
-        unitAddItem(dummy, handle)
+        unitAddItem(____exports.itemAbilityDummy, handle)
     end
     local result = action(handle, ...)
     if not isOwned then
-        unitRemoveItem(dummy, handle)
+        unitRemoveItem(____exports.itemAbilityDummy, handle)
         setItemPosition(handle, x, y)
         if isPowerup then
             setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
@@ -138,11 +141,10 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
         isPowerup = true
     end
     unitRemoveItem(owner, handle)
-    unitAddItem(dummy, handle)
+    unitAddItem(____exports.itemAbilityDummy, handle)
     local result = action(handle, ...)
-    unitRemoveItem(dummy, handle)
-    unitAddItem(owner, handle)
-    unitDropItemSlot(owner, handle, slot)
+    unitRemoveItem(____exports.itemAbilityDummy, handle)
+    unitAddItemToSlot(owner, handle, slot)
     if isPowerup then
         setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
     end

package/engine/internal/item.d.ts

@@ -5,8 +5,8 @@ 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 {
     ABILITIES = 100,
     LUA_INDEX_BY_ABILITY_TYPE_ID = 101
@@ -17,7 +17,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);
@@ -73,14 +73,17 @@ export declare class Item extends Handle<jitem> {
     set position(v: Vec2);
     set charges(v: number);
     get charges(): number;
+    consumeCharge(): boolean;
+    consumeCharges(count: number): boolean;
     addAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
     removeAbility(abilityTypeId: AbilityTypeId): boolean;
     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]>;
+    static readonly chargesChangedEvent: Event<[Item]>;
 }
 export {};

package/engine/internal/item.lua

@@ -1,20 +1,33 @@
 local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__Delete = ____lualib.__TS__Delete
 local ____exports = {}
+local invoke
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____event = require("event")
+local Event = ____event.Event
 local ____rect = require("core.types.rect")
 local Rect = ____rect.Rect
 local ____ability = require("engine.internal.ability")
 local ItemAbility = ____ability.ItemAbility
 local ____ability = require("engine.internal.item.ability")
 local doAbilityAction = ____ability.doAbilityAction
+local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
+local itemAbilityDummy = ____ability.itemAbilityDummy
+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 itemChargesChangeEvent = __TS__New(Event)
 local itemAddAbility = BlzItemAddAbility
 local itemRemoveAbility = BlzItemRemoveAbility
 local getItemAbility = BlzGetItemAbility
@@ -24,10 +37,32 @@ 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 getItemCharges = GetItemCharges
+local setItemCharges = SetItemCharges
+local unitRemoveAbility = UnitRemoveAbility
+local unitUseItem = UnitUseItem
+local unitUseItemPoint = UnitUseItemPoint
+local unitUseItemTarget = UnitUseItemTarget
+_G.SetItemCharges = function(whichItem, charges)
+    setItemCharges(whichItem, charges)
+    invoke(
+        itemChargesChangeEvent,
+        ____exports.Item:of(whichItem)
+    )
+end
 local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local getItemBooleanField = BlzGetItemBooleanField
+invoke = Event.invoke
 local enumRect = Rect:create(0, 0, 0, 0).handle
+---
+-- @internal For use by internal systems only.
 ____exports.addAndGetAbility = function(handle, abilityTypeId)
     if itemAddAbility(handle, abilityTypeId) then
         return getItemAbility(handle, abilityTypeId)
@@ -53,6 +88,49 @@ local function getItemAbilities(handle, item)
     end
     return abilities
 end
+local function consumeCharge(handle)
+    do
+        local i = 0
+        local ability = getItemAbilityByIndex(handle, i)
+        while ability ~= nil do
+            unitRemoveAbility(
+                itemAbilityDummy,
+                getAbilityId(ability)
+            )
+            do
+                i = i + 1
+                ability = getItemAbilityByIndex(handle, i)
+            end
+        end
+    end
+    return unitUseItem(itemAbilityDummy, handle) or unitUseItemPoint(itemAbilityDummy, handle, 0, 0) or unitUseItemTarget(itemAbilityDummy, handle, itemAbilityDummy)
+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"
@@ -78,6 +156,36 @@ end
 function Item.create(self, id, x, y, skinId)
     return self:of(BlzCreateItemWithSkin(id, x, y, skinId or id))
 end
+function Item.prototype.consumeCharge(self)
+    return self:consumeCharges(1)
+end
+function Item.prototype.consumeCharges(self, count)
+    local handle = self.handle
+    local charges = getItemCharges(handle)
+    if charges > count then
+        setItemCharges(handle, charges - count)
+        invoke(itemChargesChangeEvent, self)
+        return true
+    end
+    if charges == count then
+        if getItemBooleanField(handle, ITEM_BF_PERISHABLE) then
+            self:destroy()
+            return true
+        end
+        if not getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED) then
+            setItemCharges(handle, 0)
+            invoke(itemChargesChangeEvent, self)
+            return true
+        end
+        setItemCharges(handle, 1)
+        local ____doAbilityActionForceDummy_2 = doAbilityActionForceDummy
+        local ____opt_0 = self.owner
+        ____doAbilityActionForceDummy_2(handle, ____opt_0 and ____opt_0.handle, consumeCharge)
+        invoke(itemChargesChangeEvent, self)
+        return true
+    end
+    return false
+end
 function Item.prototype.addAbility(self, abilityTypeId)
     local nativeAbility = doAbilityAction(self.handle, ____exports.addAndGetAbility, abilityTypeId)
     if nativeAbility ~= nil then
@@ -111,34 +219,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,
@@ -270,7 +371,7 @@ __TS__SetDescriptor(
     "perishable",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
+            return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
         end,
         set = function(self, v)
             BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
@@ -526,10 +627,11 @@ __TS__SetDescriptor(
     "charges",
     {
         get = function(self)
-            return GetItemCharges(self.handle)
+            return getItemCharges(self.handle)
         end,
         set = function(self, v)
-            SetItemCharges(self.handle, v)
+            setItemCharges(self.handle, v)
+            invoke(itemChargesChangeEvent, self)
         end
     },
     true
@@ -551,11 +653,12 @@ __TS__ObjectDefineProperty(
 )
 __TS__ObjectDefineProperty(
     Item,
-    "onDestroy",
+    "destroyEvent",
     {get = function(self)
         return self.onDestroyEvent
     end}
 )
+Item.chargesChangedEvent = itemChargesChangeEvent
 local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()
 TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)

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/ability.d.ts

@@ -131,6 +131,11 @@ declare module "../unit" {
         const abilityNoTargetChannelingStartEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
+declare module "../unit" {
+    namespace Unit {
+        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
+    }
+}
 declare module "../unit" {
     namespace Unit {
         const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;

package/engine/internal/unit/ability.lua

@@ -21,6 +21,8 @@ local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
 local ____lazy = require("utility.lazy")
 local lazyRecord = ____lazy.lazyRecord
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
 local eventInvoke = Event.invoke
 local condition = Condition
 local createTrigger = CreateTrigger
@@ -345,6 +347,18 @@ rawset(
         extractAbilityTypeId
     )
 )
+local internalAbilityImpactEvent = __TS__New(Event)
+internalAbilityChannelingStartEvent:addListener(function(...)
+    Timer:run(eventInvoke, internalAbilityImpactEvent, ...)
+end)
+rawset(
+    Unit,
+    "abilityImpactEvent",
+    createDispatchingEvent(
+        createCommonEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
 rawset(
     Unit,
     "abilityChannelingFinishEvent",

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/allowed-targets.d.ts

@@ -2,7 +2,7 @@
 import { CombatClassifications } from "../../object-data/auxiliary/combat-classification";
 declare module "../unit" {
     interface Unit {
-        isAllowedTarget(this: Unit, source: Unit, allowedTargetCombatClassifications: CombatClassifications): boolean;
+        isAllowedTarget(this: Unit, source: Unit, allowedTargetCombatClassifications?: CombatClassifications): boolean;
     }
 }
 declare module "../unit" {

package/engine/internal/unit/allowed-targets.lua

@@ -5,7 +5,15 @@ local initializeFilterTargetState = ____combat_2Dclassification.initializeFilter
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 Unit.prototype.isAllowedTarget = function(self, source, allowedTargetCombatClassifications)
-    initializeFilterTargetState(source, allowedTargetCombatClassifications)
+    if allowedTargetCombatClassifications ~= nil then
+        initializeFilterTargetState(source, allowedTargetCombatClassifications)
+        return filterTarget(self)
+    end
+    initializeFilterTargetState(source, source.firstWeapon.allowedTargetCombatClassifications)
+    if filterTarget(self) then
+        return true
+    end
+    initializeFilterTargetState(source, source.secondWeapon.allowedTargetCombatClassifications)
     return filterTarget(self)
 end
 Unit.getAllowedTargetsInRange = function(source, allowedTargetCombatClassifications, x, y, range)

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;