warscript 0.0.1-dev.dbb3984 → 0.0.1-dev.dd8349d

package/engine/internal/ability.d.ts

@@ -12,7 +12,8 @@ export declare abstract class Ability extends Handle<jability> {
     protected constructor(handle: jability, typeId: number);
     toString(): string;
     get parentTypeId(): number;
-    get orderId(): number;
+    get orderTypeStringId(): string;
+    get orderTypeId(): number;
     abstract readonly owner: Unit | Item;
     getSnapshot(): AbilitySnapshot;
     hasField(field: jabilityfield | number): boolean;
@@ -34,6 +35,9 @@ export declare abstract class Ability extends Handle<jability> {
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
     get levelCount(): number;
     abstract get level(): number;
+    abstract get cooldownRemaining(): number;
+    abstract set cooldownRemaining(cooldownRemaining: number);
+    abstract interruptCast(): void;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
 }
@@ -44,6 +48,9 @@ export declare class UnrecognizedAbility extends Ability {
     readonly owner: Unit;
     constructor(typeId: number, owner: Unit);
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(_: number);
+    interruptCast(): void;
 }
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
@@ -51,10 +58,13 @@ export declare class UnitAbility extends Ability {
     constructor(handle: jability, typeId: number, owner: Unit);
     incrementHideCounter(): void;
     decrementHideCounter(): void;
+    incrementDisableCounter(): void;
+    decrementDisableCounter(): void;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;
-    set cooldownRemaining(v: number);
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[UnitAbility]>;
     static get onDestroy(): Event<[UnitAbility]>;
 }
@@ -78,6 +88,9 @@ export declare class ItemAbility extends Ability {
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }

package/engine/internal/ability.lua

@@ -10,7 +10,10 @@ local ____exports = {}
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____ability = require("engine.internal.item.ability")
+local abilityActionDummy = ____ability.abilityActionDummy
 local doAbilityAction = ____ability.doAbilityAction
+local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
+local startItemCooldown = ____ability.startItemCooldown
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local setUnitAbilityLevel = SetUnitAbilityLevel
 local setAbilityIntegerField = BlzSetAbilityIntegerField
@@ -32,7 +35,10 @@ 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
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -296,10 +302,18 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Ability.prototype,
-    "orderId",
+    "orderTypeStringId",
     {get = function(self)
         local field = orderIdFieldByParentTypeId[self.parentTypeId]
-        return order2orderId(field ~= nil and getAbilityStringLevelField(self.handle, ABILITY_SLF_BASE_ORDER_ID_NCL6, self.level) or (orders[self.parentTypeId] or ""))
+        return field ~= nil and getAbilityStringLevelField(self.handle, field, self.level) or (orders[self.parentTypeId] or "")
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Ability.prototype,
+    "orderTypeId",
+    {get = function(self)
+        return order2orderId(self.orderTypeStringId)
     end},
     true
 )
@@ -318,6 +332,17 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Ability.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+        end,
+        set = function(self, cooldownRemaining)
+        end
+    },
+    true
+)
 __TS__ObjectDefineProperty(
     Ability,
     "onCreate",
@@ -341,6 +366,8 @@ function UnrecognizedAbility.prototype.____constructor(self, typeId, owner)
     UnrecognizedAbility.____super.prototype.____constructor(self, nil, typeId)
     self.owner = owner
 end
+function UnrecognizedAbility.prototype.interruptCast(self)
+end
 __TS__SetDescriptor(
     UnrecognizedAbility.prototype,
     "level",
@@ -349,6 +376,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    UnrecognizedAbility.prototype,
+    "cooldownRemaining",
+    {
+        get = function(self)
+            return 0
+        end,
+        set = function(self, _)
+        end
+    },
+    true
+)
 ____exports.UnitAbility = __TS__Class()
 local UnitAbility = ____exports.UnitAbility
 UnitAbility.name = "UnitAbility"
@@ -364,6 +403,15 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.incrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, true, false)
+end
+function UnitAbility.prototype.decrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, false, false)
+end
+function UnitAbility.prototype.interruptCast(self)
+    self.owner:interruptCast(self.typeId)
+end
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",
@@ -384,8 +432,8 @@ __TS__SetDescriptor(
         get = function(self)
             return getUnitAbilityCooldownRemaining(self.u, self.typeId)
         end,
-        set = function(self, v)
-            startUnitAbilityCooldown(self.u, self.typeId, v)
+        set = function(self, cooldownRemaining)
+            startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
         end
     },
     true
