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

package/engine/internal/unit/appearance.lua

@@ -0,0 +1,85 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local UnitWeapon = ____unit.UnitWeapon
+local allowHeroGlowOnUnit = AllowHeroGlowOnUnit
+local disallowHeroGlowOnUnit = DisallowHeroGlowOnUnit
+local getUnitAnimationDuration = BlzGetUnitAnimationDuration
+local getUnitAnimationDurationByIndex = BlzGetUnitAnimationDurationByIndex
+local getUnitBooleanField = BlzGetUnitBooleanField
+local getUnitRealField = BlzGetUnitRealField
+local heroGlowIsAllowedOnUnit = HeroGlowIsAllowedOnUnit
+local resetUnitAttack = BlzResetUnitAttack
+local setUnitBooleanField = BlzSetUnitBooleanField
+local setUnitRealField = BlzSetUnitRealField
+local unitEnableAuras = BlzUnitEnableAuras
+Unit.prototype.getAnimationDuration = function(self, animation)
+    if type(animation) == "number" then
+        return getUnitAnimationDurationByIndex(self.handle, animation)
+    end
+    return getUnitAnimationDuration(self.handle, animation)
+end
+Unit.prototype.setAurasEnabled = function(self, enabled, affectsUI)
+    if affectsUI == nil then
+        affectsUI = true
+    end
+    unitEnableAuras(self.handle, enabled, affectsUI)
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "isHeroGlowAllowed",
+    {
+        get = function(self)
+            return heroGlowIsAllowedOnUnit(self.handle)
+        end,
+        set = function(self, allowed)
+            if allowed then
+                allowHeroGlowOnUnit(self.handle)
+            else
+                disallowHeroGlowOnUnit(self.handle)
+            end
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "maximumFlyHeight",
+    {
+        get = function(self)
+            return getUnitRealField(self.handle, UNIT_RF_FLY_MAX_HEIGHT)
+        end,
+        set = function(self, height)
+            setUnitRealField(self.handle, UNIT_RF_FLY_MAX_HEIGHT, height)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "showsAirToGroundIndicator",
+    {
+        get = function(self)
+            return getUnitBooleanField(self.handle, UNIT_BF_SHOW_AIR_TO_GROUND)
+        end,
+        set = function(self, show)
+            setUnitBooleanField(self.handle, UNIT_BF_SHOW_AIR_TO_GROUND, show)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "alwaysDisplaysHealth",
+    {
+        get = function(self)
+            return getUnitBooleanField(self.handle, UNIT_BF_FORCE_DISPLAY_HP)
+        end,
+        set = function(self, show)
+            setUnitBooleanField(self.handle, UNIT_BF_FORCE_DISPLAY_HP, show)
+        end
+    }
+)
+UnitWeapon.prototype.resetAttack = function(self)
+    resetUnitAttack(self.unit.handle, self.index)
+end
+return ____exports

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

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        strengthBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        agilityBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        intelligenceBase: number;
+    }
+}
+export {};

package/engine/internal/unit/attributes.lua

