warscript 0.0.1-dev.b530e1f → 0.0.1-dev.b9f7033

package/engine/ability.d.ts

@@ -2,4 +2,4 @@
 import { AbilityTypeId } from "./object-data/entry/ability-type";
 import { UnitAbility } from "./internal/ability";
 import { Player } from "../core/types/player";
-export declare const castAbility: (owner: Player, abilityTypeId: AbilityTypeId, ...args: [x: number, y: number] | [number, x: number, y: number] | [(ability: UnitAbility) => void, x: number, y: number]) => void;
+export declare const castAbility: (owner: Player, abilityTypeId: AbilityTypeId, ...args: [...levelOrAbilityConsumer: [number] | [(ability: UnitAbility) => void] | [], x: number, y: number]) => void;

package/engine/behavior.d.ts

@@ -1,28 +1,33 @@
 /** @noSelfInFile */
 import { AbstractDestroyable, Destructor } from "../destroyable";
-export type BehaviorConstructor<T extends Behavior<any>, Parameters extends any[] = any[]> = OmitConstructor<typeof Behavior<any>> & (abstract new (...parameters: Parameters) => T);
+import { Event } from "../event";
+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,
     NEXT_BEHAVIOR = 1,
     TIMER = 2
 }
-export declare abstract class Behavior<T, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
+export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParameters extends any[] = any[]> extends AbstractDestroyable {
     protected readonly object: T;
     private [BehaviorPropertyKey.PREVIOUS_BEHAVIOR]?;
     private [BehaviorPropertyKey.NEXT_BEHAVIOR]?;
     private [BehaviorPropertyKey.TIMER]?;
     protected constructor(object: T);
     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;
     protected onPeriod(...parameters: PeriodicActionParameters): void;
     protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;
     protected stopPeriodicAction(): void;
-    static count<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
-    static getFirst<T extends Behavior<any>, ConstructorParameters extends any[], Count extends [number] | []>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, ...[count]: Count): Count extends [number] ? T[] : T | undefined;
-    static getLast<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
-    static getAll<T extends Behavior<any>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T[];
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
+    static count<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, limit?: number): number;
+    static getFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], CountOrPredicate extends [number] | [] | [(behavior: T, ...args: PredicateArgs) => boolean, ...PredicateArgs], PredicateArgs extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, ...[countOrPredicate]: CountOrPredicate): CountOrPredicate extends [number] ? T[] : T | undefined;
+    static getLast<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
+    static getAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], PredicateArgs extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, predicate?: (this: void, behavior: T, ...args: PredicateArgs) => boolean, ...predicateArgs: PredicateArgs): T[];
+    static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
+    static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
+    static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
+    static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
+    static reduce<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[], Accumulator, R>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, operation: (this: void, accumulator: Accumulator, value: R) => Accumulator, initial: Accumulator, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => R, ...parameters: ConsumerParameters): Accumulator;
+    static reduce<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], Accumulator, R, K extends KeysOfType<T, (this: T, ...args: any) => R>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, operation: (this: void, accumulator: Accumulator, value: R) => Accumulator, initial: Accumulator, key: K, ...parameters: T[K] extends (this: T, ...args: any) => R ? Parameters<T[K]> : never): Accumulator;
 }
 export {};

package/engine/behavior.lua

@@ -1,18 +1,63 @@
 local ____lualib = require("lualib_bundle")
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__InstanceOf = ____lualib.__TS__InstanceOf
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____destroyable = require("destroyable")
 local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____functions = require("utility.functions")
+local increment = ____functions.increment
+local ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
+local ____lua_2Dmaps = require("utility.lua-maps")
+local getOrPut = ____lua_2Dmaps.getOrPut
+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 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)
+                        end
+                    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)
+                        end
+                    end
+                    behavior = behavior[1]
+                end
+            until not (behavior ~= nil)
+        end
+    end
+    return accumulator
+end
+local behaviorsByEvent = {}
+local listenerByBehaviorByEvent = {}
+local eventsByBehavior = {}
 ____exports.Behavior = __TS__Class()
 local Behavior = ____exports.Behavior
 Behavior.name = "Behavior"
