warscript 0.0.1-dev.5ca835c → 0.0.1-dev.5d49132

package/core/types/player.d.ts

@@ -81,6 +81,7 @@ export declare class Player extends Handle<jplayer> {
         };
     };
     static get onChat(): Event<[player: Player, message: string]>;
+    static readonly colorChangedEvent: Event<[Player]>;
     static byId(id: number): Player | undefined;
 }
 export {};

package/core/types/player.lua

@@ -1,7 +1,7 @@
 local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local ____exports = {}
@@ -49,6 +49,7 @@ local nativeByPlayerAllianceType = {
     [8] = ALLIANCE_SHARED_CONTROL,
     [9] = ALLIANCE_SHARED_ADVANCED_CONTROL
 }
+local playerColorChangedEvent = __TS__New(Event)
 ____exports.Player = __TS__Class()
 local Player = ____exports.Player
 Player.name = "Player"
@@ -300,6 +301,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, color)
             SetPlayerColor(self.handle, color.handle)
+            Event.invoke(playerColorChangedEvent, self)
         end
     },
     true
@@ -487,4 +489,5 @@ __TS__ObjectDefineProperty(
         return event
     end}
 )
+Player.colorChangedEvent = playerColorChangedEvent
 return ____exports

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/ability/apply-buff.lua

@@ -27,7 +27,7 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 constructorOrTypeIdOrTypeIds,
                 typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy,
                 polarityOrTypeIdSelectionPolicyOrResistanceType,
-                ability,
+                self,
                 resistanceTypeOrPolarityOrParameters
             )
         end
@@ -39,7 +39,7 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy,
                 polarityOrTypeIdSelectionPolicyOrResistanceType,
                 resistanceTypeOrPolarityOrParameters,
-                ability,
+                self,
                 parametersOrResistanceType
             )
         end
@@ -50,7 +50,7 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy,
                 polarityOrTypeIdSelectionPolicyOrResistanceType,
                 resistanceTypeOrPolarityOrParameters,
-                ability,
+                self,
                 parametersOrResistanceType
             )
         end
@@ -62,7 +62,7 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 polarityOrTypeIdSelectionPolicyOrResistanceType,
                 resistanceTypeOrPolarityOrParameters,
                 parametersOrResistanceType,
-                ability,
+                self,
                 parameters
             )
         end

package/engine/behaviour/ability.d.ts

@@ -1,6 +1,7 @@
 /** @noSelfInFile */
 import { Behavior } from "../behavior";
-import { Unit } from "../unit";
+import { Unit } from "../internal/unit";
+import "../internal/unit/ability";
 import { Ability } from "../internal/ability";
 import { AbilityTypeId } from "../object-data/entry/ability-type";
 import { Widget } from "../../core/types/widget";

package/engine/behaviour/ability.lua

@@ -7,8 +7,9 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
-local ____unit = require("engine.unit")
+local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.ability")
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
 local ____effect = require("core.types.effect")

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

@@ -4,16 +4,18 @@ import { Unit } from "../../unit";
 import { BuffTypeId } from "../../object-data/entry/buff-type";
 import { TextTagPreset } from "../../text-tag";
 import { Destructor } from "../../../destroyable";
-export type StunImmunityUnitBehaviourParameters = {
-    buffTypeIds?: LuaSet<BuffTypeId>;
+import { BehaviorPriority } from "../../behavior";
+export type StunImmunityUnitBehaviorParameters = {
+    readonly priority?: BehaviorPriority;
+    buffTypeIds?: readonly BuffTypeId[];
     textTagPreset?: TextTagPreset;
     textTagText?: string;
     additionalAction?: (this: void, unit: Unit) => void;
 };
 export declare class StunImmunityUnitBehavior extends UnitBehavior {
-    readonly parameters: Readonly<StunImmunityUnitBehaviourParameters>;
-    static defaultParameters: StunImmunityUnitBehaviourParameters;
-    constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviourParameters>);
+    readonly parameters: Readonly<StunImmunityUnitBehaviorParameters>;
+    static defaultParameters: StunImmunityUnitBehaviorParameters;
+    constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviorParameters>);
     protected onDestroy(): Destructor;
     onDamageReceived(): void;
     onTargetingAbilityChannelingStart(): 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
