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

package/engine/internal/unit/bonus.lua

@@ -1,11 +1,14 @@
 local ____exports = {}
+local applyAbilityBonus, applyHealthRegenerationRateBonus
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
-local ____armor_2Dincrease = require("engine.internal.object-data.armor-increase")
-local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_FIELD
-local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____armor_2Dbonus = require("engine.internal.object-data.armor-bonus")
+local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_FIELD
+local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
 local ____utility = require("engine.internal.utility")
 local addInternalAbility = ____utility.addInternalAbility
+local ____unit_2Dability_2Dlevel_2Dnatives = require("engine.internal.misc.unit-ability-level-natives")
+local rawSetUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawSetUnitAbilityLevel
 local ____arrays = require("utility.arrays")
 local product = ____arrays.product
 local sum = ____arrays.sum
@@ -24,6 +27,21 @@ local MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____movement_2Dspee
 local ____evasion_2Dprobability = require("engine.internal.object-data.evasion-probability")
 local EVASION_PROBABILITY_ABILITY_FIELD = ____evasion_2Dprobability.EVASION_PROBABILITY_ABILITY_FIELD
 local EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID = ____evasion_2Dprobability.EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID
+local ____health_2Dbonus = require("engine.internal.object-data.health-bonus")
+local HEALTH_BONUS_DUMMY_ABILITY_FIELD = ____health_2Dbonus.HEALTH_BONUS_DUMMY_ABILITY_FIELD
+local HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID = ____health_2Dbonus.HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____mana_2Dbonus = require("engine.internal.object-data.mana-bonus")
+local MANA_BONUS_DUMMY_ABILITY_FIELD = ____mana_2Dbonus.MANA_BONUS_DUMMY_ABILITY_FIELD
+local MANA_BONUS_DUMMY_ABILITY_TYPE_ID = ____mana_2Dbonus.MANA_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor = require("engine.internal.object-data.mana-regeneration-rate-increase-factor")
+local MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD
+local MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID
+local ____health_2Dregeneration_2Drate_2Dincrease = require("engine.internal.object-data.health-regeneration-rate-increase")
+local FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD = ____health_2Dregeneration_2Drate_2Dincrease.FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD
+local FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID = ____health_2Dregeneration_2Drate_2Dincrease.FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID
+local HEALTH_REGENERATION_RATE_DECREASE_DUMMY_ABILITY_TYPE_ID = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_DECREASE_DUMMY_ABILITY_TYPE_ID
+local HEALTH_REGENERATION_RATE_DECREASE_DUMMY_VALUE = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_DECREASE_DUMMY_VALUE
+local HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_IDS = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_IDS
 local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
 local function atLeastOnceProbability(array)
@@ -36,6 +54,20 @@ end
 ____exports.UnitBonusType = {}
 local UnitBonusType = ____exports.UnitBonusType
 do
+    UnitBonusType.HEALTH = {
+        abilityTypeId = HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID,
+        field = HEALTH_BONUS_DUMMY_ABILITY_FIELD,
+        integer = true,
+        reduce = sum,
+        initialValue = 0
+    }
+    UnitBonusType.MANA = {
+        abilityTypeId = MANA_BONUS_DUMMY_ABILITY_TYPE_ID,
+        field = MANA_BONUS_DUMMY_ABILITY_FIELD,
+        integer = true,
+        reduce = sum,
+        initialValue = 0
+    }
     UnitBonusType.ARMOR = {
         abilityTypeId = ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID,
         field = ARMOR_BONUS_DUMMY_ABILITY_FIELD,
@@ -73,33 +105,95 @@ do
         reduce = atLeastOnceProbability,
         initialValue = 0
     }
+    UnitBonusType.MANA_REGENERATION_RATE_FACTOR = {
+        abilityTypeId = MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID,
+        field = MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD,
+        integer = false,
+        reduce = sum,
+        initialValue = 0
+    }
+    --- Supported range: -1000 to 1000; the total is clamped to it.
+    UnitBonusType.HEALTH_REGENERATION_RATE = {
+        apply = function(unitHandle, value) return applyHealthRegenerationRateBonus(unitHandle, value) end,
+        reduce = sum,
+        initialValue = 0
+    }
 end
 local bonusesByUnitByBonusType = {}
 local nextId = 1