@@ -0,0 +1,46 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____unit = require("engine.standard.fields.unit")
+local AGILITY_UNIT_FIELD = ____unit.AGILITY_UNIT_FIELD
+local INTELLIGENCE_UNIT_FIELD = ____unit.INTELLIGENCE_UNIT_FIELD
+local STRENGTH_UNIT_FIELD = ____unit.STRENGTH_UNIT_FIELD
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "strengthBase",
+    {
+        get = function(self)
+            return STRENGTH_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            STRENGTH_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "agilityBase",
+    {
+        get = function(self)
+            return AGILITY_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            AGILITY_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "intelligenceBase",
+    {
+        get = function(self)
+            return INTELLIGENCE_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            INTELLIGENCE_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

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

@@ -5,12 +5,18 @@ export type UnitBonusId<Brand extends string = any> = number & {
     readonly __unitBonusId: unique symbol;
     readonly __unitBonusIdBrand: Brand;
 };
+export type UnitMaxHealthBonusId = UnitBonusId<"maxHealth">;
+export type UnitMaxManaBonusId = UnitBonusId<"maxMana">;
 export type UnitArmorBonusId = UnitBonusId<"armor">;
 export type UnitAttackSpeedFactorBonusId = UnitBonusId<"attackSpeedFactor">;
 export type UnitMovementSpeedFactorBonusId = UnitBonusId<"movementSpeedFactor">;
 export type UnitAutoAttackDamageBonusId = UnitBonusId<"autoAttackDamage">;
 export type UnitDamageFactorBonusId = UnitBonusId<"damageFactor">;
 export type UnitReceivedDamageFactorBonusId = UnitBonusId<"receivedDamageFactor">;
+export type UnitReturnedMeleeDamageFactorBonusId = UnitBonusId<"returnedMeleeDamageFactor">;
+export type UnitEvasionProbabilityBonusId = UnitBonusId<"evasionProbability">;
+export type UnitManaRegenerationRateFactorBonusId = UnitBonusId<"manaRegenerationRateFactor">;
+export type UnitHealthRegenerationRateBonusId = UnitBonusId<"healthRegenerationRate">;
 export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     abilityTypeId: AbilityTypeId;
     field: jabilityintegerlevelfield;
@@ -22,18 +28,31 @@ export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
 } | {
     abilityTypeId?: undefined;
     valueByUnit: LuaMap<Unit, number>;
+    apply?: undefined;
+} | {
+    abilityTypeId?: undefined;
+    valueByUnit?: undefined;
+    apply: (this: void, unitHandle: junit, value: number) => void;
 }) & {
     reduce: (this: void, array: number[]) => number;
     initialValue: number;
     readonly __unitBonusTypeId?: Id;
 };
 export declare namespace UnitBonusType {
+    const HEALTH: UnitBonusType<UnitMaxHealthBonusId>;
+    const MANA: UnitBonusType<UnitMaxManaBonusId>;
     const ARMOR: UnitBonusType<UnitArmorBonusId>;
     const ATTACK_SPEED_FACTOR: UnitBonusType<UnitAttackSpeedFactorBonusId>;
     const MOVEMENT_SPEED_FACTOR: UnitBonusType<UnitAttackSpeedFactorBonusId>;
     const AUTO_ATTACK_DAMAGE: UnitBonusType<UnitAutoAttackDamageBonusId>;
     const DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
+    /** The factor of melee attack damage returned to the attacker, as Spiked Carapace. */
+    const RETURNED_MELEE_DAMAGE_FACTOR: UnitBonusType<UnitReturnedMeleeDamageFactorBonusId>;
+    const EVASION_PROBABILITY: UnitBonusType<UnitEvasionProbabilityBonusId>;
+    const MANA_REGENERATION_RATE_FACTOR: UnitBonusType<UnitManaRegenerationRateFactorBonusId>;
+    /** Supported range: -1000 to 1000; the total is clamped to it. */
+    const HEALTH_REGENERATION_RATE: UnitBonusType<UnitHealthRegenerationRateBonusId>;
 }
 export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
 export declare const removeUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;

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
@@ -21,11 +24,53 @@ local AUTO_ATTACK_DAMAGE_INCREASE_DUMMY_ABILITY_TYPE_ID = ____auto_2Dattack_2Dda
 local ____movement_2Dspeed_2Dincrease_2Dfactor = require("engine.internal.object-data.movement-speed-increase-factor")
 local MOVEMENT_SPEED_INCREASE_FACTOR_ABILITY_FIELD = ____movement_2Dspeed_2Dincrease_2Dfactor.MOVEMENT_SPEED_INCREASE_FACTOR_ABILITY_FIELD
 local MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____movement_2Dspeed_2Dincrease_2Dfactor.MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID
+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 ____returned_2Dmelee_2Ddamage_2Dfactor = require("engine.internal.object-data.returned-melee-damage-factor")
+local RETURNED_MELEE_DAMAGE_FACTOR_ABILITY_FIELD = ____returned_2Dmelee_2Ddamage_2Dfactor.RETURNED_MELEE_DAMAGE_FACTOR_ABILITY_FIELD
+local RETURNED_MELEE_DAMAGE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____returned_2Dmelee_2Ddamage_2Dfactor.RETURNED_MELEE_DAMAGE_FACTOR_DUMMY_ABILITY_TYPE_ID
 local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
+local function atLeastOnceProbability(array)
+    local oppositeEventProbability = 1
+    for i = 1, #array do
+        oppositeEventProbability = oppositeEventProbability * (1 - array[i])
+    end
+    return 1 - oppositeEventProbability
+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,
@@ -56,33 +101,110 @@ do
     }
     UnitBonusType.DAMAGE_FACTOR = {reduce = product, valueByUnit = damageFactorByUnit, initialValue = 1}
     UnitBonusType.RECEIVED_DAMAGE_FACTOR = {reduce = product, valueByUnit = receivedDamageFactorByUnit, initialValue = 1}
+    --- The factor of melee attack damage returned to the attacker, as Spiked Carapace.
+    UnitBonusType.RETURNED_MELEE_DAMAGE_FACTOR = {
+        abilityTypeId = RETURNED_MELEE_DAMAGE_FACTOR_DUMMY_ABILITY_TYPE_ID,
+        field = RETURNED_MELEE_DAMAGE_FACTOR_ABILITY_FIELD,
+        integer = false,
+        reduce = sum,
+        initialValue = 0
+    }
+    UnitBonusType.EVASION_PROBABILITY = {
+        abilityTypeId = EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID,
+        field = EVASION_PROBABILITY_ABILITY_FIELD,
+        integer = false,
+        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
+        ]>;
+    }
+}