warscript 0.0.1-dev.65d0014 → 0.0.1-dev.65ee461

package/engine/behaviour/unit.d.ts

@@ -5,9 +5,11 @@ 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";
 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;
     get unit(): Unit;
     onAutoAttackStart(target: Unit): void;
     onAutoAttackFinish(target: Unit): void;

package/engine/buff.d.ts

@@ -64,6 +64,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     durationIncreaseOnAutoAttack?: NumberParameterValueType;
     maximumRemainingDuration?: NumberParameterValueType;
     maximumDuration?: NumberParameterValueType;
+    turnsIntoGhost?: BooleanParameterValueType;
     stuns?: BooleanParameterValueType;
     ignoresStunImmunity?: BooleanParameterValueType;
     providesStunImmunity?: BooleanParameterValueType;
@@ -116,13 +117,14 @@ declare const enum BuffPropertyKey {
     MAXIMUM_DAMAGE_DEALT_EVENT_COUNT = 132,
     DAMAGE_RECEIVED_EVENT_COUNT = 133,
     MAXIMUM_DAMAGE_RECEIVED_EVENT_COUNT = 134,
-    STUNS = 135,
-    IGNORES_STUN_IMMUNITY = 136,
-    DISABLES_AUTO_ATTACK = 137,
-    PROVIDES_INVULNERABILITY = 138,
-    KILLS_ON_EXPIRATION = 139,
-    EXPLODES_ON_EXPIRATION = 140,
-    MISS_PROBABILITY = 141
+    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
 }
 export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
@@ -136,7 +138,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
     polarity: BuffPolarityParameterType,
     resistanceType: BuffResistanceTypeParameterType,
     ...abilityOrParameters: [
-        ability: Ability,
+        ability?: Ability,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
     ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
 ];
@@ -178,6 +180,7 @@ 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.TURNS_INTO_GHOST]?;
     private [BuffPropertyKey.STUNS]?;
     private [BuffPropertyKey.IGNORES_STUN_IMMUNITY]?;
     private [BuffPropertyKey.DISABLES_AUTO_ATTACK]?;
@@ -231,6 +234,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set receivedDamageFactor(receivedDamageFactor: number);
     get armorIncrease(): number;
     set armorIncrease(armorIncrease: number);
+    get turnsIntoGhost(): boolean;
+    set turnsIntoGhost(turnsIntoGhost: boolean);
     get stuns(): boolean;
     set stuns(stuns: boolean);
     get ignoresStunImmunity(): boolean;

package/engine/buff.lua

