warscript 0.0.1-dev.f074376 → 0.0.1-dev.f0daa48

package/core/types/sound.lua

@@ -22,7 +22,7 @@ local setSoundPlayPosition = SetSoundPlayPosition
 local stopSound = StopSound
 local attachSoundToUnit = AttachSoundToUnit
 local killSoundWhenDone = KillSoundWhenDone
-____exports.SoundChannel = SoundChannel or ({})
+____exports.SoundChannel = ____exports.SoundChannel or ({})
 ____exports.SoundChannel.General = 0
 ____exports.SoundChannel[____exports.SoundChannel.General] = "General"
 ____exports.SoundChannel.UnitSelection = 1

package/engine/behaviour/ability.d.ts

@@ -26,16 +26,20 @@ export declare abstract class AbilityBehavior<Parameters extends {
     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, ...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: [
+    flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashTargetEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
+    flashSpecialEffect(...args: [
         ...pointOrWidget: [x: number, y: number] | [widget: Widget],
         ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]
     ]): void;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
+    protected launchMissile(source: Unit, ...args: [
+        ...pointOrWidget: [x: number, y: number] | [widget: Unit /** TODO: support Widget */],
+        ...parameters: NonNullable<Parameters["missileParameters"]>
+    ]): void;
     protected onCreate(): void;
     onValueChange(_value: ReadonlySubscribableAbilityDependentValue<string | number | boolean>): void;
     onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;

package/engine/behaviour/ability.lua

@@ -30,7 +30,14 @@ local ____ability = require("engine.object-field.ability")
 local AbilityField = ____ability.AbilityField
 local AbilityLevelField = ____ability.AbilityLevelField
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
+local ____missile = require("core.types.missile")
+local Missile = ____missile.Missile
 local createBehaviorFunctionsByAbilityTypeId = {}
+local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
+    if success then
+        abilityBehavior:onMissileArrival(...)
+    end
+end
 local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
 local function createUnitEventListener(key)
     return function(unit, ability, ...)
@@ -160,6 +167,28 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrParame
         )
     end
 end
+function AbilityBehavior.prototype.launchMissile(self, source, xOrWidget, yOrParameter, ...)
+    if type(xOrWidget) ~= "number" then
+        Missile:launch(
+            self.missileLaunchConfig,
+            source,
+            xOrWidget,
+            invokeOnMissileArrival,
+            self,
+            yOrParameter,
+            ...
+        )
+    else
+        Missile:launch(
+            self.missileLaunchConfig,
+            source,
+            vec2(xOrWidget, yOrParameter),
+            invokeOnMissileArrival,
+            self,
+            ...
+        )
+    end
+end
 function AbilityBehavior.prototype.onCreate(self)
 end
 function AbilityBehavior.prototype.onValueChange(self, _value)

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

