warscript 0.0.1-dev.87b6c38 → 0.0.1-dev.8895ff6

package/destroyable.d.ts

@@ -10,6 +10,7 @@ export interface Destroyable {
     destroy(): void;
 }
 export declare abstract class AbstractDestroyable implements Destroyable {
+    get isDestroyed(): boolean;
     /**
      * An overriding function should always call the super one at the end of it,
      * in the following manner: `return super.onDestroy()`.

package/destroyable.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
@@ -28,4 +29,12 @@ function AbstractDestroyable.prototype.destroy(self)
     end
     return true
 end
+__TS__SetDescriptor(
+    AbstractDestroyable.prototype,
+    "isDestroyed",
+    {get = function(self)
+        return stateByDestroyable[self] ~= nil
+    end},
+    true
+)
 return ____exports

package/engine/behavior.d.ts

@@ -18,9 +18,11 @@ export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParame
     private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
     private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
     private [BehaviorPropertyKey.TIMER]?;
-    protected constructor(object: T, priority?: BehaviorPriority);
+    constructor(object: T, priority?: BehaviorPriority);
     protected onDestroy(): Destructor;
-    protected registerEvent<K extends string, Args extends any[]>(this: Behavior<any, PeriodicActionParameters> & Record<K, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, listener: K): void;
+    protected registerGlobalEvent<K extends string, Args extends any[]>(this: Behavior<any, PeriodicActionParameters> & Record<K, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, listener: K): void;
+    protected deregisterGlobalEvent(event: Event<any>): boolean;
+    protected registerEvent<K extends string, Args extends any[]>(this: Behavior<any, PeriodicActionParameters> & Record<K, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractObject: (...args: Args) => T | undefined, listener: K): void;
     protected deregisterEvent(event: Event<any>): boolean;
     protected onPeriod(...parameters: PeriodicActionParameters): void;
     protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;

package/engine/behavior.lua

@@ -57,9 +57,17 @@ local function reduceBehaviors(behaviorConstructor, object, operation, initial,
     end
     return accumulator
 end
+local behaviorsByGlobalEvent = {}
+local listenerByBehaviorByGlobalEvent = {}
+local globalEventsByBehavior = {}
 local behaviorsByEvent = {}
 local listenerByBehaviorByEvent = {}
 local eventsByBehavior = {}
+local function safeCallBehaviorListener(behavior, behaviors, listenerByBehavior, ...)
+    if behaviors[behavior] ~= nil then
+        safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
+    end
+end
 ____exports.Behavior = __TS__Class()
 local Behavior = ____exports.Behavior
 Behavior.name = "Behavior"
@@ -87,18 +95,32 @@ function Behavior.prototype.onDestroy(self)
     if ____opt_0 ~= nil then
         ____opt_0:destroy()
     end
-    local events = eventsByBehavior[self]
-    if events ~= nil then
-        for event in pairs(events) do
-            local ____opt_2 = behaviorsByEvent[event]
+    local globalEvents = globalEventsByBehavior[self]
+    if globalEvents ~= nil then
+        for event in pairs(globalEvents) do
+            local ____opt_2 = behaviorsByGlobalEvent[event]
             if ____opt_2 ~= nil then
                 ____opt_2:remove(self)
             end
-            local ____opt_4 = listenerByBehaviorByEvent[event]
+            local ____opt_4 = listenerByBehaviorByGlobalEvent[event]
             if ____opt_4 ~= nil then
                 ____opt_4[self] = nil
             end
         end
+        globalEventsByBehavior[self] = nil
+    end
+    local events = eventsByBehavior[self]
+    if events ~= nil then
+        for event in pairs(events) do
+            local ____opt_6 = behaviorsByEvent[event]
+            if ____opt_6 ~= nil then
+                ____opt_6[self] = nil
+            end
+            local ____opt_8 = listenerByBehaviorByEvent[event]
+            if ____opt_8 ~= nil then
+                ____opt_8[self] = nil
+            end
+        end
         eventsByBehavior[self] = nil
     end
     local previousBehavior = self[0]
@@ -115,7 +137,35 @@ function Behavior.prototype.onDestroy(self)
     end
     return AbstractDestroyable.prototype.onDestroy(self)
 end
-function Behavior.prototype.registerEvent(self, event, listener)
+function Behavior.prototype.registerGlobalEvent(self, event, listener)
+    local listenerByBehavior = getOrPut(listenerByBehaviorByGlobalEvent, event, mutableLuaMap)
+    listenerByBehavior[self] = listener
+    getOrPut(globalEventsByBehavior, self, mutableLuaSet)[event] = true
+    local behaviors = behaviorsByGlobalEvent[event]
+    if behaviors == nil then
+        event:addListener(function(...)
+            local behaviors = behaviorsByGlobalEvent[event]
+            if behaviors ~= nil then
+                for behavior in pairs(behaviors) do
+                    safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
+                end
+            end
+        end)
+        behaviors = __TS__New(LinkedSet)
+        behaviorsByGlobalEvent[event] = behaviors
+    end
+    behaviors:add(self)
+end
+function Behavior.prototype.deregisterGlobalEvent(self, event)
+    local behaviors = behaviorsByGlobalEvent[event]
+    if behaviors ~= nil and behaviors:remove(self) then
+        globalEventsByBehavior[self][event] = nil
+        listenerByBehaviorByGlobalEvent[event][self] = nil
+        return true
+    end
+    return false
+end
+function Behavior.prototype.registerEvent(self, event, extractObject, listener)
     local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
     listenerByBehavior[self] = listener
     getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
@@ -124,19 +174,27 @@ function Behavior.prototype.registerEvent(self, event, listener)
         event:addListener(function(...)
             local behaviors = behaviorsByEvent[event]
             if behaviors ~= nil then
-                for behavior in pairs(behaviors) do
-                    safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
+                local object = extractObject(...)
+                if object ~= nil then
+                    ____exports.Behavior:forAll(
+                        object,
+                        safeCallBehaviorListener,
+                        behaviors,
+                        listenerByBehavior,
+                        ...
+                    )
                 end
             end
         end)
-        behaviors = __TS__New(LinkedSet)
+        behaviors = {}
         behaviorsByEvent[event] = behaviors
     end
-    behaviors:add(self)
+    behaviors[self] = true
 end
 function Behavior.prototype.deregisterEvent(self, event)
     local behaviors = behaviorsByEvent[event]
-    if behaviors ~= nil and behaviors:remove(self) then
+    if behaviors ~= nil and behaviors[self] ~= nil then
+        behaviors[self] = nil
         eventsByBehavior[self][event] = nil
         listenerByBehaviorByEvent[event][self] = nil
         return true

package/engine/behaviour/unit/stun-immunity.d.ts

@@ -7,7 +7,7 @@ import { Destructor } from "../../../destroyable";
 import { BehaviorPriority } from "../../behavior";
 export type StunImmunityUnitBehaviorParameters = {
     readonly priority?: BehaviorPriority;
-    buffTypeIds?: LuaSet<BuffTypeId>;
+    buffTypeIds?: readonly BuffTypeId[];
     textTagPreset?: TextTagPreset;
     textTagText?: string;
     additionalAction?: (this: void, unit: Unit) => void;

package/engine/behaviour/unit/stun-immunity.lua

@@ -8,14 +8,15 @@ local UnitBehavior = ____unit.UnitBehavior
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
 local ____arrays = require("utility.arrays")
-local flatMapToLuaSet = ____arrays.flatMapToLuaSet
+local distinct = ____arrays.distinct
+local flatMap = ____arrays.flatMap
 local map = ____arrays.map
 local ____text_2Dtag = require("engine.text-tag")
 local TextTag = ____text_2Dtag.TextTag
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
-    return flatMapToLuaSet(
+    return distinct(flatMap(
         AbilityType:getAllByBaseIds(map({
             "AHtb",
             "AHbh",
@@ -41,11 +42,11 @@ local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
             "ACcb"
         }, fourCC)),
         function(abilityType) return __TS__ArrayFlat(abilityType.buffTypeIds) end
-    )
+    ))
 end)
 local function process(behavior)
     local hasRemovedBuffs = false
-    for buffTypeId in pairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
+    for ____, buffTypeId in ipairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
         hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
     end
     if hasRemovedBuffs then

package/engine/behaviour/unit.lua

@@ -21,6 +21,8 @@ local ____bonus = require("engine.internal.unit.bonus")
 local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
 local getUnitBonus = ____bonus.getUnitBonus
 local removeUnitBonus = ____bonus.removeUnitBonus
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local safeCall = warpack.safeCall
 local createBehaviorFunctionsByUnitTypeId = {}
 local behaviorsByOwningPlayerEvent = {}
@@ -79,16 +81,24 @@ function UnitBehavior.prototype.onDestroy(self)
 end
 function UnitBehavior.prototype.getUnitBonus(self, bonusType)
     local ____opt_10 = self._bonusIdByBonusType
-    local bonusId = ____opt_10 and ____opt_10[bonusType]
+    local bonusId = ____opt_10 and ____opt_10:get(bonusType)
     return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
 end
 function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
     local bonusIdByBonusType = self._bonusIdByBonusType
     if bonusIdByBonusType == nil then
-        bonusIdByBonusType = {}
+        bonusIdByBonusType = __TS__New(LinkedMap)
         self._bonusIdByBonusType = bonusIdByBonusType
     end
-    bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[bonusType], value)
+    bonusIdByBonusType:put(
+        bonusType,
+        addOrUpdateOrRemoveUnitBonus(
+            self.object,
+            bonusType,
+            bonusIdByBonusType:get(bonusType),
+            value
+        )
+    )
 end
 function UnitBehavior.prototype.registerOwningPlayerEvent(self, event, extractPlayer, listener)
     local listenerByBehavior = getOrPut(listenerByBehaviorByOwningPlayerEvent, event, mutableLuaMap)

package/engine/buff.d.ts

@@ -31,8 +31,10 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     source?: Unit;
     behaviorConstructors?: (new (unit: Unit) => UnitBehavior)[];
     abilityTypeIds?: Record<AbilityTypeId, {
-        [numberField: (AbilityNumberField | AbilityNumberLevelField) & symbol]: NumberParameterValueType;
-    } & {
+        readonly fields?: [
+            AbilityNumberField | AbilityNumberLevelField,
+            NumberParameterValueType
+        ][];
         /** Default `true`. */
         readonly isButtonVisible?: boolean;
         /** Default is the level of the source ability or 0 if it is absent. */
@@ -57,6 +59,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     armorIncreaseFactor?: NumberParameterValueType;
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
+    manaRegenerationRateIncreaseFactor?: NumberParameterValueType;
     evasionProbability?: NumberParameterValueType;
     missProbability?: NumberParameterValueType;
     damageFactor?: NumberParameterValueType;
@@ -265,6 +268,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: number);
     get evasionProbability(): number;
     set evasionProbability(evasionProbability: number);