@@ -35,6 +80,20 @@ 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]
+            if ____opt_2 ~= nil then
+                ____opt_2:remove(self)
+            end
+            local ____opt_4 = listenerByBehaviorByEvent[event]
+            if ____opt_4 ~= nil then
+                ____opt_4[self] = nil
+            end
+        end
+        eventsByBehavior[self] = nil
+    end
     local previousBehavior = self[0]
     local nextBehavior = self[1]
     if previousBehavior ~= nil then
@@ -49,6 +108,34 @@ function Behavior.prototype.onDestroy(self)
     end
     return AbstractDestroyable.prototype.onDestroy(self)
 end
+function Behavior.prototype.registerEvent(self, event, listener)
+    local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
+    listenerByBehavior[self] = listener
+    getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
+    local behaviors = behaviorsByEvent[event]
+    if behaviors == nil then
+        event:addListener(function(...)
+            local behaviors = behaviorsByEvent[event]
+            if behaviors ~= nil then
+                for behavior in pairs(behaviors) do
+                    safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
+                end
+            end
+        end)
+        behaviors = __TS__New(LinkedSet)
+        behaviorsByEvent[event] = behaviors
+    end
+    behaviors:add(self)
+end
+function Behavior.prototype.deregisterEvent(self, event)
+    local behaviors = behaviorsByEvent[event]
+    if behaviors ~= nil and behaviors:remove(self) then
+        eventsByBehavior[self][event] = nil
+        listenerByBehaviorByEvent[event][self] = nil
+        return true
+    end
+    return false
+end
 function Behavior.prototype.onPeriod(self, ...)
 end
 function Behavior.prototype.startPeriodicAction(self, interval, ...)
@@ -83,11 +170,11 @@ function Behavior.count(self, object, limit)
     end
     return behaviorsCount
 end
-function Behavior.getFirst(self, object, count)
+function Behavior.getFirst(self, object, countOrPredicate, ...)
     local behavior = firstBehaviorByObject[object]
-    if count == nil then
+    if type(countOrPredicate) ~= "number" then
         while behavior ~= nil do
-            if __TS__InstanceOf(behavior, self) then
+            if __TS__InstanceOf(behavior, self) and (countOrPredicate == nil or countOrPredicate(behavior, ...)) then
                 return behavior
             end
             behavior = behavior[1]
@@ -96,7 +183,7 @@ function Behavior.getFirst(self, object, count)
     end
     local behaviors = {}
     local behaviorsCount = 0
-    while behavior ~= nil and behaviorsCount < count do
+    while behavior ~= nil and behaviorsCount < countOrPredicate do
         if __TS__InstanceOf(behavior, self) then
             behaviorsCount = behaviorsCount + 1
             behaviors[behaviorsCount] = behavior
@@ -115,12 +202,12 @@ function Behavior.getLast(self, object)
     end
     return nil
 end
-function Behavior.getAll(self, object)
+function Behavior.getAll(self, object, predicate, ...)
     local behaviors = {}
     local behaviorsCount = 0
     local behavior = firstBehaviorByObject[object]
     while behavior ~= nil do
-        if __TS__InstanceOf(behavior, self) then
+        if __TS__InstanceOf(behavior, self) and (predicate == nil or predicate(behavior, ...)) then
             behaviorsCount = behaviorsCount + 1
             behaviors[behaviorsCount] = behavior
         end
@@ -151,31 +238,23 @@ function Behavior.forFirst(self, object, count, consumerOrKey, ...)
     return behaviorsCount
 end
 function Behavior.forAll(self, object, consumerOrKey, ...)
-    local behaviorsCount = 0
-    local behavior = firstBehaviorByObject[object]
-    if behavior ~= nil then
-        if type(consumerOrKey) == "function" then
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, self) then
-                        safeCall(consumerOrKey, behavior, ...)
-                        behaviorsCount = behaviorsCount + 1
-                    end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
-        else
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, self) then
-                        safeCall(behavior[consumerOrKey], behavior, ...)
-                        behaviorsCount = behaviorsCount + 1
-                    end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
-        end
-    end
-    return behaviorsCount
+    return reduceBehaviors(
+        self,
+        object,
+        increment,
+        0,
+        consumerOrKey,
+        ...
+    )
+end
+function Behavior.reduce(self, object, operation, initial, consumerOrKey, ...)
+    return reduceBehaviors(
+        self,
+        object,
+        operation,
+        initial,
+        consumerOrKey,
+        ...
+    )
 end
 return ____exports