@@ -109,6 +109,7 @@ local buffParametersKeys = {
     durationIncreaseOnAutoAttack = true,
     maximumDuration = true,
     maximumRemainingDuration = true,
+    turnsIntoGhost = true,
     stuns = true,
     ignoresStunImmunity = true,
     providesStunImmunity = true,
@@ -174,6 +175,7 @@ local function resolveAndSetNumberValue(buff, property, ability, level, value, d
     end
 end
 local buffBooleanParameters = {
+    "turnsIntoGhost",
     "stuns",
     "ignoresStunImmunity",
     "disablesAutoAttack",
@@ -321,7 +323,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = selectBuffTypeIdWithLeastDuration(typeIdOrTypeIds, _unit)
         polarity = resistanceTypeOrPolarity
         resistanceType = abilityOrParametersOrResistanceType
-        if __TS__InstanceOf(parametersOrAbility, Ability) then
+        if __TS__InstanceOf(parametersOrAbility, Ability) or parametersOrAbility == nil then
             ability = parametersOrAbility
         else
             ability = nil
@@ -331,7 +333,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = typeIdOrTypeIds
         polarity = polarityOrTypeIdSelectionPolicy
         resistanceType = resistanceTypeOrPolarity
-        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) then
+        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) or abilityOrParametersOrResistanceType == nil then
             ability = abilityOrParametersOrResistanceType
             parameters = parametersOrAbility
         else
@@ -340,7 +342,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         end
     end
     self.typeId = typeId
-    if not __TS__InstanceOf(ability, Ability) then
+    if not (__TS__InstanceOf(ability, Ability) or ability == nil) then
         parameters = ability
         ability = nil
     end
@@ -371,7 +373,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     local missProbability = parameters and parameters.missProbability or defaultParameters.missProbability
     if missProbability ~= nil then
         missProbability = resolveNumberValue(ability, level, missProbability)
-        self[141] = missProbability
+        self[142] = missProbability
     end
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
@@ -592,15 +594,21 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[137] then
+    if self[139] then
+        unit:decrementInvulnerabilityCounter()
+    end
+    if self[138] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[135] then
-        if self[136] then
+    if self[136] then
+        if self[137] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
     end
+    if self[135] then
+        unit:decrementGhostCounter()
+    end
     if self._abilityTypeIds ~= nil then
         for abilityTypeId in pairs(self._abilityTypeIds) do
             unit:removeAbility(abilityTypeId)
@@ -655,9 +663,9 @@ function Buff.prototype.onExpiration(self)
     if self[121] ~= nil then
         (self[102] or unit):healTarget(unit, self[120] or 0)
     end
-    if self[140] then
+    if self[141] then
         unit:explode()
-    elseif self[139] then
+    elseif self[140] then
         unit:kill()
     end
 end
@@ -963,7 +971,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "stuns",
+    "turnsIntoGhost",
     {
         get = function(self)
             local ____self__135_54 = self[135]
@@ -972,18 +980,12 @@ __TS__SetDescriptor(
             end
             return ____self__135_54
         end,
-        set = function(self, stuns)
-            if not stuns and self[135] then
-                if self[136] then
-                    self.object:decrementStunCounter()
-                end
-                self.object:decrementStunCounter()
+        set = function(self, turnsIntoGhost)
+            if not turnsIntoGhost and self[135] then
+                self.object:decrementGhostCounter()
                 self[135] = nil
-            elseif stuns and not self[135] then
-                if self[136] then
-                    self.object:incrementStunCounter()
-                end
-                self.object:incrementStunCounter()
+            elseif turnsIntoGhost and not self[135] then
+                self.object:incrementGhostCounter()
                 self[135] = true
             end
         end
@@ -992,7 +994,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "ignoresStunImmunity",
+    "stuns",
     {
         get = function(self)
             local ____self__136_55 = self[136]
@@ -1001,16 +1003,18 @@ __TS__SetDescriptor(
             end
             return ____self__136_55
         end,
-        set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[136] then
-                if self[135] then
+        set = function(self, stuns)
+            if not stuns and self[136] then
+                if self[137] then
                     self.object:decrementStunCounter()
                 end
+                self.object:decrementStunCounter()
                 self[136] = nil
-            elseif ignoresStunImmunity and not self[136] then
-                if self[135] then
+            elseif stuns and not self[136] then
+                if self[137] then
                     self.object:incrementStunCounter()
                 end
+                self.object:incrementStunCounter()
                 self[136] = true
             end
         end
@@ -1019,7 +1023,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "disablesAutoAttack",
+    "ignoresStunImmunity",
     {
         get = function(self)
             local ____self__137_56 = self[137]
@@ -1028,12 +1032,16 @@ __TS__SetDescriptor(
             end
             return ____self__137_56
         end,
-        set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[137] then
-                self.object:decrementDisableAutoAttackCounter()
+        set = function(self, ignoresStunImmunity)
+            if not ignoresStunImmunity and self[137] then
+                if self[136] then
+                    self.object:decrementStunCounter()
+                end
                 self[137] = nil
-            elseif disablesAutoAttack and not self[137] then
-                self.object:incrementDisableAutoAttackCounter()
+            elseif ignoresStunImmunity and not self[137] then
+                if self[136] then
+                    self.object:incrementStunCounter()
+                end
                 self[137] = true
             end
         end
@@ -1042,7 +1050,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "providesInvulnerability",
+    "disablesAutoAttack",
     {
         get = function(self)
             local ____self__138_57 = self[138]
@@ -1051,12 +1059,12 @@ __TS__SetDescriptor(
             end
             return ____self__138_57
         end,
-        set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[138] then
-                self.object:decrementInvulnerabilityCounter()
+        set = function(self, disablesAutoAttack)
+            if not disablesAutoAttack and self[138] then
+                self.object:decrementDisableAutoAttackCounter()
                 self[138] = nil
-            elseif providesInvulnerability and not self[138] then
-                self.object:incrementInvulnerabilityCounter()
+            elseif disablesAutoAttack and not self[138] then
+                self.object:incrementDisableAutoAttackCounter()
                 self[138] = true
             end
         end
@@ -1065,7 +1073,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "killsOnExpiration",
+    "providesInvulnerability",
     {
         get = function(self)
             local ____self__139_58 = self[139]
@@ -1074,10 +1082,12 @@ __TS__SetDescriptor(
             end
             return ____self__139_58
         end,
-        set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[139] then
+        set = function(self, providesInvulnerability)
+            if not providesInvulnerability and self[139] then
+                self.object:decrementInvulnerabilityCounter()
                 self[139] = nil
-            elseif killsOnExpiration and not self[139] then
+            elseif providesInvulnerability and not self[139] then
+                self.object:incrementInvulnerabilityCounter()
                 self[139] = true
             end
         end
@@ -1086,7 +1096,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Buff.prototype,
-    "explodesOnExpiration",
+    "killsOnExpiration",
     {
         get = function(self)
             local ____self__140_59 = self[140]
@@ -1105,6 +1115,27 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "explodesOnExpiration",
+    {
+        get = function(self)
+            local ____self__141_60 = self[141]
+            if ____self__141_60 == nil then
+                ____self__141_60 = false
+            end
+            return ____self__141_60
+        end,
+        set = function(self, killsOnExpiration)
+            if not killsOnExpiration and self[141] then
+                self[141] = nil
+            elseif killsOnExpiration and not self[141] then
+                self[141] = true
+            end
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "maximumDamageDealtEventCount",
@@ -1221,13 +1252,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_60 = self._timer
-            return ____opt_60 and ____opt_60.remaining or 0
+            local ____opt_61 = self._timer
+            return ____opt_61 and ____opt_61.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_64 = remainingDuration
-            local ____opt_62 = self._timer
-            local remainingDurationDelta = ____remainingDuration_64 - (____opt_62 and ____opt_62.remaining or 0)
+            local ____remainingDuration_65 = remainingDuration
+            local ____opt_63 = self._timer
+            local remainingDurationDelta = ____remainingDuration_65 - (____opt_63 and ____opt_63.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1242,7 +1273,7 @@ __TS__SetDescriptor(
                         remainingDuration,
                         self._spellStealPriority,
                         self._learnLevelMinimum,
-                        self[141]
+                        self[142]
                     ) then
                         local timer = self._timer
                         if timer == nil then

package/engine/internal/mechanics/ability-duration.lua

@@ -8,6 +8,6 @@ local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_AB
 -- @internal For use by internal systems only.
 ____exports.getAbilityDuration = function(ability, target)
     local level = ability.level
-    return target ~= nil and target:hasClassification(UnitClassification.RESISTANT) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
+    return target ~= nil and (target.isHero or target:getField(UNIT_IF_LEVEL) >= 6 or target:hasClassification(UnitClassification.RESISTANT)) and DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level) or DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD:getValue(ability, level)
 end
 return ____exports

package/engine/internal/unit.d.ts

@@ -100,7 +100,9 @@ declare const enum UnitPropertyKey {
     DELAY_HEALTH_CHECKS_COUNTER = 103,
     DELAY_HEALTH_CHECKS_HEALTH_BONUS = 104,
     PREVENT_DEATH_HEALTH_BONUS = 105,
-    IS_TEAM_GLOW_HIDDEN = 106
+    IS_TEAM_GLOW_HIDDEN = 106,
+    LAST_X = 107,
+    LAST_Y = 108
 }
 export type UnitSyncId = number & {
     readonly __unitSyncId: unique symbol;
@@ -113,6 +115,8 @@ export declare class Unit extends Handle<junit> {
     private [UnitPropertyKey.DELAY_HEALTH_CHECKS_HEALTH_BONUS]?;
     private [UnitPropertyKey.PREVENT_DEATH_HEALTH_BONUS]?;
     private [UnitPropertyKey.IS_TEAM_GLOW_HIDDEN]?;
+    private [UnitPropertyKey.LAST_X]?;
+    private [UnitPropertyKey.LAST_Y]?;
     private _owner?;
     private _timeScale?;
     private events?;
@@ -148,6 +152,7 @@ export declare class Unit extends Handle<junit> {
     isEnemyOf(unit: Unit): boolean;
     playAnimation(animation: string, rarity?: jraritycontrol): void;
     playAnimation(animation: number): void;
+    resetAnimation(): void;
     queueAnimation(animation: string): void;
     get weapons(): [UnitWeapon, UnitWeapon];
     get firstWeapon(): UnitWeapon;

package/engine/internal/unit.lua

@@ -58,6 +58,7 @@ local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
 local setUnitAnimationWithRarity = SetUnitAnimationWithRarity
 local setUnitAnimationByIndex = SetUnitAnimationByIndex
+local resetUnitAnimation = ResetUnitAnimation
 local queueUnitAnimation = QueueUnitAnimation
 local getUnitIntegerField = BlzGetUnitIntegerField
 local getUnitRealField = BlzGetUnitRealField
@@ -680,6 +681,8 @@ function Unit.prototype.getEvent(self, event, collector)
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
+    self[107] = getUnitX(handle)
+    self[108] = getUnitY(handle)
     if not self._owner then
         self._owner = Player:of(getOwningPlayer(handle))
     end
@@ -795,6 +798,9 @@ function Unit.prototype.playAnimation(self, animation, rarity)
         setUnitAnimation(self.handle, animation)
     end
 end
+function Unit.prototype.resetAnimation(self)
+    resetUnitAnimation(self.handle)
+end
 function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
@@ -1597,7 +1603,7 @@ __TS__SetDescriptor(
     "x",
     {
         get = function(self)
-            return getUnitX(self.handle)
+            return self[107] or getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1610,7 +1616,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return getUnitY(self.handle)
+            return self[108] or getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)

package/engine/object-data/auxiliary/animation-name.d.ts

@@ -12,3 +12,4 @@ export declare const enum AnimationName {
     STAND = "stand",
     WALK = "walk"
 }
+export declare const isAnimationName: (value: string) => value is AnimationName;

package/engine/object-data/auxiliary/animation-name.lua

@@ -1,2 +1,18 @@
 local ____exports = {}
+local animationNames = {
+    attack = true,
+    birth = true,
+    death = true,
+    decay = true,
+    dissipate = true,
+    morph = true,
+    portrait = true,
+    sleep = true,
+    spell = true,
+    stand = true,
+    walk = true
+}
+____exports.isAnimationName = function(value)
+    return animationNames[value] ~= nil
+end
 return ____exports

package/engine/object-data/auxiliary/attachment-preset.d.ts

@@ -2,13 +2,18 @@
 import { ModelNodeName } from "./model-node-name";
 import { ModelNodeQualifier } from "./model-node-qualifier";
 import { Optional } from "../../../utility/types";
+import { EffectParameters } from "../../../core/types/effect";
 export type AttachmentPreset = {
     modelPath: string;
     nodeName: ModelNodeName;
     nodeQualifiers: ModelNodeQualifier[];
 };
-export type AttachmentPresetInput = Optional<AttachmentPreset, "nodeQualifiers"> | string;
-export declare const toAttachmentPreset: (attachmentPresetInput: AttachmentPresetInput) => AttachmentPreset;
+export type EffectPresetWithParameters = AttachmentPreset & {
+    parameters?: EffectParameters;
+};
+export type AttachmentPresetInput<T extends AttachmentPreset = AttachmentPreset> = Optional<T, "nodeName" | "nodeQualifiers"> | string;
+export type EffectPresetWithParametersInput = AttachmentPresetInput<EffectPresetWithParameters>;
+export declare const toEffectPreset: (effectPresetInput: EffectPresetWithParametersInput) => EffectPresetWithParameters;
 export declare const extractAttachmentPresetInputModelPath: (attachmentPresetInput: AttachmentPresetInput | undefined) => string;
 export declare const extractAttachmentPresetInputNodeFQN: (attachmentPresetInput: AttachmentPresetInput | undefined) => string;
 export declare const splitAttachmentNodeFQN: (attachmentNodeFQN: string) => LuaMultiReturn<[attachmentNodeName: ModelNodeName, attachmentNodeQualifiers: ModelNodeQualifier[]]>;

package/engine/object-data/auxiliary/attachment-preset.lua

@@ -1,9 +1,10 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayJoin = ____lualib.__TS__ArrayJoin
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArraySlice = ____lualib.__TS__ArraySlice
 local ____exports = {}
-____exports.toAttachmentPreset = function(attachmentPresetInput)
-    return type(attachmentPresetInput) == "string" and ({modelPath = attachmentPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = attachmentPresetInput.modelPath, nodeName = attachmentPresetInput.nodeName, nodeQualifiers = attachmentPresetInput.nodeQualifiers or ({})})
+____exports.toEffectPreset = function(effectPresetInput)
+    return type(effectPresetInput) == "string" and ({modelPath = effectPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = effectPresetInput.modelPath, nodeName = effectPresetInput.nodeName or "origin", nodeQualifiers = effectPresetInput.nodeQualifiers or ({}), parameters = effectPresetInput.parameters})
 end
 ____exports.extractAttachmentPresetInputModelPath = function(attachmentPresetInput)
     return type(attachmentPresetInput) == "string" and attachmentPresetInput or (attachmentPresetInput and attachmentPresetInput.modelPath or "")
@@ -12,7 +13,7 @@ ____exports.extractAttachmentPresetInputNodeFQN = function(attachmentPresetInput
     if type(attachmentPresetInput) == "string" or attachmentPresetInput == nil then
         return ""
     end
-    return table.concat(
+    return __TS__ArrayJoin(
         {
             attachmentPresetInput.nodeName,
             table.unpack(attachmentPresetInput.nodeQualifiers or ({}))

package/engine/object-data/auxiliary/sound-eax.d.ts

@@ -0,0 +1,10 @@
+/** @noSelfInFile */
+export declare const enum SoundEax {
+    DEFAULT = "DefaultEAXON",
+    ACKNOWLEDGEMENTS = "HeroAcksEAX",
+    ENVIRONMENT = "DoodadsEAX",
+    DRUMS = "KotoDrumsEAX",
+    ATTACKS = "CombatSoundsEAX",
+    ABILITIES = "SpellsEAX",
+    MISSILES = "MissilesEAX"
+}

package/engine/object-data/auxiliary/sound-eax.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+return ____exports

package/engine/object-data/auxiliary/tech-tree-dependency.d.ts

@@ -12,5 +12,5 @@ export type TechTreeDependency = {
     level: number;
 };
 export type TechTreeDependencyInput = TechTreeDependency | UnitTypeId | UpgradeId;
-export declare const extractTechTreeDependencyInputObjectDataEntryId: (techTreeDependencyInput: TechTreeDependencyInput) => ObjectDataEntryId;
+export declare const extractTechTreeDependencyInputObjectDataEntryId: (techTreeDependencyInput: TechTreeDependencyInput) => ObjectDataEntryId & number;
 export declare const extractTechTreeDependencyInputLevel: (techTreeDependencyInput: TechTreeDependencyInput) => number;

package/engine/object-data/entry/ability-type/blank-configurable.lua

@@ -6,6 +6,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____channel = require("engine.object-data.entry.ability-type.channel")
 local ChannelAbilityType = ____channel.ChannelAbilityType
+local ____animation_2Dname = require("engine.object-data.auxiliary.animation-name")
+local isAnimationName = ____animation_2Dname.isAnimationName
 local ____order_2Dtype_2Dstring_2Did_2Dfactory = require("engine.object-data.utility.order-type-string-id-factory")
 local orderTypeStringIdFactory = ____order_2Dtype_2Dstring_2Did_2Dfactory.orderTypeStringIdFactory
 local ____timer = require("core.types.timer")
@@ -211,7 +213,16 @@ for abilityTypeId, usesAttackAnimation in pairs(postcompile(function()
     for abilityTypeId, usesAttackAnimation in pairs(usesAttackAnimationByAbilityTypeId) do
         if usesAttackAnimation then
             local abilityType = checkNotNull(____exports.BlankConfigurableAbilityType:of(abilityTypeId))
-            abilityType.channelingAnimation = {"attack"}
+            if isAnimationName(abilityType.channelingAnimation[1]) then
+                if abilityType.channelingAnimation[1] ~= "attack" then
+                    abilityType.channelingAnimation = {"attack"}
+                end
+            else
+                abilityType.channelingAnimation = {
+                    "attack",
+                    table.unpack(abilityType.channelingAnimation)
+                }
+            end
         end
     end
     return usesAttackAnimationByAbilityTypeId

package/engine/object-data/entry/ability-type/carrion-swarm.d.ts

@@ -0,0 +1,14 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class CarrionSwarmAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get damagePerTarget(): number[];
+    set damagePerTarget(damagePerTarget: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get maximumTotalDamage(): number[];
+    set maximumTotalDamage(maximumTotalDamage: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get distance(): number[];
+    set distance(distance: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get finalAreaOfEffect(): number[];
+    set finalAreaOfEffect(finalAreaOfEffect: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/carrion-swarm.lua

@@ -0,0 +1,65 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.CarrionSwarmAbilityType = __TS__Class()
+local CarrionSwarmAbilityType = ____exports.CarrionSwarmAbilityType
+CarrionSwarmAbilityType.name = "CarrionSwarmAbilityType"
+__TS__ClassExtends(CarrionSwarmAbilityType, AbilityType)
+CarrionSwarmAbilityType.BASE_ID = fourCC("AUcs")
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "damagePerTarget",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs1")
+        end,
+        set = function(self, damagePerTarget)
+            self:setNumberLevelField("Ucs1", damagePerTarget)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "maximumTotalDamage",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs2")
+        end,
+        set = function(self, maximumTotalDamage)
+            self:setNumberLevelField("Ucs2", maximumTotalDamage)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "distance",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs3")
+        end,
+        set = function(self, distance)
+            self:setNumberLevelField("Ucs3", distance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    CarrionSwarmAbilityType.prototype,
+    "finalAreaOfEffect",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ucs4")
+        end,
+        set = function(self, finalAreaOfEffect)
+            self:setNumberLevelField("Ucs4", finalAreaOfEffect)
+        end
+    },
+    true
+)
+return ____exports

package/engine/object-data/entry/ability-type/disease-cloud.lua

@@ -54,10 +54,10 @@ __TS__SetDescriptor(
     "plagueWardUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Aplu")
+            return self:getObjectDataEntryNumericIdLevelField("Aplu")
         end,
         set = function(self, plagueWardUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Aplu", plagueWardUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Aplu", plagueWardUnitTypeId)
         end
     },
     true