+local ceil = math.ceil
+local floor = math.floor
+local max = math.max
+local min = math.min
 local function processUnitBonus(unit, bonusType, bonusesArray)
     local unitHandle = unit.handle
     local totalValue = bonusType.reduce(bonusesArray)
     local abilityTypeId = bonusType.abilityTypeId
     if abilityTypeId == nil then
         local valueByUnit = bonusType.valueByUnit
-        if totalValue == bonusType.initialValue then
+        if valueByUnit == nil then
+            bonusType.apply(unitHandle, totalValue)
+        elseif totalValue == bonusType.initialValue then
             valueByUnit[unit] = nil
         else
             valueByUnit[unit] = totalValue
         end
         return
     end
-    if totalValue == bonusType.initialValue then
+    applyAbilityBonus(
+        unitHandle,
+        abilityTypeId,
+        bonusType.field,
+        bonusType.integer,
+        totalValue,
+        bonusType.initialValue
+    )
+end
+applyAbilityBonus = function(unitHandle, abilityTypeId, field, integer, value, initialValue)
+    if value == initialValue then
         UnitRemoveAbility(unitHandle, abilityTypeId)
         return
     end
     local abilityHandle = checkNotNull(addInternalAbility(unitHandle, abilityTypeId))
-    check((bonusType.integer and BlzSetAbilityIntegerLevelField or BlzSetAbilityRealLevelField)(abilityHandle, bonusType.field, 0, totalValue))
+    check((integer and BlzSetAbilityIntegerLevelField or BlzSetAbilityRealLevelField)(abilityHandle, field, 0, value))
     BlzSetAbilityIntegerField(abilityHandle, ABILITY_IF_LEVELS, 2)
-    SetUnitAbilityLevel(unitHandle, abilityTypeId, 2)
-    SetUnitAbilityLevel(unitHandle, abilityTypeId, 1)
+    rawSetUnitAbilityLevel(unitHandle, abilityTypeId, 2)
+    rawSetUnitAbilityLevel(unitHandle, abilityTypeId, 1)
     BlzSetAbilityIntegerField(abilityHandle, ABILITY_IF_LEVELS, 1)
 end
+local function setInternalAbilityPresence(unitHandle, abilityTypeId, present)
+    if present then
+        addInternalAbility(unitHandle, abilityTypeId)
+    else
+        UnitRemoveAbility(unitHandle, abilityTypeId)
+    end
+end
+local MINIMUM_HEALTH_REGENERATION_RATE_BONUS = -1000
+local MAXIMUM_HEALTH_REGENERATION_RATE_BONUS = 1000
+applyHealthRegenerationRateBonus = function(unitHandle, value)
+    value = max(
+        MINIMUM_HEALTH_REGENERATION_RATE_BONUS,
+        min(value, MAXIMUM_HEALTH_REGENERATION_RATE_BONUS)
+    )
+    local integerValue = value < 0 and ceil(value) or floor(value)
+    local remainder = integerValue
+    setInternalAbilityPresence(unitHandle, HEALTH_REGENERATION_RATE_DECREASE_DUMMY_ABILITY_TYPE_ID, remainder < 0)
+    if remainder < 0 then
+        remainder = remainder - HEALTH_REGENERATION_RATE_DECREASE_DUMMY_VALUE
+    end
+    for ____, abilityTypeId in ipairs(HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_IDS) do
+        setInternalAbilityPresence(unitHandle, abilityTypeId, remainder % 2 == 1)
+        remainder = floor(remainder / 2)
+    end
+    applyAbilityBonus(
+        unitHandle,
+        FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID,
+        FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD,
+        false,
+        value - integerValue,
+        0
+    )
+end
 ____exports.addUnitBonus = function(unit, bonusType, value)
     local bonusesByUnit = bonusesByUnitByBonusType[bonusType]
     if bonusesByUnit == nil then

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

@@ -32,7 +32,7 @@ declare module "../unit" {
          * @param includeAuras Whether to remove aura buffs. Default `true`.
          * @param autoDispel Unknown. Default `false`.
          */
-        removeBuffs(polarity?: BuffPolarity, resistanceType?: BuffResistanceType, includeExpirationTimers?: boolean, includeAuras?: boolean, autoDispel?: boolean): void;
-        removeBuffs(buffTypeIds: number[]): void;
+        removeBuffs(polarity?: BuffPolarity, resistanceType?: BuffResistanceType, includeExpirationTimers?: boolean, includeAuras?: boolean, autoDispel?: boolean): number;
+        removeBuffs(buffTypeIds: number[]): number;
     }
 }