+    get manaRegenerationRateIncreaseFactor(): number;
+    set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
     get duration(): number;
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);

package/engine/buff.lua

@@ -42,6 +42,7 @@ local BuffType = ____buff_2Dtype.BuffType
 local ____unit = require("engine.behaviour.unit")
 local UnitBehavior = ____unit.UnitBehavior
 local ____arrays = require("utility.arrays")
+local emptyArray = ____arrays.emptyArray
 local forEach = ____arrays.forEach
 local ____event = require("event")
 local Event = ____event.Event
@@ -55,6 +56,8 @@ local ____ability = require("engine.standard.fields.ability")
 local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
 local ____ability = require("engine.behaviour.ability")
 local AbilityBehavior = ____ability.AbilityBehavior
+local ____records = require("utility.records")
+local sortedKeysUnnested = ____records.sortedKeysUnnested
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -103,6 +106,7 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    manaRegenerationRateIncreaseFactor = true,
     evasionProbability = true,
     missProbability = true,
     damageFactor = true,
@@ -190,6 +194,7 @@ local buffNumberParameters = {
     "durationIncreaseOnAutoAttack",
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
+    "manaRegenerationRateIncreaseFactor",
     "evasionProbability",
     "armorIncrease",
     "damageFactor",
@@ -466,24 +471,22 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
                 abilityTypeIds = {}
                 self._abilityTypeIds = abilityTypeIds
             end
-            for abilityTypeId, abilityParameters in pairs(parametersAbilityTypeIds) do
+            for ____, abilityTypeId in ipairs(sortedKeysUnnested(parametersAbilityTypeIds)) do
+                local abilityParameters = parametersAbilityTypeIds[abilityTypeId]
                 local addedAbility = _unit:addAbility(abilityTypeId)
                 if addedAbility ~= nil then
                     _unit:makeAbilityPermanent(abilityTypeId, true)
                     _unit:setAbilityLevel(abilityTypeId, 1 + (abilityParameters.level or ability and ability.level or 0))
-                    for abilityParameterKey, abilityParameterValue in pairs(abilityParameters) do
-                        if abilityParameterKey == "isButtonVisible" then
-                            if not resolveBooleanValue(ability, level, abilityParameterValue) then
-                                _unit:hideAbility(abilityTypeId, true)
-                            end
-                        elseif abilityParameterKey ~= "level" then
-                            abilityParameterKey:setValue(
-                                addedAbility,
-                                resolveNumberValue(ability, level, abilityParameterValue)
-                            )
-                        end
+                    if abilityParameters.isButtonVisible == false then
+                        _unit:hideAbility(abilityTypeId, true)
+                    end
+                    for ____, field in ipairs(abilityParameters.fields or emptyArray()) do
+                        field[1]:setValue(
+                            addedAbility,
+                            resolveNumberValue(ability, level, field[2])
+                        )
                     end
-                    abilityTypeIds[abilityTypeId] = true
+                    abilityTypeIds[#abilityTypeIds + 1] = abilityTypeId
                 end
             end
             local behaviorConstructors = parameters and parameters.behaviorConstructors or defaultParameters.behaviorConstructors
@@ -495,18 +498,20 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
                 self._behaviors = behaviors
             end
         end
-        local additionalParameters = {}
-        for key, value in pairs(parameters) do
-            if not buffParametersKeys[key] then
-                if ability then
-                    additionalParameters[key] = resolveCurrentAbilityDependentValue(ability, value)
-                else
-                    additionalParameters[key] = value
+        if parameters ~= nil then
+            local additionalParameters = {}
+            for ____, key in ipairs(sortedKeysUnnested(parameters)) do
+                if not buffParametersKeys[key] then
+                    if ability then
+                        additionalParameters[key] = resolveCurrentAbilityDependentValue(ability, parameters[key])
+                    else
+                        additionalParameters[key] = parameters[key]
+                    end
                 end
             end
-        end
-        if (next(additionalParameters)) ~= nil then
-            self.parameters = additionalParameters
+            if (next(additionalParameters)) ~= nil then
+                self.parameters = additionalParameters
+            end
         end
     end
     if duration ~= nil and duration > 0 then
@@ -630,7 +635,7 @@ function Buff.prototype.onDestroy(self)
         unit:decrementGhostCounter()
     end
     if self._abilityTypeIds ~= nil then
-        for abilityTypeId in pairs(self._abilityTypeIds) do
+        for ____, abilityTypeId in ipairs(self._abilityTypeIds) do
             unit:removeAbility(abilityTypeId)
         end
     end
@@ -1254,6 +1259,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "manaRegenerationRateIncreaseFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.MANA_REGENERATION_RATE_FACTOR)
+        end,
+        set = function(self, manaRegenerationRateIncreaseFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.MANA_REGENERATION_RATE_FACTOR, manaRegenerationRateIncreaseFactor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "duration",

package/engine/internal/mechanics/cast-ability.lua

@@ -74,9 +74,12 @@ ____exports.castAbility = function(nativeUnit, abilityTypeId, prepareAbility, ..
         unitRemoveAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
         if latestInventoryAbilityTypeId ~= 0 then
             unitAddAbility(nativeUnit, latestInventoryAbilityTypeId)
-            for slot, nativeItem in pairs(nativeItemBySlot) do
-                unitAddItem(nativeUnit, nativeItem)
-                unitDropItemSlot(nativeUnit, nativeItem, slot)
+            for slot = 0, inventorySize - 1 do
+                local nativeItem = nativeItemBySlot[slot]
+                if nativeItem ~= nil then
+                    unitAddItem(nativeUnit, nativeItem)
+                    unitDropItemSlot(nativeUnit, nativeItem, slot)
+                end
             end
         end
     end

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts

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

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dregeneration = require("engine.object-data.entry.ability-type.mana-regeneration")
+local ManaRegenerationAbilityType = ____mana_2Dregeneration.ManaRegenerationAbilityType
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaRegenerationAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaRegenerationRateIncreaseFactor = 4
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_MANA_REGENERATION_BONUS_AS_FRACTION_OF_NORMAL
+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

@@ -12,6 +12,7 @@ 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 UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     abilityTypeId: AbilityTypeId;
     field: jabilityintegerlevelfield;
@@ -36,6 +37,7 @@ 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>;
 }
 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

@@ -24,6 +24,9 @@ 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 ____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 damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
 local function atLeastOnceProbability(array)
@@ -73,6 +76,13 @@ 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
+    }
 end
 local bonusesByUnitByBonusType = {}
 local nextId = 1

package/engine/internal/unit/fly-height.lua

@@ -4,16 +4,16 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____unit = require("engine.standard.fields.unit")
-local FLY_HEIGHT_UNIT_FLOAT_FIELD = ____unit.FLY_HEIGHT_UNIT_FLOAT_FIELD
+local FLY_HEIGHT_UNIT_FIELD = ____unit.FLY_HEIGHT_UNIT_FIELD
 __TS__ObjectDefineProperty(
     Unit.prototype,
     "flyHeight",
     {
         get = function(self)
-            return FLY_HEIGHT_UNIT_FLOAT_FIELD:getValue(self)
+            return FLY_HEIGHT_UNIT_FIELD:getValue(self)
         end,
         set = function(self, value)
-            FLY_HEIGHT_UNIT_FLOAT_FIELD:setValue(self, value)
+            FLY_HEIGHT_UNIT_FIELD:setValue(self, value)
         end
     }
 )

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

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        interruptAttack(this: Unit): void;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        interruptMovement(this: Unit): void;
+    }
+}
+export {};