@@ -67,7 +68,7 @@ function StunImmunityUnitBehavior.prototype.____constructor(self, unit, paramete
     if parameters == nil then
         parameters = ____exports.StunImmunityUnitBehavior.defaultParameters
     end
-    UnitBehavior.prototype.____constructor(self, unit)
+    UnitBehavior.prototype.____constructor(self, unit, parameters.priority)
     self.parameters = parameters
     unit:decrementStunCounter()
     process(self)

package/engine/behaviour/unit.d.ts

@@ -1,11 +1,11 @@
 /** @noSelfInFile */
-import { Behavior } from "../behavior";
+import { Behavior, BehaviorPriority } from "../behavior";
 import { Ability } from "../internal/ability";
 import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
 import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
 import { Item } from "../internal/item";
-import type { AbilityBehavior } from "./ability";
+import { AbilityBehavior } from "./ability";
 import { Event } from "../../event";
 import { Destructor } from "../../destroyable";
 import type { Widget } from "../../core/types/widget";
@@ -13,15 +13,17 @@ import { Destructable } from "../../core/types/destructable";
 import type { Buff } from "../buff";
 import { UnitBonusType } from "../internal/unit/bonus";
 import { Player } from "../../core/types/player";
+import { UnitTypeId } from "../object-data/entry/unit-type";
 export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
 export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
     readonly sourceAbilityBehavior?: AbilityBehavior;
     private _bonusIdByBonusType?;
-    constructor(unit: Unit);
+    constructor(unit: Unit, priority?: BehaviorPriority);
     protected onDestroy(): Destructor;
     get unit(): Unit;
     protected getUnitBonus(bonusType: UnitBonusType): number;
     protected addOrUpdateOrRemoveUnitBonus(bonusType: UnitBonusType, value: number): void;
+    protected registerOwningPlayerEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractPlayer: (...args: Args) => Player | undefined, listener: T): void;
     protected registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractUnit: (...args: Args) => Unit | undefined, range: number, listener: T): void;
     onImmediateOrder(orderId: number): void;
     onTargetOrder(orderId: number, target: Widget): void;
@@ -49,6 +51,7 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onTargetingAbilityChannelingStart(ability: Ability, source: Unit): void;
     onTargetingAbilityImpact(ability: Ability, source: Unit): void;
     onBuffGained(buff: Buff): void;
+    onBuffLost(buff: Buff): void;
     onItemDropped(item: Item): void;
     onItemPickedUp(item: Item): void;
     onItemUsed(item: Item): void;
@@ -57,4 +60,5 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onKill(target: Unit): void;
     onDeath(source: Unit | undefined): void;
     onOwnerChange(previousOwner: Player): void;
+    static bindUnitType<Args extends any[]>(this: UnitBehaviorConstructor<Args>, unitTypeId: UnitTypeId, ...args: Args): void;
 }

package/engine/behaviour/unit.lua

@@ -21,36 +21,56 @@ 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 behaviorsByEvent = {}
-local rangeByBehaviorByEvent = {}
-local listenerByBehaviorByEvent = {}
-local eventsByBehavior = {}
+local createBehaviorFunctionsByUnitTypeId = {}
+local behaviorsByOwningPlayerEvent = {}
+local listenerByBehaviorByOwningPlayerEvent = {}
+local owningPlayerEventsByBehavior = {}
+local behaviorsByInRangeUnitEvent = {}
+local rangeByBehaviorByInRangeUnitEvent = {}
+local listenerByBehaviorByInRangeUnitEvent = {}
+local inRangeUnitEventsByBehavior = {}
 ____exports.UnitBehavior = __TS__Class()
 local UnitBehavior = ____exports.UnitBehavior
 UnitBehavior.name = "UnitBehavior"
 __TS__ClassExtends(UnitBehavior, Behavior)
-function UnitBehavior.prototype.____constructor(self, unit)
-    Behavior.prototype.____constructor(self, unit)
+function UnitBehavior.prototype.____constructor(self, unit, priority)
+    Behavior.prototype.____constructor(self, unit, priority)
 end
 function UnitBehavior.prototype.onDestroy(self)
-    local events = eventsByBehavior[self]
-    if events ~= nil then
-        for event in pairs(events) do
-            local ____opt_0 = behaviorsByEvent[event]
+    local owningPlayerEvents = owningPlayerEventsByBehavior[self]
+    if owningPlayerEvents ~= nil then
+        for event in pairs(owningPlayerEvents) do
+            local ____opt_0 = behaviorsByOwningPlayerEvent[event]
             if ____opt_0 ~= nil then
                 ____opt_0:remove(self)
             end
-            local ____opt_2 = rangeByBehaviorByEvent[event]
+            local ____opt_2 = listenerByBehaviorByOwningPlayerEvent[event]
             if ____opt_2 ~= nil then
                 ____opt_2[self] = nil
             end
-            local ____opt_4 = listenerByBehaviorByEvent[event]
+        end
+        owningPlayerEventsByBehavior[self] = nil
+    end
+    local inRangeUnitEvents = inRangeUnitEventsByBehavior[self]
+    if inRangeUnitEvents ~= nil then
+        for event in pairs(inRangeUnitEvents) do
+            local ____opt_4 = behaviorsByInRangeUnitEvent[event]
             if ____opt_4 ~= nil then
-                ____opt_4[self] = nil
+                ____opt_4:remove(self)
+            end
+            local ____opt_6 = rangeByBehaviorByInRangeUnitEvent[event]
+            if ____opt_6 ~= nil then
+                ____opt_6[self] = nil
+            end
+            local ____opt_8 = listenerByBehaviorByInRangeUnitEvent[event]
+            if ____opt_8 ~= nil then
+                ____opt_8[self] = nil
             end
         end