package/engine/internal/unit/buff.lua

@@ -1,7 +1,3 @@
-local ____lualib = require("lualib_bundle")
-local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
-local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
-local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local ____exports = {}
 local ____buff = require("engine.buff")
 local checkBuff = ____buff.checkBuff
@@ -19,7 +15,7 @@ Unit.prototype.hasBuff = function(self, buffTypeId)
 end
 Unit.prototype.removeBuff = function(self, buffTypeId)
     if removeBuff(self.handle, buffTypeId) then
-        checkBuff(self, buffTypeId)
+        checkBuff(self, buffTypeId, false)
         return true
     end
     return false
@@ -46,36 +42,55 @@ Unit.prototype.countBuffs = function(self, polarity, resistanceType, includeExpi
     )
 end
 Unit.prototype.removeBuffs = function(self, polarityOrBuffTypeIds, resistanceType, includeExpirationTimers, includeAuras, autoDispel)
+    local handle = self.handle
+    local cnt
     if type(polarityOrBuffTypeIds) == "table" then
-        local handle = self.handle
+        cnt = 0
         for i = 1, #polarityOrBuffTypeIds do
-            unitRemoveAbility(handle, polarityOrBuffTypeIds[i])
+            cnt = cnt + (unitRemoveAbility(handle, polarityOrBuffTypeIds[i]) and 1 or 0)
         end
     else
-        local ____array_3 = __TS__SparseArrayNew(
-            self.handle,
-            (polarityOrBuffTypeIds or 3) & 1 ~= 0,
-            (polarityOrBuffTypeIds or 3) & 2 ~= 0,
-            (resistanceType or 0) & 1 ~= 0,
-            (resistanceType or 0) & 2 ~= 0
-        )
+        local positive = (polarityOrBuffTypeIds or 3) & 1 ~= 0
+        local negative = (polarityOrBuffTypeIds or 3) & 2 ~= 0
+        local magic = (resistanceType or 0) & 1 ~= 0
+        local physical = (resistanceType or 0) & 2 ~= 0
         local ____includeExpirationTimers_0 = includeExpirationTimers
         if ____includeExpirationTimers_0 == nil then
             ____includeExpirationTimers_0 = true
         end
-        __TS__SparseArrayPush(____array_3, ____includeExpirationTimers_0)
+        includeExpirationTimers = ____includeExpirationTimers_0
         local ____includeAuras_1 = includeAuras
         if ____includeAuras_1 == nil then
             ____includeAuras_1 = true
         end
-        __TS__SparseArrayPush(____array_3, ____includeAuras_1)
+        includeAuras = ____includeAuras_1
         local ____autoDispel_2 = autoDispel
         if ____autoDispel_2 == nil then
             ____autoDispel_2 = false
         end
-        __TS__SparseArrayPush(____array_3, ____autoDispel_2)
-        unitRemoveBuffsEx(__TS__SparseArraySpread(____array_3))
+        autoDispel = ____autoDispel_2
+        cnt = unitCountBuffsEx(
+            handle,
+            positive,
+            negative,
+            magic,
+            physical,
+            includeExpirationTimers,
+            includeAuras,
+            autoDispel
+        )
+        unitRemoveBuffsEx(
+            handle,
+            positive,
+            negative,
+            magic,
+            physical,
+            includeExpirationTimers,
+            includeAuras,
+            autoDispel
+        )
     end
-    checkBuffs(self)
+    checkBuffs(self, false)
+    return cnt
 end
 return ____exports

package/engine/internal/unit/equipment-inventory.d.ts

