warscript 0.0.1-dev.7b00732 → 0.0.1-dev.7cd1850

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

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

package/engine/internal/unit/ability.lua

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

package/engine/internal/unit/add-item-to-slot-init.d.ts

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

package/engine/internal/unit/add-item-to-slot-init.lua

@@ -0,0 +1,23 @@
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local fillerItems = ____add_2Ditem_2Dto_2Dslot.fillerItems
+local unitsWithFillerItems = ____add_2Ditem_2Dto_2Dslot.unitsWithFillerItems
+local setItemVisible = SetItemVisible
+local unitRemoveItem = UnitRemoveItem
+Unit.itemPickedUpEvent:addListener(
+    4,
+    function(unit)
+        local handle = unit.handle
+        if unitsWithFillerItems[handle] ~= nil then
+            for previousSlot = 1, 6 do
+                local fillerItem = fillerItems[previousSlot]
+                unitRemoveItem(handle, fillerItem)
+                setItemVisible(fillerItem, false)
+            end
+            unitsWithFillerItems[handle] = nil
+        end
+    end
+)
+return ____exports

package/engine/internal/unit/add-item-to-slot.d.ts

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

package/engine/internal/unit/add-item-to-slot.lua

@@ -0,0 +1,50 @@
+local ____exports = {}
+local ____blank = require("engine.object-data.entry.item-type.blank")
+local BlankItemType = ____blank.BlankItemType
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local setItemVisible = SetItemVisible
+local unitAddItem = UnitAddItem
+local unitItemInSlot = UnitItemInSlot
+local unitRemoveItem = UnitRemoveItem
+local FILLER_ITEM_TYPE_ID = compiletime(function()
+    local itemType = BlankItemType:create()
+    itemType.name = "[Warscript/Dummy] Slot Filler"
+    return itemType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.fillerItems = array(
+    6,
+    function()
+        local item = CreateItem(FILLER_ITEM_TYPE_ID, 0, 0)
+        setItemVisible(item, false)
+        ignoreEventsItems[item] = true
+        return item
+    end
+)
+---
+-- @internal For use by internal systems only.
+____exports.unitsWithFillerItems = {}
+---
+-- @internal For use by internal systems only.
+____exports.unitAddItemToSlot = function(unit, item, slot)
+    for previousSlot = 0, slot - 1 do
+        if unitItemInSlot(unit, previousSlot) == nil then
+            unitAddItem(unit, ____exports.fillerItems[previousSlot + 1])
+            ____exports.unitsWithFillerItems[unit] = true
+        end
+    end
+    unitAddItem(unit, item)
+    if ____exports.unitsWithFillerItems[unit] ~= nil then
+        for previousSlot = 0, slot - 1 do
+            local fillerItem = ____exports.fillerItems[previousSlot + 1]
+            unitRemoveItem(unit, fillerItem)
+            setItemVisible(fillerItem, false)
+        end
+        ____exports.unitsWithFillerItems[unit] = nil
+    end
+end
+return ____exports

package/engine/internal/unit/ignore-events-items.d.ts

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

package/engine/internal/unit/ignore-events-items.lua

@@ -0,0 +1,5 @@
+local ____exports = {}
+---
+-- @internal For use by internal systems only.
+____exports.ignoreEventsItems = {}
+return ____exports

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

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

package/engine/internal/unit/item.lua

@@ -7,12 +7,14 @@ local ____item = require("engine.internal.item")
 local Item = ____item.Item
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+local ____utility = require("engine.internal.utility")
+local findUnitItemSlot = ____utility.findUnitItemSlot
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
 local rawset = _G.rawset
 local ____type = _G.type
 local isItemPowerup = IsItemPowerup
 local setItemBooleanField = BlzSetItemBooleanField
-local unitAddItem = UnitAddItem
-local unitDropItemSlot = UnitDropItemSlot
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
 local unitRemoveItemFromSlot = UnitRemoveItemFromSlot
@@ -30,6 +32,9 @@ UnitItems.name = "UnitItems"
 function UnitItems.prototype.____constructor(self, handle)
     handleByUnitItems[self] = handle
 end
+function UnitItems.prototype.findSlot(self, item)
+    return findUnitItemSlot(handleByUnitItems[self], item.handle)
+end
 function UnitItems.prototype.__newindex(self, slot, item)
     local handle = handleByUnitItems[self]
     if slot < 1 or slot > unitInventorySize(handle) then
@@ -42,8 +47,7 @@ function UnitItems.prototype.__newindex(self, slot, item)
         if isPowerup then
             setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
         end
-        unitAddItem(handle, itemHandle)
-        unitDropItemSlot(handle, itemHandle, slot - 1)
+        unitAddItemToSlot(handle, itemHandle, slot - 1)
         if isPowerup then
             setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
         end

package/engine/internal/unit/main-selected.d.ts

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

package/engine/internal/unit/main-selected.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____player = require("core.types.player")
 local Player = ____player.Player
@@ -8,6 +10,10 @@ local ____local_2Dclient = require("engine.local-client")
 local LocalClient = ____local_2Dclient.LocalClient
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+local ____event = require("event")
+local Event = ____event.Event
+local mainSelectedUnitChangeEvent = __TS__New(Event)
+rawset(Unit, "mainSelectedUnitChangeEvent", mainSelectedUnitChangeEvent)
 local mainSelectedUnitByPlayer = {}
 local syncSlider = BlzCreateFrameByType(
     "SLIDER",
@@ -27,7 +33,12 @@ BlzTriggerRegisterFrameEvent(trg, syncSlider, FRAMEEVENT_SLIDER_VALUE_CHANGED)
 TriggerAddAction(
     trg,
     function()
-        mainSelectedUnitByPlayer[Player:of(GetTriggerPlayer())] = Unit:getBySyncId(BlzGetTriggerFrameValue())
+        local player = Player:of(GetTriggerPlayer())
+        local mainSelectedUnit = Unit:getBySyncId(BlzGetTriggerFrameValue())
+        if mainSelectedUnit ~= mainSelectedUnitByPlayer[player] then
+            mainSelectedUnitByPlayer[player] = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, player)
+        end
     end
 )
 rawset(

package/engine/internal/unit.d.ts

@@ -133,6 +133,7 @@ export declare class Unit extends Handle<junit> {
     get isAlive(): boolean;
     get isDead(): boolean;
     get isIllusion(): boolean;
+    get isStunned(): boolean;
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
     hasCombatClassification(combatClassification: CombatClassification): boolean;
@@ -332,6 +333,13 @@ export declare class Unit extends Handle<junit> {
     static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
     static itemUsedEvent: UnitTriggerEvent<[Item]>;
     static itemStackedEvent: UnitTriggerEvent<[Item]>;
+    static get itemUseOrderEvent(): Event<[unit: Unit, item: Item]>;
+    static get itemMoveOrderEvent(): Event<[
+        unit: Unit,
+        item: Item,
+        slotFrom: 0 | 1 | 2 | 3 | 4 | 5,
+        slotTo: 0 | 1 | 2 | 3 | 4 | 5
+    ]>;
     static get onCreate(): EventDispatcher<[Unit], [Unit]>;
     static get destroyEvent(): EventDispatcher<[Unit], [Unit]>;
     getField(field: junitintegerfield | junitrealfield): number;

package/engine/internal/unit.lua

@@ -51,6 +51,8 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____math = require("math")
 local min = ____math.min
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
@@ -75,6 +77,7 @@ local setUnitScale = SetUnitScale
 local setUnitPosition = SetUnitPosition
 local setUnitTimeScale = SetUnitTimeScale
 local getHandleId = GetHandleId
+local getUnitCurrentOrder = GetUnitCurrentOrder
 local createUnit = CreateUnit
 local killUnit = KillUnit
 local setUnitExploded = SetUnitExploded
@@ -562,17 +565,6 @@ local function retrieveAbility(unit, ability, abilityId)
             ____exports.Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                ____exports.Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -940,8 +932,15 @@ function Unit.prototype.interruptAttack(self)
     unitInterruptAttack(self.handle)
 end
 function Unit.prototype.interruptCast(self, abilityId)
-    unitDisableAbility(self.handle, abilityId, true, false)
-    unitDisableAbility(self.handle, abilityId, false, false)
+    local handle = self.handle
+    unitDisableAbility(handle, abilityId, true, false)
+    Timer:run(
+        unitDisableAbility,
+        handle,
+        abilityId,
+        false,
+        false
+    )
 end
 function Unit.prototype.getDistanceTo(self, target)
     local handle = self.handle
@@ -1206,6 +1205,14 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "isStunned",
+    {get = function(self)
+        return getUnitCurrentOrder(self.handle) == orderId("stunned")
+    end},
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "combatClassifications",
@@ -2326,10 +2333,12 @@ Unit.onImmediateOrder = dispatchId(__TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_ISSUED_ORDER,
     function()
-        local unit = ____exports.Unit:of(getOrderedUnit())
-        local issuedOrderId = getIssuedOrderId()
-        if unit ~= nil and unit.state == 1 then
-            return unit, issuedOrderId
+        local handle = getOrderedUnit()
+        if handle ~= nil and getUnitTypeId(handle) ~= dummyUnitId then
+            local unit = ____exports.Unit:of(handle)
+            if unit.state == 1 then
+                return unit, getIssuedOrderId()
+            end
         end
         return IgnoreEvent
     end
@@ -2520,8 +2529,9 @@ Unit.itemDroppedEvent = __TS__New(
     EVENT_PLAYER_UNIT_DROP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
@@ -2531,8 +2541,9 @@ Unit.itemPickedUpEvent = __TS__New(
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
@@ -2540,13 +2551,65 @@ Unit.itemPickedUpEvent = __TS__New(
 Unit.itemUsedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_USE_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+    function()
+        local unit = getTriggerUnit()
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
+        end
+        return IgnoreEvent
+    end
 )
 Unit.itemStackedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_STACK_ITEM,
     function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
 )
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemUseOrderEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        for order = orderId("useslot0"), orderId("useslot5") do
+            local slot = order - orderId("useslot0")
+            local function listener(unit)
+                local item = unit.items[slot + 1]
+                if item ~= nil then
+                    invoke(event, unit, item)
+                end
+            end
+            self.onImmediateOrder[order]:addListener(listener)
+            self.onTargetOrder[order]:addListener(listener)
+            self.onPointOrder[order]:addListener(listener)
+        end
+        rawset(self, "itemUseOrderEvent", event)
+        return event
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemMoveOrderEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        for order = orderId("moveslot0"), orderId("moveslot5") do
+            local slotTo = order - orderId("moveslot0")
+            self.onTargetOrder[order]:addListener(function(unit, item)
+                local slotFrom = unit.items:findSlot(item)
+                if slotFrom ~= nil then
+                    invoke(
+                        event,
+                        unit,
+                        item,
+                        slotFrom,
+                        slotTo
+                    )
+                end
+            end)
+        end
+        rawset(self, "itemMoveOrderEvent", event)
+        return event
+    end}
+)
 __TS__ObjectDefineProperty(
     Unit,
     "onCreate",

package/engine/internal/utility.lua

@@ -1,6 +1,8 @@
 local ____exports = {}
 local getUnitAbility = BlzGetUnitAbility
 local unitAddAbility = UnitAddAbility
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
 local unitMakeAbilityPermanent = UnitMakeAbilityPermanent
 ---
 -- @internal For use by internal systems only.
@@ -10,4 +12,14 @@ ____exports.addInternalAbility = function(unit, abilityTypeId)
     end
     return getUnitAbility(unit, abilityTypeId)
 end
+---
+-- @internal For use by internal systems only.
+____exports.findUnitItemSlot = function(unit, item)
+    for slot = 0, unitInventorySize(unit) - 1 do
+        if item == unitItemInSlot(unit, slot) then
+            return slot
+        end
+    end
+    return nil
+end
 return ____exports

package/engine/local-client.lua

@@ -131,8 +131,9 @@ __TS__ObjectDefineProperty(
             localSelectedUnits[i] = nil
         end
         if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
-            Event.invoke(mainSelectedUnitChangeEvent, previousMainSelectedUnit, mainSelectedUnit)
+            local previousPreviousMainSelectedUnit = previousMainSelectedUnit
             previousMainSelectedUnit = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
         end
         return mainSelectedUnit
     end}

package/engine/object-data/auxiliary/sound-preset-name.d.ts

@@ -4,5 +4,9 @@ export declare const enum SoundPresetName {
     ABOMINATION_PISSED = "AbominationPissed",
     ABOMINATION_READY = "AbominationReady",
     ABOMINATION_WAR_CRY = "AbominationWarcry",
-    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood"
+    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood",
+    IMPALE = "Impale",
+    IMPALE_HIT = "ImpaleHit",
+    IMPALE_LAND = "ImpaleLand",
+    IMPALE_CAST = "ImpaleCast"
 }

package/engine/object-data/entry/ability-type.lua

@@ -1,7 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
@@ -31,7 +30,7 @@ local ____entry = require("engine.object-data.entry")
 local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLevelFieldValue
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
-local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local castAnimationFQNByAbilityTypeId = {}
@@ -53,10 +52,7 @@ end
 function AbilityType.getObjectData(self, map)
     return map.objects.ability
 end
-AbilityType.idGenerator = __TS__New(
-    ObjectDataEntryIdGenerator,
-    fourCC("A000")
-)
+AbilityType.idGenerator = abilityTypeIdGenerator
 __TS__SetDescriptor(
     AbilityType.prototype,
     "channelingAnimation",
@@ -999,7 +995,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
     end
     casterCastingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEvent(caster)
+local function handleAbilityStopCastingEvent(caster)
     local effects = casterCastingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1010,8 +1006,8 @@ local function handleAbilityStopEvent(caster)
 end
 for abilityTypeId in pairs(casterCastingEffectModelPathsByAbilityTypeId) do
     Unit.abilityCastingStartEvent[abilityTypeId]:addListener(4, handleAbilityCastingStartEvent)
-    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
+    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
 end
 local casterChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
@@ -1042,7 +1038,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEventV2(caster)
+local function handleAbilityStopChannelingEvent(caster)
     local effects = casterChannelingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1053,7 +1049,7 @@ local function handleAbilityStopEventV2(caster)
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
-    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
 return ____exports

package/engine/object-data/entry/item-type.d.ts

@@ -45,6 +45,8 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set tooltipText(tooltipText: string);
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
+    get cooldownGroupId(): number;
+    set cooldownGroupId(cooldownGroupId: number);
     get goldCost(): number;
     set goldCost(goldCost: number);
     get lumberCost(): number;

package/engine/object-data/entry/item-type.lua

@@ -256,6 +256,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "cooldownGroupId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryIdField("icid")
+        end,
+        set = function(self, cooldownGroupId)
+            self:setObjectDataEntryIdField("icid", cooldownGroupId)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     ItemType.prototype,
     "goldCost",

package/engine/object-data/utility/object-data-entry-id-generator.lua

@@ -1,5 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
@@ -60,4 +61,10 @@ function ObjectDataEntryIdGenerator.prototype.next(self)
     self.id = id
     return id
 end
+---
+-- @internal For use by internal systems only.
+____exports.abilityTypeIdGenerator = __TS__New(
+    ____exports.ObjectDataEntryIdGenerator,
+    fourCC("A000")
+)
 return ____exports