warscript 0.0.1-dev.c826fde → 0.0.1-dev.c86de6d

package/engine/internal/ability.lua

@@ -35,8 +35,6 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
-local getItemBooleanField = BlzGetItemBooleanField
-local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
 local unitDisableAbility = BlzUnitDisableAbility
 local match = string.match
@@ -516,11 +514,13 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, 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)
+    local item = self.owner
+    local itemHandle = item.handle
+    local ____opt_1 = item.owner
+    local itemOwnerHandle = ____opt_1 and ____opt_1.handle
+    local cooldownRemaining = doAbilityActionForceDummy(itemHandle, itemOwnerHandle, getAbilityCooldown, self.typeId)
+    if cooldownRemaining == 0 then
+        startItemCooldown(itemHandle, itemOwnerHandle, 0.015625)
     end
 end
 function ItemAbility.prototype.onDestroy(self)
@@ -543,17 +543,17 @@ __TS__SetDescriptor(
     {
         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)
+            local ____doAbilityActionForceDummy_6 = doAbilityActionForceDummy
+            local ____item_handle_5 = item.handle
+            local ____opt_3 = item.owner
+            return ____doAbilityActionForceDummy_6(____item_handle_5, ____opt_3 and ____opt_3.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)
+            local ____startItemCooldown_10 = startItemCooldown
+            local ____item_handle_9 = item.handle
+            local ____opt_7 = item.owner
+            ____startItemCooldown_10(____item_handle_9, ____opt_7 and ____opt_7.handle, cooldownRemaining)
         end
     },
     true

package/engine/internal/item/fields.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+declare module "../item" {
+    interface Item {
+        canBeSold: boolean;
+    }
+}
+declare module "../item" {
+    interface Item {
+        isActivelyUsed: boolean;
+    }
+}
+export {};

package/engine/internal/item/fields.lua