@@ -0,0 +1,44 @@
+/** @noSelfInFile */
+import { Item } from "../item";
+import { EquipmentSlot } from "../../object-data/auxiliary/equipment-slot";
+import { EquipmentType } from "../../object-data/auxiliary/equipment-type";
+import type { UnitItemContainer } from "./item-container";
+export interface UnitEquipmentInventory extends UnitItemContainer {
+}
+/**
+ * A live view of a unit's equipment inventory, indexed by {@link EquipmentSlot}.
+ *
+ * Equipment slots are typed, so the engine picks the slot itself when equipping: slot assignment frees
+ * the requested slot and then equips the item. The only type with two slots is the ring; equipping into
+ * ALTERNATE_RING temporarily occupies RING with a filler ring, mirroring the regular inventory's approach.
+ */
+export declare class UnitEquipmentInventory {
+    constructor(handle: junit);
+    equip(item: Item): boolean;
+    unequip(item: Item): void;
+    unequipSlot(slot: EquipmentSlot): Item | undefined;
+    has(item: Item): boolean;
+    hasAny(): boolean;
+    isSlotEmpty(slot: EquipmentSlot): boolean;
+    hasType(type: EquipmentType): boolean;
+    canEquipType(type: EquipmentType): boolean;
+    findSlot(item: Item): EquipmentSlot | undefined;
+    protected __newindex(slot: number, item: Item | undefined): void;
+    protected __index(key: string | number): unknown;
+    protected __len(): number;
+    protected __ipairs(): LuaIterator<LuaMultiReturn<[number, Item | undefined]>, junit>;
+}
+declare module "../unit" {
+    interface Unit {
+        readonly equipmentInventory: UnitEquipmentInventory;
+    }
+    namespace Unit {
+        const itemEquippedEvent: UnitTriggerEvent<[item: Item]>;
+        const itemUnequippedEvent: UnitTriggerEvent<[item: Item]>;
+        let itemStackedEvent: UnitTriggerEvent<[
+            target: Item,
+            source: Item,
+            previousTargetCharges: number
+        ]>;
+    }
+}

package/engine/internal/unit/equipment-inventory.lua

