warscript 0.0.1-dev.f5421e8 → 0.0.1-dev.f70428f

package/engine/behavior.d.ts

@@ -1,5 +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,
@@ -8,11 +14,14 @@ 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;
     protected onPeriod(...parameters: PeriodicActionParameters): void;
     protected startPeriodicAction(interval: number, ...parameters: PeriodicActionParameters): void;
     protected stopPeriodicAction(): void;
@@ -24,5 +33,7 @@ export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParame
     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,28 +1,80 @@
 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 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
+    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
+                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
+    end
+    return accumulator
+end
+local behaviorsByEvent = {}
+local listenerByBehaviorByEvent = {}
+local eventsByBehavior = {}
 ____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
@@ -35,20 +87,62 @@ 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
         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
+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, ...)
@@ -74,108 +168,116 @@ 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
 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/apply-buff.lua

@@ -148,7 +148,7 @@ function ApplyBuffChannelingTargetAbilityBehavior.prototype.onStop(self)
         self.buff = nil
     end
 end
-Buff.destroyEvent:addListener(function(buff)
+Buff.beingDestroyedEvent:addListener(function(buff)
     local behavior = behaviorByBuff[buff]
     if behavior ~= nil then
         behaviorByBuff[buff] = nil

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

@@ -4,26 +4,29 @@ import { Ability } from "../../internal/ability";
 import { Unit } from "../../internal/unit";
 import { AbilityDependentValue } from "../../object-field/ability";
 import { Widget } from "../../../core/types/widget";
-import { AttackType, DamageType, WeaponType } from "../../internal/unit+damage";
+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?: AttackType;
+    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>;
 };
-declare abstract class DamageAbilityBehavior<T extends DamageAbilityBehaviorParameters = DamageAbilityBehaviorParameters> extends AbilityBehavior {
+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);

package/engine/behaviour/ability/damage.lua

@@ -9,7 +9,8 @@ local Unit = ____unit.Unit
 local ____ability = require("engine.standard.fields.ability")
 local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
-local DamageAbilityBehavior = __TS__Class()
+____exports.DamageAbilityBehavior = __TS__Class()
+local DamageAbilityBehavior = ____exports.DamageAbilityBehavior
 DamageAbilityBehavior.name = "DamageAbilityBehavior"
 __TS__ClassExtends(DamageAbilityBehavior, AbilityBehavior)
 function DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
@@ -34,49 +35,44 @@ function DamageAbilityBehavior.prototype.calculateDamage(self, caster)
     end
     return damage
 end
-____exports.DamageSelfAbilityBehavior = __TS__Class()
-local DamageSelfAbilityBehavior = ____exports.DamageSelfAbilityBehavior
-DamageSelfAbilityBehavior.name = "DamageSelfAbilityBehavior"
-__TS__ClassExtends(DamageSelfAbilityBehavior, DamageAbilityBehavior)
-function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-end
-function DamageSelfAbilityBehavior.prototype.onImpact(self, caster)
+function DamageAbilityBehavior.prototype.damageTarget(self, caster, target, damage)
     local parameters = self.parameters
     caster:damageTarget(
-        caster,
-        self:calculateDamage(caster),
+        target,
+        damage or self:calculateDamage(caster),
         nil,
         nil,
-        parameters and parameters.attackType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
         parameters and parameters.damageType,
-        parameters and parameters.weaponType
+        parameters and parameters.weaponType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
     )
 end
+____exports.DamageSelfAbilityBehavior = __TS__Class()
+local DamageSelfAbilityBehavior = ____exports.DamageSelfAbilityBehavior
+DamageSelfAbilityBehavior.name = "DamageSelfAbilityBehavior"
+__TS__ClassExtends(DamageSelfAbilityBehavior, ____exports.DamageAbilityBehavior)
+function DamageSelfAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageSelfAbilityBehavior.____super.prototype.____constructor(self, ability, damage, parameters)
+end
+function DamageSelfAbilityBehavior.prototype.onImpact(self, caster)
+    self:damageTarget(caster, caster)
+end
 ____exports.DamageTargetAbilityBehavior = __TS__Class()
 local DamageTargetAbilityBehavior = ____exports.DamageTargetAbilityBehavior
 DamageTargetAbilityBehavior.name = "DamageTargetAbilityBehavior"
-__TS__ClassExtends(DamageTargetAbilityBehavior, DamageAbilityBehavior)
+__TS__ClassExtends(DamageTargetAbilityBehavior, ____exports.DamageAbilityBehavior)
 function DamageTargetAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageTargetAbilityBehavior.____super.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageTargetAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
-    local parameters = self.parameters
-    caster:damageTarget(
-        target,
-        self:calculateDamage(caster),
-        nil,
-        nil,
-        parameters and parameters.attackType,
-        parameters and parameters.damageType,
-        parameters and parameters.weaponType
-    )
+    self:damageTarget(caster, target)
 end
 local DamageAreaAbilityBehavior = __TS__Class()
 DamageAreaAbilityBehavior.name = "DamageAreaAbilityBehavior"
-__TS__ClassExtends(DamageAreaAbilityBehavior, DamageAbilityBehavior)
+__TS__ClassExtends(DamageAreaAbilityBehavior, ____exports.DamageAbilityBehavior)
 function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
-    DamageAbilityBehavior.prototype.____constructor(self, ability, damage, parameters)
+    DamageAreaAbilityBehavior.____super.prototype.____constructor(self, ability, damage, parameters)
 end
 function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
     local parameters = self.parameters
@@ -93,15 +89,7 @@ function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
         damage = maximumDamage / #targets
     end
     for ____, target in ipairs(targets) do
-        caster:damageTarget(
-            target,
-            damage,
-            nil,
-            nil,
-            parameters and parameters.attackType,
-            parameters and parameters.damageType,
-            parameters and parameters.weaponType
-        )
+        self:damageTarget(caster, target, damage)
     end
 end
 ____exports.DamageSelfAreaAbilityBehavior = __TS__Class()

package/engine/behaviour/ability/emulate-impact.d.ts

@@ -2,5 +2,5 @@
 import { AbilityBehavior } from "../ability";
 import { Unit } from "../../internal/unit";
 export declare abstract class EmulateImpactAbilityBehavior extends AbilityBehavior {
-    protected emulateImpact(caster: Unit): void;
+    protected emulateImpact(caster: Unit): boolean;
 }

package/engine/behaviour/ability/emulate-impact.lua

@@ -1,15 +1,25 @@
 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 ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
 local ____ability = require("engine.standard.fields.ability")
 local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
 local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
 local ____math = require("math")
 local max = ____math.max
 local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
+local ____sound = require("core.types.sound")
+local Sound3D = ____sound.Sound3D
+local SoundSettings = ____sound.SoundSettings
+local ____ability = require("engine.internal.ability")
+local UnitAbility = ____ability.UnitAbility
+local ____event = require("event")
+local Event = ____event.Event
 ____exports.EmulateImpactAbilityBehavior = __TS__Class()
 local EmulateImpactAbilityBehavior = ____exports.EmulateImpactAbilityBehavior
 EmulateImpactAbilityBehavior.name = "EmulateImpactAbilityBehavior"
@@ -17,12 +27,17 @@ __TS__ClassExtends(EmulateImpactAbilityBehavior, AbilityBehavior)
 function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
     local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
     local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
-    if self.ability.cooldownRemaining ~= 0 or caster.mana < manaCost then
-        return
+    if self.ability.cooldownRemaining ~= 0 or caster.mana < manaCost or __TS__InstanceOf(self.ability, UnitAbility) and self.ability.isDisabled then
+        return false
     end
     caster.mana = caster.mana - manaCost
     self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
     self:flashCasterEffect(caster)
-    AbilityBehavior:forAll(self.ability, "onImpact", caster)
+    local soundPresetId = self.ability:getField(ABILITY_SF_EFFECT_SOUND)
+    if soundPresetId ~= "" then
+        Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
+    end
+    Event.invoke(Unit.abilityImpactEvent, caster, self.ability)
+    return true
 end
 return ____exports

package/engine/behaviour/ability/remove-buffs.d.ts

@@ -14,3 +14,12 @@ export declare class RemoveBuffsSelfAbilityBehavior extends AbilityBehavior {
     constructor(ability: Ability, polarity?: AbilityDependentValue<BuffPolarity> | undefined, resistanceType?: AbilityDependentValue<BuffResistanceType> | undefined, includeExpirationTimers?: AbilityDependentValue<boolean> | undefined, includeAuras?: AbilityDependentValue<boolean> | undefined, autoDispel?: AbilityDependentValue<boolean> | undefined);
     onImpact(caster: Unit): void;
 }
+export declare class RemoveBuffsTargetAbilityBehavior extends AbilityBehavior {
+    private readonly polarity?;
+    private readonly resistanceType?;
+    private readonly includeExpirationTimers?;
+    private readonly includeAuras?;
+    private readonly autoDispel?;
+    constructor(ability: Ability, polarity?: AbilityDependentValue<BuffPolarity> | undefined, resistanceType?: AbilityDependentValue<BuffResistanceType> | undefined, includeExpirationTimers?: AbilityDependentValue<boolean> | undefined, includeAuras?: AbilityDependentValue<boolean> | undefined, autoDispel?: AbilityDependentValue<boolean> | undefined);
+    onUnitTargetImpact(_: Unit, target: Unit): void;
+}

package/engine/behaviour/ability/remove-buffs.lua

@@ -25,4 +25,25 @@ function RemoveBuffsSelfAbilityBehavior.prototype.onImpact(self, caster)
         self:resolveCurrentAbilityDependentValue(self.autoDispel)
     )
 end
