warscript 0.0.1-dev.32c305a → 0.0.1-dev.3370e98

package/core/types/frame.lua

@@ -15,6 +15,10 @@ local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates")
+local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
+local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
+local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
 local frameClick = BlzFrameClick
 local frameGetEnable = BlzFrameGetEnable
 local frameIsVisible = BlzFrameIsVisible
@@ -344,27 +348,21 @@ __TS__ObjectDefineProperty(
     Frame,
     "minX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return -width4by3 * pxtodpi
+        local minX = getFrameMinXMaxX()
+        return minX
     end}
 )
 __TS__ObjectDefineProperty(
     Frame,
     "maxX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return (-width4by3 + w) * pxtodpi
+        local ____, maxX = getFrameMinXMaxX()
+        return maxX
     end}
 )
 Frame.centerX = 0.4
-Frame.minY = 0
-Frame.maxY = 0.6
+Frame.minY = FRAME_MIN_Y
+Frame.maxY = FRAME_MAX_Y
 Frame.centerY = 0.3
 __TS__SetDescriptor(
     Frame.prototype,

package/core/types/player.lua

@@ -21,6 +21,8 @@ local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
 local ____math = require("math")
 local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
 local getPlayerColor = GetPlayerColor
 local getPlayerName = GetPlayerName
 local getPlayerTechCount = GetPlayerTechCount
@@ -249,7 +251,7 @@ Player.all = (function()
     end
     return all
 end)()
-Player["local"] = ____exports.Player:of(GetLocalPlayer())
+Player["local"] = ____exports.Player:of(PLAYER_LOCAL_HANDLE)
 Player.neutralPassive = ____exports.Player.all[PLAYER_NEUTRAL_PASSIVE + 1]
 Player.neutralAggressive = ____exports.Player.all[PLAYER_NEUTRAL_AGGRESSIVE + 1]
 Player.neutralVictim = ____exports.Player.all[bj_PLAYER_NEUTRAL_VICTIM + 1]

package/core/types/playerCamera.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+import type { Unit } from "../../engine/internal/unit";
 export declare class PlayerCamera {
     private readonly player;
     private readonly isLocal;
@@ -28,5 +29,6 @@ export declare class PlayerCamera {
     get roll(): number;
     set roll(v: number);
     reset(): void;
+    static isUnitInView(unit: Unit): boolean;
     static of(player: jplayer): PlayerCamera;
 }

package/core/types/playerCamera.lua

@@ -3,33 +3,49 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
+local ____preconditions = require("utility.preconditions")
+local check = ____preconditions.check
+local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates")
+local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
+local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
+local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
 local getHandleId = GetHandleId
 local setCameraField = SetCameraField
 local getCameraField = GetCameraField
 local setCameraPosition = SetCameraPosition
+local getCameraEyePositionX = GetCameraEyePositionX
+local getCameraEyePositionY = GetCameraEyePositionY
+local getCameraEyePositionZ = GetCameraEyePositionZ
 local getCameraTargetPositionX = GetCameraTargetPositionX
 local getCameraTargetPositionY = GetCameraTargetPositionY
 local resetToGameCamera = ResetToGameCamera
+local cos = math.cos
 local deg = math.deg
-local localPlayer = GetLocalPlayer()
+local sin = math.sin
 local memoized = {}
 ____exports.PlayerCamera = __TS__Class()
 local PlayerCamera = ____exports.PlayerCamera
 PlayerCamera.name = "PlayerCamera"
 function PlayerCamera.prototype.____constructor(self, player)
     local id = getHandleId(player)
-    if memoized[id] then
-        error("Double-constructor run player camera!")
-    end
+    check(memoized[id] == nil)
     memoized[id] = self
     self.player = player
-    self.isLocal = player == localPlayer
+    self.isLocal = player == PLAYER_LOCAL_HANDLE
 end
 function PlayerCamera.prototype.reset(self)
     if self.isLocal then
         resetToGameCamera(0)
     end
 end
+function PlayerCamera.isUnitInView(self, unit)
+    local ____, ____, isInView = ____exports.worldCoordinatesToFrame(unit.x, unit.y, unit.z)
+    return isInView
+end
 function PlayerCamera.of(self, player)
     return memoized[getHandleId(player)] or __TS__New(____exports.PlayerCamera, player)
 end
@@ -159,4 +175,62 @@ __TS__SetDescriptor(
     },
     true
 )
+local cameraEyeX = 0
+local cameraEyeY = 0
+local cameraEyeZ = 0
+local cameraAngleOfAttack = 0
+local cameraAngleOfAttackCos = 0
+local cameraAngleOfAttackSin = 0
+local cameraRotation = 0
+local cameraRotationCos = 0
+local cameraRotationSin = 0
+local cameraAngleOfAttackCosRotationCos = 0
+local cameraAngleOfAttackCosRotationSin = 0
+local cameraAngleOfAttackSinRotationCos = 0
+local cameraAngleOfAttackSinRotationSin = 0
+local yCenterScreenShift = 0
+local scaleFactor = 0
+local frameMinX = 0
+local frameMaxX = 0
+local isCameraViewPrecalculated = false
+local function precalculateCameraView()
+    cameraEyeX = getCameraEyePositionX()
+    cameraEyeY = getCameraEyePositionY()
+    cameraEyeZ = getCameraEyePositionZ()
+    cameraAngleOfAttack = getCameraField(CAMERA_FIELD_ANGLE_OF_ATTACK)
+    cameraAngleOfAttackCos = cos(cameraAngleOfAttack)
+    cameraAngleOfAttackSin = sin(cameraAngleOfAttack)
+    cameraRotation = getCameraField(CAMERA_FIELD_ROTATION)
+    cameraRotationCos = cos(cameraRotation)
+    cameraRotationSin = sin(cameraRotation)
+    cameraAngleOfAttackCosRotationCos = cameraAngleOfAttackCos * cameraRotationCos
+    cameraAngleOfAttackCosRotationSin = cameraAngleOfAttackCos * cameraRotationSin
+    cameraAngleOfAttackSinRotationCos = cameraAngleOfAttackSin * cameraRotationCos
+    cameraAngleOfAttackSinRotationSin = cameraAngleOfAttackSin * cameraRotationSin
+    yCenterScreenShift = 0.1284 * cameraAngleOfAttackCos
+    local cameraFieldOfView = getCameraField(CAMERA_FIELD_FIELD_OF_VIEW)
+    scaleFactor = 0.0524 * cameraFieldOfView ^ 3 - 0.0283 * cameraFieldOfView ^ 2 + 1.061 * cameraFieldOfView
+    frameMinX, frameMaxX = getFrameMinXMaxX()
+    isCameraViewPrecalculated = true
+end
+Timer.onPeriod[1 / 64]:addListener(
+    4,
+    function()
+        isCameraViewPrecalculated = false
+    end
+)
+---
+-- @internal For use by internal systems only.
+____exports.worldCoordinatesToFrame = function(x, y, z)
+    if not isCameraViewPrecalculated then
+        precalculateCameraView()
+    end
+    local dx = x - cameraEyeX
+    local dy = y - cameraEyeY
+    local dz = z - cameraEyeZ
+    local xPrime = scaleFactor * (-cameraAngleOfAttackCosRotationCos * dx - cameraAngleOfAttackCosRotationSin * dy - cameraAngleOfAttackSin * dz)
+    local frameX = 0.4 + (cameraRotationCos * dy - cameraRotationSin * dx) / xPrime
+    local frameY = 0.42625 - yCenterScreenShift + (cameraAngleOfAttackSinRotationCos * dx + cameraAngleOfAttackSinRotationSin * dy - cameraAngleOfAttackCos * dz) / xPrime
+    return frameX, frameY, xPrime < 0 and frameX >= frameMinX and frameX <= frameMaxX and frameY >= FRAME_MIN_Y and frameY <= FRAME_MAX_Y
+end
 return ____exports

package/core/types/timer.d.ts

@@ -22,7 +22,8 @@ export declare class Timer extends AbstractDestroyable {
     pause(): void;
     resume(): void;
     static create(): Timer;
-    static run<Args extends any[]>(callback: (...args: Args) => void, ...args: Args): void;
+    static run<T, K extends KeysOfType<T, (this: T, ...args: any) => any>>(object: T, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): void;
+    static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args): void;
     static simple<Args extends any[]>(timeout: number, callback: (...args: Args) => void, ...args: Args): Timer;
     static periodic<Args extends any[]>(period: number, callback: (this: void, timer: Timer, ...args: Args) => void, ...args: Args): Timer;
     static counted(period: number, count: number, callback: (this: void, timer: Timer) => void): Timer;

package/core/types/timer.lua

@@ -24,6 +24,7 @@ local getHandleId = GetHandleId
 local ____pcall = _G.pcall
 local ____print = _G.print
 local select = _G.select
+local ____type = _G.type
 local safeCall = warpack.safeCall
 local corunning = coroutine.running
 local coresume = coroutine.resume
@@ -81,8 +82,12 @@ end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
-function Timer.run(self, callback, ...)
-    ____exports.Timer:simple(0, callback, ...)
+function Timer.run(self, objectOrCallback, keyOrFirstArg, ...)
+    if ____type(objectOrCallback) == "function" then
+        ____exports.Timer:simple(0, objectOrCallback, keyOrFirstArg, ...)
+    else
+        ____exports.Timer:simple(0, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
+    end
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)

package/decl/native.d.ts

@@ -388,13 +388,15 @@ declare interface jmovetype extends jhandle {
 declare interface jtargetflag extends jhandle {
     __jtargetflag: never
 }
-declare interface jarmortype extends jhandle {
+declare type jarmortype = symbol &
+    jhandle & {
     __jarmortype: never
 }
 declare interface jheroattribute extends jhandle {
     __jheroattribute: never
 }
-declare interface jdefensetype extends jhandle {
+declare type jdefensetype = symbol &
+    jhandle & {
     __jdefensetype: never
 }
 declare interface jregentype extends jhandle {

package/engine/behavior.d.ts

@@ -24,5 +24,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,18 +1,52 @@
 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 ____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 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
 ____exports.Behavior = __TS__Class()
 local Behavior = ____exports.Behavior
 Behavior.name = "Behavior"
@@ -151,31 +185,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/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/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

@@ -28,7 +28,7 @@ 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 or __TS__InstanceOf(self.ability, UnitAbility) and self.ability.isDisabled then
-        return
+        return false
     end
     caster.mana = caster.mana - manaCost
     self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
@@ -38,5 +38,6 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
         Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
     end
     Event.invoke(Unit.abilityImpactEvent, caster, self.ability)
+    return true
 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

package/engine/behaviour/ability.lua

@@ -5,7 +5,6 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
-local createUnitEventListener
 local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.unit")
@@ -30,17 +29,9 @@ local ____ability = require("engine.object-field.ability")
 local AbilityField = ____ability.AbilityField
 local AbilityLevelField = ____ability.AbilityLevelField
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
-local ____timer = require("core.types.timer")
-local Timer = ____timer.Timer
 local createBehaviorFunctionsByAbilityTypeId = {}
 local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
-local function createZeroTimerUnitEventListener(key)
-    local unitEventListener = createUnitEventListener(key)
-    return function(unit, ability, ...)
-        Timer:run(unitEventListener, unit, ability, ...)
-    end
-end
-createUnitEventListener = function(key)
+local function createUnitEventListener(key)
     return function(unit, ability, ...)
         ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
     end
@@ -275,12 +266,12 @@ __TS__SetDescriptor(
     Unit.abilityPointTargetChannelingStartEvent:addListener(createUnitEventListener("onPointTargetChannelingStart"))
     Unit.abilityNoTargetChannelingStartEvent:addListener(createUnitEventListener("onNoTargetChannelingStart"))
     Unit.abilityImpactEvent:addListener(createUnitEventListener("onImpact"))
-    Unit.abilityWidgetTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onWidgetTargetImpact"))
-    Unit.abilityUnitTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onUnitTargetImpact"))
-    Unit.abilityItemTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onItemTargetImpact"))
-    Unit.abilityDestructibleTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onDestructibleTargetImpact"))
-    Unit.abilityPointTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onPointTargetImpact"))
-    Unit.abilityNoTargetChannelingStartEvent:addListener(createZeroTimerUnitEventListener("onNoTargetImpact"))
+    Unit.abilityWidgetTargetImpactEvent:addListener(createUnitEventListener("onWidgetTargetImpact"))
+    Unit.abilityUnitTargetImpactEvent:addListener(createUnitEventListener("onUnitTargetImpact"))
+    Unit.abilityItemTargetImpactEvent:addListener(createUnitEventListener("onItemTargetImpact"))
+    Unit.abilityDestructibleTargetImpactEvent:addListener(createUnitEventListener("onDestructibleTargetImpact"))
+    Unit.abilityPointTargetImpactEvent:addListener(createUnitEventListener("onPointTargetImpact"))
+    Unit.abilityNoTargetImpactEvent:addListener(createUnitEventListener("onNoTargetImpact"))
     Unit.abilityChannelingFinishEvent:addListener(createUnitEventListener("onChannelingFinish"))
     Unit.abilityStopEvent:addListener(createUnitEventListener("onStop"))
 end)(AbilityBehavior)

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

@@ -10,9 +10,11 @@ export type StunImmunityUnitBehaviourParameters = {
     textTagText?: string;
 };
 export declare class StunImmunityUnitBehavior extends UnitBehavior {
-    private readonly parameters;
+    readonly parameters: Readonly<StunImmunityUnitBehaviourParameters>;
     static defaultParameters: StunImmunityUnitBehaviourParameters;
-    constructor(unit: Unit, parameters?: StunImmunityUnitBehaviourParameters);
+    constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviourParameters>);
     protected onDestroy(): Destructor;
-    private onBuffsCheck;
+    onDamageReceived(): void;
+    onTargetingAbilityChannelingStart(): void;
+    onTargetingAbilityImpact(): void;
 }

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

@@ -12,31 +12,46 @@ local flatMapToLuaSet = ____arrays.flatMapToLuaSet
 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(
         AbilityType:getAllByBaseIds(map({
-            "Aslo",
-            "AHtc",
-            "Aens",
-            "Aprg",
-            "Apg2",
-            "AOeq",
-            "SNeq",
-            "Aweb",
-            "Afra",
-            "Afrb",
-            "Afrc",
-            "Afr2",
-            "Acri",
-            "Scri",
-            "AUfn",
-            "Aspo",
-            "AEer",
-            "ACwb"
+            "AHtb",
+            "AHbh",
+            "AOws",
+            "AOw2",
+            "AUim",
+            "Acyc",
+            "ANfb",
+            "ANsb",
+            "ANcs",
+            "ANc1",
+            "ANc2",
+            "ANc3",
+            "ACbh",
+            "ANbh",
+            "SCc1",
+            "ACcy",
+            "ANb2",
+            "Awrs",
+            "Awrh",
+            "Awrg",
+            "ACtb",
+            "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
+        hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
+    end
+    if hasRemovedBuffs and behavior.parameters.textTagText ~= nil then
+        TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
+    end
+end
 ____exports.StunImmunityUnitBehavior = __TS__Class()
 local StunImmunityUnitBehavior = ____exports.StunImmunityUnitBehavior
 StunImmunityUnitBehavior.name = "StunImmunityUnitBehavior"
@@ -48,20 +63,21 @@ function StunImmunityUnitBehavior.prototype.____constructor(self, unit, paramete
     UnitBehavior.prototype.____constructor(self, unit)
     self.parameters = parameters
     unit:decrementStunCounter()
-    self:onBuffsCheck()
+    process(self)
 end
 function StunImmunityUnitBehavior.prototype.onDestroy(self)
     self.unit:incrementStunCounter()
     return UnitBehavior.prototype.onDestroy(self)
 end
-function StunImmunityUnitBehavior.prototype.onBuffsCheck(self)
-    local hasRemovedBuffs = false
-    for buffTypeId in pairs(self.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
-        hasRemovedBuffs = hasRemovedBuffs or self.unit:removeBuff(buffTypeId)
-    end
-    if hasRemovedBuffs and self.parameters.textTagText ~= nil then
-        TextTag:flash(TextTag.MISS, self.parameters.textTagText, self.unit.x, self.unit.y)
-    end
+function StunImmunityUnitBehavior.prototype.onDamageReceived(self)
+    process(self)
+    Timer:run(process, self)
+end
+function StunImmunityUnitBehavior.prototype.onTargetingAbilityChannelingStart(self)
+    process(self)
+end
+function StunImmunityUnitBehavior.prototype.onTargetingAbilityImpact(self)
+    process(self)
 end
 StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
 return ____exports

package/engine/behaviour/unit.d.ts

@@ -9,13 +9,15 @@ import type { AbilityBehavior } from "./ability";
 import { Event } from "../../event";
 import { Destructor } from "../../destroyable";
 import type { Widget } from "../../core/types/widget";
+import { Destructable } from "../../core/types/destructable";
+import type { Buff } from "../buff";
 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> {
     constructor(unit: Unit);
     protected onDestroy(): Destructor;
     readonly sourceAbilityBehavior?: AbilityBehavior;
     get unit(): Unit;
-    registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, unit: Unit, ...args: Args) => unknown>, event: Event<[Unit, ...Args]>, range: number, listener: T): void;
+    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;
     onPointOrder(orderId: number, x: number, y: number): void;
@@ -31,8 +33,17 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onAbilityLost(ability: Ability): void;
     onAbilityChannelingStart(ability: Ability): void;
     onAbilityImpact(ability: Ability): void;
+    onAbilityWidgetTargetImpact(ability: Ability, target: Widget): void;
+    onAbilityUnitTargetImpact(ability: Ability, target: Unit): void;
+    onAbilityItemTargetImpact(ability: Ability, target: Item): void;
+    onAbilityDestructibleTargetImpact(ability: Ability, target: Destructable): void;
+    onAbilityPointTargetImpact(ability: Ability, x: number, y: number): void;
+    onAbilityNoTargetImpact(ability: Ability): void;
     onAbilityChannelingFinish(ability: Ability): void;
     onAbilityStop(ability: Ability): void;
+    onTargetingAbilityChannelingStart(ability: Ability, source: Unit): void;
+    onTargetingAbilityImpact(ability: Ability, source: Unit): void;
+    onBuffGained(buff: Buff): void;
     onItemDropped(item: Item): void;
     onItemPickedUp(item: Item): void;
     onItemUsed(item: Item): void;