warscript 0.0.1-dev.a9a8ba4 → 0.0.1-dev.a9f2494

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";

package/engine/behaviour/ability.lua

@@ -7,8 +7,9 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 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")

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

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

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

@@ -48,8 +48,15 @@ local function process(behavior)
     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)
+    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()
@@ -60,7 +67,7 @@ function StunImmunityUnitBehavior.prototype.____constructor(self, unit, paramete
     if parameters == nil then
         parameters = ____exports.StunImmunityUnitBehavior.defaultParameters
     end
-    UnitBehavior.prototype.____constructor(self, unit)
+    UnitBehavior.prototype.____constructor(self, unit, parameters.priority)
     self.parameters = parameters
     unit:decrementStunCounter()
     process(self)
@@ -79,5 +86,7 @@ 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,23 +1,30 @@
 /** @noSelfInFile */
-import { Behavior } from "../behavior";
+import { Behavior, BehaviorPriority } from "../behavior";
 import { Ability } from "../internal/ability";
 import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
 import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
 import { Item } from "../internal/item";
-import type { AbilityBehavior } from "./ability";
+import { AbilityBehavior } from "./ability";
 import { Event } from "../../event";
 import { Destructor } from "../../destroyable";
 import type { Widget } from "../../core/types/widget";
 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);
-    protected onDestroy(): Destructor;
     readonly sourceAbilityBehavior?: AbilityBehavior;
+    private _bonusIdByBonusType?;
+    constructor(unit: Unit, priority?: BehaviorPriority);
+    protected onDestroy(): Destructor;
     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;
+    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;
@@ -44,6 +51,7 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onTargetingAbilityChannelingStart(ability: Ability, source: Unit): void;
     onTargetingAbilityImpact(ability: Ability, source: Unit): void;
     onBuffGained(buff: Buff): void;
+    onBuffLost(buff: Buff): void;
     onItemDropped(item: Item): void;
     onItemPickedUp(item: Item): void;
     onItemUsed(item: Item): void;
@@ -51,4 +59,6 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     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;
 }

package/engine/behaviour/unit.lua

@@ -17,60 +17,127 @@ local getOrPut = ____lua_2Dmaps.getOrPut
 local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
 local ____lua_2Dsets = require("utility.lua-sets")
 local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
-local behaviorsByEvent = {}
-local rangeByBehaviorByEvent = {}
-local listenerByBehaviorByEvent = {}
-local eventsByBehavior = {}
+local ____bonus = require("engine.internal.unit.bonus")
+local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
+local getUnitBonus = ____bonus.getUnitBonus
+local removeUnitBonus = ____bonus.removeUnitBonus
+local safeCall = warpack.safeCall
+local createBehaviorFunctionsByUnitTypeId = {}
+local behaviorsByOwningPlayerEvent = {}
+local listenerByBehaviorByOwningPlayerEvent = {}
+local owningPlayerEventsByBehavior = {}
+local behaviorsByInRangeUnitEvent = {}
+local rangeByBehaviorByInRangeUnitEvent = {}
+local listenerByBehaviorByInRangeUnitEvent = {}
+local inRangeUnitEventsByBehavior = {}
 ____exports.UnitBehavior = __TS__Class()
 local UnitBehavior = ____exports.UnitBehavior
 UnitBehavior.name = "UnitBehavior"
 __TS__ClassExtends(UnitBehavior, Behavior)
-function UnitBehavior.prototype.____constructor(self, unit)
-    Behavior.prototype.____constructor(self, unit)
+function UnitBehavior.prototype.____constructor(self, unit, priority)
+    Behavior.prototype.____constructor(self, unit, priority)
 end
 function UnitBehavior.prototype.onDestroy(self)
-    local events = eventsByBehavior[self]
-    if events ~= nil then
-        for event in pairs(events) do
-            local ____opt_0 = behaviorsByEvent[event]
+    local owningPlayerEvents = owningPlayerEventsByBehavior[self]
+    if owningPlayerEvents ~= nil then
+        for event in pairs(owningPlayerEvents) do
+            local ____opt_0 = behaviorsByOwningPlayerEvent[event]
             if ____opt_0 ~= nil then
                 ____opt_0:remove(self)
             end
-            local ____opt_2 = rangeByBehaviorByEvent[event]
+            local ____opt_2 = listenerByBehaviorByOwningPlayerEvent[event]
             if ____opt_2 ~= nil then
                 ____opt_2[self] = nil
             end