@@ -0,0 +1,233 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local UnitTriggerEvent = ____unit.UnitTriggerEvent
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____event = require("event")
+local IgnoreEvent = ____event.IgnoreEvent
+local ____dummy = require("objutil.dummy")
+local dummyUnitId = ____dummy.dummyUnitId
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItemTypeIds = ____ignore_2Devents_2Ditems.ignoreEventsItemTypeIds
+local isItemIgnoredInEvents = ____ignore_2Devents_2Ditems.isItemIgnoredInEvents
+local ____blank = require("engine.object-data.entry.item-type.blank")
+local BlankItemType = ____blank.BlankItemType
+local convertEquipmentType = ConvertEquipmentType
+local convertLoadoutSlot = ConvertLoadoutSlot
+local getEquippedItem = GetEquippedItem
+local getStackingItemSource = BlzGetStackingItemSource
+local getStackingItemTarget = BlzGetStackingItemTarget
+local getStackingItemTargetPreviousCharges = BlzGetStackingItemTargetPreviousCharges
+local getTriggerUnit = GetTriggerUnit
+local getUnequippedItem = GetUnequippedItem
+local getUnitTypeId = GetUnitTypeId
+local unitCanEquipItemOfEquipmentType = UnitCanEquipItemOfEquipmentType
+local unitEquipItem = UnitEquipItem
+local unitHasAnyItemEquiped = UnitHasAnyItemEquiped
+local unitHasItemEquipmentOfType = UnitHasItemEquipmentOfType
+local unitHasItemEquipped = UnitHasItemEquipped
+local unitHasLoadoutSlotEmpty = UnitHasLoadoutSlotEmpty
+local unitItemInEquipmentSlot = UnitItemInEquipmentSlot
+local setItemVisible = SetItemVisible
+local unitAddItem = UnitAddItem
+local unitRemoveItem = UnitRemoveItem
+local unitUnequipItem = UnitUnequipItem
+local unitUnequipItemFromSlot = UnitUnequipItemFromSlot
+local ____rawget = _G.rawget
+local rawset = _G.rawset
+local ____type = _G.type
+local EQUIPMENT_INVENTORY_SLOT_COUNT = bj_MAX_EQUIPMENT_INVENTORY
+---
+-- @internal For use by internal systems only.
+____exports.RING_FILLER_ITEM_TYPE_ID = compiletime(function()
+    local itemType = BlankItemType:create()
+    itemType.name = "[Warscript/Dummy] Ring Filler"
+    itemType.itemClass = "Equipment"
+    itemType.equipmentType = 5
+    return itemType.id
+end)
+ignoreEventsItemTypeIds[____exports.RING_FILLER_ITEM_TYPE_ID] = true
+--- Occupies the RING slot while a ring is being equipped into ALTERNATE_RING, since the engine fills the
+-- RING slot first.
+local ringFillerItem = (function()
+    local item = CreateItem(____exports.RING_FILLER_ITEM_TYPE_ID, 0, 0)
+    setItemVisible(item, false)
+    return item
+end)()
+--- Equips an item the unit may not be carrying yet; the engine picks the slot.
+local function unitEquip(unit, item)
+    return unitEquipItem(unit, item) or unitAddItem(unit, item) and unitEquipItem(unit, item)
+end
+local handleByUnitEquipmentInventory = setmetatable({}, {__mode = "k"})
+local function unitEquipmentInventoryNext(handle, slot)
+    if slot >= EQUIPMENT_INVENTORY_SLOT_COUNT then
+        return nil, nil
+    end
+    return slot + 1, Item:of(unitItemInEquipmentSlot(
+        handle,
+        convertLoadoutSlot(slot)
+    ))
+end
+--- A live view of a unit's equipment inventory, indexed by {@link EquipmentSlot}.
+-- 
+-- Equipment slots are typed, so the engine picks the slot itself when equipping: slot assignment frees
+-- the requested slot and then equips the item. The only type with two slots is the ring; equipping into
+-- ALTERNATE_RING temporarily occupies RING with a filler ring, mirroring the regular inventory's approach.
+____exports.UnitEquipmentInventory = __TS__Class()
+local UnitEquipmentInventory = ____exports.UnitEquipmentInventory
+UnitEquipmentInventory.name = "UnitEquipmentInventory"
+function UnitEquipmentInventory.prototype.____constructor(self, handle)
+    handleByUnitEquipmentInventory[self] = handle
+end
+function UnitEquipmentInventory.prototype.equip(self, item)
+    return unitEquipItem(handleByUnitEquipmentInventory[self], item.handle)
+end
+function UnitEquipmentInventory.prototype.unequip(self, item)
+    unitUnequipItem(handleByUnitEquipmentInventory[self], item.handle)
+end
+function UnitEquipmentInventory.prototype.unequipSlot(self, slot)
+    return Item:of(unitUnequipItemFromSlot(
+        handleByUnitEquipmentInventory[self],
+        convertLoadoutSlot(slot)
+    ))
+end
+function UnitEquipmentInventory.prototype.has(self, item)
+    return unitHasItemEquipped(handleByUnitEquipmentInventory[self], item.handle)
+end
+function UnitEquipmentInventory.prototype.hasAny(self)
+    return unitHasAnyItemEquiped(handleByUnitEquipmentInventory[self])
+end
+function UnitEquipmentInventory.prototype.isSlotEmpty(self, slot)
+    return unitHasLoadoutSlotEmpty(
+        handleByUnitEquipmentInventory[self],
+        convertLoadoutSlot(slot)
+    )
+end
+function UnitEquipmentInventory.prototype.hasType(self, ____type)
+    return unitHasItemEquipmentOfType(
+        handleByUnitEquipmentInventory[self],
+        convertEquipmentType(____type)
+    )
+end
+function UnitEquipmentInventory.prototype.canEquipType(self, ____type)
+    return unitCanEquipItemOfEquipmentType(
+        handleByUnitEquipmentInventory[self],
+        convertEquipmentType(____type)
+    )
+end
+function UnitEquipmentInventory.prototype.findSlot(self, item)
+    local handle = handleByUnitEquipmentInventory[self]
+    for slot = 0, EQUIPMENT_INVENTORY_SLOT_COUNT - 1 do
+        if unitItemInEquipmentSlot(
+            handle,
+            convertLoadoutSlot(slot)
+        ) == item.handle then
+            return slot
+        end
+    end
+    return nil
+end
+function UnitEquipmentInventory.prototype.__newindex(self, slot, item)
+    local handle = handleByUnitEquipmentInventory[self]
+    if slot < 1 or slot > EQUIPMENT_INVENTORY_SLOT_COUNT then
+        return
+    end
+    local loadoutSlot = convertLoadoutSlot(slot - 1)
+    local previousItem = unitItemInEquipmentSlot(handle, loadoutSlot)
+    if previousItem ~= nil and previousItem ~= (item and item.handle) then
+        unitUnequipItemFromSlot(handle, loadoutSlot)
+        unitRemoveItem(handle, previousItem)
+    end
+    if item ~= nil then
+        local itemHandle = item.handle
+        local ringLoadoutSlot = convertLoadoutSlot(4)
+        if slot - 1 == 5 and unitHasLoadoutSlotEmpty(handle, ringLoadoutSlot) then
+            unitEquip(handle, ringFillerItem)
+            unitEquip(handle, itemHandle)
+            unitUnequipItemFromSlot(handle, ringLoadoutSlot)
+            unitRemoveItem(handle, ringFillerItem)
+            setItemVisible(ringFillerItem, false)
+        else
+            unitEquip(handle, itemHandle)
+        end
+    end
+end
+function UnitEquipmentInventory.prototype.__index(self, key)
+    if ____type(key) == "number" then
+        return Item:of(unitItemInEquipmentSlot(
+            handleByUnitEquipmentInventory[self],
+            convertLoadoutSlot(key - 1)
+        ))
+    end
+    return ____rawget(____exports.UnitEquipmentInventory.prototype, key)
+end
+function UnitEquipmentInventory.prototype.__len(self)
+    return EQUIPMENT_INVENTORY_SLOT_COUNT
+end
+function UnitEquipmentInventory.prototype.__ipairs(self)
+    return unitEquipmentInventoryNext, handleByUnitEquipmentInventory[self], 0
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "equipmentInventory",
+    {get = function(self)
+        local equipmentInventory = __TS__New(____exports.UnitEquipmentInventory, self.handle)
+        rawset(self, "equipmentInventory", equipmentInventory)
+        return equipmentInventory
+    end}
+)
+rawset(
+    Unit,
+    "itemEquippedEvent",
+    __TS__New(
+        UnitTriggerEvent,
+        EVENT_PLAYER_UNIT_EQUIP_ITEM,
+        function()
+            local unit = getTriggerUnit()
+            local item = getEquippedItem()
+            if getUnitTypeId(unit) ~= dummyUnitId and not isItemIgnoredInEvents(item) then
+                return Unit:of(unit), Item:of(item)
+            end
+            return IgnoreEvent
+        end
+    )
+)
+rawset(
+    Unit,
+    "itemUnequippedEvent",
+    __TS__New(
+        UnitTriggerEvent,
+        EVENT_PLAYER_UNIT_UNEQUIP_ITEM,
+        function()
+            local unit = getTriggerUnit()
+            local item = getUnequippedItem()
+            if getUnitTypeId(unit) ~= dummyUnitId and not isItemIgnoredInEvents(item) then
+                return Unit:of(unit), Item:of(item)
+            end
+            return IgnoreEvent
+        end
+    )
+)
+rawset(
+    Unit,
+    "itemStackedEvent",
+    __TS__New(
+        UnitTriggerEvent,
+        EVENT_PLAYER_UNIT_STACK_ITEM,
+        function()
+            local unit = getTriggerUnit()
+            local target = getStackingItemTarget()
+            local source = getStackingItemSource()
+            if getUnitTypeId(unit) ~= dummyUnitId and not isItemIgnoredInEvents(target) and not isItemIgnoredInEvents(source) then
+                return Unit:of(unit), Item:of(target), Item:of(source), getStackingItemTargetPreviousCharges()
+            end
+            return IgnoreEvent
+        end
+    )
+)
+return ____exports

