warscript 0.0.1-dev.e1acea3 → 0.0.1-dev.e4a5fce

package/engine/behaviour/ability/always-enabled.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+import { AbilityBehavior } from "../ability";
+import { Destructor } from "../../../destroyable";
+export declare class AlwaysEnabledAbilityBehavior extends AbilityBehavior {
+    protected onCreate(): void;
+    protected onDestroy(): Destructor;
+}

package/engine/behaviour/ability/always-enabled.lua

@@ -0,0 +1,31 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+local ____ability = require("engine.internal.ability")
+local UnitAbility = ____ability.UnitAbility
+local ____ability_2Ddisable_2Dcounter = require("engine.internal.misc.ability-disable-counter")
+local increaseAbilityDisableCounter = ____ability_2Ddisable_2Dcounter.increaseAbilityDisableCounter
+____exports.AlwaysEnabledAbilityBehavior = __TS__Class()
+local AlwaysEnabledAbilityBehavior = ____exports.AlwaysEnabledAbilityBehavior
+AlwaysEnabledAbilityBehavior.name = "AlwaysEnabledAbilityBehavior"
+__TS__ClassExtends(AlwaysEnabledAbilityBehavior, AbilityBehavior)
+function AlwaysEnabledAbilityBehavior.prototype.onCreate(self)
+    local ability = self.ability
+    if not __TS__InstanceOf(ability, UnitAbility) then
+        return
+    end
+    increaseAbilityDisableCounter(ability.owner.handle, ability.typeId, -10)
+end
+function AlwaysEnabledAbilityBehavior.prototype.onDestroy(self)
+    local ability = self.ability
+    if not __TS__InstanceOf(ability, UnitAbility) then
+        return AbilityBehavior.prototype.onDestroy(self)
+    end
+    increaseAbilityDisableCounter(ability.owner.handle, ability.typeId, 10)
+    return AbilityBehavior.prototype.onDestroy(self)
+end
+return ____exports

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

@@ -24,6 +24,7 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
     else
         caster:startAbilityCooldown(self.ability.typeId, cooldown)
     end
+    self:flashCasterEffect(caster)
     AbilityBehavior:forAll(self.ability, "onImpact", caster)
 end
 return ____exports

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

@@ -8,6 +8,9 @@ import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-
 export declare class RemoveBuffsSelfAbilityBehavior extends AbilityBehavior {
     private readonly polarity?;
     private readonly resistanceType?;
-    constructor(ability: Ability, polarity?: AbilityDependentValue<BuffPolarity> | undefined, resistanceType?: AbilityDependentValue<BuffResistanceType> | undefined);
+    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

@@ -8,15 +8,21 @@ ____exports.RemoveBuffsSelfAbilityBehavior = __TS__Class()
 local RemoveBuffsSelfAbilityBehavior = ____exports.RemoveBuffsSelfAbilityBehavior
 RemoveBuffsSelfAbilityBehavior.name = "RemoveBuffsSelfAbilityBehavior"
 __TS__ClassExtends(RemoveBuffsSelfAbilityBehavior, AbilityBehavior)
-function RemoveBuffsSelfAbilityBehavior.prototype.____constructor(self, ability, polarity, resistanceType)
+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.resistanceType),
+        self:resolveCurrentAbilityDependentValue(self.includeExpirationTimers),
+        self:resolveCurrentAbilityDependentValue(self.includeAuras),
+        self:resolveCurrentAbilityDependentValue(self.autoDispel)
     )
 end
 return ____exports

package/engine/behaviour/ability.d.ts