@@ -410,6 +458,9 @@ end
 local function setAbilityField(_, ability, field, levelOrValue, value)
     return ____exports.Ability.prototype.setField(ability, field, levelOrValue, value)
 end
+local function getAbilityCooldown(_, abilityTypeId)
+    return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
+end
 ____exports.ItemAbility = __TS__Class()
 local ItemAbility = ____exports.ItemAbility
 ItemAbility.name = "ItemAbility"
@@ -437,6 +488,14 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
         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)
+    end
+end
 __TS__SetDescriptor(
     ItemAbility.prototype,
     "level",
@@ -445,6 +504,27 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    ItemAbility.prototype,
+    "cooldownRemaining",
+    {
+        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)
+        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)
+        end
+    },
+    true
+)
 __TS__ObjectDefineProperty(
     ItemAbility,
     "onCreate",

package/engine/internal/item/ability.lua

@@ -1,27 +1,100 @@
 local ____exports = {}
+local restoreCooldownGroup
 local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
 local dummyUnitId = ____dummy.dummyUnitId
+local ____utility = require("engine.internal.utility")
+local findUnitItemSlot = ____utility.findUnitItemSlot
+local ____blank = require("engine.object-data.entry.item-type.blank")
+local BlankItemType = ____blank.BlankItemType
+local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
+local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
+local ____math = require("math")
+local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
 local isItemOwned = IsItemOwned
 local isItemPowerup = IsItemPowerup
 local getItemX = GetItemX
 local getItemY = GetItemY
+local setAbilityRealLevelField = BlzSetAbilityRealLevelField
+local setItemIntegerField = BlzSetItemIntegerField
+local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local setItemPosition = SetItemPosition
 local unitAddItem = UnitAddItem
 local unitRemoveItem = UnitRemoveItem
-local dummy = assert(CreateUnit(
+local unitUseItem = UnitUseItem
+local unitResetCooldown = UnitResetCooldown
+local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
+    if not currentMap then
+        return 0
+    end
+    local abilityType = currentMap.objects.ability:newObject(
+        util.id2s(abilityTypeIdGenerator:next()),
+        "Absk"
+    )
+    abilityType["bsk1+0"] = 0
+    abilityType["bsk2+0"] = 0
+    abilityType["bsk3+0"] = 0
+    abilityType["amcs+0"] = 0
+    abilityType["adur+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
+    abilityType["ahdu+0"] = MINIMUM_POSITIVE_NORMALIZED_FLOAT
+    return util.s2id(abilityType.id)
+end)
+local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
+    local itemType = BlankItemType:create()
+    itemType.name = "[Warscript/Dummy] Item Cooldown Starter"
+    itemType.abilityTypeIds = {COOLDOWN_STARTER_ABILITY_TYPE_ID}
+    itemType.cooldownGroupId = COOLDOWN_STARTER_ABILITY_TYPE_ID
+    itemType.activelyUsed = true
+    return itemType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.itemAbilityDummy = assert(CreateUnit(
     Player.neutralVictim.handle,
     dummyUnitId,
     0,
     0,
     270
 ))
-ShowUnit(dummy, false)
+local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
+local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
+ShowUnit(____exports.itemAbilityDummy, false)
+local function startItemCooldownInternal(handle, cooldown)
+    local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
+    setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, COOLDOWN_STARTER_ABILITY_TYPE_ID)
+    setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
+    unitResetCooldown(____exports.itemAbilityDummy)
+    unitUseItem(____exports.itemAbilityDummy, cooldownStarterItem)
+    Timer:run(restoreCooldownGroup, handle, cooldownGroup)
+end
+restoreCooldownGroup = function(handle, cooldownGroup)
+    if getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP) == COOLDOWN_STARTER_ABILITY_TYPE_ID then
+        setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, cooldownGroup)
+    end
+end
+---
+-- @internal For use by internal systems only.
+____exports.startItemCooldown = function(handle, owner, cooldown)
+    ____exports.doAbilityActionForceDummy(handle, owner, startItemCooldownInternal, cooldown)
+end
+---
+-- @internal For use by internal systems only.
+____exports.abilityActionDummy = ____exports.itemAbilityDummy
 ---
 -- @internal For use by internal systems only.
 ____exports.doAbilityAction = function(handle, action, ...)