@@ -0,0 +1,33 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____item = require("engine.standard.fields.item")
+local CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD = ____item.CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD
+local IS_ACTIVELY_USED_ITEM_FIELD = ____item.IS_ACTIVELY_USED_ITEM_FIELD
+__TS__ObjectDefineProperty(
+    Item.prototype,
+    "canBeSold",
+    {
+        get = function(self)
+            return CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Item.prototype,
+    "isActivelyUsed",
+    {
+        get = function(self)
+            return IS_ACTIVELY_USED_ITEM_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            IS_ACTIVELY_USED_ITEM_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

package/engine/internal/item.d.ts

@@ -8,10 +8,12 @@ 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;
 declare const enum ItemPropertyKey {
-    ABILITIES = 100
+    ABILITIES = 100,
+    DEATH_TRIGGER = 101
 }
 export declare class Item extends Handle<jitem> {
     private readonly [ItemPropertyKey.ABILITIES];
+    private readonly [ItemPropertyKey.DEATH_TRIGGER];
     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;
@@ -28,22 +30,18 @@ export declare class Item extends Handle<jitem> {
     get extendedTooltip(): string;
     set iconPath(v: string);
     get iconPath(): string;
-    set dropOnDeath(v: boolean);
-    get dropOnDeath(): boolean;
-    set droppable(v: boolean);
-    get droppable(): boolean;
-    set pawnable(v: boolean);
-    get pawnable(): boolean;
-    set perishable(v: boolean);
-    get perishable(): boolean;
-    set powerup(v: boolean);
-    get powerup(): boolean;
+    set dropsOnDeath(dropsOnDeath: boolean);
+    get dropsOnDeath(): boolean;
+    set canBeDropped(canBeDropped: boolean);
+    get canBeDropped(): boolean;
+    set perishes(perishes: boolean);
+    get perishes(): boolean;
+    set isPowerUp(isPowerUp: boolean);
+    get isPowerUp(): boolean;
     get isAlive(): boolean;
     get isDead(): boolean;
     set isInvulnerable(isInvulnerable: boolean);
     get isInvulnerable(): boolean;
-    set usable(v: boolean);
-    get usable(): boolean;
     set visible(v: boolean);
     get visible(): boolean;
     set level(v: number);
@@ -82,6 +80,7 @@ export declare class Item extends Handle<jitem> {
     static getInRect(rect: ReadonlyRect): Item[];
     static get onCreate(): Event<[Item]>;
     static get destroyEvent(): Event<[Item]>;
+    static readonly deathEvent: Event<[Item]>;
     static readonly chargesChangedEvent: Event<[Item]>;
 }
 export {};

package/engine/internal/item.lua

@@ -27,7 +27,13 @@ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slo
 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 ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local createTrigger = CreateTrigger
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterDeathEvent = TriggerRegisterDeathEvent
+local condition = Condition
+local destroyTrigger = DestroyTrigger
 local itemAddAbility = BlzItemAddAbility
 local itemRemoveAbility = BlzItemRemoveAbility
 local getItemAbility = BlzGetItemAbility
@@ -50,7 +56,17 @@ local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitUseItemPoint = UnitUseItemPoint
 local unitUseItemTarget = UnitUseItemTarget
+local setItemDropOnDeath = SetItemDropOnDeath
+local setItemDroppable = SetItemDroppable
+local getItemIntegerField = BlzGetItemIntegerField
+local setItemBooleanField = BlzSetItemBooleanField
+local getItemBooleanField = BlzGetItemBooleanField
+local getTriggerWidget = GetTriggerWidget
+local saveWidgetHandle = SaveWidgetHandle
+local loadItemHandle = LoadItemHandle
 local tableRemove = table.remove
+local itemChargesChangeEvent = __TS__New(Event)
+local itemDeathEvent = __TS__New(Event)
 _G.SetItemCharges = function(whichItem, charges)
     setItemCharges(whichItem, charges)
     invoke(
@@ -58,9 +74,6 @@ _G.SetItemCharges = function(whichItem, charges)
         ____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
 ---
@@ -133,6 +146,25 @@ local function collectIntoTargetRange()
         targetCollectionNextIndex = targetCollectionNextIndex + 1
     end
 end
+local hashtable = InitHashtable()
+local deathTriggerCondition = condition(function()
+    saveWidgetHandle(
+        hashtable,
+        1,
+        1,
+        getTriggerWidget()
+    )
+    local item = ____exports.Item:of(loadItemHandle(hashtable, 1, 1))
+    if item ~= nil then
+        invoke(itemDeathEvent, item)
+    end
+end)
+itemDeathEvent:addListener(
+    999999,
+    function(item)
+        Timer:run(item, "destroy")
+    end
+)
 ____exports.Item = __TS__Class()
 local Item = ____exports.Item
 Item.name = "Item"
@@ -140,6 +172,10 @@ __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
     self[100] = doAbilityAction(handle, getItemAbilities, self)
+    local deathTrigger = createTrigger()
+    triggerRegisterDeathEvent(deathTrigger, handle)
+    triggerAddCondition(deathTrigger, deathTriggerCondition)
+    self[101] = deathTrigger
 end
 function Item.prototype.onDestroy(self)
     local owner = self.owner
@@ -151,6 +187,7 @@ function Item.prototype.onDestroy(self)
         abilities[i]:destroy()
     end
     removeItem(self.handle)
+    destroyTrigger(self[101])
     return Handle.prototype.onDestroy(self)
 end
 function Item.create(self, id, x, y, skinId)
@@ -328,65 +365,55 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "dropOnDeath",
-    {
-        get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
-        end,
-        set = function(self, v)
-            SetItemDropOnDeath(self.handle, v)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    Item.prototype,
-    "droppable",
+    "dropsOnDeath",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
+            return getItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
         end,
-        set = function(self, v)
-            SetItemDroppable(self.handle, v)
+        set = function(self, dropsOnDeath)
+            setItemDropOnDeath(self.handle, dropsOnDeath)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "pawnable",
+    "canBeDropped",
     {
         get = function(self)
-            return IsItemPawnable(self.handle)
+            return getItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
         end,
-        set = function(self, v)
-            SetItemPawnable(self.handle, v)
+        set = function(self, canBeDropped)
+            setItemDroppable(self.handle, canBeDropped)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "perishable",
+    "perishes",
     {
         get = function(self)
             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
@@ -420,22 +447,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "usable",
-    {
-        get = function(self)
-            return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
-        end,
-        set = function(self, v)
-            local handle = self.handle
-            local powerup = isItemPowerup(handle)
-            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, v)
-            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerup)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "visible",
@@ -657,6 +668,7 @@ __TS__ObjectDefineProperty(
         return self.onDestroyEvent
     end}
 )
+Item.deathEvent = itemDeathEvent
 Item.chargesChangedEvent = itemChargesChangeEvent
 local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()

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

@@ -74,9 +74,12 @@ ____exports.castAbility = function(nativeUnit, abilityTypeId, prepareAbility, ..
         unitRemoveAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
         if latestInventoryAbilityTypeId ~= 0 then
             unitAddAbility(nativeUnit, latestInventoryAbilityTypeId)
-            for slot, nativeItem in pairs(nativeItemBySlot) do
-                unitAddItem(nativeUnit, nativeItem)
-                unitDropItemSlot(nativeUnit, nativeItem, slot)
+            for slot = 0, inventorySize - 1 do
+                local nativeItem = nativeItemBySlot[slot]
+                if nativeItem ~= nil then
+                    unitAddItem(nativeUnit, nativeItem)
+                    unitDropItemSlot(nativeUnit, nativeItem, slot)
+                end
             end
         end
     end

package/engine/internal/object-data/attribute-bonus.lua

@@ -1,6 +1,6 @@
 local ____exports = {}
-local ____attribute_2Dincrease = require("engine.object-data.entry.ability-type.attribute-increase")
-local AttributeBonusAbilityType = ____attribute_2Dincrease.AttributeBonusAbilityType
+local ____attribute_2Dbonus = require("engine.object-data.entry.ability-type.attribute-bonus")
+local AttributeBonusAbilityType = ____attribute_2Dbonus.AttributeBonusAbilityType
 ---
 -- @internal For use by internal systems.
 ____exports.ATTRIBUTE_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()

package/engine/internal/object-data/health-bonus.d.ts

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

package/engine/internal/object-data/health-bonus.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____health_2Dbonus = require("engine.object-data.entry.ability-type.health-bonus")
+local HealthBonusAbilityType = ____health_2Dbonus.HealthBonusAbilityType
+---
+-- @internal For use by internal systems only.
+____exports.HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = HealthBonusAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.healthBonus = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.HEALTH_BONUS_DUMMY_ABILITY_FIELD = ABILITY_ILF_MAX_LIFE_GAINED
+return ____exports

package/engine/internal/object-data/mana-bonus.d.ts

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

package/engine/internal/object-data/mana-bonus.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dbonus = require("engine.object-data.entry.ability-type.mana-bonus")
+local ManaBonusAbilityType = ____mana_2Dbonus.ManaBonusAbilityType
+---
+-- @internal For use by internal systems only.
+____exports.MANA_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaBonusAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaBonus = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.MANA_BONUS_DUMMY_ABILITY_FIELD = ABILITY_ILF_MAX_MANA_GAINED
+return ____exports

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts

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

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dregeneration = require("engine.object-data.entry.ability-type.mana-regeneration")
+local ManaRegenerationAbilityType = ____mana_2Dregeneration.ManaRegenerationAbilityType
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaRegenerationAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaRegenerationRateIncreaseFactor = 4
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_MANA_REGENERATION_BONUS_AS_FRACTION_OF_NORMAL
+return ____exports

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

@@ -133,55 +133,55 @@ declare module "../unit" {
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
+        const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
+        const abilityCommandEvent: {
+            readonly [abilityTypeId: number]: {
+                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
+            };
+        };
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
+        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
+        const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
+        const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityCommandEvent: {
-            readonly [abilityTypeId: number]: {
-                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
-            };
-        };
+        const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }

package/engine/internal/unit/ability.lua

@@ -22,7 +22,12 @@ 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
@@ -347,10 +352,65 @@ rawset(
         extractAbilityTypeId
     )
 )
+local internalAbilityChannelingFinishEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters)
+rawset(
+    Unit,
+    "abilityChannelingFinishEvent",
+    createDispatchingEvent(internalAbilityChannelingFinishEvent, extractAbilityTypeId)
+)
+local internalAbilityStopEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters)
+rawset(
+    Unit,
+    "abilityStopEvent",
+    createDispatchingEvent(internalAbilityStopEvent, 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:getAbility(abilityTypeId)
+                                if ability ~= nil then
+                                    eventInvoke(event, unit, ability, orderTypeStringId)
+                                end
+                            end
+                        end)
+                    )
+                end
+            )
+        end)
+    end)
+)
 local internalAbilityImpactEvent = __TS__New(Event)
-internalAbilityChannelingStartEvent:addListener(function(...)
-    Timer:run(eventInvoke, internalAbilityImpactEvent, ...)
-end)
+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",
@@ -407,47 +467,14 @@ rawset(
         extractAbilityTypeId
     )
 )
-rawset(
-    Unit,
-    "abilityChannelingFinishEvent",
-    createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters),
-        extractAbilityTypeId
-    )
-)
-rawset(
-    Unit,
-    "abilityStopEvent",
-    createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters),
-        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:getAbility(abilityTypeId)
-                                if ability ~= nil then
-                                    eventInvoke(event, unit, ability, orderTypeStringId)
-                                end
-                            end
-                        end)
-                    )
-                end
-            )
-        end)
-    end)
+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/attributes.d.ts

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        strengthBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        agilityBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        intelligenceBase: number;
+    }
+}
+export {};