warscript 0.0.1-dev.a21905e → 0.0.1-dev.a228cc0

package/engine/internal/unit.lua

@@ -562,17 +562,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
@@ -630,15 +619,15 @@ for ____, player in ipairs(Player.all) do
     dummies[player] = dummy
 end
 local function delayHealthChecksCallback(unit)
-    local counter = (unit[102] or 0) - 1
+    local counter = (unit[103] or 0) - 1
     if counter ~= 0 then
-        unit[102] = counter
+        unit[103] = counter
         return
     end
-    unit[102] = nil
-    local healthBonus = unit[103]
+    unit[103] = nil
+    local healthBonus = unit[104]
     if healthBonus ~= nil then
-        unit[103] = nil
+        unit[104] = nil
         local handle = unit.handle
         BlzSetUnitMaxHP(
             handle,
@@ -646,12 +635,17 @@ local function delayHealthChecksCallback(unit)
         )
     end
 end
+local nextSyncId = 1
+local unitBySyncId = setmetatable({}, {__mode = "k"})
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
 __TS__ClassExtends(Unit, Handle)
 function Unit.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
+    local ____nextSyncId_0 = nextSyncId
+    nextSyncId = ____nextSyncId_0 + 1
+    self.syncId = ____nextSyncId_0
     self._owner = Player:of(getOwningPlayer(handle))
     assert(unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId))
     assert(unitAddAbility(handle, morphDetectAbilityId))
@@ -664,6 +658,7 @@ function Unit.prototype.____constructor(self, handle)
             fourCC("Amrf")
         ))
     end
+    unitBySyncId[self.syncId] = self
     local ____ = self.abilities
 end
 function Unit.prototype.getEvent(self, event, collector)
@@ -749,8 +744,8 @@ function Unit.prototype.addModifier(self, property, modifier)
     end}
 end
 function Unit.prototype.hasCombatClassification(self, combatClassification)
-    local ____combatClassification_0 = combatClassification
-    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_0 == ____combatClassification_0
+    local ____combatClassification_1 = combatClassification
+    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_1 == ____combatClassification_1
 end
 function Unit.prototype.addClassification(self, classification)
     return unitAddType(self.handle, classification)
@@ -768,13 +763,13 @@ function Unit.prototype.isInvisibleTo(self, player)
     return isUnitInvisible(self.handle, player.handle)
 end
 function Unit.prototype.isInRangeOf(self, x, y, range)
-    local ____temp_1
+    local ____temp_2
     if type(x) == "number" then
-        ____temp_1 = isUnitInRangeXY(self.handle, x, y, range)
+        ____temp_2 = isUnitInRangeXY(self.handle, x, y, range)
     else
-        ____temp_1 = isUnitInRange(self.handle, x.handle, y)
+        ____temp_2 = isUnitInRange(self.handle, x.handle, y)
     end
