warscript 0.0.1-dev.20f0f7e → 0.0.1-dev.221cca4

package/engine/internal/unit/ability.lua

@@ -22,7 +22,15 @@ local checkNotNull = ____preconditions.checkNotNull
 local ____lazy = require("utility.lazy")
 local lazyRecord = ____lazy.lazyRecord
 local ____timer = require("core.types.timer")
+local consumeZeroTimerCallback = ____timer.consumeZeroTimerCallback
 local Timer = ____timer.Timer
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
+local ____pseudo_2Dpassive_2Dabilities = require("engine.internal.unit.pseudo-passive-abilities")
+local pseudoPassiveAbilityOrderTypeStringId = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityOrderTypeStringId
+local pseudoPassiveAbilityTypeIds = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityTypeIds
 local eventInvoke = Event.invoke
 local condition = Condition
 local createTrigger = CreateTrigger
@@ -85,7 +93,7 @@ local function createCommonEvent(underlyingEvent)
         underlyingEvent,
         3,
         function(caster, ability)
-            return true, caster, ability
+            return not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil), caster, ability
         end
     )
 end
@@ -165,7 +173,7 @@ local function createNoTargetEvent(underlyingEvent)
         underlyingEvent,
         1,
         function(caster, ability, targetUnit, targetItem, targetDestructible, x, y)
-            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil then
+            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil and not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil) then
                 return true, caster, ability
             else
                 return false
@@ -347,10 +355,69 @@ rawset(
         extractAbilityTypeId
     )
 )
+local internalAbilityChannelingFinishEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters)
+rawset(
+    Unit,
+    "abilityChannelingFinishEvent",
+    createDispatchingEvent(internalAbilityChannelingFinishEvent, extractAbilityTypeId)
+)
+local internalAbilityStopEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters)
+rawset(
+    Unit,
+    "abilityStopEvent",
+    createDispatchingEvent(internalAbilityStopEvent, extractAbilityTypeId)
+)
+rawset(
+    Unit,
+    "abilityCommandEvent",
+    lazyRecord(function(abilityTypeId)
+        return lazyRecord(function(orderTypeStringId)
+            return __TS__New(
+                InitializingEvent,
+                function(event)
+                    local trigger = createTrigger()
+                    triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
+                    triggerAddCondition(
+                        trigger,
+                        condition(function()
+                            local unit = Unit:of(getTriggerUnit())
+                            if unit ~= nil then
+                                local ability = unit:getAbility(abilityTypeId)
+                                if ability ~= nil then
+                                    if pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil then
+                                        ability:interruptCast()
+                                    else
+                                        eventInvoke(event, unit, ability, orderTypeStringId)
+                                    end
+                                end
+                            end
+                        end)
+                    )
+                end
+            )
+        end)
+    end)
+)
 local internalAbilityImpactEvent = __TS__New(Event)
-internalAbilityChannelingStartEvent:addListener(function(...)
-    Timer:run(eventInvoke, internalAbilityImpactEvent, ...)
-end)
+local impactCallbackIdAttribute = attribute()
+local function invokeImpactEvent(unit, ability, ...)
+    ability[impactCallbackIdAttribute] = nil
+    eventInvoke(internalAbilityImpactEvent, unit, ability, ...)
+end
+internalAbilityChannelingStartEvent:addListener(
+    999999,
+    function(unit, ability, ...)
+        ability[impactCallbackIdAttribute] = Timer:run(invokeImpactEvent, unit, ability, ...)
+    end
+)
+local function consumeImpactCallback(_, ability)
+    local impactCallbackId = ability[impactCallbackIdAttribute]
+    if impactCallbackId ~= nil then
+        consumeZeroTimerCallback(impactCallbackId)
+    end
+end
+internalAbilityChannelingFinishEvent:addListener(999999, consumeImpactCallback)
+internalAbilityStopEvent:addListener(999999, consumeImpactCallback)
 rawset(
     Unit,
     "abilityImpactEvent",
@@ -407,47 +474,19 @@ rawset(
         extractAbilityTypeId
     )
 )