@@ -19,12 +19,15 @@ export declare abstract class AbilityBehavior<Parameters extends {
     constructor(ability: Ability, parameters?: AbilityBehaviorParameters);
     protected registerCommandEvent(orderTypeStringId?: string): void;
     get ability(): Ability;
-    protected resolveCurrentAbilityDependentValue<T extends boolean | number | string | undefined>(value: AbilityDependentValue<T>): T;
+    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 onCreate(): void;
     onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
     onUnitGainAbility(_unit: Unit): void;
     onUnitLoseAbility(_unit: Unit): void;

package/engine/behaviour/ability.lua

@@ -15,6 +15,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
@@ -77,6 +79,7 @@ function AbilityBehavior.prototype.____constructor(self, ability, parameters)
     if parameters and parameters.isExclusiveOnImpactHandler then
         exclusiveOnImpactHandlerAbilityBehaviorByAbility[ability] = self
     end
+    self:onCreate()
 end
 function AbilityBehavior.prototype.registerCommandEvent(self, orderTypeStringId)
     if orderTypeStringId == nil then
@@ -91,6 +94,14 @@ 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),
@@ -124,6 +135,8 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
         )
     end
 end
+function AbilityBehavior.prototype.onCreate(self)
+end
 function AbilityBehavior.prototype.onMissileArrival(self, ...)
 end
 function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)

package/engine/internal/misc/ability-disable-counter.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/misc/ability-disable-counter.lua

@@ -0,0 +1,13 @@
+local ____exports = {}
+local disableAbility = BlzUnitDisableAbility
+---
+-- @internal For use by internal systems only.
+____exports.increaseAbilityDisableCounter = function(unit, abilityTypeId, times)
+    for _ = 1, times do
+        disableAbility(unit, abilityTypeId, true, false)
+    end
+    for _ = times, -1 do
+        disableAbility(unit, abilityTypeId, false, false)
+    end
+end
+return ____exports

package/engine/object-field/ability.d.ts

@@ -130,5 +130,8 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string | undefined> = ValueType | AbilityField<NonNullable<ValueType>> | AbilityLevelField<NonNullable<ValueType>> | ((ability: Ability) => ValueType);
-export declare const resolveCurrentAbilityDependentValue: <ValueType extends boolean | number | string | undefined>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;
+export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
+export declare const resolveCurrentAbilityDependentValue: {
+    <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>): ValueType;
+    <ValueType extends boolean | number | string>(ability: Ability, value?: AbilityDependentValue<ValueType>): ValueType | undefined;
+};

package/engine/standard/fields/ability.d.ts

@@ -687,6 +687,8 @@ export declare const DISABLE_OTHER_ABILITIES_ABILITY_BOOLEAN_LEVEL_FIELD: Abilit
 export declare const ALLOW_BOUNTY_ABILITY_BOOLEAN_LEVEL_FIELD: AbilityBooleanLevelField & symbol;
 export declare const ICON_NORMAL_ABILITY_STRING_LEVEL_FIELD: AbilityStringLevelField & symbol;
 export declare const CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD: AbilityStringArrayField & symbol;
+export declare const CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
+export declare const CASTER_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
 export declare const TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD: AbilityStringArrayField & symbol;
 export declare const TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
 export declare const TARGET_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;

package/engine/standard/fields/ability.lua

@@ -698,6 +698,8 @@ ____exports.DISABLE_OTHER_ABILITIES_ABILITY_BOOLEAN_LEVEL_FIELD = AbilityBoolean
 ____exports.ALLOW_BOUNTY_ABILITY_BOOLEAN_LEVEL_FIELD = AbilityBooleanLevelField:create(fourCC("Ntm4"))
 ____exports.ICON_NORMAL_ABILITY_STRING_LEVEL_FIELD = AbilityStringLevelField:create(fourCC("aart"))
 ____exports.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = AbilityStringArrayField:create(fourCC("acat"))
+____exports.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("acap"))
+____exports.CASTER_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("aca1"))
 ____exports.TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = AbilityStringArrayField:create(fourCC("atat"))
 ____exports.TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("ata0"))
 ____exports.TARGET_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("ata1"))

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.e1acea3",
+    "version": "0.0.1-dev.e4a5fce",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",