warscript 0.0.1-dev.0606d9c → 0.0.1-dev.064c144

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

package/engine/behaviour/ability.d.ts

@@ -1,6 +1,7 @@
 /** @noSelfInFile */
 import { Behavior } from "../behavior";
-import { Unit } from "../unit";
+import { Unit } from "../internal/unit";
+import "../internal/unit/ability";
 import { Ability } from "../internal/ability";
 import { AbilityTypeId } from "../object-data/entry/ability-type";
 import { Widget } from "../../core/types/widget";
@@ -22,12 +23,17 @@ export declare abstract class AbilityBehavior<Parameters extends {
     protected subscribe<T extends boolean | number | string>(value: SubscribableAbilityDependentValue<T>): void;
     protected registerCommandEvent(orderTypeStringId?: string): void;
     get ability(): Ability;
+    get unit(): Unit | undefined;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value?: AbilityDependentValue<T>): T | undefined;
-    protected flashCasterEffect(widget: Widget): void;
+    protected flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    protected flashTargetEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
-    protected flashSpecialEffect(...args: [...pointOrWidget: [x: number, y: number] | [widget: Widget], duration?: number]): void;
+    protected flashSpecialEffect(...args: [
+        ...pointOrWidget: [x: number, y: number] | [widget: Widget],
+        ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]
+    ]): void;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
     protected onCreate(): void;

package/engine/behaviour/ability.lua

@@ -5,11 +5,11 @@ 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")
+local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.ability")
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
 local ____effect = require("core.types.effect")
@@ -24,21 +24,15 @@ local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL
 local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_INTEGER_FIELD
 local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
 local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = ____ability.TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD
+local TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 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
@@ -112,12 +106,22 @@ end
 function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
     return resolveCurrentAbilityDependentValue(self.ability, value)
 end
-function AbilityBehavior.prototype.flashCasterEffect(self, widget)
+function AbilityBehavior.prototype.flashCasterEffect(self, widget, ...)
     local attachmentPoint = CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
     Effect:flash(
         CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
         widget,
-        attachmentPoint ~= "" and attachmentPoint or "origin"
+        attachmentPoint ~= "" and attachmentPoint or "origin",
+        ...
+    )
+end
+function AbilityBehavior.prototype.flashTargetEffect(self, widget, ...)
+    local attachmentPoint = TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
+    Effect:flash(
+        TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
+        widget,
+        attachmentPoint ~= "" and attachmentPoint or "origin",
+        ...
     )
 end
 function AbilityBehavior.prototype.flashAreaEffect(self, x, y, ...)
@@ -136,20 +140,23 @@ function AbilityBehavior.prototype.flashEffect(self, x, y, ...)
         ...
     )
 end
-function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDuration, duration)
+function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrParametersOrDuration, durationOrParameters, parameters)
     if type(xOrWidget) == "number" then
         Effect:flash(
             SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
             xOrWidget,
-            yOrDuration,
-            duration
+            yOrParametersOrDuration,
+            durationOrParameters,
+            parameters
         )
     else
+        local attachmentPoint = SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
         Effect:flash(
             SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
             xOrWidget,
-            SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability),
-            yOrDuration
+            attachmentPoint ~= "" and attachmentPoint or "origin",
+            yOrParametersOrDuration,
+            durationOrParameters
         )
     end
 end
@@ -224,6 +231,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    AbilityBehavior.prototype,
+    "unit",
+    {get = function(self)
+        local owner = self.object.owner
+        if __TS__InstanceOf(owner, Unit) then
+            return owner
+        end
+        return owner.owner
+    end},
+    true
+)
 AbilityBehavior.MissileLaunchConfig = ____class_2
 __TS__SetDescriptor(
     AbilityBehavior.prototype,
@@ -247,13 +266,13 @@ __TS__SetDescriptor(
     Unit.abilityDestructibleTargetChannelingStartEvent:addListener(createUnitEventListener("onDestructibleTargetChannelingStart"))
     Unit.abilityPointTargetChannelingStartEvent:addListener(createUnitEventListener("onPointTargetChannelingStart"))
     Unit.abilityNoTargetChannelingStartEvent:addListener(createUnitEventListener("onNoTargetChannelingStart"))
-    Unit.abilityChannelingStartEvent:addListener(createZeroTimerUnitEventListener("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.abilityImpactEvent:addListener(createUnitEventListener("onImpact"))
+    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

@@ -4,15 +4,21 @@ 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 {
-    private readonly parameters;
-    static defaultParameters: StunImmunityUnitBehaviourParameters;
-    constructor(unit: Unit, parameters?: StunImmunityUnitBehaviourParameters);
+    readonly parameters: Readonly<StunImmunityUnitBehaviorParameters>;
+    static defaultParameters: StunImmunityUnitBehaviorParameters;
+    constructor(unit: Unit, parameters?: Readonly<StunImmunityUnitBehaviorParameters>);
     protected onDestroy(): Destructor;
-    private onBuffsCheck;
+    onDamageReceived(): void;
+    onTargetingAbilityChannelingStart(): void;
+    onTargetingAbilityImpact(): void;
+    protected onEffect(): void;
 }

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

@@ -12,31 +12,53 @@ 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 then
+        behavior.onEffect(behavior)
+        if behavior.parameters.textTagText ~= nil then
+            TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
+        end
+        local ____opt_0 = behavior.parameters.additionalAction
+        if ____opt_0 ~= nil then
+            ____opt_0(behavior.unit)
+        end
+    end
+end
 ____exports.StunImmunityUnitBehavior = __TS__Class()
 local StunImmunityUnitBehavior = ____exports.StunImmunityUnitBehavior
 StunImmunityUnitBehavior.name = "StunImmunityUnitBehavior"
@@ -45,23 +67,26 @@ 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()
-    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
+function StunImmunityUnitBehavior.prototype.onEffect(self)
 end
 StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
 return ____exports

package/engine/behaviour/unit.d.ts

@@ -1,26 +1,64 @@
 /** @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 { 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";
+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> {
-    constructor(unit: Unit);
+    readonly sourceAbilityBehavior?: AbilityBehavior;
+    private _bonusIdByBonusType?;
+    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;
+    onPointOrder(orderId: number, x: number, y: number): void;
     onAutoAttackStart(target: Unit): void;
     onAutoAttackFinish(target: Unit): void;
+    onTargetingAutoAttackStart(source: Unit): void;
+    onTargetingAutoAttackFinish(source: Unit): void;
     onDamageDealing(target: Unit, event: DamagingEvent): void;
     onDamageDealt(target: Unit, event: DamageEvent): void;
     onDamageReceiving(source: Unit | undefined, event: DamagingEvent): void;
     onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
     onAbilityGained(ability: Ability): void;
     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;
+    onBuffLost(buff: Buff): void;
     onItemDropped(item: Item): void;
     onItemPickedUp(item: Item): void;
     onItemUsed(item: Item): void;
     onItemStacked(item: Item): void;
+    onItemChargesChanged(item: Item): void;
     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;
 }