+    local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = true
+    end
     local isOwned = isItemOwned(handle)
     local isPowerup
     local x
@@ -33,16 +106,51 @@ ____exports.doAbilityAction = function(handle, action, ...)
         end
         x = getItemX(handle)
         y = getItemY(handle)
-        unitAddItem(dummy, handle)
+        unitAddItem(____exports.itemAbilityDummy, handle)
     end
     local result = action(handle, ...)
     if not isOwned then
-        unitRemoveItem(dummy, handle)
+        unitRemoveItem(____exports.itemAbilityDummy, handle)
         setItemPosition(handle, x, y)
         if isPowerup then
             setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
         end
     end
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = nil
+    end
+    return result
+end
+---
+-- @internal For use by internal systems only.
+____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
+    if owner == nil then
+        return ____exports.doAbilityAction(handle, action, ...)
+    end
+    local slot = findUnitItemSlot(owner, handle)
+    if slot == nil then
+        return ____exports.doAbilityAction(handle, action, ...)
+    end
+    local isAlreadyIgnoredInEvents = ignoreEventsItems[handle] ~= nil
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = true
+    end
+    local isPowerup
+    if isItemPowerup(handle) then
+        setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+        isPowerup = true
+    end
+    unitRemoveItem(owner, handle)
+    unitAddItem(____exports.itemAbilityDummy, handle)
+    local result = action(handle, ...)
+    unitRemoveItem(____exports.itemAbilityDummy, handle)
+    unitAddItemToSlot(owner, handle, slot)
+    if isPowerup then
+        setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+    end
+    if not isAlreadyIgnoredInEvents then
+        ignoreEventsItems[handle] = nil
+    end
     return result
 end
 return ____exports

package/engine/internal/item.d.ts

@@ -5,8 +5,8 @@ import { Event } from "../../event";
 import { ReadonlyRect } from "../../core/types/rect";
 import { ItemAbility } from "./ability";
 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;