-    return ____temp_1
+    return ____temp_2
 end
 function Unit.prototype.isAllyOf(self, unit)
     return isUnitAlly(
@@ -801,7 +796,7 @@ function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
 function Unit.prototype.delayHealthChecks(self)
-    self[102] = (self[102] or 0) + 1
+    self[103] = (self[103] or 0) + 1
     Timer:run(delayHealthChecksCallback, self)
 end
 function Unit.prototype.setPosition(self, x, y)
@@ -818,14 +813,14 @@ function Unit.prototype.kill(self)
     killUnit(self.handle)
 end
 function Unit.prototype.revive(self, x, y, doEffect)
-    local ____ReviveHero_4 = ReviveHero
-    local ____array_3 = __TS__SparseArrayNew(self.handle, x, y)
-    local ____doEffect_2 = doEffect
-    if ____doEffect_2 == nil then
-        ____doEffect_2 = false
+    local ____ReviveHero_5 = ReviveHero
+    local ____array_4 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_3 = doEffect
+    if ____doEffect_3 == nil then
+        ____doEffect_3 = false
     end
-    __TS__SparseArrayPush(____array_3, ____doEffect_2)
-    ____ReviveHero_4(__TS__SparseArraySpread(____array_3))
+    __TS__SparseArrayPush(____array_4, ____doEffect_3)
+    ____ReviveHero_5(__TS__SparseArraySpread(____array_4))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -995,18 +990,18 @@ function Unit.prototype.unpauseEx(self)
     self:decrementStunCounter()
 end
 function Unit.prototype.incrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 0 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 0 then
         BlzPauseUnitEx(self.handle, true)
     end
-    self[101] = stunCounter + 1
+    self[102] = stunCounter + 1
 end
 function Unit.prototype.decrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 1 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 1 then
         BlzPauseUnitEx(self.handle, false)
     end
-    self[101] = stunCounter - 1
+    self[102] = stunCounter - 1
 end
 function Unit.create(self, owner, id, x, y, facing, skinId)
     local handle = skinId and BlzCreateUnitWithSkin(
@@ -1108,8 +1103,11 @@ function Unit.getInSector(self, pos, range, offsetAngle, centralAngle)
     )
     return targetCollection
 end
-function Unit.getSelectionOf(self, player)
-    targetCollection = {}
+function Unit.getSelectionOf(self, player, target)
+    if target == nil then
+        target = {}
+    end
+    targetCollection = target
     targetCollectionNextIndex = 1
     GroupEnumUnitsSelected(dummyGroup, player.handle, collectIntoTarget)
     return targetCollection
@@ -1131,6 +1129,9 @@ end
 function Unit.prototype.__tostring(self)
     return (((self.constructor.name .. "$") .. util.id2s(self.typeId)) .. "@") .. tostring(getHandleId(self.handle))
 end
+function Unit.getBySyncId(self, syncId)
+    return unitBySyncId[syncId]
+end
 __TS__SetDescriptor(
     Unit.prototype,
     "_deltas",
@@ -1388,17 +1389,17 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[105]
+            return not self[106]
         end,
         set = function(self, isTeamGlowVisible)
             showUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_5
+            local ____temp_6
             if not isTeamGlowVisible then
-                ____temp_5 = true
+                ____temp_6 = true
             else
-                ____temp_5 = nil
+                ____temp_6 = nil
             end
-            self[105] = ____temp_5
+            self[106] = ____temp_6
         end
     },
     true
@@ -1408,7 +1409,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         setUnitColor(self.handle, color.handle)
-        if self[105] then
+        if self[106] then
             showUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1432,14 +1433,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[103] or 0) - (self[104] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[104] or 0) - (self[105] or 0)
         end,
         set = function(self, maxHealth)
-            if maxHealth < 1 and self[102] ~= nil then
-                self[103] = (self[103] or 0) + (1 - maxHealth)
+            if maxHealth < 1 and self[103] ~= nil then
+                self[104] = (self[104] or 0) + (1 - maxHealth)
                 maxHealth = 1
             end
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[104] or 0))
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[105] or 0))
         end
     },
     true
@@ -1481,10 +1482,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[104] or 0)
+            return GetWidgetLife(self.handle) - (self[105] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[104] or 0))
+            SetWidgetLife(self.handle, health + (self[105] or 0))
         end
     },
     true
@@ -1695,17 +1696,17 @@ __TS__SetDescriptor(
         set = function(self, isPaused)
             local handle = self.handle
             if isPaused and not IsUnitPaused(handle) then
-                self[100] = true
-                for _ = self[101] or 0, -1 do
+                self[101] = true
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, true)
                 end
                 PauseUnit(handle, true)
             elseif not isPaused and IsUnitPaused(handle) then
                 PauseUnit(handle, false)
-                for _ = self[101] or 0, -1 do
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, false)
                 end
-                self[100] = nil
+                self[101] = nil
             end
         end
     },
@@ -2124,25 +2125,25 @@ Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_8
+            local ____GetSpellTargetUnit_result_9
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_8 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_9 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_7
+                local ____GetSpellTargetItem_result_8
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_7 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_8 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_6
+                    local ____GetSpellTargetDestructable_result_7
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_6 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_7 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_6 = nil
+                        ____GetSpellTargetDestructable_result_7 = nil
                     end
-                    ____GetSpellTargetItem_result_7 = ____GetSpellTargetDestructable_result_6
+                    ____GetSpellTargetItem_result_8 = ____GetSpellTargetDestructable_result_7
                 end
-                ____GetSpellTargetUnit_result_8 = ____GetSpellTargetItem_result_7
+                ____GetSpellTargetUnit_result_9 = ____GetSpellTargetItem_result_8
             end
