warscript 0.0.1-dev.d6e2c10 → 0.0.1-dev.d77b529

package/engine/index.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 export declare const enum GraphicsMode {
     SD = 0,
-    HD = 1
+    HD = 1,
+    DE = 2
 }

package/engine/internal/ability.d.ts

@@ -64,8 +64,12 @@ export declare class UnitAbility extends Ability {
     get isDisabled(): boolean;
     get level(): number;
     set level(v: number);
+    /** Uses the native percentage scale. */
+    get cooldownRemainingPercent(): number;
+    set cooldownRemainingPercent(percent: number);
     get cooldownRemaining(): number;
     set cooldownRemaining(cooldownRemaining: number);
+    startCooldown(cooldown: number): void;
     interruptCast(): void;
     protected onDestroy(): HandleDestructor;
     static get onCreate(): Event<[UnitAbility]>;

package/engine/internal/ability.lua

@@ -14,31 +14,34 @@ 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
-local setAbilityRealField = BlzSetAbilityRealField
-local setAbilityBooleanField = BlzSetAbilityBooleanField
-local setAbilityStringField = BlzSetAbilityStringField
-local setAbilityIntegerLevelField = BlzSetAbilityIntegerLevelField
-local setAbilityRealLevelField = BlzSetAbilityRealLevelField
-local setAbilityBooleanLevelField = BlzSetAbilityBooleanLevelField
-local setAbilityStringLevelField = BlzSetAbilityStringLevelField
-local getAbilityIntegerField = BlzGetAbilityIntegerField
-local getAbilityRealField = BlzGetAbilityRealField
+local ____unit_2Dability_2Dlevel_2Dnatives = require("engine.internal.misc.unit-ability-level-natives")
+local rawSetUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawSetUnitAbilityLevel
 local getAbilityBooleanField = BlzGetAbilityBooleanField
-local getAbilityStringField = BlzGetAbilityStringField
+local getAbilityBooleanLevelField = BlzGetAbilityBooleanLevelField
+local getAbilityIntegerField = BlzGetAbilityIntegerField
 local getAbilityIntegerLevelField = BlzGetAbilityIntegerLevelField
+local getAbilityRealField = BlzGetAbilityRealField
 local getAbilityRealLevelField = BlzGetAbilityRealLevelField
-local getAbilityBooleanLevelField = BlzGetAbilityBooleanLevelField
+local getAbilityStringField = BlzGetAbilityStringField
 local getAbilityStringLevelField = BlzGetAbilityStringLevelField
+local getHandleId = GetHandleId
+local getUnitAbilityCooldownPercent = BlzGetUnitAbilityCooldownPercent
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
+local getUnitAbilityLevel = GetUnitAbilityLevel
+local order2orderId = _G.OrderId
+local setAbilityBooleanField = BlzSetAbilityBooleanField
+local setAbilityBooleanLevelField = BlzSetAbilityBooleanLevelField
+local setAbilityIntegerField = BlzSetAbilityIntegerField
+local setAbilityIntegerLevelField = BlzSetAbilityIntegerLevelField
+local setAbilityRealField = BlzSetAbilityRealField
+local setAbilityRealLevelField = BlzSetAbilityRealLevelField
+local setAbilityStringField = BlzSetAbilityStringField
+local setAbilityStringLevelField = BlzSetAbilityStringLevelField
+local setUnitAbilityCooldownPercent = BlzSetUnitAbilityCooldownPercent
+local setUnitAbilityCooldownRemaining = BlzSetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
-local getHandleId = GetHandleId
-local getItemBooleanField = BlzGetItemBooleanField
-local setItemBooleanField = BlzSetItemBooleanField
-local unitHideAbility = BlzUnitHideAbility
 local unitDisableAbility = BlzUnitDisableAbility
+local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -215,7 +218,6 @@ local levelRefreshFields = {
     [fourCC("Neg1")] = true
 }
 local levelsField = ABILITY_IF_LEVELS
-local order2orderId = _G.OrderId
 local orderIdFieldByParentTypeId = {
     [fourCC("ANcl")] = ABILITY_SLF_BASE_ORDER_ID_NCL6,
     [fourCC("Aspb")] = ABILITY_SLF_BASE_ORDER_ID_SPB5,
@@ -288,8 +290,8 @@ function Ability.prototype.setField(self, field, levelOrValue, value)
         local levels = getAbilityIntegerField(ability, levelsField)
         setAbilityIntegerField(ability, levelsField, levels + 1)
         local level = getUnitAbilityLevel(unit, typeId)
-        setUnitAbilityLevel(unit, typeId, levels + 1)
-        setUnitAbilityLevel(unit, typeId, level)
+        rawSetUnitAbilityLevel(unit, typeId, levels + 1)
+        rawSetUnitAbilityLevel(unit, typeId, level)
         setAbilityIntegerField(ability, levelsField, levels)
     end
     return success
@@ -422,6 +424,9 @@ function UnitAbility.prototype.decrementDisableCounter(self)
     unitHideAbility(unit, typeId, true)
     self.d = (self.d or 0) - 1
 end
+function UnitAbility.prototype.startCooldown(self, cooldown)
+    startUnitAbilityCooldown(self.u, self.typeId, cooldown)
+end
 function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
@@ -447,7 +452,20 @@ __TS__SetDescriptor(
             return getUnitAbilityLevel(self.u, self.typeId) - 1
         end,
         set = function(self, v)
-            setUnitAbilityLevel(self.u, self.typeId, v + 1)
+            SetUnitAbilityLevel(self.u, self.typeId, v + 1)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitAbility.prototype,
+    "cooldownRemainingPercent",
+    {
+        get = function(self)
+            return getUnitAbilityCooldownPercent(self.u, self.typeId)
+        end,
+        set = function(self, percent)
+            setUnitAbilityCooldownPercent(self.u, self.typeId, percent)
         end
     },
     true
@@ -460,7 +478,7 @@ __TS__SetDescriptor(
             return getUnitAbilityCooldownRemaining(self.u, self.typeId)
         end,
         set = function(self, cooldownRemaining)
-            startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
+            setUnitAbilityCooldownRemaining(self.u, self.typeId, cooldownRemaining)
         end
     },
     true
@@ -516,11 +534,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 +563,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/owner-cache.d.ts

@@ -0,0 +1,5 @@
+/** @noSelfInFile */
+import type { Item } from "../item";
+import type { Unit } from "../unit";
+/** The last unit known (from item events) to carry each item; validated against the engine on read. */
+export declare const ownerByItem: LuaMap<Item, Unit>;

package/engine/internal/item/owner-cache.lua

@@ -0,0 +1,4 @@
+local ____exports = {}
+--- The last unit known (from item events) to carry each item; validated against the engine on read.
+____exports.ownerByItem = setmetatable({}, {__mode = "kv"})
+return ____exports

package/engine/internal/item+owner.d.ts

@@ -1,7 +1,9 @@
 /** @noSelfInFile */
 import { Unit } from "./unit";
+import "./unit/equipment-inventory";
 declare module "./item" {
     interface Item {
+        /** The unit carrying the item in any of its inventories (regular, extended or equipment), if any. */
         readonly owner?: Unit;
     }
 }

package/engine/internal/item+owner.lua

@@ -5,15 +5,33 @@ local ____item = require("engine.internal.item")
 local Item = ____item.Item
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
-local ownerByItem = setmetatable({}, {__mode = "kv"})
+require("engine.internal.unit.equipment-inventory")
+local ____owner_2Dcache = require("engine.internal.item.owner-cache")
+local ownerByItem = ____owner_2Dcache.ownerByItem
+local ____item_2Dcontainer = require("engine.internal.unit.item-container")
+local unitOwnsItem = ____item_2Dcontainer.unitOwnsItem
 Unit.itemPickedUpEvent:addListener(
-    4,
+    999999,
     function(unit, item)
         ownerByItem[item] = unit
     end
 )
+Unit.itemEquippedEvent:addListener(
+    999999,
+    function(unit, item)
+        ownerByItem[item] = unit
+    end
+)
+Unit.itemUnequippedEvent:addListener(
+    999999,
+    function(unit, item)
+        if not unitOwnsItem(unit.handle, item.handle) then
+            ownerByItem[item] = nil
+        end
+    end
+)
 Unit.itemDroppedEvent:addListener(
-    4,
+    999999,
     function(unit, item)
         ownerByItem[item] = nil
     end
@@ -22,7 +40,12 @@ __TS__ObjectDefineProperty(
     Item.prototype,
     "owner",
     {get = function(self)
-        return ownerByItem[self]
+        local owner = ownerByItem[self]
+        if owner ~= nil and not unitOwnsItem(owner.handle, self.handle) then
+            ownerByItem[self] = nil
+            return nil
+        end
+        return owner
     end}
 )
 return ____exports

package/engine/internal/item.d.ts

@@ -2,19 +2,37 @@
 import { Handle, HandleDestructor } from "../../core/types/handle";
 import { Color } from "../../core/types/color";
 import { Event } from "../../event";
+import { PlayerColor } from "../../core/types/playerColor";
+import { EquipmentType } from "../object-data/auxiliary/equipment-type";
+import { ItemTag } from "../object-data/auxiliary/item-tag";
 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;
 declare const enum ItemPropertyKey {
-    ABILITIES = 100
+    ABILITIES = 100,
+    DEATH_TRIGGER = 101,
+    COLOR = 102
 }
 export declare class Item extends Handle<jitem> {
     private readonly [ItemPropertyKey.ABILITIES];
+    private readonly [ItemPropertyKey.DEATH_TRIGGER];
+    private [ItemPropertyKey.COLOR]?;
     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;
+    /** Whether the item is owned by a unit, i.e. carried in any of its inventories (regular, extended or equipment). */
+    get isOwned(): boolean;
+    /** Whether the item is carried in a unit's (regular) inventory, as opposed to its extended or equipment inventory. */
+    get isInInventory(): boolean;
+    get isInExtendedInventory(): boolean;
+    get isInEquipmentInventory(): boolean;
+    get equipmentType(): EquipmentType;
+    get tag(): ItemTag;
+    get color(): PlayerColor;
+    set color(color: PlayerColor);
+    static getRandomTypeId(level: number, equipmentType?: EquipmentType | undefined, tag?: ItemTag, itemType?: jitemtype): ItemTypeId | undefined;
     get typeId(): ItemTypeId;
     set skinId(v: number);
     get skinId(): number;
@@ -32,8 +50,6 @@ export declare class Item extends Handle<jitem> {
     get dropsOnDeath(): boolean;
     set canBeDropped(canBeDropped: boolean);
     get canBeDropped(): boolean;
-    set canBeSold(canBeSold: boolean);
-    get canBeSold(): boolean;
     set perishes(perishes: boolean);
     get perishes(): boolean;
     set isPowerUp(isPowerUp: boolean);
@@ -42,8 +58,6 @@ export declare class Item extends Handle<jitem> {
     get isDead(): boolean;
     set isInvulnerable(isInvulnerable: boolean);
     get isInvulnerable(): boolean;
-    set isActivelyUsed(isActivelyUsed: boolean);
-    get isActivelyUsed(): boolean;
     set visible(v: boolean);
     get visible(): boolean;
     set level(v: number);
@@ -82,6 +96,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

@@ -13,6 +13,8 @@ local ____color = require("core.types.color")
 local Color = ____color.Color
 local ____event = require("event")
 local Event = ____event.Event
+local ____playerColor = require("core.types.playerColor")
+local PlayerColor = ____playerColor.PlayerColor
 local ____rect = require("core.types.rect")
 local Rect = ____rect.Rect
 local ____ability = require("engine.internal.ability")
@@ -27,37 +29,58 @@ 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 itemAddAbility = BlzItemAddAbility
-local itemRemoveAbility = BlzItemRemoveAbility
-local getItemAbility = BlzGetItemAbility
-local isItemPowerup = IsItemPowerup
-local getItemAbilityByIndex = BlzGetItemAbilityByIndex
-local getAbilityId = BlzGetAbilityId
-local getWidgetLife = GetWidgetLife
-local removeItem = RemoveItem
-local getHandleId = GetHandleId
-local setRect = SetRect
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local chooseRandomItemExWithFilter = ChooseRandomItemExWithFilter
+local condition = Condition
+local convertEquipmentType = ConvertEquipmentType
+local convertItemTag = ConvertItemTag
+local createTrigger = CreateTrigger
+local destroyTrigger = DestroyTrigger
 local enumItemsInRect = EnumItemsInRect
+local getAbilityId = BlzGetAbilityId
 local getEnumItem = GetEnumItem
+local getHandleId = GetHandleId
+local getItemAbility = BlzGetItemAbility
+local getItemAbilityByIndex = BlzGetItemAbilityByIndex
+local getItemBooleanField = BlzGetItemBooleanField
+local getItemCharges = GetItemCharges
+local getItemEquipmentType = GetItemEquipmentType
+local getItemIntegerField = BlzGetItemIntegerField
+local getItemTag = GetItemTag
 local getItemTypeId = GetItemTypeId
 local getItemX = GetItemX
 local getItemY = GetItemY
-local getItemCharges = GetItemCharges
+local getManipulatedItem = GetManipulatedItem
+local getTriggerWidget = GetTriggerWidget
+local getWidgetLife = GetWidgetLife
+local isItemEquipped = IsItemEquipped
+local isItemInBag = IsItemInBag
+local isItemOwned = IsItemOwned
+local isItemPawnable = IsItemPawnable
+local isItemPowerup = IsItemPowerup
+local itemAddAbility = BlzItemAddAbility
+local itemRemoveAbility = BlzItemRemoveAbility
+local loadItemHandle = LoadItemHandle
+local removeItem = RemoveItem
+local saveWidgetHandle = SaveWidgetHandle
+local setItemBooleanField = BlzSetItemBooleanField
 local setItemCharges = SetItemCharges
+local setItemColor = SetItemColor
+local setItemDropOnDeath = SetItemDropOnDeath
+local setItemDroppable = SetItemDroppable
+local setItemPawnable = SetItemPawnable
+local setRect = SetRect
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterDeathEvent = TriggerRegisterDeathEvent
 local unitRemoveAbility = UnitRemoveAbility
 local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitUseItemPoint = UnitUseItemPoint
 local unitUseItemTarget = UnitUseItemTarget
-local setItemDropOnDeath = SetItemDropOnDeath
-local setItemDroppable = SetItemDroppable
-local setItemPawnable = SetItemPawnable
-local isItemPawnable = IsItemPawnable
-local getItemIntegerField = BlzGetItemIntegerField
-local setItemBooleanField = BlzSetItemBooleanField
-local getItemBooleanField = BlzGetItemBooleanField
 local tableRemove = table.remove
+local itemChargesChangeEvent = __TS__New(Event)
+local itemDeathEvent = __TS__New(Event)
 _G.SetItemCharges = function(whichItem, charges)
     setItemCharges(whichItem, charges)
     invoke(
@@ -137,6 +160,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"
@@ -144,6 +186,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
@@ -155,11 +201,27 @@ 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)
     return self:of(BlzCreateItemWithSkin(id, x, y, skinId or id))
 end
+function Item.getRandomTypeId(self, level, equipmentType, tag, itemType)
+    if tag == nil then
+        tag = 8
+    end
+    if itemType == nil then
+        itemType = ITEM_TYPE_ANY
+    end
+    local id = chooseRandomItemExWithFilter(
+        itemType,
+        level,
+        convertEquipmentType(equipmentType or 9),
+        convertItemTag(tag)
+    )
+    return id ~= 0 and id or nil
+end
 function Item.prototype.consumeCharge(self)
     return self:consumeCharges(1)
 end
@@ -244,6 +306,70 @@ function Item.getInRect(self, rect)
     enumItemsInRect(rect.handle, nil, collectIntoTarget)
     return targetCollection
 end
+__TS__SetDescriptor(
+    Item.prototype,
+    "isOwned",
+    {get = function(self)
+        local handle = self.handle
+        return isItemOwned(handle) or isItemInBag(handle) or isItemEquipped(handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "isInInventory",
+    {get = function(self)
+        local handle = self.handle
+        return isItemOwned(handle) and not isItemInBag(handle) and not isItemEquipped(handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "isInExtendedInventory",
+    {get = function(self)
+        return isItemInBag(self.handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "isInEquipmentInventory",
+    {get = function(self)
+        return isItemEquipped(self.handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "equipmentType",
+    {get = function(self)
+        return getHandleId(getItemEquipmentType(self.handle))
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "tag",
+    {get = function(self)
+        return getHandleId(getItemTag(self.handle))
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "color",
+    {
+        get = function(self)
+            return self[102] or PlayerColor.red
+        end,
+        set = function(self, color)
+            setItemColor(self.handle, color.handle)
+            self[102] = color
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Item.prototype,
     "typeId",
@@ -356,19 +482,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "canBeSold",
-    {
-        get = function(self)
-            return isItemPawnable(self.handle)
-        end,
-        set = function(self, canBeSold)
-            setItemPawnable(self.handle, canBeSold)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "perishes",
@@ -427,30 +540,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "isActivelyUsed",
-    {
-        get = function(self)
-            return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
-        end,
-        set = function(self, isActivelyUsed)
-            local handle = self.handle
-            local powerUp = isItemPowerup(handle)
-            local perishes = getItemBooleanField(handle, ITEM_BF_PERISHABLE)
-            local dropsOnDeath = getItemBooleanField(handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
-            local canBeDropped = getItemBooleanField(handle, ITEM_BF_CAN_BE_DROPPED)
-            local canBeSold = isItemPawnable(handle)
-            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, isActivelyUsed)
-            setItemPawnable(handle, canBeSold)
-            setItemDroppable(handle, canBeDropped)
-            setItemDropOnDeath(handle, dropsOnDeath)
-            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
-            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "visible",
@@ -672,8 +761,8 @@ __TS__ObjectDefineProperty(
         return self.onDestroyEvent
     end}
 )
+Item.deathEvent = itemDeathEvent
 Item.chargesChangedEvent = itemChargesChangeEvent
-local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()
 TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)
 TriggerAddAction(

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/misc/unit-ability-level-natives.lua

@@ -0,0 +1,12 @@
+local ____exports = {}
+---
+-- @internal The original natives, captured before `unit+ability` wraps them to report
+-- ability level changes. For internal level juggling that must not be reported.
+____exports.rawSetUnitAbilityLevel = SetUnitAbilityLevel
+---
+-- @internal
+____exports.rawIncUnitAbilityLevel = IncUnitAbilityLevel
+---
+-- @internal
+____exports.rawDecUnitAbilityLevel = DecUnitAbilityLevel
+return ____exports

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

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