-rawset(
-    Unit,
-    "abilityChannelingFinishEvent",
-    createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters),
-        extractAbilityTypeId
-    )
-)
-rawset(
-    Unit,
-    "abilityStopEvent",
-    createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters),
-        extractAbilityTypeId
-    )
-)
-rawset(
-    Unit,
-    "abilityCommandEvent",
-    lazyRecord(function(abilityTypeId)
-        return lazyRecord(function(orderTypeStringId)
-            return __TS__New(
-                InitializingEvent,
-                function(event)
-                    local trigger = createTrigger()
-                    triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
-                    triggerAddCondition(
-                        trigger,
-                        condition(function()
-                            local unit = Unit:of(getTriggerUnit())
-                            if unit ~= nil then
-                                local ability = unit:getAbility(abilityTypeId)
-                                if ability ~= nil then
-                                    eventInvoke(event, unit, ability, orderTypeStringId)
-                                end
-                            end
-                        end)
-                    )
-                end
-            )
-        end)
-    end)
+local spellEffectOnlyAbilityTypeIds = luaSetOf(fourCC("AAns"))
+internalAbilityChannelingStartEvent:addListener(
+    -999999,
+    function(unit, ability)
+        if spellEffectOnlyAbilityTypeIds[ability.parentTypeId] ~= nil then
+            eventInvoke(internalAbilityChannelingFinishEvent, unit, ability)
+            eventInvoke(internalAbilityStopEvent, unit, ability)
+        end
+    end
 )
+local function doNothing()
+end
+for pseudoPassiveAbilityTypeId in pairs(pseudoPassiveAbilityTypeIds) do
+    Unit.abilityCommandEvent[pseudoPassiveAbilityTypeId][pseudoPassiveAbilityOrderTypeStringId]:addListener(999999, doNothing)
+end
 return ____exports

package/engine/internal/unit/add-item-to-slot-init.lua

@@ -2,22 +2,11 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
-local fillerItems = ____add_2Ditem_2Dto_2Dslot.fillerItems
-local unitsWithFillerItems = ____add_2Ditem_2Dto_2Dslot.unitsWithFillerItems
-local setItemVisible = SetItemVisible
-local unitRemoveItem = UnitRemoveItem
+local unitRemoveFillerItems = ____add_2Ditem_2Dto_2Dslot.unitRemoveFillerItems
 Unit.itemPickedUpEvent:addListener(
-    4,
+    999999,
     function(unit)
-        local handle = unit.handle
-        if unitsWithFillerItems[handle] ~= nil then
-            for previousSlot = 1, 6 do
-                local fillerItem = fillerItems[previousSlot]
-                unitRemoveItem(handle, fillerItem)
-                setItemVisible(fillerItem, false)
-            end
-            unitsWithFillerItems[handle] = nil
-        end
+        unitRemoveFillerItems(unit.handle)
     end
 )
 return ____exports

package/engine/internal/unit/add-item-to-slot.lua

@@ -4,9 +4,14 @@ local BlankItemType = ____blank.BlankItemType
 local ____arrays = require("utility.arrays")
 local array = ____arrays.array
 local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
-local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local ignoreEventsItemTypeIds = ____ignore_2Devents_2Ditems.ignoreEventsItemTypeIds
+local ____item_2Dcontainer = require("engine.internal.unit.item-container")
+local UNIT_EXTENDED_INVENTORY_SLOT_COUNT = ____item_2Dcontainer.UNIT_EXTENDED_INVENTORY_SLOT_COUNT
+local UNIT_INVENTORY_SLOT_COUNT = ____item_2Dcontainer.UNIT_INVENTORY_SLOT_COUNT
 local setItemVisible = SetItemVisible
 local unitAddItem = UnitAddItem
+local unitInventorySize = UnitInventorySize
+local unitItemInBagSlot = UnitItemInBagSlot
 local unitItemInSlot = UnitItemInSlot
 local unitRemoveItem = UnitRemoveItem
 ---
@@ -16,14 +21,15 @@ ____exports.SLOT_FILLER_ITEM_TYPE_ID = compiletime(function()
     itemType.name = "[Warscript/Dummy] Slot Filler"
     return itemType.id
 end)
----
+ignoreEventsItemTypeIds[____exports.SLOT_FILLER_ITEM_TYPE_ID] = true
+--- Enough fillers to occupy every regular and extended inventory slot that precedes the last extended one.
+-- 
 -- @internal For use by internal systems only.
 ____exports.fillerItems = array(
-    6,
+    UNIT_INVENTORY_SLOT_COUNT + UNIT_EXTENDED_INVENTORY_SLOT_COUNT,
     function()
         local item = CreateItem(____exports.SLOT_FILLER_ITEM_TYPE_ID, 0, 0)
         setItemVisible(item, false)
-        ignoreEventsItems[item] = true
         return item
     end
 )
@@ -32,21 +38,56 @@ ____exports.fillerItems = array(
 ____exports.unitsWithFillerItems = {}
 ---
 -- @internal For use by internal systems only.
-____exports.unitAddItemToSlot = function(unit, item, slot)
-    for previousSlot = 0, slot - 1 do
-        if unitItemInSlot(unit, previousSlot) == nil then
-            unitAddItem(unit, ____exports.fillerItems[previousSlot + 1])
-            ____exports.unitsWithFillerItems[unit] = true
+____exports.unitRemoveFillerItems = function(unit)
+    if ____exports.unitsWithFillerItems[unit] ~= nil then
+        for ____, fillerItem in ipairs(____exports.fillerItems) do
+            unitRemoveItem(unit, fillerItem)
+            setItemVisible(fillerItem, false)
+        end
+        ____exports.unitsWithFillerItems[unit] = nil
+    end
+end
+--- Adds an item to a unit so that it lands in a specific slot of its regular or extended inventory.
+-- 
+-- The engine fills slots in order (the regular inventory first, then the extended one), so every empty slot
+-- preceding the target is temporarily occupied by a filler item. Unlike `moveslot` orders, this works
+-- regardless of whether the unit can currently act.
+-- 
+-- @internal For use by internal systems only.
+____exports.unitAddItemToSlot = function(unit, item, slot, containerType)
+    if containerType == nil then
+        containerType = 0
+    end
+    local fillerCount = 0
+    local function fillEmptySlots(slotCount, itemInSlot)
+        for precedingSlot = 0, slotCount - 1 do
+            if itemInSlot(unit, precedingSlot) == nil then
+                unitAddItem(unit, ____exports.fillerItems[fillerCount + 1])
+                fillerCount = fillerCount + 1
+            end
         end
     end
-    unitAddItem(unit, item)
+    if containerType == 0 then
+        fillEmptySlots(slot, unitItemInSlot)
+    else
+        fillEmptySlots(
+            unitInventorySize(unit),
+            unitItemInSlot
+        )
+        fillEmptySlots(slot, unitItemInBagSlot)
+    end
+    if fillerCount > 0 then
+        ____exports.unitsWithFillerItems[unit] = true
+    end
+    local result = unitAddItem(unit, item)
     if ____exports.unitsWithFillerItems[unit] ~= nil then
-        for previousSlot = 0, slot - 1 do
-            local fillerItem = ____exports.fillerItems[previousSlot + 1]
+        for fillerIndex = 0, fillerCount - 1 do
+            local fillerItem = ____exports.fillerItems[fillerIndex + 1]
             unitRemoveItem(unit, fillerItem)
             setItemVisible(fillerItem, false)
         end
         ____exports.unitsWithFillerItems[unit] = nil
     end
+    return result
 end
 return ____exports

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

@@ -0,0 +1,15 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        getAnimationDuration(this: Unit, animation: string | number): number;
+        setAurasEnabled(this: Unit, enabled: boolean, affectsUI?: boolean): void;
+        isHeroGlowAllowed: boolean;
+        maximumFlyHeight: number;
+        showsAirToGroundIndicator: boolean;
+        alwaysDisplaysHealth: boolean;
+    }
+    interface UnitWeapon {
+        resetAttack(this: UnitWeapon): void;
+    }
+}
+export {};

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,6 +5,8 @@ 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">;
@@ -12,6 +14,8 @@ export type UnitAutoAttackDamageBonusId = UnitBonusId<"autoAttackDamage">;
 export type UnitDamageFactorBonusId = UnitBonusId<"damageFactor">;
 export type UnitReceivedDamageFactorBonusId = UnitBonusId<"receivedDamageFactor">;
 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;
@@ -29,6 +33,8 @@ export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     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>;
@@ -36,6 +42,8 @@ export declare namespace UnitBonusType {
     const DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const EVASION_PROBABILITY: UnitBonusType<UnitEvasionProbabilityBonusId>;
+    const MANA_REGENERATION_RATE_FACTOR: UnitBonusType<UnitManaRegenerationRateFactorBonusId>;
+    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,9 +1,9 @@
 local ____exports = {}
 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 ____arrays = require("utility.arrays")
@@ -24,6 +24,18 @@ 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 HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD
+local HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID
 local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
 local function atLeastOnceProbability(array)
@@ -36,6 +48,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,6 +99,20 @@ 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
+    }
+    UnitBonusType.HEALTH_REGENERATION_RATE = {
+        abilityTypeId = HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID,
+        field = HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD,
+        integer = false,
+        reduce = sum,
+        initialValue = 0
+    }
 end
 local bonusesByUnitByBonusType = {}
 local nextId = 1

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