warscript 0.0.1-dev.4363c65 → 0.0.1-dev.4f7cd3b

package/engine/behaviour/ability/on-command-impact.lua

@@ -0,0 +1,25 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____emulate_2Dimpact = require("engine.behaviour.ability.emulate-impact")
+local EmulateImpactAbilityBehavior = ____emulate_2Dimpact.EmulateImpactAbilityBehavior
+____exports.OnCommandImpactAbilityBehavior = __TS__Class()
+local OnCommandImpactAbilityBehavior = ____exports.OnCommandImpactAbilityBehavior
+OnCommandImpactAbilityBehavior.name = "OnCommandImpactAbilityBehavior"
+__TS__ClassExtends(OnCommandImpactAbilityBehavior, EmulateImpactAbilityBehavior)
+function OnCommandImpactAbilityBehavior.prototype.____constructor(self, ability)
+    EmulateImpactAbilityBehavior.prototype.____constructor(self, ability)
+    self:registerCommandEvent()
+end
+function OnCommandImpactAbilityBehavior.prototype.onCommand(self, caster)
+    self:emulateImpact(caster)
+end
+Unit.itemUseOrderEvent:addListener(function(unit, item)
+    for ____, ability in ipairs(item.abilities) do
+        ____exports.OnCommandImpactAbilityBehavior:forAll(ability, "onCommand", unit)
+    end
+end)
+return ____exports

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

@@ -0,0 +1,16 @@
+/** @noSelfInFile */
+import { AbilityBehavior } from "../ability";
+import { Unit } from "../../internal/unit";
+import { Ability } from "../../internal/ability";
+import { AbilityDependentValue } from "../../object-field/ability";
+import { BuffPolarity } from "../../object-data/auxiliary/buff-polarity";
+import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-type";
+export declare class RemoveBuffsSelfAbilityBehavior 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);
+    onImpact(caster: Unit): void;
+}

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

@@ -0,0 +1,28 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+____exports.RemoveBuffsSelfAbilityBehavior = __TS__Class()
+local RemoveBuffsSelfAbilityBehavior = ____exports.RemoveBuffsSelfAbilityBehavior
+RemoveBuffsSelfAbilityBehavior.name = "RemoveBuffsSelfAbilityBehavior"
+__TS__ClassExtends(RemoveBuffsSelfAbilityBehavior, AbilityBehavior)
+function RemoveBuffsSelfAbilityBehavior.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 RemoveBuffsSelfAbilityBehavior.prototype.onImpact(self, caster)
+    caster: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.d.ts

@@ -7,24 +7,35 @@ import { Widget } from "../../core/types/widget";
 import { Item } from "../internal/item";
 import { Destructable } from "../../core/types/destructable";
 import { EffectParameters } from "../../core/types/effect";
-import { AbilityDependentValue } from "../object-field/ability";
+import { AbilityDependentValue, ReadonlySubscribableAbilityDependentValue, SubscribableAbilityDependentValue } from "../object-field/ability";
+import { Destructor } from "../../destroyable";
 export type AbilityBehaviorConstructor<Args extends any[]> = new (ability: Ability, ...args: Args) => AbilityBehavior;