@@ -7,7 +7,7 @@ import { Destructor } from "../../../destroyable";
 import { BehaviorPriority } from "../../behavior";
 export type StunImmunityUnitBehaviorParameters = {
     readonly priority?: BehaviorPriority;
-    buffTypeIds?: LuaSet<BuffTypeId>;
+    buffTypeIds?: readonly BuffTypeId[];
     textTagPreset?: TextTagPreset;
     textTagText?: string;
     additionalAction?: (this: void, unit: Unit) => void;

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

@@ -8,14 +8,15 @@ local UnitBehavior = ____unit.UnitBehavior
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
 local ____arrays = require("utility.arrays")
-local flatMapToLuaSet = ____arrays.flatMapToLuaSet
+local distinct = ____arrays.distinct
+local flatMap = ____arrays.flatMap
 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(
+    return distinct(flatMap(
         AbilityType:getAllByBaseIds(map({
             "AHtb",
             "AHbh",
@@ -41,11 +42,11 @@ local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
             "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
+    for ____, buffTypeId in ipairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
         hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
     end
     if hasRemovedBuffs then

package/engine/behaviour/unit.lua

@@ -21,6 +21,8 @@ local ____bonus = require("engine.internal.unit.bonus")
 local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
 local getUnitBonus = ____bonus.getUnitBonus
 local removeUnitBonus = ____bonus.removeUnitBonus
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local safeCall = warpack.safeCall
 local createBehaviorFunctionsByUnitTypeId = {}
 local behaviorsByOwningPlayerEvent = {}
@@ -79,16 +81,24 @@ function UnitBehavior.prototype.onDestroy(self)
 end
 function UnitBehavior.prototype.getUnitBonus(self, bonusType)
     local ____opt_10 = self._bonusIdByBonusType
-    local bonusId = ____opt_10 and ____opt_10[bonusType]
+    local bonusId = ____opt_10 and ____opt_10:get(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 = {}
+        bonusIdByBonusType = __TS__New(LinkedMap)
         self._bonusIdByBonusType = bonusIdByBonusType
     end
-    bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[bonusType], value)
+    bonusIdByBonusType:put(
+        bonusType,
+        addOrUpdateOrRemoveUnitBonus(
+            self.object,
+            bonusType,
+            bonusIdByBonusType:get(bonusType),
+            value
+        )
+    )
 end
 function UnitBehavior.prototype.registerOwningPlayerEvent(self, event, extractPlayer, listener)
     local listenerByBehavior = getOrPut(listenerByBehaviorByOwningPlayerEvent, event, mutableLuaMap)

package/engine/buff.d.ts

@@ -31,8 +31,10 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     source?: Unit;
     behaviorConstructors?: (new (unit: Unit) => UnitBehavior)[];
     abilityTypeIds?: Record<AbilityTypeId, {
-        [numberField: (AbilityNumberField | AbilityNumberLevelField) & symbol]: NumberParameterValueType;
-    } & {
+        readonly fields?: [
+            AbilityNumberField | AbilityNumberLevelField,
+            NumberParameterValueType
+        ][];
         /** Default `true`. */
         readonly isButtonVisible?: boolean;
         /** Default is the level of the source ability or 0 if it is absent. */
@@ -54,7 +56,8 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     damageIncrease?: NumberParameterValueType;
     damageIncreaseFactor?: NumberParameterValueType;
     armorIncrease?: NumberParameterValueType;
-    armorIncreaseFactor?: NumberParameterValueType;
+    maxHealthIncrease?: NumberParameterValueType;
+    maxManaIncrease?: NumberParameterValueType;
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
     manaRegenerationRateIncreaseFactor?: NumberParameterValueType;
@@ -77,6 +80,9 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     maximumAutoAttackCount?: IntegerParameterValueType;
     maximumDamageDealtEventCount?: IntegerParameterValueType;
     maximumDamageReceivedEventCount?: IntegerParameterValueType;
+    absorbedDamageFactor?: NumberParameterValueType;
+    maximumDamageAbsorbed?: NumberParameterValueType;
+    destroysOnMaximumDamageAbsorbed?: BooleanParameterValueType;
     damageOnExpiration?: NumberParameterValueType;
     healingOnExpiration?: NumberParameterValueType;
     killsOnExpiration?: BooleanParameterValueType;
@@ -120,22 +126,26 @@ declare const enum BuffPropertyKey {
     MAXIMUM_DAMAGE_DEALT_EVENT_COUNT = 132,
     DAMAGE_RECEIVED_EVENT_COUNT = 133,
     MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT = 134,
-    TURNS_INTO_GHOST = 135,
-    STUNS = 136,
-    IGNORES_STUN_IMMUNITY = 137,
-    DISABLES_AUTO_ATTACK = 138,
-    PROVIDES_INVULNERABILITY = 139,
-    KILLS_ON_EXPIRATION = 140,
-    EXPLODES_ON_EXPIRATION = 141,
-    MISS_PROBABILITY = 142,
-    ABILITY_COOLDOWN_FACTOR = 143,
-    ABILITY_COOLDOWN_MODIFIER = 144
+    ABSORBED_DAMAGE_FACTOR = 135,
+    MAXIMUM_DAMAGE_ABSORBED = 136,
+    DAMAGE_ABSORBED = 137,
+    DESTROYS_ON_MAXIMUM_DAMAGE_ABSORBED = 138,
+    TURNS_INTO_GHOST = 139,
+    STUNS = 140,
+    IGNORES_STUN_IMMUNITY = 141,
+    DISABLES_AUTO_ATTACK = 142,
+    PROVIDES_INVULNERABILITY = 143,
+    KILLS_ON_EXPIRATION = 144,
+    EXPLODES_ON_EXPIRATION = 145,
+    MISS_PROBABILITY = 146,
+    ABILITY_COOLDOWN_FACTOR = 147,
+    ABILITY_COOLDOWN_MODIFIER = 148
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
 }
 export type BuffAdditionalParameters = Prohibit<Record<string, any>, keyof BuffParameters>;
-export type BuffConstructorParameters<AdditionalParameters extends BuffAdditionalParameters> = [
+export type BuffConstructorParameters<T extends Buff<BuffAdditionalParameters>> = T extends Buff<infer AdditionalParameters> ? [
     ...typeId: [ApplicableBuffTypeId] | [
         typeIds: ReadonlyNonEmptyArray<ApplicableBuffTypeId>,
         typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
@@ -145,8 +155,10 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
     ...abilityOrParameters: [
         ability?: Ability | AbilityBehavior,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
-    ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
-];
+    ] | [
+        parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
+    ]
+] : never;
 export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
     private _unit;
     protected readonly __additionalParametersBrand?: AdditionalParameters;
@@ -185,6 +197,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private [BuffPropertyKey.DAMAGE_DEALT_EVENT_COUNT]?;
     private [BuffPropertyKey.MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT]?;
     private [BuffPropertyKey.DAMAGE_RECEIVED_EVENT_COUNT]?;
+    private [BuffPropertyKey.ABSORBED_DAMAGE_FACTOR]?;
+    private [BuffPropertyKey.MAXIMUM_DAMAGE_ABSORBED]?;
+    private [BuffPropertyKey.DAMAGE_ABSORBED]?;
+    private [BuffPropertyKey.DESTROYS_ON_MAXIMUM_DAMAGE_ABSORBED]?;
     private [BuffPropertyKey.TURNS_INTO_GHOST]?;
     private [BuffPropertyKey.STUNS]?;
     private [BuffPropertyKey.IGNORES_STUN_IMMUNITY]?;
@@ -199,7 +215,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     readonly typeId: ApplicableBuffTypeId;
     readonly polarity: BuffPolarity;
     readonly resistanceType: BuffResistanceType;
-    readonly parameters: IsExactlyAny<AdditionalParameters> extends true ? any : keyof AdditionalParameters extends never ? undefined : {
+    readonly parameters: IsExactlyAny<AdditionalParameters> extends true ? any : AdditionalParameters extends Record<PropertyKey, never> ? undefined : {
         [K in keyof Omit<AdditionalParameters, keyof BuffParameters>]: AdditionalParameters[K] extends AbilityDependentValue<infer T> ? T : AdditionalParameters[K];
     };
     private readonly handle;
@@ -210,7 +226,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
     private readonly _abilityTypeIds?;
     private _behaviors?;
-    constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
+    constructor(target: Unit, ...parameters: BuffConstructorParameters<Buff<AdditionalParameters>>);
     get level(): number;
     get remainingDamageOverDuration(): number;
     set remainingDamageOverDuration(remainingDamageOverDuration: number);
@@ -238,6 +254,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set receivedDamageFactor(receivedDamageFactor: number);
     get armorIncrease(): number;
     set armorIncrease(armorIncrease: number);
+    get maxHealthIncrease(): number;
+    set maxHealthIncrease(maxHealthIncrease: number);
+    get maxManaIncrease(): number;
+    set maxManaIncrease(maxManaIncrease: number);
     get turnsIntoGhost(): boolean;
     set turnsIntoGhost(turnsIntoGhost: boolean);
     get stuns(): boolean;
@@ -269,8 +289,16 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get manaRegenerationRateIncreaseFactor(): number;
     set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
     get duration(): number;
+    set duration(duration: number);
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
+    get absorbedDamageFactor(): number;
+    set absorbedDamageFactor(absorbedDamageFactor: number);
+    get maximumDamageAbsorbed(): number;
+    set maximumDamageAbsorbed(maximumDamageAbsorbed: number);
+    get damageAbsorbed(): number;
+    get destroysOnMaximumDamageAbsorbed(): boolean;
+    set destroysOnMaximumDamageAbsorbed(destroysOnMaximumDamageAbsorbed: boolean);
     get abilityCooldownFactor(): number;
     set abilityCooldownFactor(abilityCooldownFactor: number);
     onAbilityGained(ability: Ability): void;
@@ -279,7 +307,12 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
         ...widgetOrXY: [] | [Widget] | [x: number, x: number],
         ...parametersOrDuration: [] | [EffectParameters] | [number]
     ]): void;
-    flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    flashSpecialEffect(...parameters: [
+        ...widgetOrXY: [] | [Widget] | [x: number, x: number],
+        ...parametersOrDuration: [] | [EffectParameters] | [number]
+    ]): void;
+    private flash;
+    expire(): void;
     protected onCreate(): void;
     protected onDestroy(): Destructor;
     static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;