warscript 0.0.1-dev.9b0216a → 0.0.1-dev.9bcb501

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

@@ -1,5 +1,5 @@
 /** @noSelfInFile */
-import { Handle } from "../../core/types/handle";
+import { Handle, HandleDestructor } from "../../core/types/handle";
 import { Event } from "../../event";
 import type { Item } from "../../core/types/item";
 import type { Unit } from "./unit";
@@ -37,6 +37,7 @@ export declare abstract class Ability extends Handle<jability> {
     abstract get level(): number;
     abstract get cooldownRemaining(): number;
     abstract set cooldownRemaining(cooldownRemaining: number);
+    abstract startCooldown(cooldown: number): void;
     abstract interruptCast(): void;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
@@ -50,19 +51,29 @@ export declare class UnrecognizedAbility extends Ability {
     get level(): number;
     get cooldownRemaining(): number;
     set cooldownRemaining(_: number);
+    startCooldown(_: number): void;
     interruptCast(): void;
 }
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
+    private d?;
     constructor(handle: jability, typeId: number, owner: Unit);
     incrementHideCounter(): void;
     decrementHideCounter(): void;
+    incrementDisableCounter(): void;
+    decrementDisableCounter(): void;
+    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]>;
     static get onDestroy(): Event<[UnitAbility]>;
 }
@@ -88,7 +99,9 @@ export declare class ItemAbility extends Ability {
     get level(): number;
     get cooldownRemaining(): number;
     set cooldownRemaining(cooldownRemaining: number);
+    startCooldown(cooldown: number): void;
     interruptCast(): void;
+    protected onDestroy(): HandleDestructor;
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }

package/engine/internal/ability.lua

@@ -14,27 +14,33 @@ 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 unitDisableAbility = BlzUnitDisableAbility
 local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
@@ -212,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,
@@ -229,6 +234,19 @@ ____exports.getOrderIdByAbilityTypeId = function(abilityTypeId)
     local parentTypeId = availableFields[abilityTypeId]
     return order2orderId(orders[____type(parentTypeId) == "number" and parentTypeId or abilityTypeId] or "")
 end
+---
+-- @internal For use by internal systems only.
+____exports.abilityTypeHasField = function(abilityTypeId, field)
+    field = ____type(field) == "number" and field or getHandleId(field)
+    if commonFields[field] then
+        return true
+    end
+    local id = availableFields[abilityTypeId]
+    if ____type(id) == "number" then
+        id = availableFields[id]
+    end
+    return not not (id and id[field])
+end
 ____exports.Ability = __TS__Class()
 local Ability = ____exports.Ability
 Ability.name = "Ability"
@@ -244,15 +262,7 @@ function Ability.prototype.getSnapshot(self)
     return nil
 end
 function Ability.prototype.hasField(self, field)
