warscript 0.0.1-dev.d18f377 → 0.0.1-dev.d1b563b

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,34 @@ 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 unitRemoveItem = UnitRemoveItem
+local unitUseItem = UnitUseItem
+local unitUseItemPoint = UnitUseItemPoint
+local unitUseItemTarget = UnitUseItemTarget
+local tableRemove = table.remove
+_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,21 +90,62 @@ 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"
 __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
-    local abilities = doAbilityAction(handle, getItemAbilities, self)
-    self[100] = abilities
-    local luaIndexByAbilityTypeId = {}
-    for i = 1, #abilities do
-        luaIndexByAbilityTypeId[abilities[i].typeId] = i
-    end
-    self[101] = luaIndexByAbilityTypeId
+    self[100] = doAbilityAction(handle, getItemAbilities, self)
 end
 function Item.prototype.onDestroy(self)
+    local owner = self.owner
+    if owner ~= nil then
+        unitRemoveItem(owner.handle, self.handle)
+    end
     local abilities = self[100]
     for i = 1, #abilities do
         abilities[i]:destroy()
@@ -78,67 +156,89 @@ 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
         local ability = ItemAbility:of(nativeAbility, abilityTypeId, self)
         local abilities = self[100]
-        local luaIndex = #abilities + 1
-        abilities[luaIndex] = ability
-        self[101][abilityTypeId] = luaIndex
+        abilities[#abilities + 1] = ability
         return ability
     end
     return nil
 end
 function Item.prototype.removeAbility(self, abilityTypeId)
-    local luaIndexByAbilityTypeId = self[101]
-    local luaIndex = luaIndexByAbilityTypeId[abilityTypeId]
-    if luaIndex ~= nil and doAbilityAction(self.handle, itemRemoveAbility, abilityTypeId) then
-        luaIndexByAbilityTypeId[abilityTypeId] = nil
-        local abilities = self[100]
-        abilities[luaIndex]:destroy()
-        local abilityTypeIdsLength = #abilities
-        for j = luaIndex, abilityTypeIdsLength do
-            abilities[j] = abilities[j + 1]
+    local abilities = self[100]
+    for i = 1, #abilities do
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
+            tableRemove(abilities, i)
+            ability:destroy()
+            return true
         end
     end
-    return false
+    return doAbilityAction(self.handle, itemRemoveAbility, abilityTypeId)
 end
 function Item.prototype.hasAbility(self, abilityTypeId)
-    return self[101][abilityTypeId] ~= nil
+    return doAbilityAction(self.handle, getItemAbility, abilityTypeId) ~= nil
 end
 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(
-        enumRect,
-        pos.x - range,
-        pos.y - range,
-        pos.x + range,
-        pos.y + range
+    return ItemAbility:of(
+        doAbilityAction(self.handle, getItemAbility, abilityTypeId),
+        abilityTypeId,
+        self
     )
-    EnumItemsInRect(
+end
+function Item.getInRange(self, x, y, range)
+    targetCollection = {}
+    targetCollectionNextIndex = 1
+    centerX = x
+    centerY = y
+    enumRange = range
+    setRect(
         enumRect,
-        nil,
-        function()
-            collection[#collection + 1] = self:of(GetEnumItem())
-        end
+        x - range,
+        y - range,
+        x + range,
+        y + range
     )
-    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 +370,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 +626,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 +652,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/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/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/misc/frame-coordinates.d.ts

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

package/engine/internal/misc/frame-coordinates.lua

@@ -0,0 +1,21 @@
+local ____exports = {}
+local getLocalClientWidth = BlzGetLocalClientWidth
+local getLocalClientHeight = BlzGetLocalClientHeight
+---
+-- @internal For use by internal systems only.
+____exports.getFrameMinXMaxX = function()
+    local w = getLocalClientWidth()
+    local h = getLocalClientHeight()
+    local width4by3 = (w - h / 600 * 800) / 2
+    local pxtodpi = 0.6 / h
+    local minX = -width4by3 * pxtodpi
+    local maxX = minX + w * pxtodpi
+    return minX, maxX
+end
+---
+-- @internal For use by internal systems only.
+____exports.FRAME_MIN_Y = 0
+---
+-- @internal For use by internal systems only.
+____exports.FRAME_MAX_Y = 0.6
+return ____exports

package/engine/internal/misc/get-terrain-z.d.ts

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

package/engine/internal/misc/get-terrain-z.lua

@@ -0,0 +1,11 @@
+local ____exports = {}
+local getLocationZ = GetLocationZ
+local moveLocation = MoveLocation
+local location = Location(0, 0)
+---
+-- @internal For use by internal systems only.
+____exports.getTerrainZ = function(x, y)
+    moveLocation(location, x, y)
+    return getLocationZ(location)
+end
+return ____exports

package/engine/internal/misc/player-local-handle.d.ts

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

package/engine/internal/misc/player-local-handle.lua

@@ -0,0 +1,5 @@
+local ____exports = {}
+---
+-- @internal For use by internal systems only.
+____exports.PLAYER_LOCAL_HANDLE = GetLocalPlayer()
+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,41 @@ declare module "../unit" {
         const abilityNoTargetChannelingStartEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
+declare module "../unit" {
+    namespace Unit {
+        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityNoTargetImpactEvent: 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,66 @@ rawset(
         extractAbilityTypeId
     )
 )
+local internalAbilityImpactEvent = __TS__New(Event)
+internalAbilityChannelingStartEvent:addListener(function(...)
+    Timer:run(eventInvoke, internalAbilityImpactEvent, ...)
+end)
+rawset(
+    Unit,
+    "abilityImpactEvent",
+    createDispatchingEvent(
+        createCommonEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityWidgetTargetImpactEvent",
+    createDispatchingEvent(
+        createWidgetTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityUnitTargetImpactEvent",
+    createDispatchingEvent(
+        createUnitTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityItemTargetImpactEvent",
+    createDispatchingEvent(
+        createItemTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityDestructibleTargetImpactEvent",
+    createDispatchingEvent(
+        createDestructibleTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityPointTargetImpactEvent",
+    createDispatchingEvent(
+        createPointTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityNoTargetImpactEvent",
+    createDispatchingEvent(
+        createNoTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
 rawset(
     Unit,
     "abilityChannelingFinishEvent",
@@ -376,7 +438,7 @@ rawset(
                         condition(function()
                             local unit = Unit:of(getTriggerUnit())
                             if unit ~= nil then
-                                local ability = unit:getAbilityById(abilityTypeId)
+                                local ability = unit:getAbility(abilityTypeId)
                                 if ability ~= nil then
                                     eventInvoke(event, unit, ability, orderTypeStringId)
                                 end

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)