package/engine/behaviour/ability/always-enabled.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+import { AbilityBehavior } from "../ability";
+import { Destructor } from "../../../destroyable";
+export declare class AlwaysEnabledAbilityBehavior extends AbilityBehavior {
+    protected onCreate(): void;
+    protected onDestroy(): Destructor;
+}

package/engine/behaviour/ability/always-enabled.lua

@@ -0,0 +1,31 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.internal.ability")
+local UnitAbility = ____ability.UnitAbility
+local ____ability_2Ddisable_2Dcounter = require("engine.internal.misc.ability-disable-counter")
+local increaseAbilityDisableCounter = ____ability_2Ddisable_2Dcounter.increaseAbilityDisableCounter
+____exports.AlwaysEnabledAbilityBehavior = __TS__Class()
+local AlwaysEnabledAbilityBehavior = ____exports.AlwaysEnabledAbilityBehavior
+AlwaysEnabledAbilityBehavior.name = "AlwaysEnabledAbilityBehavior"
+__TS__ClassExtends(AlwaysEnabledAbilityBehavior, AbilityBehavior)
+function AlwaysEnabledAbilityBehavior.prototype.onCreate(self)
+    local ability = self.ability
+    if not __TS__InstanceOf(ability, UnitAbility) then
+        return
+    end
+    increaseAbilityDisableCounter(ability.owner.handle, ability.typeId, -10)
+end
+function AlwaysEnabledAbilityBehavior.prototype.onDestroy(self)
+    local ability = self.ability
+    if not __TS__InstanceOf(ability, UnitAbility) then
+        return AbilityBehavior.prototype.onDestroy(self)
+    end
+    increaseAbilityDisableCounter(ability.owner.handle, ability.typeId, 10)
+    return AbilityBehavior.prototype.onDestroy(self)
+end
+return ____exports

package/engine/behaviour/ability/apply-buff.d.ts

@@ -1,11 +1,9 @@
 /** @noSelfInFile */
 import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
-import { Buff, BuffConstructor, BuffParameters, BuffTypeIdSelectionPolicy } from "../../buff";
+import { Buff, BuffConstructor, BuffParameters, BuffPolarityParameterType, BuffResistanceTypeParameterType, BuffTypeIdSelectionPolicy } from "../../buff";
 import { Unit } from "../../internal/unit";
 import { ApplicableBuffTypeId } from "../../object-data/entry/buff-type/applicable";
-import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-type";
-import { BuffPolarity } from "../../object-data/auxiliary/buff-polarity";
 import { Widget } from "../../../core/types/widget";
 type BuffParametersType<T extends BuffConstructor> = BuffParameters & Omit<BuffAdditionalParametersType<T>, keyof BuffParameters>;
 type BuffAdditionalParametersType<T extends BuffConstructor> = T extends BuffConstructor<Buff<infer AdditionalParameters>> ? AdditionalParameters : never;
@@ -17,8 +15,8 @@ export declare abstract class ApplyBuffAbilityBehavior<T extends BuffConstructor
             typeIds: [ApplicableBuffTypeId, ...ApplicableBuffTypeId[]],
             typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
         ],
-        polarity: BuffPolarity,
-        resistanceType: BuffResistanceType,
+        polarity: BuffPolarityParameterType,
+        resistanceType: BuffResistanceTypeParameterType,
         parameters?: BuffParametersType<T>
     ]);
 }
@@ -35,4 +33,9 @@ export declare class ApplyBuffTargetAreaAbilityBehavior<T extends BuffConstructo
     onPointTargetImpact(caster: Unit, x: number, y: number): void;
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
 }
+export declare class ApplyBuffChannelingTargetAbilityBehavior<T extends BuffConstructor = typeof Buff> extends ApplyBuffAbilityBehavior<T> {
+    private buff?;
+    onUnitTargetChannelingStart(caster: Unit, target: Unit): void;
+    onStop(): void;
+}
 export {};

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

@@ -123,4 +123,36 @@ function ApplyBuffTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self,
         self.applyBuff(unit)
     end
 end