package/engine/internal/unit/expiration-timer.lua

@@ -29,7 +29,7 @@ Unit.prototype.removeExpirationTimer = function(self)
     cancelTimedLife(handle)
     setWidgetLife(handle, life)
 end
-Unit.onImmediateOrder[orderId("phoenixmorph")]:addListener(
+Unit.onImmediateOrder[852482]:addListener(
     4,
     function(unit)
         unitRemoveAbility(unit.handle, dummyPhoenixMorphAbilityTypeId)

package/engine/internal/unit/extended-inventory.d.ts

@@ -0,0 +1,25 @@
+/** @noSelfInFile */
+import { Item } from "../item";
+import type { UnitItemContainer } from "./item-container";
+export interface UnitExtendedInventory extends UnitItemContainer {
+}
+/**
+ * A live, zero-based view of a unit's extended inventory.
+ *
+ * Slot assignment works like the regular inventory's, see {@link unitAddItemToSlot}.
+ */
+export declare class UnitExtendedInventory {
+    constructor(handle: junit);
+    has(item: Item): boolean;
+    findSlot(item: Item): number | undefined;
+    isSlotEmpty(slot: number): boolean;
+    protected __newindex(slot: number, item: Item | undefined): void;
+    protected __index(key: string | number): unknown;
+    protected __len(): number;
+    protected __ipairs(): LuaIterator<LuaMultiReturn<[number, Item | undefined]>, junit>;
+}
+declare module "../unit" {
+    interface Unit {
+        readonly extendedInventory: UnitExtendedInventory;
+    }
+}

package/engine/internal/unit/extended-inventory.lua

@@ -0,0 +1,99 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____item_2Dcontainer = require("engine.internal.unit.item-container")
+local unitOwnsItem = ____item_2Dcontainer.unitOwnsItem
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
+local unitExtendedInventorySize = UnitExtendedInventorySize
+local unitHasItemBagged = UnitHasItemBagged
+local unitItemInBagSlot = UnitItemInBagSlot
+local unitRemoveItem = UnitRemoveItem
+local isItemPowerup = IsItemPowerup
+local setItemBooleanField = BlzSetItemBooleanField
+local ____rawget = _G.rawget
+local rawset = _G.rawset
+local ____type = _G.type
+local handleByUnitExtendedInventory = setmetatable({}, {__mode = "k"})
+local function unitExtendedInventoryNext(handle, slot)
+    if slot >= unitExtendedInventorySize(handle) then
+        return nil, nil
+    end
+    return slot + 1, Item:of(unitItemInBagSlot(handle, slot))
+end
+--- A live, zero-based view of a unit's extended inventory.
+-- 
+-- Slot assignment works like the regular inventory's, see {@link unitAddItemToSlot}.
+____exports.UnitExtendedInventory = __TS__Class()
+local UnitExtendedInventory = ____exports.UnitExtendedInventory
+UnitExtendedInventory.name = "UnitExtendedInventory"
+function UnitExtendedInventory.prototype.____constructor(self, handle)
+    handleByUnitExtendedInventory[self] = handle
+end
+function UnitExtendedInventory.prototype.has(self, item)
+    return unitHasItemBagged(handleByUnitExtendedInventory[self], item.handle)
+end
+function UnitExtendedInventory.prototype.findSlot(self, item)
+    local handle = handleByUnitExtendedInventory[self]
+    for slot = 0, unitExtendedInventorySize(handle) - 1 do
+        if unitItemInBagSlot(handle, slot) == item.handle then
+            return slot
+        end
+    end
+    return nil
+end
+function UnitExtendedInventory.prototype.isSlotEmpty(self, slot)
+    return unitItemInBagSlot(handleByUnitExtendedInventory[self], slot) == nil
+end
+function UnitExtendedInventory.prototype.__newindex(self, slot, item)
+    local handle = handleByUnitExtendedInventory[self]
+    if slot < 1 or slot > unitExtendedInventorySize(handle) then
+        return
+    end
+    local previousItem = unitItemInBagSlot(handle, slot - 1)
+    if previousItem ~= nil and previousItem ~= (item and item.handle) then
+        unitRemoveItem(handle, previousItem)
+    end
+    if item ~= nil then
+        local itemHandle = item.handle
+        if unitOwnsItem(handle, itemHandle) then
+            unitRemoveItem(handle, itemHandle)
+        end
+        local isPowerup = isItemPowerup(itemHandle)
+        if isPowerup then
+            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+        end
+        unitAddItemToSlot(handle, itemHandle, slot - 1, 1)
+        if isPowerup then
+            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+        end
+    end
+end
+function UnitExtendedInventory.prototype.__index(self, key)
+    if ____type(key) == "number" then
+        return Item:of(unitItemInBagSlot(handleByUnitExtendedInventory[self], key - 1))
+    end
+    return ____rawget(____exports.UnitExtendedInventory.prototype, key)
+end
+function UnitExtendedInventory.prototype.__len(self)
+    return unitExtendedInventorySize(handleByUnitExtendedInventory[self])
+end
+function UnitExtendedInventory.prototype.__ipairs(self)
+    return unitExtendedInventoryNext, handleByUnitExtendedInventory[self], 0
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "extendedInventory",
+    {get = function(self)
+        local extendedInventory = __TS__New(____exports.UnitExtendedInventory, self.handle)
+        rawset(self, "extendedInventory", extendedInventory)
+        return extendedInventory
+    end}
+)
+return ____exports