warscript 0.0.1-dev.8bfb72f → 0.0.1-dev.8dbb0ee

package/engine/internal/item.lua

@@ -1,24 +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
@@ -32,10 +41,34 @@ 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 setItemDropOnDeath = SetItemDropOnDeath
+local setItemDroppable = SetItemDroppable
+local setItemPawnable = SetItemPawnable
+local isItemPawnable = IsItemPawnable
 local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local getItemBooleanField = BlzGetItemBooleanField
+local tableRemove = table.remove
+_G.SetItemCharges = function(whichItem, charges)
+    setItemCharges(whichItem, charges)
+    invoke(
+        itemChargesChangeEvent,
+        ____exports.Item:of(whichItem)
+    )
+end
+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)
@@ -61,13 +94,46 @@ 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(getEnumItem())
+        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
@@ -77,15 +143,13 @@ 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()
@@ -96,42 +160,74 @@ 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
+    return ItemAbility:of(
+        doAbilityAction(self.handle, getItemAbility, abilityTypeId),
+        abilityTypeId,
+        self
+    )
 end
 function Item.getInRange(self, x, y, range)
     targetCollection = {}
     targetCollectionNextIndex = 1
+    centerX = x
+    centerY = y
+    enumRange = range
     setRect(
         enumRect,
         x - range,
@@ -139,7 +235,7 @@ function Item.getInRange(self, x, y, range)
         x + range,
         y + range
     )
-    enumItemsInRect(enumRect, nil, collectIntoTarget)
+    enumItemsInRect(enumRect, nil, collectIntoTargetRange)
     return targetCollection
 end
 function Item.getInRect(self, rect)
@@ -236,65 +332,68 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "dropOnDeath",
+    "dropsOnDeath",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
+            return getItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
         end,
-        set = function(self, v)
-            SetItemDropOnDeath(self.handle, v)
+        set = function(self, dropsOnDeath)
+            setItemDropOnDeath(self.handle, dropsOnDeath)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "droppable",
+    "canBeDropped",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
+            return getItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
         end,
-        set = function(self, v)
-            SetItemDroppable(self.handle, v)
+        set = function(self, canBeDropped)
+            setItemDroppable(self.handle, canBeDropped)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "pawnable",
+    "canBeSold",
     {
         get = function(self)
-            return IsItemPawnable(self.handle)
+            return isItemPawnable(self.handle)
         end,
-        set = function(self, v)
-            SetItemPawnable(self.handle, v)
+        set = function(self, canBeSold)
+            setItemPawnable(self.handle, canBeSold)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "perishable",
+    "perishes",
     {
         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)
+        set = function(self, perishes)
+            local handle = self.handle
+            local powerUp = isItemPowerup(handle)
+            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
+            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "powerup",
+    "isPowerUp",
     {
         get = function(self)
             return isItemPowerup(self.handle)
         end,
-        set = function(self, v)
-            setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, v)
+        set = function(self, isPowerUp)
+            setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, isPowerUp)
         end
     },
     true
@@ -330,16 +429,24 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "usable",
+    "isActivelyUsed",
     {
         get = function(self)
             return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
         end,
-        set = function(self, v)
+        set = function(self, isActivelyUsed)
             local handle = self.handle
-            local powerup = isItemPowerup(handle)
-            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, v)
-            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerup)
+            local powerUp = isItemPowerup(handle)
+            local perishes = getItemBooleanField(handle, ITEM_BF_PERISHABLE)
+            local dropsOnDeath = getItemBooleanField(handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
+            local canBeDropped = getItemBooleanField(handle, ITEM_BF_CAN_BE_DROPPED)
+            local canBeSold = isItemPawnable(handle)
+            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, isActivelyUsed)
+            setItemPawnable(handle, canBeSold)
+            setItemDroppable(handle, canBeDropped)
+            setItemDropOnDeath(handle, dropsOnDeath)
+            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
+            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
         end
     },
     true
@@ -534,10 +641,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
@@ -564,6 +672,7 @@ __TS__ObjectDefineProperty(
         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/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/unit/ability.d.ts

@@ -150,3 +150,38 @@ declare module "../unit" {
         };
     }
 }
+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]>;
+    }
+}

package/engine/internal/unit/ability.lua

@@ -21,6 +21,13 @@ 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 consumeZeroTimerCallback = ____timer.consumeZeroTimerCallback
+local Timer = ____timer.Timer
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
 local eventInvoke = Event.invoke
 local condition = Condition
 local createTrigger = CreateTrigger
@@ -345,21 +352,17 @@ rawset(
         extractAbilityTypeId
     )
 )
+local internalAbilityChannelingFinishEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters)
 rawset(
     Unit,
     "abilityChannelingFinishEvent",
-    createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters),
-        extractAbilityTypeId
-    )
+    createDispatchingEvent(internalAbilityChannelingFinishEvent, extractAbilityTypeId)
 )
+local internalAbilityStopEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters)
 rawset(
     Unit,
     "abilityStopEvent",
-    createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters),
-        extractAbilityTypeId
-    )
+    createDispatchingEvent(internalAbilityStopEvent, extractAbilityTypeId)
 )
 rawset(
     Unit,
@@ -376,7 +379,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
@@ -388,4 +391,90 @@ rawset(
         end)
     end)
 )
+local internalAbilityImpactEvent = __TS__New(Event)
+local impactCallbackIdAttribute = attribute()
+local function invokeImpactEvent(unit, ability, ...)
+    ability[impactCallbackIdAttribute] = nil
+    eventInvoke(internalAbilityImpactEvent, unit, ability, ...)
+end
+internalAbilityChannelingStartEvent:addListener(
+    999999,
+    function(unit, ability, ...)
+        ability[impactCallbackIdAttribute] = Timer:run(invokeImpactEvent, unit, ability, ...)
+    end
+)
+local function consumeImpactCallback(_, ability)
+    local impactCallbackId = ability[impactCallbackIdAttribute]
+    if impactCallbackId ~= nil then
+        consumeZeroTimerCallback(impactCallbackId)
+    end
+end
+internalAbilityChannelingFinishEvent:addListener(999999, consumeImpactCallback)
+internalAbilityStopEvent:addListener(999999, consumeImpactCallback)
+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
+    )
+)
+local spellEffectOnlyAbilityTypeIds = luaSetOf(fourCC("AAns"))
+internalAbilityChannelingStartEvent:addListener(
+    -999999,
+    function(unit, ability)
+        if spellEffectOnlyAbilityTypeIds[ability.parentTypeId] ~= nil then
+            eventInvoke(internalAbilityChannelingFinishEvent, unit, ability)
+            eventInvoke(internalAbilityStopEvent, unit, ability)
+        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)