-        eventsByBehavior[self] = nil
+        inRangeUnitEventsByBehavior[self] = nil
     end
     if self._bonusIdByBonusType ~= nil then
         for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
@@ -60,28 +80,60 @@ function UnitBehavior.prototype.onDestroy(self)
     return Behavior.prototype.onDestroy(self)
 end
 function UnitBehavior.prototype.getUnitBonus(self, bonusType)
-    local ____opt_6 = self._bonusIdByBonusType
-    local bonusId = ____opt_6 and ____opt_6[bonusType]
+    local ____opt_10 = self._bonusIdByBonusType
+    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)
+    listenerByBehavior[self] = listener
+    getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
+    local behaviors = behaviorsByOwningPlayerEvent[event]
+    if behaviors == nil then
+        event:addListener(function(...)
+            local behaviors = behaviorsByOwningPlayerEvent[event]
+            if behaviors ~= nil then
+                local player = extractPlayer(...)
+                if player ~= nil then
+                    for behavior in pairs(behaviors) do
+                        if behavior.unit.owner == player then
+                            safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
+                        end
+                    end
+                end
+            end
+        end)
+        behaviors = __TS__New(LinkedSet)
+        behaviorsByOwningPlayerEvent[event] = behaviors
+    end
+    behaviors:add(self)
 end
 function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
-    local rangeByBehavior = getOrPut(rangeByBehaviorByEvent, event, mutableLuaMap)
+    local rangeByBehavior = getOrPut(rangeByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
     rangeByBehavior[self] = range
-    local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
+    local listenerByBehavior = getOrPut(listenerByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
     listenerByBehavior[self] = listener
-    getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
-    local behaviors = behaviorsByEvent[event]
+    getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
+    local behaviors = behaviorsByInRangeUnitEvent[event]
     if behaviors == nil then
         event:addListener(function(...)
-            local behaviors = behaviorsByEvent[event]
+            local behaviors = behaviorsByInRangeUnitEvent[event]
             if behaviors ~= nil then
                 local unit = extractUnit(...)
                 if unit ~= nil then
@@ -95,7 +147,7 @@ function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUni
             end
         end)
         behaviors = __TS__New(LinkedSet)
-        behaviorsByEvent[event] = behaviors
+        behaviorsByInRangeUnitEvent[event] = behaviors
     end
     behaviors:add(self)
 end
@@ -151,6 +203,8 @@ function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
 end
 function UnitBehavior.prototype.onBuffGained(self, buff)
 end
+function UnitBehavior.prototype.onBuffLost(self, buff)
+end
 function UnitBehavior.prototype.onItemDropped(self, item)
 end
 function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -167,6 +221,21 @@ function UnitBehavior.prototype.onDeath(self, source)
 end
 function UnitBehavior.prototype.onOwnerChange(self, previousOwner)
 end
+function UnitBehavior.bindUnitType(self, unitTypeId, ...)
+    local args = {...}
+    local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unitTypeId]
+    if createBehaviorFunctions == nil then
+        createBehaviorFunctions = {}
+        createBehaviorFunctionsByUnitTypeId[unitTypeId] = createBehaviorFunctions
+    end
+    createBehaviorFunctions[#createBehaviorFunctions + 1] = function(unit)
+        return __TS__New(
+            self,
+            unit,
+            table.unpack(args)
+        )
+    end
+end
 __TS__SetDescriptor(
     UnitBehavior.prototype,
     "unit",
@@ -282,6 +351,14 @@ __TS__SetDescriptor(
         ____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
     end)
 end)(UnitBehavior)
+Unit.onCreate:addListener(function(unit)
+    local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unit.typeId]
+    if createBehaviorFunctions ~= nil then
+        for ____, createBehavior in ipairs(createBehaviorFunctions) do
+            createBehavior(unit)
+        end
+    end
+end)
 Unit.destroyEvent:addListener(function(unit)
     ____exports.UnitBehavior:forAll(unit, "destroy")
 end)

package/engine/buff.d.ts

@@ -13,6 +13,7 @@ import { UnitBehavior } from "./behaviour/unit";
 import type { Widget } from "../core/types/widget";
 import { Destructor } from "../destroyable";
 import { Event } from "../event";
+import { AbilityBehavior } from "./behaviour/ability";
 export type BuffConstructor<T extends Buff<any> = Buff<any>, Args extends any[] = any> = OmitConstructor<typeof Buff<any>> & (new (...args: Args) => T);
 type EnumParameterValueType<T extends number> = T | AbilityEnumLevelField<T>;
 type NumberParameterValueType = number | AbilityNumberField | AbilityNumberLevelField;
@@ -30,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. */
@@ -56,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;
@@ -141,7 +145,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
     polarity: BuffPolarityParameterType,
     resistanceType: BuffResistanceTypeParameterType,
     ...abilityOrParameters: [
-        ability?: Ability,
+        ability?: Ability | AbilityBehavior,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
     ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
 ];
@@ -264,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);