package/engine/internal/unit/interrupts.lua

@@ -0,0 +1,28 @@
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____unit_2Dmissile_2Dlaunch = require("engine.internal.unit-missile-launch")
+local resetAutoAttackTimer = ____unit_2Dmissile_2Dlaunch.resetAutoAttackTimer
+local unitDisableAbility = BlzUnitDisableAbility
+local unitInterruptAttack = BlzUnitInterruptAttack
+Unit.prototype.interruptAttack = function(self)
+    unitInterruptAttack(self.handle)
+    resetAutoAttackTimer(self)
+end
+Unit.prototype.interruptMovement = function(self)
+    local handle = self.handle
+    unitDisableAbility(
+        handle,
+        fourCC("Amov"),
+        true,
+        false
+    )
+    unitDisableAbility(
+        handle,
+        fourCC("Amov"),
+        false,
+        false
+    )
+    resetAutoAttackTimer(self)
+end
+return ____exports

package/engine/internal/unit/scale.lua

@@ -4,16 +4,16 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____unit = require("engine.standard.fields.unit")
-local SCALING_VALUE_UNIT_FLOAT_FIELD = ____unit.SCALING_VALUE_UNIT_FLOAT_FIELD
+local SCALING_VALUE_UNIT_FIELD = ____unit.SCALING_VALUE_UNIT_FIELD
 __TS__ObjectDefineProperty(
     Unit.prototype,
     "scale",
     {
         get = function(self)
-            return SCALING_VALUE_UNIT_FLOAT_FIELD:getValue(self)
+            return SCALING_VALUE_UNIT_FIELD:getValue(self)
         end,
         set = function(self, value)
-            SCALING_VALUE_UNIT_FLOAT_FIELD:setValue(self, value)
+            SCALING_VALUE_UNIT_FIELD:setValue(self, value)
         end
     }
 )