+____exports.RemoveBuffsTargetAbilityBehavior = __TS__Class()
+local RemoveBuffsTargetAbilityBehavior = ____exports.RemoveBuffsTargetAbilityBehavior
+RemoveBuffsTargetAbilityBehavior.name = "RemoveBuffsTargetAbilityBehavior"
+__TS__ClassExtends(RemoveBuffsTargetAbilityBehavior, AbilityBehavior)
+function RemoveBuffsTargetAbilityBehavior.prototype.____constructor(self, ability, polarity, resistanceType, includeExpirationTimers, includeAuras, autoDispel)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.polarity = polarity
+    self.resistanceType = resistanceType
+    self.includeExpirationTimers = includeExpirationTimers
+    self.includeAuras = includeAuras
+    self.autoDispel = autoDispel
+end
+function RemoveBuffsTargetAbilityBehavior.prototype.onUnitTargetImpact(self, _, target)
+    target:removeBuffs(
+        self:resolveCurrentAbilityDependentValue(self.polarity),
+        self:resolveCurrentAbilityDependentValue(self.resistanceType),
+        self:resolveCurrentAbilityDependentValue(self.includeExpirationTimers),
+        self:resolveCurrentAbilityDependentValue(self.includeAuras),
+        self:resolveCurrentAbilityDependentValue(self.autoDispel)
+    )
+end
 return ____exports