+local behaviorByBuff = {}
+____exports.ApplyBuffChannelingTargetAbilityBehavior = __TS__Class()
+local ApplyBuffChannelingTargetAbilityBehavior = ____exports.ApplyBuffChannelingTargetAbilityBehavior
+ApplyBuffChannelingTargetAbilityBehavior.name = "ApplyBuffChannelingTargetAbilityBehavior"
+__TS__ClassExtends(ApplyBuffChannelingTargetAbilityBehavior, ____exports.ApplyBuffAbilityBehavior)
+function ApplyBuffChannelingTargetAbilityBehavior.prototype.onUnitTargetChannelingStart(self, caster, target)
+    local previousBuff = self.buff
+    if previousBuff ~= nil then
+        behaviorByBuff[previousBuff] = nil
+        previousBuff:destroy()
+    end
+    local buff = self.applyBuff(target)
+    if buff ~= nil then
+        behaviorByBuff[buff] = self
+    end
+    self.buff = buff
+end
+function ApplyBuffChannelingTargetAbilityBehavior.prototype.onStop(self)
+    local buff = self.buff
+    if buff ~= nil then
+        behaviorByBuff[buff] = nil
+        buff:destroy()
+        self.buff = nil
+    end
+end
+Buff.beingDestroyedEvent:addListener(function(buff)
+    local behavior = behaviorByBuff[buff]
+    if behavior ~= nil then
+        behaviorByBuff[buff] = nil
+        behavior.ability:interruptCast()
+    end
+end)
 return ____exports

package/engine/behaviour/ability/apply-unit-behavior.d.ts

@@ -1,12 +1,21 @@
 /** @noSelfInFile */
 import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
-import { UnitBehaviorConstructor } from "../unit";
+import { UnitBehavior } from "../unit";
 import { Unit } from "../../internal/unit";
-export declare class ApplyUnitBehaviorAbilityBehavior<Args extends any[]> extends AbilityBehavior {
-    private readonly createUnitBehavior;
+import { MutableKeys } from "../../../utility/types";
+import { AbilityDependentValue } from "../../object-field/ability";
+type UnitBehaviorParameters<T extends UnitBehavior> = Partial<{
+    [K in MutableKeys<T> & KeysOfType<T, boolean | number | string>]: T[K] extends boolean | number | string ? AbilityDependentValue<T[K]> : never;
+}>;
+export declare class ApplyUnitBehaviorAbilityBehavior<T extends UnitBehavior> extends AbilityBehavior {
+    private readonly unitBehaviorConstructor;
+    private readonly parameters?;
+    private readonly keys?;
     private unitBehavior?;
-    constructor(ability: Ability, unitBehaviorConstructor: UnitBehaviorConstructor<Args>, ...args: Args);
+    constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: UnitBehaviorParameters<T> | undefined);
+    update(): void;
     onUnitGainAbility(unit: Unit): void;
     onUnitLoseAbility(): void;
 }
+export {};

package/engine/behaviour/ability/apply-unit-behavior.lua

@@ -1,23 +1,38 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
+local __TS__ArraySort = ____lualib.__TS__ArraySort
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____ability = require("engine.behaviour.ability")
 local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.object-field.ability")
+local AbilityField = ____ability.AbilityField
+local AbilityLevelField = ____ability.AbilityLevelField
 ____exports.ApplyUnitBehaviorAbilityBehavior = __TS__Class()
 local ApplyUnitBehaviorAbilityBehavior = ____exports.ApplyUnitBehaviorAbilityBehavior
 ApplyUnitBehaviorAbilityBehavior.name = "ApplyUnitBehaviorAbilityBehavior"
 __TS__ClassExtends(ApplyUnitBehaviorAbilityBehavior, AbilityBehavior)
-function ApplyUnitBehaviorAbilityBehavior.prototype.____constructor(self, ability, unitBehaviorConstructor, ...)
-    local args = {...}
+function ApplyUnitBehaviorAbilityBehavior.prototype.____constructor(self, ability, unitBehaviorConstructor, parameters)
     AbilityBehavior.prototype.____constructor(self, ability)
-    self.createUnitBehavior = function(____, unit)
-        return __TS__New(
-            unitBehaviorConstructor,
-            unit,
-            table.unpack(args)
-        )
+    self.unitBehaviorConstructor = unitBehaviorConstructor
+    self.parameters = parameters
+    if parameters ~= nil then
+        self.keys = __TS__ArraySort(__TS__ObjectKeys(parameters))
+    end
+end
+function ApplyUnitBehaviorAbilityBehavior.prototype.update(self)
+    local unitBehavior = self.unitBehavior
+    local parameters = self.parameters
+    local keys = self.keys
+    if unitBehavior ~= nil and parameters ~= nil and keys ~= nil then
+        for ____, key in ipairs(keys) do
+            local value = parameters[key]
+            if value ~= nil then
+                unitBehavior[key] = self:resolveCurrentAbilityDependentValue(value)
+            end
+        end
     end
 end
 function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitGainAbility(self, unit)