-export declare const addAndGetAbility: (handle: jitem, abilityTypeId: AbilityTypeId) => jability | null;
 declare const enum ItemPropertyKey {
     ABILITIES = 100,
     LUA_INDEX_BY_ABILITY_TYPE_ID = 101
@@ -17,7 +17,7 @@ export declare class Item extends Handle<jitem> {
     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;
-    get typeId(): number;
+    get typeId(): ItemTypeId;
     set skinId(v: number);
     get skinId(): number;
     set name(v: string);
@@ -73,14 +73,16 @@ export declare class Item extends Handle<jitem> {
     set position(v: Vec2);
     set charges(v: number);
     get charges(): number;
+    consumeCharge(): boolean;
     addAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
     removeAbility(abilityTypeId: AbilityTypeId): boolean;
     hasAbility(abilityTypeId: AbilityTypeId): boolean;
     getAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
     get abilities(): readonly ItemAbility[];
-    static getInRange(pos: Vec2, range: number): Item[];
+    static getInRange(x: number, y: number, range: number): Item[];
     static getInRect(rect: ReadonlyRect): Item[];
     static get onCreate(): Event<[Item]>;
-    static get onDestroy(): Event<[Item]>;
+    static get destroyEvent(): Event<[Item]>;
+    static readonly chargesChangedEvent: Event<[Item]>;
 }
 export {};

package/engine/internal/item.lua

@@ -1,20 +1,33 @@
 local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__Delete = ____lualib.__TS__Delete
 local ____exports = {}
+local invoke
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____event = require("event")
+local Event = ____event.Event
 local ____rect = require("core.types.rect")
 local Rect = ____rect.Rect
 local ____ability = require("engine.internal.ability")
 local ItemAbility = ____ability.ItemAbility
 local ____ability = require("engine.internal.item.ability")
 local doAbilityAction = ____ability.doAbilityAction
+local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
+local itemAbilityDummy = ____ability.itemAbilityDummy
+local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
+local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
+local ____vec2 = require("math.vec2")
+local distance = ____vec2.distance
+local itemChargesChangeEvent = __TS__New(Event)
 local itemAddAbility = BlzItemAddAbility
 local itemRemoveAbility = BlzItemRemoveAbility
 local getItemAbility = BlzGetItemAbility
@@ -24,10 +37,32 @@ local getAbilityId = BlzGetAbilityId
 local getWidgetLife = GetWidgetLife
 local removeItem = RemoveItem
 local getHandleId = GetHandleId
+local setRect = SetRect
+local enumItemsInRect = EnumItemsInRect
+local getEnumItem = GetEnumItem
+local getItemTypeId = GetItemTypeId
+local getItemX = GetItemX
+local getItemY = GetItemY
+local getItemCharges = GetItemCharges
+local setItemCharges = SetItemCharges
+local unitRemoveAbility = UnitRemoveAbility
+local unitUseItem = UnitUseItem
+local unitUseItemPoint = UnitUseItemPoint
+local unitUseItemTarget = UnitUseItemTarget
+_G.SetItemCharges = function(whichItem, charges)
+    setItemCharges(whichItem, charges)
+    invoke(
+        itemChargesChangeEvent,
+        ____exports.Item:of(whichItem)
+    )
+end
 local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local getItemBooleanField = BlzGetItemBooleanField
+invoke = Event.invoke
 local enumRect = Rect:create(0, 0, 0, 0).handle
+---
+-- @internal For use by internal systems only.
 ____exports.addAndGetAbility = function(handle, abilityTypeId)
     if itemAddAbility(handle, abilityTypeId) then
         return getItemAbility(handle, abilityTypeId)
@@ -53,6 +88,49 @@ local function getItemAbilities(handle, item)
     end
     return abilities
 end
+local function consumeCharge(handle)
+    do
+        local i = 0
+        local ability = getItemAbilityByIndex(handle, i)
+        while ability ~= nil do
+            unitRemoveAbility(
+                itemAbilityDummy,
+                getAbilityId(ability)
+            )
+            do
+                i = i + 1
+                ability = getItemAbilityByIndex(handle, i)
+            end
+        end
+    end
+    return unitUseItem(itemAbilityDummy, handle) or unitUseItemPoint(itemAbilityDummy, handle, 0, 0) or unitUseItemTarget(itemAbilityDummy, handle, itemAbilityDummy)
+end
+local targetCollection
+local targetCollectionNextIndex
+local centerX
+local centerY
+local enumRange
+local function collectIntoTarget()
+    local item = getEnumItem()
+    local typeId = getItemTypeId(item)
+    if typeId ~= DUMMY_ITEM_ID and typeId ~= SLOT_FILLER_ITEM_TYPE_ID then
+        targetCollection[targetCollectionNextIndex] = ____exports.Item:of(item)
+        targetCollectionNextIndex = targetCollectionNextIndex + 1
+    end
+end
+local function collectIntoTargetRange()
+    local item = getEnumItem()
+    local typeId = getItemTypeId(item)
+    if distance(
+        getItemX(item),
+        getItemY(item),
+        centerX,
+        centerY
+    ) <= enumRange and typeId ~= DUMMY_ITEM_ID and typeId ~= SLOT_FILLER_ITEM_TYPE_ID then
+        targetCollection[targetCollectionNextIndex] = ____exports.Item:of(item)
+        targetCollectionNextIndex = targetCollectionNextIndex + 1
+    end
+end
 ____exports.Item = __TS__Class()
 local Item = ____exports.Item
 Item.name = "Item"
@@ -78,6 +156,32 @@ 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)
+    local handle = self.handle
+    local charges = getItemCharges(handle)
+    if charges >= 2 then
+        setItemCharges(handle, charges - 1)
+        invoke(itemChargesChangeEvent, self)
+        return true
+    end
+    if charges == 1 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
+        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
@@ -111,34 +215,27 @@ function Item.prototype.getAbility(self, abilityTypeId)
     local ability = self[101][abilityTypeId] ~= nil and doAbilityAction(self.handle, getItemAbility, abilityTypeId)
     return ability and ItemAbility:of(ability, abilityTypeId, self) or nil
 end
-function Item.getInRange(self, pos, range)
-    local collection = {}
-    SetRect(
+function Item.getInRange(self, x, y, range)
+    targetCollection = {}
+    targetCollectionNextIndex = 1
+    centerX = x
+    centerY = y
+    enumRange = range
+    setRect(
         enumRect,
-        pos.x - range,
-        pos.y - range,
-        pos.x + range,
-        pos.y + range
+        x - range,
+        y - range,
+        x + range,
+        y + range
     )
-    EnumItemsInRect(
-        enumRect,
-        nil,
-        function()
-            collection[#collection + 1] = self:of(GetEnumItem())
-        end
-    )
-    return collection
+    enumItemsInRect(enumRect, nil, collectIntoTargetRange)
+    return targetCollection
 end
 function Item.getInRect(self, rect)
-    local collection = {}
-    EnumItemsInRect(
-        rect.handle,
-        nil,
-        function()
-            collection[#collection + 1] = self:of(GetEnumItem())
-        end
-    )
-    return collection
+    targetCollection = {}
+    targetCollectionNextIndex = 1
+    enumItemsInRect(rect.handle, nil, collectIntoTarget)
+    return targetCollection
 end
 __TS__SetDescriptor(
     Item.prototype,
@@ -270,7 +367,7 @@ __TS__SetDescriptor(
     "perishable",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
+            return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
         end,
         set = function(self, v)
             BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
@@ -526,10 +623,11 @@ __TS__SetDescriptor(
     "charges",
     {
         get = function(self)
-            return GetItemCharges(self.handle)
+            return getItemCharges(self.handle)
         end,
         set = function(self, v)
-            SetItemCharges(self.handle, v)
+            setItemCharges(self.handle, v)
+            invoke(itemChargesChangeEvent, self)
         end
     },
     true
@@ -551,11 +649,12 @@ __TS__ObjectDefineProperty(
 )
 __TS__ObjectDefineProperty(
     Item,
-    "onDestroy",
+    "destroyEvent",
     {get = function(self)
         return self.onDestroyEvent
     end}
 )
+Item.chargesChangedEvent = itemChargesChangeEvent
 local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()
 TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)

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

@@ -8,6 +8,6 @@ local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_AB
 -- @internal For use by internal systems only.
 ____exports.getAbilityDuration = function(ability, target)
     local level = ability.level
-    return target ~= nil and target:hasClassification(UnitClassification.RESISTANT) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
+    return target ~= nil and (target.isHero or target:getField(UNIT_IF_LEVEL) >= 6 or target:hasClassification(UnitClassification.RESISTANT)) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
 end
 return ____exports

package/engine/internal/misc/ability-disable-counter.d.ts

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

package/engine/internal/misc/ability-disable-counter.lua

@@ -0,0 +1,13 @@
+local ____exports = {}
+local disableAbility = BlzUnitDisableAbility
+---
+-- @internal For use by internal systems only.
+____exports.increaseAbilityDisableCounter = function(unit, abilityTypeId, times)
+    for _ = 1, times do
+        disableAbility(unit, abilityTypeId, true, false)
+    end
+    for _ = times, -1 do
+        disableAbility(unit, abilityTypeId, false, false)
+    end
+end
+return ____exports

package/engine/internal/misc/damage-metadata-by-target.d.ts

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

package/engine/internal/misc/damage-metadata-by-target.lua

@@ -0,0 +1,5 @@
+local ____exports = {}
+---
+-- @internal For use by internal systems only.
+____exports.damageMetadataByTarget = setmetatable({}, {__mode = "k"})
+return ____exports