package/engine/behaviour/ability/restore-mana.d.ts

@@ -8,7 +8,7 @@ export declare class RestoreManaSelfAbilityBehavior extends AbilityBehavior {
     constructor(ability: Ability, mana: AbilityDependentValue<number>);
     onImpact(caster: Unit): void;
 }
-export declare class RestoreManaAbilityBehavior extends AbilityBehavior {
+export declare class RestoreManaTargetAbilityBehavior extends AbilityBehavior {
     private readonly mana;
     constructor(ability: Ability, mana: AbilityDependentValue<number>);
     onUnitTargetImpact(caster: Unit, target: Unit): void;

package/engine/behaviour/ability/restore-mana.lua

@@ -15,15 +15,15 @@ end
 function RestoreManaSelfAbilityBehavior.prototype.onImpact(self, caster)
     caster.mana = caster.mana + self:resolveCurrentAbilityDependentValue(self.mana)
 end
-____exports.RestoreManaAbilityBehavior = __TS__Class()
-local RestoreManaAbilityBehavior = ____exports.RestoreManaAbilityBehavior
-RestoreManaAbilityBehavior.name = "RestoreManaAbilityBehavior"
-__TS__ClassExtends(RestoreManaAbilityBehavior, AbilityBehavior)
-function RestoreManaAbilityBehavior.prototype.____constructor(self, ability, mana)
+____exports.RestoreManaTargetAbilityBehavior = __TS__Class()
+local RestoreManaTargetAbilityBehavior = ____exports.RestoreManaTargetAbilityBehavior
+RestoreManaTargetAbilityBehavior.name = "RestoreManaTargetAbilityBehavior"
+__TS__ClassExtends(RestoreManaTargetAbilityBehavior, AbilityBehavior)
+function RestoreManaTargetAbilityBehavior.prototype.____constructor(self, ability, mana)
     AbilityBehavior.prototype.____constructor(self, ability)
     self.mana = mana
 end
-function RestoreManaAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
+function RestoreManaTargetAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
     target.mana = target.mana + self:resolveCurrentAbilityDependentValue(self.mana)
 end
 return ____exports