-            local target = ____GetSpellTargetUnit_result_8
+            local target = ____GetSpellTargetUnit_result_9
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2469,7 +2470,7 @@ Unit.onDamage = __TS__New(
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)
-                    target[104] = (target[104] or 0) + bonusHealth
+                    target[105] = (target[105] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2483,7 +2484,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[104] = (target[104] or 0) - bonusHealth
+                        target[105] = (target[105] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth
@@ -2535,6 +2536,51 @@ Unit.itemStackedEvent = __TS__New(
     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.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { Unit } from "../core/types/unit";
 import { Async } from "../core/types/async";
-import { TriggerEvent } from "../event";
+import { Event, TriggerEvent } from "../event";
 import { GraphicsMode } from "./index";
 export declare class LocalClient {
     private constructor();
@@ -11,6 +11,11 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
-    static get mouseFocusUnit(): Async<Unit>;
+    static get mouseFocusUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnitChangeEvent(): Event<[
+        previousMainSelectedUnit: Unit | undefined,
+        newMainSelectedUnit: Unit | undefined
+    ]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }

package/engine/local-client.lua

@@ -1,4 +1,5 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__New = ____lualib.__TS__New
@@ -6,13 +7,25 @@ local ____exports = {}
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
+local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
+local ____frame = require("core.types.frame")
+local Frame = ____frame.Frame
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
 local isLocalClientActive = BlzIsLocalClientActive
+local isHeroUnitId = IsHeroUnitId
+local getHandleId = GetHandleId
 local getMouseFocusUnit = BlzGetMouseFocusUnit
+local getUnitRealField = BlzGetUnitRealField
+local getUnitTypeId = GetUnitTypeId
 local getLocale = BlzGetLocale
+local tableSort = table.sort
 local tocPath = "_warscript\\IsHD.toc"
 compiletime(function()
     if currentMap then
@@ -21,6 +34,29 @@ compiletime(function()
         currentMap:addFileString("_HD.w3mod\\" .. tocPath, fdfPath .. "\r\n")
     end
 end)
+local selectionButtons
+Timer:run(function()
+    selectionButtons = __TS__ArrayMap(
+        Frame:byName("SimpleInfoPanelUnitDetail").parent:getChild(5):getChild(0).children,
+        function(____, frame) return frame:getChild(1) end
+    )
+end)
+local localSelectedUnits = {}
+local indexByLocalSelectedUnit = {}
+local function compareUnitsSelectionPriority(a, b)
+    local aHandle = a.handle
+    local bHandle = b.handle
+    local priorityDelta = getUnitRealField(bHandle, UNIT_RF_PRIORITY) - getUnitRealField(aHandle, UNIT_RF_PRIORITY)
+    if priorityDelta ~= 0 then
+        return priorityDelta < 0
+    end
+    local aTypeId = getUnitTypeId(aHandle)
+    local bTypeId = getUnitTypeId(bHandle)
+    local orderDelta = (isHeroUnitId(aTypeId) and getHandleId(aHandle) or aTypeId) - (isHeroUnitId(bTypeId) and getHandleId(bHandle) or bTypeId)
+    return (orderDelta ~= 0 and orderDelta or indexByLocalSelectedUnit[a] - indexByLocalSelectedUnit[b]) < 0
+end
+local mainSelectedUnitChangeEvent
+local previousMainSelectedUnit
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
@@ -69,6 +105,52 @@ __TS__ObjectDefineProperty(
         return Unit:of(getMouseFocusUnit())
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnit",
+    {get = function(self)
+        Unit:getSelectionOf(Player["local"], localSelectedUnits)
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = i
+        end
+        tableSort(localSelectedUnits, compareUnitsSelectionPriority)
+        local mainSelectedUnitIndex
+        if selectionButtons and #localSelectedUnits > 1 then
+            local maxButtonWidth = 0
+            for i = 0, #selectionButtons - 1 do
+                local width = selectionButtons[i + 1].width
+                if width > maxButtonWidth then
+                    maxButtonWidth = width
+                    mainSelectedUnitIndex = i
+                end
+            end
+        end
+        local mainSelectedUnit = localSelectedUnits[(mainSelectedUnitIndex or 0) + 1]
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = nil
+            localSelectedUnits[i] = nil
+        end
+        if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
+            local previousPreviousMainSelectedUnit = previousMainSelectedUnit
+            previousMainSelectedUnit = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
+        end
+        return mainSelectedUnit
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnitChangeEvent",
+    {get = function(self)
+        if mainSelectedUnitChangeEvent == nil then
+            mainSelectedUnitChangeEvent = __TS__New(Event)
+            Timer.onPeriod[1 / 64]:addListener(function()
+                local _ = ____exports.LocalClient.mainSelectedUnit
+            end)
+        end
+        return mainSelectedUnitChangeEvent
+    end}
+)
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)

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,4 +45,18 @@ 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;
+    set lumberCost(lumberCost: number);
+    get activelyUsed(): boolean;
+    set activelyUsed(activelyUsed: boolean);
+    get perishable(): boolean;
+    set perishable(perishable: boolean);
+    get initialStackSize(): number;
+    set initialStackSize(initialStackSize: number);
+    get maximumStackSize(): number;
+    set maximumStackSize(maximumStackSize: number);
 }