-            local ____opt_4 = listenerByBehaviorByEvent[event]
+        end
+        owningPlayerEventsByBehavior[self] = nil
+    end
+    local inRangeUnitEvents = inRangeUnitEventsByBehavior[self]
+    if inRangeUnitEvents ~= nil then
+        for event in pairs(inRangeUnitEvents) do
+            local ____opt_4 = behaviorsByInRangeUnitEvent[event]
             if ____opt_4 ~= nil then
-                ____opt_4[self] = nil
+                ____opt_4:remove(self)
+            end
+            local ____opt_6 = rangeByBehaviorByInRangeUnitEvent[event]
+            if ____opt_6 ~= nil then
+                ____opt_6[self] = nil
+            end
+            local ____opt_8 = listenerByBehaviorByInRangeUnitEvent[event]
+            if ____opt_8 ~= nil then
+                ____opt_8[self] = nil
             end
         end
-        eventsByBehavior[self] = nil
+        inRangeUnitEventsByBehavior[self] = nil
+    end
+    if self._bonusIdByBonusType ~= nil then
+        for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
+            removeUnitBonus(self.object, bonusType, bonusId)
+        end
     end
     return Behavior.prototype.onDestroy(self)
 end
-function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, range, listener)
-    local rangeByBehavior = getOrPut(rangeByBehaviorByEvent, event, mutableLuaMap)
+function UnitBehavior.prototype.getUnitBonus(self, bonusType)
+    local ____opt_10 = self._bonusIdByBonusType
+    local bonusId = ____opt_10 and ____opt_10[bonusType]
+    return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
+end
+function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
+    local bonusIdByBonusType = self._bonusIdByBonusType
+    if bonusIdByBonusType == nil then
+        bonusIdByBonusType = {}
+        self._bonusIdByBonusType = bonusIdByBonusType
+    end
+    bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[bonusType], value)
+end
+function UnitBehavior.prototype.registerOwningPlayerEvent(self, event, extractPlayer, listener)
+    local listenerByBehavior = getOrPut(listenerByBehaviorByOwningPlayerEvent, event, mutableLuaMap)
+    listenerByBehavior[self] = listener
+    getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
+    local behaviors = behaviorsByOwningPlayerEvent[event]
+    if behaviors == nil then
+        event:addListener(function(...)
+            local behaviors = behaviorsByOwningPlayerEvent[event]
+            if behaviors ~= nil then
+                local player = extractPlayer(...)
+                if player ~= nil then
+                    for behavior in pairs(behaviors) do
+                        if behavior.unit.owner == player then
+                            safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
+                        end
+                    end
+                end
+            end
+        end)
+        behaviors = __TS__New(LinkedSet)
+        behaviorsByOwningPlayerEvent[event] = behaviors
+    end
+    behaviors:add(self)
+end
+function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
+    local rangeByBehavior = getOrPut(rangeByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
     rangeByBehavior[self] = range
-    local listenerByBehavior = getOrPut(listenerByBehaviorByEvent, event, mutableLuaMap)
+    local listenerByBehavior = getOrPut(listenerByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
     listenerByBehavior[self] = listener
-    getOrPut(eventsByBehavior, self, mutableLuaSet)[event] = true
-    local behaviors = behaviorsByEvent[event]
+    getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
+    local behaviors = behaviorsByInRangeUnitEvent[event]
     if behaviors == nil then
-        event:addListener(function(unit, ...)
-            local behaviors = behaviorsByEvent[event]
+        event:addListener(function(...)
+            local behaviors = behaviorsByInRangeUnitEvent[event]
             if behaviors ~= nil then
-                for behavior in pairs(behaviors) do
-                    local range = rangeByBehavior[behavior]
-                    if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
-                        local ____self_6 = behavior
-                        ____self_6[listenerByBehavior[behavior]](____self_6, unit, ...)
+                local unit = extractUnit(...)
+                if unit ~= nil then
+                    for behavior in pairs(behaviors) do
+                        local range = rangeByBehavior[behavior]
+                        if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
+                            safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
+                        end
                     end
                 end
             end
         end)
         behaviors = __TS__New(LinkedSet)
-        behaviorsByEvent[event] = behaviors
+        behaviorsByInRangeUnitEvent[event] = behaviors
     end
     behaviors:add(self)
 end
@@ -126,6 +193,8 @@ function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
 end
 function UnitBehavior.prototype.onBuffGained(self, buff)
 end
+function UnitBehavior.prototype.onBuffLost(self, buff)
+end
 function UnitBehavior.prototype.onItemDropped(self, item)
 end
 function UnitBehavior.prototype.onItemPickedUp(self, item)
@@ -140,6 +209,23 @@ function UnitBehavior.prototype.onKill(self, target)
 end
 function UnitBehavior.prototype.onDeath(self, source)
 end
+function UnitBehavior.prototype.onOwnerChange(self, previousOwner)
+end
+function UnitBehavior.bindUnitType(self, unitTypeId, ...)
+    local args = {...}
+    local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unitTypeId]
+    if createBehaviorFunctions == nil then
+        createBehaviorFunctions = {}
+        createBehaviorFunctionsByUnitTypeId[unitTypeId] = createBehaviorFunctions
+    end
+    createBehaviorFunctions[#createBehaviorFunctions + 1] = function(unit)
+        return __TS__New(
+            self,
+            unit,
+            table.unpack(args)
+        )
+    end
+end
 __TS__SetDescriptor(
     UnitBehavior.prototype,
     "unit",
@@ -251,7 +337,18 @@ __TS__SetDescriptor(
     Unit.itemChargesChangedEvent:addListener(function(unit, item)
         ____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
     end)
+    Unit.onOwnerChange:addListener(function(unit, previousOwner)
+        ____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
+    end)
 end)(UnitBehavior)
+Unit.onCreate:addListener(function(unit)
+    local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unit.typeId]
+    if createBehaviorFunctions ~= nil then
+        for ____, createBehavior in ipairs(createBehaviorFunctions) do
+            createBehavior(unit)
+        end
+    end
+end)
 Unit.destroyEvent:addListener(function(unit)
     ____exports.UnitBehavior:forAll(unit, "destroy")
 end)

package/engine/buff.d.ts

@@ -13,6 +13,7 @@ import { UnitBehavior } from "./behaviour/unit";
 import type { Widget } from "../core/types/widget";
 import { Destructor } from "../destroyable";
 import { Event } from "../event";
+import { AbilityBehavior } from "./behaviour/ability";
 export type BuffConstructor<T extends Buff<any> = Buff<any>, Args extends any[] = any> = OmitConstructor<typeof Buff<any>> & (new (...args: Args) => T);
 type EnumParameterValueType<T extends number> = T | AbilityEnumLevelField<T>;
 type NumberParameterValueType = number | AbilityNumberField | AbilityNumberLevelField;
@@ -79,6 +80,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     healingOnExpiration?: NumberParameterValueType;
     killsOnExpiration?: BooleanParameterValueType;
     explodesOnExpiration?: BooleanParameterValueType;
+    abilityCooldownFactor?: NumberParameterValueType;
     uniqueGroup?: BuffUniqueGroup;
 } : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
 declare const enum BuffPropertyKey {
@@ -124,7 +126,9 @@ declare const enum BuffPropertyKey {
     PROVIDES_INVULNERABILITY = 139,
     KILLS_ON_EXPIRATION = 140,
     EXPLODES_ON_EXPIRATION = 141,
-    MISS_PROBABILITY = 142
+    MISS_PROBABILITY = 142,
+    ABILITY_COOLDOWN_FACTOR = 143,
+    ABILITY_COOLDOWN_MODIFIER = 144
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
@@ -138,7 +142,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
     polarity: BuffPolarityParameterType,
     resistanceType: BuffResistanceTypeParameterType,
     ...abilityOrParameters: [
-        ability?: Ability,
+        ability?: Ability | AbilityBehavior,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
     ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
 ];
@@ -187,6 +191,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private [BuffPropertyKey.PROVIDES_INVULNERABILITY]?;
     private [BuffPropertyKey.KILLS_ON_EXPIRATION]?;
     private [BuffPropertyKey.EXPLODES_ON_EXPIRATION]?;
+    private [BuffPropertyKey.ABILITY_COOLDOWN_FACTOR]?;
+    private [BuffPropertyKey.ABILITY_COOLDOWN_MODIFIER]?;
     protected static readonly defaultParameters: BuffParameters;
     get source(): Unit;
     readonly typeId: ApplicableBuffTypeId;
@@ -201,11 +207,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private readonly _spellStealPriority?;
     private readonly _learnLevelMinimum?;
     private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
-    private _bonusIdByBonusType?;
     private readonly _abilityTypeIds?;
     private _behaviors?;
-    private getUnitBonus;
-    private addOrUpdateOrRemoveUnitBonus;
     constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
     get level(): number;
     get remainingDamageOverDuration(): number;
@@ -265,6 +268,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get duration(): number;
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
+    get abilityCooldownFactor(): number;
+    set abilityCooldownFactor(abilityCooldownFactor: number);
+    onAbilityGained(ability: Ability): void;
+    onAbilityLost(ability: Ability): void;
     flashEffect(...parameters: [
         ...widgetOrXY: [] | [Widget] | [x: number, x: number],
         ...parametersOrDuration: [] | [EffectParameters] | [number]