+export type AbilityBehaviorParameters = {
+    isExclusiveOnImpactHandler?: boolean;
+};
 export declare abstract class AbilityBehavior<Parameters extends {
     periodicActionParameters?: any[];
     missileParameters?: any[];
 } = {}> extends Behavior<Ability, NonNullable<Parameters["periodicActionParameters"]>> {
-    constructor(ability: Ability);
+    constructor(ability: Ability, parameters?: AbilityBehaviorParameters);
+    protected onDestroy(): Destructor;
+    protected subscribe<T extends boolean | number | string>(value: SubscribableAbilityDependentValue<T>): void;
+    protected registerCommandEvent(orderTypeStringId?: string): void;
     get ability(): Ability;
     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 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;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
-    protected launchMissile(source: Unit, target: Unit, ...parameters: NonNullable<Parameters["missileParameters"]>): void;
+    protected onCreate(): void;
+    onValueChange(_value: ReadonlySubscribableAbilityDependentValue<string | number | boolean>): void;
     onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
     onUnitGainAbility(_unit: Unit): void;
     onUnitLoseAbility(_unit: Unit): void;
+    onCommand(caster: Unit, orderTypeStringId: string): void;
     onCastingStart(caster: Unit): void;
     onCastingFinish(caster: Unit): void;
     onChannelingStart(caster: Unit): void;

package/engine/behaviour/ability.lua

@@ -1,9 +1,11 @@
 local ____lualib = require("lualib_bundle")
 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 __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local createUnitEventListener
 local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.unit")
@@ -14,6 +16,8 @@ local ____effect = require("core.types.effect")
 local Effect = ____effect.Effect
 local ____ability = require("engine.standard.fields.ability")
 local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = ____ability.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD
+local CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
 local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
@@ -21,24 +25,33 @@ local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_IN
 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 ____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 ____missile = require("core.types.missile")
-local Missile = ____missile.Missile
 local createBehaviorFunctionsByAbilityTypeId = {}
-local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
-    if success then
-        abilityBehavior:onMissileArrival(...)
+local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
+local function createZeroTimerUnitEventListener(key)
+    local unitEventListener = createUnitEventListener(key)
+    return function(unit, ability, ...)
+        Timer:run(unitEventListener, unit, ability, ...)
     end
 end
-local ____class_0 = __TS__Class()
-____class_0.name = ""
-function ____class_0.prototype.____constructor(self, abilityBehavior)
+createUnitEventListener = function(key)
+    return function(unit, ability, ...)
+        ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
+    end
+end
+local registeredCommandEventIds = {}
+local subscribedValuesByAbilityBehavior = {}
+local ____class_2 = __TS__Class()
+____class_2.name = ""
+function ____class_2.prototype.____constructor(self, abilityBehavior)
     self.abilityBehavior = abilityBehavior
 end
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "art",
     {get = function(self)
         return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
@@ -46,7 +59,7 @@ __TS__SetDescriptor(
     true
 )
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "arc",
     {get = function(self)
         return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
@@ -54,7 +67,7 @@ __TS__SetDescriptor(
     true
 )
 __TS__SetDescriptor(
-    ____class_0.prototype,
+    ____class_2.prototype,
     "speed",
     {get = function(self)
         return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
@@ -65,12 +78,48 @@ ____exports.AbilityBehavior = __TS__Class()
 local AbilityBehavior = ____exports.AbilityBehavior
 AbilityBehavior.name = "AbilityBehavior"
 __TS__ClassExtends(AbilityBehavior, Behavior)
-function AbilityBehavior.prototype.____constructor(self, ability)
+function AbilityBehavior.prototype.____constructor(self, ability, parameters)
     Behavior.prototype.____constructor(self, ability)
+    if parameters and parameters.isExclusiveOnImpactHandler then
+        exclusiveOnImpactHandlerAbilityBehaviorByAbility[ability] = self
+    end
+    self:onCreate()
+end
+function AbilityBehavior.prototype.onDestroy(self)
+    subscribedValuesByAbilityBehavior[self] = nil
+    return Behavior.prototype.onDestroy(self)
+end
+function AbilityBehavior.prototype.subscribe(self, value)
+    if __TS__InstanceOf(value, AbilityField) or __TS__InstanceOf(value, AbilityLevelField) then
+        local subscribedValues = subscribedValuesByAbilityBehavior[self]
+        if subscribedValues == nil then
+            subscribedValues = {}
+            subscribedValuesByAbilityBehavior[self] = subscribedValues
+        end
+        subscribedValues[value] = true
+    end
+end
+function AbilityBehavior.prototype.registerCommandEvent(self, orderTypeStringId)
+    if orderTypeStringId == nil then
+        orderTypeStringId = self.ability.orderTypeStringId
+    end
+    local commandEventId = (tostring(self.ability.typeId) .. "#") .. orderTypeStringId
+    if not (registeredCommandEventIds[commandEventId] ~= nil) then
+        registeredCommandEventIds[commandEventId] = true
+        Unit.abilityCommandEvent[self.ability.typeId][orderTypeStringId]:addListener(createUnitEventListener("onCommand"))
+    end
 end
 function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
     return resolveCurrentAbilityDependentValue(self.ability, value)
 end
+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"
+    )
+end
 function AbilityBehavior.prototype.flashAreaEffect(self, x, y, ...)
     Effect:flash(
         AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.ability, 0),
@@ -104,15 +153,9 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
         )
     end
 end
-function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
-    Missile:launch(
-        self.missileLaunchConfig,
-        source,
-        target,
-        invokeOnMissileArrival,
-        self,
-        ...
-    )
+function AbilityBehavior.prototype.onCreate(self)
+end
+function AbilityBehavior.prototype.onValueChange(self, _value)
 end
 function AbilityBehavior.prototype.onMissileArrival(self, ...)
 end
@@ -120,6 +163,8 @@ function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
 end
 function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
 end
+function AbilityBehavior.prototype.onCommand(self, caster, orderTypeStringId)
+end
 function AbilityBehavior.prototype.onCastingStart(self, caster)
 end
 function AbilityBehavior.prototype.onCastingFinish(self, caster)
@@ -179,7 +224,7 @@ __TS__SetDescriptor(
     end},
     true
 )
-AbilityBehavior.MissileLaunchConfig = ____class_0
+AbilityBehavior.MissileLaunchConfig = ____class_2
 __TS__SetDescriptor(
     AbilityBehavior.prototype,
     "missileLaunchConfig",
@@ -191,17 +236,6 @@ __TS__SetDescriptor(
     true
 );
 (function(self)
-    local function createUnitEventListener(key)
-        return function(unit, ability, ...)
-            ____exports.AbilityBehavior:forAll(ability, key, unit, ...)
-        end
-    end
-    local function createZeroTimerUnitEventListener(key)
-        local unitEventListener = createUnitEventListener(key)
-        return function(unit, ability, ...)
-            Timer:run(unitEventListener, unit, ability, ...)
-        end
-    end
     Unit.abilityGainedEvent:addListener(createUnitEventListener("onUnitGainAbility"))
     Unit.abilityLostEvent:addListener(createUnitEventListener("onUnitLoseAbility"))
     Unit.abilityCastingStartEvent:addListener(createUnitEventListener("onCastingStart"))
@@ -223,6 +257,18 @@ __TS__SetDescriptor(
     Unit.abilityChannelingFinishEvent:addListener(createUnitEventListener("onChannelingFinish"))
     Unit.abilityStopEvent:addListener(createUnitEventListener("onStop"))
 end)(AbilityBehavior)
+local function checkBehaviorOnValueChange(behavior, field)
+    local subscribedValues = subscribedValuesByAbilityBehavior[behavior]
+    if subscribedValues ~= nil and subscribedValues[field] ~= nil then
+        behavior:onValueChange(field)
+    end
+end
+AbilityField.valueChangeEvent:addListener(function(ability, field)
+    ____exports.AbilityBehavior:forAll(ability, checkBehaviorOnValueChange, field)
+end)
+AbilityLevelField.valueChangeEvent:addListener(function(ability, field)
+    ____exports.AbilityBehavior:forAll(ability, checkBehaviorOnValueChange, field)
+end)
 Ability.onCreate:addListener(function(ability)
     local createBehaviorFunctions = createBehaviorFunctionsByAbilityTypeId[ability.typeId]
     if createBehaviorFunctions ~= nil then

package/engine/behaviour/unit.d.ts

@@ -4,6 +4,7 @@ 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";
 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);
@@ -16,6 +17,10 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
     onAbilityGained(ability: Ability): void;
     onAbilityLost(ability: Ability): void;
+    onItemDropped(item: Item): void;
+    onItemPickedUp(item: Item): void;
+    onItemUsed(item: Item): void;
+    onItemStacked(item: Item): void;
     onKill(target: Unit): void;
     onDeath(source: Unit | undefined): void;
 }

package/engine/behaviour/unit.lua

@@ -32,6 +32,14 @@ function UnitBehavior.prototype.onAbilityGained(self, ability)
 end
 function UnitBehavior.prototype.onAbilityLost(self, ability)
 end
+function UnitBehavior.prototype.onItemDropped(self, item)
+end
+function UnitBehavior.prototype.onItemPickedUp(self, item)
+end
+function UnitBehavior.prototype.onItemUsed(self, item)
+end
+function UnitBehavior.prototype.onItemStacked(self, item)
+end
 function UnitBehavior.prototype.onKill(self, target)
 end
 function UnitBehavior.prototype.onDeath(self, source)
@@ -75,6 +83,18 @@ __TS__SetDescriptor(
         end
         ____exports.UnitBehavior:forAll(target, "onDeath", source)
     end)
+    Unit.itemDroppedEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemDropped", item)
+    end)
+    Unit.itemPickedUpEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemPickedUp", item)
+    end)
+    Unit.itemUsedEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemUsed", item)
+    end)
+    Unit.itemStackedEvent:addListener(function(unit, item)
+        ____exports.UnitBehavior:forAll(unit, "onItemStacked", item)
+    end)
 end)(UnitBehavior)
 Unit.destroyEvent:addListener(function(unit)
     ____exports.UnitBehavior:forAll(unit, "destroy")

package/engine/buff.d.ts

@@ -5,16 +5,20 @@ import { Ability } from "./internal/ability";
 import { AbilityTypeId } from "./object-data/entry/ability-type";
 import { BuffPolarity } from "./object-data/auxiliary/buff-polarity";
 import { BuffResistanceType } from "./object-data/auxiliary/buff-resistance-type";
-import { AbilityBooleanField, AbilityBooleanLevelField, AbilityCombatClassificationsLevelField, AbilityDependentValue, AbilityIntegerField, AbilityIntegerLevelField, AbilityNumberField, AbilityNumberLevelField } from "./object-field/ability";
+import { AbilityBooleanField, AbilityBooleanLevelField, AbilityCombatClassificationsLevelField, AbilityDependentValue, AbilityEnumLevelField, AbilityIntegerField, AbilityIntegerLevelField, AbilityNumberField, AbilityNumberLevelField } from "./object-field/ability";
 import { CombatClassifications } from "./object-data/auxiliary/combat-classification";
-import { IsExactlyAny, NonEmptyArray, Prohibit } from "../utility/types";
+import { IsExactlyAny, Prohibit, ReadonlyNonEmptyArray } from "../utility/types";
+import { EffectParameters } from "../core/types/effect";
 import { UnitBehavior } from "./behaviour/unit";
 import type { Widget } from "../core/types/widget";
 import { Destructor } from "../destroyable";
 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;
 type IntegerParameterValueType = number | AbilityIntegerField | AbilityIntegerLevelField;
 type BooleanParameterValueType = boolean | AbilityBooleanField | AbilityBooleanLevelField;
+export type BuffPolarityParameterType = EnumParameterValueType<BuffPolarity>;
+export type BuffResistanceTypeParameterType = EnumParameterValueType<BuffResistanceType>;
 export declare class BuffUniqueGroup {
 }
 export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
@@ -51,6 +55,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     armorIncreaseFactor?: NumberParameterValueType;
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
+    damageFactor?: NumberParameterValueType;
     receivedDamageFactor?: NumberParameterValueType;
     receivedMagicDamageFactor?: NumberParameterValueType;
     durationIncreaseOnAutoAttack?: NumberParameterValueType;
@@ -120,11 +125,11 @@ export declare const enum BuffTypeIdSelectionPolicy {
 export type BuffAdditionalParameters = Prohibit<Record<string, any>, keyof BuffParameters>;
 export type BuffConstructorParameters<AdditionalParameters extends BuffAdditionalParameters> = [
     ...typeId: [ApplicableBuffTypeId] | [
-        typeIds: NonEmptyArray<ApplicableBuffTypeId>,
+        typeIds: ReadonlyNonEmptyArray<ApplicableBuffTypeId>,
         typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
     ],
-    polarity: BuffPolarity,
-    resistanceType: BuffResistanceType,
+    polarity: BuffPolarityParameterType,
+    resistanceType: BuffResistanceTypeParameterType,
     ...abilityOrParameters: [
         ability: Ability,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
@@ -213,6 +218,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set damageOnExpiration(damageOnExpiration: number);
     get healingOnExpiration(): number;
     set healingOnExpiration(healingOnExpiration: number);
+    get damageFactor(): number;
+    set damageFactor(damageFactor: number);
     get receivedDamageFactor(): number;
     set receivedDamageFactor(receivedDamageFactor: number);
     get armorIncrease(): number;
@@ -244,8 +251,12 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get duration(): number;
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
-    flashEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    flashEffect(...parameters: [
+        ...widgetOrXY: [] | [Widget] | [x: number, x: number],
+        ...parametersOrDuration: [] | [EffectParameters] | [number]
+    ]): void;
     flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    protected onCreate(): void;
     protected onDestroy(): Destructor;
     static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;
     static getByTypeId<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, unit: Unit, typeId: ApplicableBuffTypeId): T | undefined;

package/engine/buff.lua

@@ -46,6 +46,10 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____ability_2Dduration = require("engine.internal.mechanics.ability-duration")
 local getAbilityDuration = ____ability_2Dduration.getAbilityDuration
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____destructable = require("core.types.destructable")
+local Destructable = ____destructable.Destructable
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -94,6 +98,7 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
@@ -176,6 +181,7 @@ local buffNumberParameters = {
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
     "armorIncrease",
+    "damageFactor",
     "receivedDamageFactor",
     "maximumAutoAttackCount",
     "maximumDamageDealtEventCount",
@@ -480,6 +486,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         timer:start(duration, false, expireBuff, self)
         self._timer = timer
     end
+    self:onCreate()
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
     local ____opt_36 = self._bonusIdByBonusType
@@ -494,26 +501,30 @@ function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
     end
     bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
 end
-function Buff.prototype.flashEffect(self, widgetOrDuration, duration)
-    local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_40 = Effect
-    local ____Effect_flash_41 = Effect.flash
-    local ____array_39 = __TS__SparseArrayNew(
-        self[104],
-        isWidgetProvided and widgetOrDuration or self._unit,
-        stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
-    )
-    local ____isWidgetProvided_38
-    if isWidgetProvided then
-        ____isWidgetProvided_38 = duration
+function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+    if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
+        Effect:flash(self[104], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
-        ____isWidgetProvided_38 = widgetOrDuration
+        local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
+        local ____Effect_40 = Effect
+        local ____Effect_flash_41 = Effect.flash
+        local ____array_39 = __TS__SparseArrayNew(
+            self[104],
+            isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
+            stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
+        )
+        local ____isWidgetProvided_38
+        if isWidgetProvided then
+            ____isWidgetProvided_38 = yOrParametersOrDuration
+        else
+            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+        end
+        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
+        ____Effect_flash_41(
+            ____Effect_40,
+            __TS__SparseArraySpread(____array_39)
+        )
     end
-    __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-    ____Effect_flash_41(
-        ____Effect_40,
-        __TS__SparseArraySpread(____array_39)
-    )
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
@@ -536,6 +547,8 @@ function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
         __TS__SparseArraySpread(____array_43)
     )
 end
+function Buff.prototype.onCreate(self)
+end
 function Buff.prototype.onDestroy(self)
     local unit = self._unit
     if getUnitAbility(unit.handle, self.typeId) == self.handle then
@@ -668,7 +681,7 @@ function Buff.prototype.onDamageDealt(self, target, event)
             self:destroy()
         end
     end
-    if event.amount ~= 0 then
+    if event.originalAmount ~= 0 then
         local damageDealtEventCount = (self[130] or 0) + 1
         self[130] = damageDealtEventCount
         if damageDealtEventCount == self[131] then
@@ -677,7 +690,7 @@ function Buff.prototype.onDamageDealt(self, target, event)
     end
 end
 function Buff.prototype.onDamageReceived(self, source, event)
-    if event.amount ~= 0 then
+    if event.originalAmount ~= 0 then
         local damageReceivedEventCount = (self[132] or 0) + 1
         self[132] = damageReceivedEventCount
         if damageReceivedEventCount == self[133] then
@@ -888,6 +901,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "damageFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.DAMAGE_FACTOR)
+        end,
+        set = function(self, damageFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.DAMAGE_FACTOR, damageFactor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "receivedDamageFactor",

package/engine/internal/ability.d.ts

@@ -4,14 +4,6 @@ import { Event } from "../../event";
 import type { Item } from "../../core/types/item";
 import type { Unit } from "./unit";
 import type { AbilityTypeId } from "../object-data/entry/ability-type";
-interface Fields<K, V> {
-    set(field: K, value: V): boolean;
-    get(field: K): V;
-    has(field: K): boolean;
-}
-interface AbilityLevel {
-    realFields: Fields<jabilityreallevelfield, number>;
-}
 export type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
 export declare class AbilitySnapshot {
 }
@@ -20,7 +12,8 @@ export declare abstract class Ability extends Handle<jability> {
     protected constructor(handle: jability, typeId: number);
     toString(): string;
     get parentTypeId(): number;
-    get orderId(): number;
+    get orderTypeStringId(): string;
+    get orderTypeId(): number;
     abstract readonly owner: Unit | Item;
     getSnapshot(): AbilitySnapshot;
     hasField(field: jabilityfield | number): boolean;
@@ -40,9 +33,11 @@ export declare abstract class Ability extends Handle<jability> {
     setField(field: jabilityintegerlevelfield | jabilityreallevelfield, level: number, value: number): boolean;
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
-    get realFields(): Fields<jabilityrealfield, number>;
-    get levels(): readonly AbilityLevel[];
+    get levelCount(): number;
     abstract get level(): number;
+    abstract get cooldownRemaining(): number;
+    abstract set cooldownRemaining(cooldownRemaining: number);
+    abstract interruptCast(): void;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
 }
@@ -53,15 +48,21 @@ export declare class UnrecognizedAbility extends Ability {
     readonly owner: Unit;
     constructor(typeId: number, owner: Unit);
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(_: number);
+    interruptCast(): void;
 }
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
     constructor(handle: jability, typeId: number, owner: Unit);
+    incrementHideCounter(): void;
+    decrementHideCounter(): void;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;
-    set cooldownRemaining(v: number);
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[UnitAbility]>;
     static get onDestroy(): Event<[UnitAbility]>;
 }
@@ -85,7 +86,9 @@ export declare class ItemAbility extends Ability {
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }
-export {};