warscript 0.0.1-dev.e5e97e8 → 0.0.1-dev.e698bed

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/core/types/tileCell.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
-export declare class TileCell implements Readonly<Vec2> {
+import { AttributesHolder } from "../../attributes";
+export declare class TileCell extends AttributesHolder implements Readonly<Vec2> {
     private readonly id;
     readonly x: number;
     readonly y: number;

package/core/types/tileCell.lua

@@ -1,8 +1,11 @@
 local ____lualib = require("lualib_bundle")
 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 ____exports = {}
+local ____attributes = require("attributes")
+local AttributesHolder = ____attributes.AttributesHolder
 local getTerrainType = GetTerrainType
 local setTerrainType = SetTerrainType
 local getTerrainVariance = GetTerrainVariance
@@ -13,7 +16,9 @@ local tileCellById = {}
 ____exports.TileCell = __TS__Class()
 local TileCell = ____exports.TileCell
 TileCell.name = "TileCell"
+__TS__ClassExtends(TileCell, AttributesHolder)
 function TileCell.prototype.____constructor(self, id, x, y, z)
+    AttributesHolder.prototype.____constructor(self)
     self.id = id
     self.x = x
     self.y = y

package/engine/behavior.d.ts

@@ -1,6 +1,11 @@
 /** @noSelfInFile */
 import { AbstractDestroyable, Destructor } from "../destroyable";
 import { Event } from "../event";
+export declare const enum BehaviorPriority {
+    HIGH = 0,
+    MEDIUM = 1,
+    LOW = 2
+}
 export type BehaviorConstructor<T extends Behavior<AnyNotNil>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
 declare const enum BehaviorPropertyKey {
     PREVIOUS_BEHAVIOR = 0,
@@ -9,10 +14,11 @@ declare const enum BehaviorPropertyKey {
 }
 export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
     protected readonly object: T;
+    readonly priority: BehaviorPriority;
     private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
     private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
     private [BehaviorPropertyKey.TIMER]?;
-    protected constructor(object: T);
+    protected 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 deregisterEvent(event: Event<any>): boolean;

package/engine/behavior.lua

@@ -18,39 +18,41 @@ local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
 local ____lua_2Dsets = require("utility.lua-sets")
 local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
 local safeCall = warpack.safeCall
-local firstBehaviorByObject = {}
-local lastBehaviorByObject = {}
+local firstBehaviorByObjectByPriority = {[0] = {}, [2] = {}, [1] = {}}
+local lastBehaviorByObjectByPriority = {[0] = {}, [2] = {}, [1] = {}}
 local function invokeBehaviorOnPeriod(behavior, ...)
     behavior.onPeriod(behavior, ...)
 end
 local function reduceBehaviors(behaviorConstructor, object, operation, initial, consumerOrKey, ...)
     local accumulator = initial
-    local behavior = firstBehaviorByObject[object]
-    if behavior ~= nil then
-        if type(consumerOrKey) == "function" then
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, behaviorConstructor) then
-                        local isSuccessful, result = safeCall(consumerOrKey, behavior, ...)
-                        if isSuccessful then
-                            accumulator = operation(accumulator, result)
+    for priority = 0, 2 do
+        local behavior = firstBehaviorByObjectByPriority[priority][object]
+        if behavior ~= nil then
+            if type(consumerOrKey) == "function" then
+                repeat
+                    do
+                        if __TS__InstanceOf(behavior, behaviorConstructor) then
+                            local isSuccessful, result = safeCall(consumerOrKey, behavior, ...)
+                            if isSuccessful then
+                                accumulator = operation(accumulator, result)
+                            end
                         end
+                        behavior = behavior[1]
                     end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
-        else
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, behaviorConstructor) then
-                        local isSuccessful, result = safeCall(behavior[consumerOrKey], behavior, ...)
-                        if isSuccessful then
-                            accumulator = operation(accumulator, result)
+                until not (behavior ~= nil)
+            else
+                repeat
+                    do
+                        if __TS__InstanceOf(behavior, behaviorConstructor) then
+                            local isSuccessful, result = safeCall(behavior[consumerOrKey], behavior, ...)
+                            if isSuccessful then
+                                accumulator = operation(accumulator, result)
+                            end
                         end
+                        behavior = behavior[1]
                     end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
+                until not (behavior ~= nil)
+            end
         end
     end
     return accumulator
@@ -62,12 +64,17 @@ ____exports.Behavior = __TS__Class()
 local Behavior = ____exports.Behavior
 Behavior.name = "Behavior"
 __TS__ClassExtends(Behavior, AbstractDestroyable)
-function Behavior.prototype.____constructor(self, object)
+function Behavior.prototype.____constructor(self, object, priority)
+    if priority == nil then
+        priority = 1
+    end
     AbstractDestroyable.prototype.____constructor(self)
     self.object = object
+    self.priority = priority
+    local lastBehaviorByObject = lastBehaviorByObjectByPriority[priority]
     local lastBehavior = lastBehaviorByObject[object]
     if lastBehavior == nil then
-        firstBehaviorByObject[object] = self
+        firstBehaviorByObjectByPriority[priority][object] = self
         lastBehaviorByObject[object] = self
     else
         self[0] = lastBehavior
@@ -99,12 +106,12 @@ function Behavior.prototype.onDestroy(self)
     if previousBehavior ~= nil then
         previousBehavior[1] = nextBehavior
     else
-        firstBehaviorByObject[self.object] = nextBehavior
+        firstBehaviorByObjectByPriority[self.priority][self.object] = nextBehavior
     end
     if nextBehavior ~= nil then
         nextBehavior[0] = previousBehavior
     else
-        lastBehaviorByObject[self.object] = previousBehavior
+        lastBehaviorByObjectByPriority[self.priority][self.object] = previousBehavior
     end
     return AbstractDestroyable.prototype.onDestroy(self)
 end
@@ -161,78 +168,94 @@ function Behavior.prototype.stopPeriodicAction(self)
 end
 function Behavior.count(self, object, limit)
     local behaviorsCount = 0
-    local behavior = firstBehaviorByObject[object]
-    while behavior ~= nil and (limit == nil or behaviorsCount < limit) do
-        if __TS__InstanceOf(behavior, self) then
-            behaviorsCount = behaviorsCount + 1
+    for priority = 0, 2 do
+        local behavior = firstBehaviorByObjectByPriority[priority][object]
+        while behavior ~= nil and (limit == nil or behaviorsCount < limit) do
+            if __TS__InstanceOf(behavior, self) then
+                behaviorsCount = behaviorsCount + 1
+            end
+            behavior = behavior[1]
         end
-        behavior = behavior[1]
     end
     return behaviorsCount
 end
 function Behavior.getFirst(self, object, countOrPredicate, ...)
-    local behavior = firstBehaviorByObject[object]
     if type(countOrPredicate) ~= "number" then
-        while behavior ~= nil do
-            if __TS__InstanceOf(behavior, self) and (countOrPredicate == nil or countOrPredicate(behavior, ...)) then
-                return behavior
+        for priority = 0, 2 do
+            local behavior = firstBehaviorByObjectByPriority[priority][object]
+            while behavior ~= nil do
+                if __TS__InstanceOf(behavior, self) and (countOrPredicate == nil or countOrPredicate(behavior, ...)) then
+                    return behavior
+                end
+                behavior = behavior[1]
             end
-            behavior = behavior[1]
         end
         return nil
     end
     local behaviors = {}
     local behaviorsCount = 0
-    while behavior ~= nil and behaviorsCount < countOrPredicate do
-        if __TS__InstanceOf(behavior, self) then
-            behaviorsCount = behaviorsCount + 1
-            behaviors[behaviorsCount] = behavior
+    for priority = 0, 2 do
+        local behavior = firstBehaviorByObjectByPriority[priority][object]
+        while behavior ~= nil and behaviorsCount < countOrPredicate do
+            if __TS__InstanceOf(behavior, self) then
+                behaviorsCount = behaviorsCount + 1
+                behaviors[behaviorsCount] = behavior
+            end
+            behavior = behavior[1]
         end
-        behavior = behavior[1]
     end
     return behaviors
 end
 function Behavior.getLast(self, object)
-    local behavior = lastBehaviorByObject[object]
-    while behavior ~= nil do
-        if __TS__InstanceOf(behavior, self) then
-            return behavior
+    for priority = 2, 0, -1 do
+        local behavior = lastBehaviorByObjectByPriority[priority][object]
+        while behavior ~= nil do
+            if __TS__InstanceOf(behavior, self) then
+                return behavior
+            end
+            behavior = behavior[0]
         end
-        behavior = behavior[0]
     end
     return nil
 end
 function Behavior.getAll(self, object, predicate, ...)
     local behaviors = {}
     local behaviorsCount = 0
-    local behavior = firstBehaviorByObject[object]
-    while behavior ~= nil do
-        if __TS__InstanceOf(behavior, self) and (predicate == nil or predicate(behavior, ...)) then
-            behaviorsCount = behaviorsCount + 1
-            behaviors[behaviorsCount] = behavior
+    for priority = 0, 2 do
+        local behavior = firstBehaviorByObjectByPriority[priority][object]
+        while behavior ~= nil do
+            if __TS__InstanceOf(behavior, self) and (predicate == nil or predicate(behavior, ...)) then
+                behaviorsCount = behaviorsCount + 1
+                behaviors[behaviorsCount] = behavior
+            end
+            behavior = behavior[1]
         end
-        behavior = behavior[1]
     end
     return behaviors
 end
 function Behavior.forFirst(self, object, count, consumerOrKey, ...)
     local behaviorsCount = 0
-    local behavior = firstBehaviorByObject[object]
     if type(consumerOrKey) == "function" then
-        while behavior ~= nil and behaviorsCount < count do
-            if __TS__InstanceOf(behavior, self) then
-                safeCall(consumerOrKey, behavior, ...)
-                behaviorsCount = behaviorsCount + 1
+        for priority = 0, 2 do
+            local behavior = firstBehaviorByObjectByPriority[priority][object]
+            while behavior ~= nil and behaviorsCount < count do
+                if __TS__InstanceOf(behavior, self) then
+                    safeCall(consumerOrKey, behavior, ...)
+                    behaviorsCount = behaviorsCount + 1
+                end
+                behavior = behavior[1]
             end
-            behavior = behavior[1]
         end
     else
-        while behavior ~= nil and behaviorsCount < count do
-            if __TS__InstanceOf(behavior, self) then
-                safeCall(behavior[consumerOrKey], behavior, ...)
-                behaviorsCount = behaviorsCount + 1
+        for priority = 0, 2 do
+            local behavior = firstBehaviorByObjectByPriority[priority][object]
+            while behavior ~= nil and behaviorsCount < count do
+                if __TS__InstanceOf(behavior, self) then
+                    safeCall(behavior[consumerOrKey], behavior, ...)
+                    behaviorsCount = behaviorsCount + 1
+                end
+                behavior = behavior[1]
             end
-            behavior = behavior[1]
         end
     end
     return behaviorsCount

package/engine/behaviour/ability/apply-buff.lua

@@ -22,7 +22,7 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
     AbilityBehavior.prototype.____constructor(self, ability)
     if type(constructorOrTypeIdOrTypeIds) == "number" then
         self.applyBuff = function(unit)
-            return Buff:apply(
+            local buff = Buff:apply(
                 unit,
                 constructorOrTypeIdOrTypeIds,
                 typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy,
@@ -30,10 +30,12 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 ability,
                 resistanceTypeOrPolarityOrParameters
             )
+            buff.sourceAbilityBehavior = self
+            return buff
         end
     elseif __TS__ArrayIsArray(constructorOrTypeIdOrTypeIds) then
         self.applyBuff = function(unit)
-            return Buff:apply(
+            local buff = Buff:apply(
                 unit,
                 constructorOrTypeIdOrTypeIds,
                 typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy,
@@ -42,10 +44,12 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 ability,
                 parametersOrResistanceType
             )
+            buff.sourceAbilityBehavior = self
+            return buff
         end
     elseif type(typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy) == "number" then
         self.applyBuff = function(unit)
-            return constructorOrTypeIdOrTypeIds:apply(
+            local buff = constructorOrTypeIdOrTypeIds:apply(
                 unit,
                 typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy,
                 polarityOrTypeIdSelectionPolicyOrResistanceType,
@@ -53,10 +57,12 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 ability,
                 parametersOrResistanceType
             )
+            buff.sourceAbilityBehavior = self
+            return buff
         end
     else
         self.applyBuff = function(unit)
-            return constructorOrTypeIdOrTypeIds:apply(
+            local buff = constructorOrTypeIdOrTypeIds:apply(
                 unit,
                 typeIdOrTypeIdsOrPolarityOrTypeIdSelectionPolicy,
                 polarityOrTypeIdSelectionPolicyOrResistanceType,
@@ -65,6 +71,8 @@ function ApplyBuffAbilityBehavior.prototype.____constructor(self, ability, const
                 ability,
                 parameters
             )
+            buff.sourceAbilityBehavior = self
+            return buff
         end
     end
 end

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 = {
+import { BehaviorPriority } from "../../behavior";
+export type StunImmunityUnitBehaviorParameters = {
+    readonly priority?: BehaviorPriority;
     buffTypeIds?: LuaSet<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

@@ -67,7 +67,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

@@ -22,35 +22,53 @@ local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
 local getUnitBonus = ____bonus.getUnitBonus
 local removeUnitBonus = ____bonus.removeUnitBonus
 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,8 +78,8 @@ 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[bonusType]
     return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
 end
 function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
@@ -72,16 +90,40 @@ function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, va
     end
     bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[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 +137,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 +193,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 +211,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 +341,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)