-    field = ____type(field) == "number" and field or getHandleId(field)
-    if commonFields[field] then
-        return true
-    end
-    local id = availableFields[self.typeId]
-    if ____type(id) == "number" then
-        id = availableFields[id]
-    end
-    return not not (id and id[field])
+    return ____exports.abilityTypeHasField(self.typeId, field)
 end
 function Ability.prototype.getField(self, field, level)
     local fieldType = match(
@@ -280,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
@@ -363,6 +373,8 @@ function UnrecognizedAbility.prototype.____constructor(self, typeId, owner)
     UnrecognizedAbility.____super.prototype.____constructor(self, nil, typeId)
     self.owner = owner
 end
+function UnrecognizedAbility.prototype.startCooldown(self, _)
+end
 function UnrecognizedAbility.prototype.interruptCast(self)
 end
 __TS__SetDescriptor(
@@ -400,9 +412,40 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.incrementDisableCounter(self)
+    local unit = self.u
+    local typeId = self.typeId
+    unitHideAbility(unit, typeId, true)
+    unitDisableAbility(unit, typeId, true, false)
+    self.d = (self.d or 0) + 1
+end
+function UnitAbility.prototype.decrementDisableCounter(self)
+    local unit = self.u
+    local typeId = self.typeId
+    unitDisableAbility(unit, typeId, false, false)
+    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
+function UnitAbility.prototype.onDestroy(self)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
+    return UnitAbility.____super.prototype.onDestroy(self)
+end
+__TS__SetDescriptor(
+    UnitAbility.prototype,
+    "isDisabled",
+    {get = function(self)
+        return self.d ~= nil and self.d > 0
+    end},
+    true
+)
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",
@@ -411,7 +454,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
@@ -424,7 +480,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
@@ -452,8 +508,6 @@ end
 local function getAbilityCooldown(_, abilityTypeId)
     return getUnitAbilityCooldownRemaining(abilityActionDummy, abilityTypeId)
 end
-local function doNothing()
-end
 ____exports.ItemAbility = __TS__Class()
 local ItemAbility = ____exports.ItemAbility
 ItemAbility.name = "ItemAbility"
@@ -481,12 +535,28 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
         value
     )
 end
-function ItemAbility.prototype.interruptCast(self)
+function ItemAbility.prototype.startCooldown(self, cooldown)
     local item = self.owner
-    local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
+    local ____startItemCooldown_4 = startItemCooldown
     local ____item_handle_3 = item.handle
     local ____opt_1 = item.owner
-    ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, doNothing)
+    ____startItemCooldown_4(____item_handle_3, ____opt_1 and ____opt_1.handle, cooldown)
+end
+function ItemAbility.prototype.interruptCast(self)
+    local item = self.owner
+    local itemHandle = item.handle
+    local ____opt_5 = item.owner
+    local itemOwnerHandle = ____opt_5 and ____opt_5.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)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
+    return ItemAbility.____super.prototype.onDestroy(self)
 end
 __TS__SetDescriptor(
     ItemAbility.prototype,
@@ -502,17 +572,17 @@ __TS__SetDescriptor(
     {
         get = function(self)
             local item = self.owner
-            local ____doAbilityActionForceDummy_8 = doAbilityActionForceDummy
-            local ____item_handle_7 = item.handle
-            local ____opt_5 = item.owner
-            return ____doAbilityActionForceDummy_8(____item_handle_7, ____opt_5 and ____opt_5.handle, getAbilityCooldown, self.typeId)
+            local ____doAbilityActionForceDummy_10 = doAbilityActionForceDummy
+            local ____item_handle_9 = item.handle
+            local ____opt_7 = item.owner
+            return ____doAbilityActionForceDummy_10(____item_handle_9, ____opt_7 and ____opt_7.handle, getAbilityCooldown, self.typeId)
         end,
         set = function(self, cooldownRemaining)
             local item = self.owner
-            local ____startItemCooldown_12 = startItemCooldown
-            local ____item_handle_11 = item.handle
-            local ____opt_9 = item.owner
-            ____startItemCooldown_12(____item_handle_11, ____opt_9 and ____opt_9.handle, cooldownRemaining)
+            local ____startItemCooldown_14 = startItemCooldown
+            local ____item_handle_13 = item.handle
+            local ____opt_11 = item.owner
+            ____startItemCooldown_14(____item_handle_13, ____opt_11 and ____opt_11.handle, cooldownRemaining)
         end
     },
     true

package/engine/internal/item/ability.lua

@@ -1,4 +1,5 @@
 local ____exports = {}
+local restoreCooldownGroup
 local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
@@ -11,8 +12,15 @@ local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.u
 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 getItemAbility = BlzGetItemAbility
 local getItemX = GetItemX
 local getItemY = GetItemY
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
@@ -21,10 +29,11 @@ local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local setItemPosition = SetItemPosition
 local unitAddItem = UnitAddItem
-local unitDropItemSlot = UnitDropItemSlot
 local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitResetCooldown = UnitResetCooldown
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
 local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
     if not currentMap then
         return 0
@@ -43,28 +52,36 @@ local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
 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)
-local dummy = assert(CreateUnit(
+---
+-- @internal For use by internal systems only.
+____exports.itemAbilityDummy = assert(CreateUnit(
     Player.neutralVictim.handle,
     dummyUnitId,
     0,
     0,
     270
 ))
-local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
-local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
-ShowUnit(dummy, false)
+local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
+local cooldownStarterAbility = getItemAbility(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(dummy)
-    unitUseItem(dummy, cooldownStarterItem)
-    setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, cooldownGroup)
+    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.
@@ -73,10 +90,14 @@ ____exports.startItemCooldown = function(handle, owner, cooldown)
 end
 ---
 -- @internal For use by internal systems only.
-____exports.abilityActionDummy = dummy
+____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
@@ -88,16 +109,19 @@ ____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
 ---
@@ -110,20 +134,73 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
     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(dummy, handle)
+    unitAddItem(____exports.itemAbilityDummy, handle)
     local result = action(handle, ...)
-    unitRemoveItem(dummy, handle)
-    unitAddItem(owner, handle)
-    unitDropItemSlot(owner, handle, slot)
+    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
+local depth = 0
+local itemBySlot = {}
+---
+-- @internal For use by internal systems only.
+____exports.doUnitAbilityAction = function(unit, abilityTypeId, action, ...)
+    local ____depth_0 = depth
+    depth = ____depth_0 + 1
+    local offset = 6 * ____depth_0
+    for slot = 0, unitInventorySize(unit) - 1 do
+        local item = unitItemInSlot(unit, slot)
+        if getItemAbility(item, abilityTypeId) ~= nil then
+            local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = true
+            end
+            unitRemoveItem(unit, item)
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = nil
+            end
+            itemBySlot[offset + slot] = item
+        end
+    end
+    local result = action(unit, ...)
+    for slot = 0, unitInventorySize(unit) - 1 do
+        local item = itemBySlot[offset + slot]
+        if item ~= nil then
+            local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = true
+            end
+            local isPowerup = isItemPowerup(item)
+            if isPowerup then
+                setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+            end
+            unitAddItemToSlot(unit, item, slot)
+            if isPowerup then
+                setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+            end
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = nil
+            end
+            itemBySlot[offset + slot] = nil
+        end
+    end
+    depth = depth - 1
     return result
 end
 return ____exports

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,18 +5,47 @@ 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"})
-Unit.itemPickedUpEvent:addListener(function(unit, item)
-    ownerByItem[item] = unit
-end)
-Unit.itemDroppedEvent:addListener(function(unit, item)
-    ownerByItem[item] = nil
-end)
+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(
+    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(
+    999999,
+    function(unit, item)
+        ownerByItem[item] = nil
+    end
+)
 __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