@@ -25,7 +40,9 @@ function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitGainAbility(self, unit
     if ____opt_0 ~= nil then
         ____opt_0:destroy()
     end
-    self.unitBehavior = self:createUnitBehavior(unit)
+    self.unitBehavior = __TS__New(self.unitBehaviorConstructor, unit)
+    self.unitBehavior.sourceAbilityBehavior = self
+    self:update()
 end
 function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitLoseAbility(self)
     local ____opt_2 = self.unitBehavior
@@ -33,4 +50,10 @@ function ApplyUnitBehaviorAbilityBehavior.prototype.onUnitLoseAbility(self)
         ____opt_2:destroy()
     end
 end
+AbilityField.valueChangeEvent:addListener(function(ability)
+    ____exports.ApplyUnitBehaviorAbilityBehavior:forAll(ability, "update")
+end)
+AbilityLevelField.valueChangeEvent:addListener(function(ability)
+    ____exports.ApplyUnitBehaviorAbilityBehavior:forAll(ability, "update")
+end)
 return ____exports

package/engine/behaviour/ability/damage.d.ts

@@ -4,22 +4,50 @@ import { Ability } from "../../internal/ability";
 import { Unit } from "../../internal/unit";
 import { AbilityDependentValue } from "../../object-field/ability";
 import { Widget } from "../../../core/types/widget";
-export declare class DamageSelfAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>);
+import { DamageType, WeaponType } from "../../internal/unit+damage";
+import { CombatClassifications } from "../../object-data/auxiliary/combat-classification";
+import { AttackType } from "../../object-data/auxiliary/attack-type";
+export type DamageAbilityBehaviorParameters = {
+    damagePerStrength?: AbilityDependentValue<number>;
+    damagePerAgility?: AbilityDependentValue<number>;
+    damagePerIntelligence?: AbilityDependentValue<number>;
+    attackType?: AbilityDependentValue<AttackType>;
+    damageType?: DamageType;
+    weaponType?: WeaponType;
+    metadata?: AbilityDependentValue<string | number | boolean>;
+};
+export type DamageAreaAbilityBehaviorParameters = DamageAbilityBehaviorParameters & {
+    maximumDamage?: AbilityDependentValue<number>;
+    areaOfEffect?: AbilityDependentValue<number>;
+    allowedTargetCombatClassifications?: AbilityDependentValue<CombatClassifications>;
+};
+export declare abstract class DamageAbilityBehavior<T extends DamageAbilityBehaviorParameters = DamageAbilityBehaviorParameters> extends AbilityBehavior {
+    protected readonly damage: AbilityDependentValue<number>;
+    protected readonly parameters?: T | undefined;
+    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: T | undefined);
+    protected calculateDamage(caster: Unit): number;
+    protected damageTarget(caster: Unit, target: Widget, damage?: number): void;
+}
+export declare class DamageSelfAbilityBehavior extends DamageAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);
     onImpact(caster: Unit): void;
 }
-export declare class DamageTargetAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>);
+export declare class DamageTargetAbilityBehavior extends DamageAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAbilityBehaviorParameters);
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
 }
-export declare class DamageTargetAreaAbilityBehavior extends AbilityBehavior {
-    private readonly damage;
-    private readonly maximumDamage?;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number> | undefined);
+declare abstract class DamageAreaAbilityBehavior extends DamageAbilityBehavior<DamageAreaAbilityBehaviorParameters> {
+    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
+    protected damageArea(caster: Unit, x: number, y: number): void;
+}
+export declare class DamageSelfAreaAbilityBehavior extends DamageAreaAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
+    onImpact(caster: Unit): void;
+}
+export declare class DamageTargetAreaAbilityBehavior extends DamageAreaAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, parameters?: DamageAreaAbilityBehaviorParameters);
     onNoTargetImpact(caster: Unit): void;
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
     onPointTargetImpact(caster: Unit, x: number, y: number): void;
-    private damageArea;
 }
+export {};