warscript 0.0.1-dev.0fdd287 → 0.0.1-dev.10e558e

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

@@ -3,17 +3,18 @@ import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";
 import { AnimationName } from "../auxiliary/animation-name";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
-import { AttachmentPresetInput, EffectPresetWithParameters, EffectPresetWithParametersInput } from "../auxiliary/attachment-preset";
+import { AttachmentPoint, AttachmentPointInput, AttachmentPresetInput, EffectPresetWithParameters, EffectPresetWithParametersInput } from "../auxiliary/attachment-preset";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { Race } from "../auxiliary/race";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
-import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
+import { ObjectDataEntry, CustomObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { BuffTypeId } from "./buff-type";
 import { LightningTypeId } from "./lightning-type";
 import { SoundPresetId } from "./sound-preset";
-export type AbilityTypeId = ObjectDataEntryId & number & {
+import { StandardAbilityTypeId } from "../../standard/entries/ability-type";
+export type AbilityTypeId = (CustomObjectDataEntryId & number & {
     readonly __abilityTypeId: unique symbol;
-};
+}) | StandardAbilityTypeId;
 export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId> {
     private static readonly idGenerator;
     protected static generateId(): number;
@@ -35,12 +36,20 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set casterAttachmentPresets(casterAttachmentPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2>);
     get effectModelPaths(): string[];
     set effectModelPaths(effectModelPaths: string[]);
+    get effectModelPathsSD(): string[];
+    set effectModelPathsSD(effectModelPathsSD: string[]);
+    get effectModelPathsHD(): string[];
+    set effectModelPathsHD(effectModelPathsHD: string[]);
+    get effectModelPathsDE(): string[];
+    set effectModelPathsDE(effectModelPathsDE: string[]);
     get iconPath(): string;
     set iconPath(iconPath: string);
     get iconPathSD(): string;
     set iconPathSD(iconPathSD: string);
     get iconPathHD(): string;
     set iconPathHD(iconPathHD: string);
+    get iconPathDE(): string;
+    set iconPathDE(iconPathDE: string);
     get isButtonVisible(): boolean;
     set isButtonVisible(isButtonVisible: boolean);
     get isMissileHoming(): boolean;
@@ -59,20 +68,36 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set missileModelPathSD(missileModelPathSD: string);
     get missileModelPathHD(): string;
     set missileModelPathHD(missileModelPathHD: string);
+    get missileModelPathDE(): string;
+    set missileModelPathDE(missileModelPathDE: string);
     get missileMovementArc(): number;
     set missileMovementArc(missileMovementArc: number);
     get missileMovementSpeed(): number;
     set missileMovementSpeed(missileMovementSpeed: number);
-    get specialAttachmentPreset(): EffectPresetWithParameters | undefined;
-    set specialAttachmentPreset(specialAttachmentPreset: AttachmentPresetInput | undefined);
+    /** Model paths of the special art (`asat`); Flame Strike, for one, uses three. */
+    get specialEffectModelPaths(): string[];
+    set specialEffectModelPaths(specialEffectModelPaths: string[]);
+    /** Where the special art attaches (`aspt`), shared by all its models. */
+    get specialEffectAttachmentPoint(): AttachmentPoint;
+    set specialEffectAttachmentPoint(specialEffectAttachmentPoint: AttachmentPointInput);
     get targetCastingEffectPresets(): EffectPresetWithParameters[];
     set targetCastingEffectPresets(targetCastingEffectPresets: AttachmentPresetInput[]);
+    get targetChannelingEffectPresets(): EffectPresetWithParameters[];
+    set targetChannelingEffectPresets(targetChannelingEffectPresets: EffectPresetWithParametersInput[]);
+    get targetChannelingEffectPresetsSD(): EffectPresetWithParameters[];
+    set targetChannelingEffectPresetsSD(targetChannelingEffectPresetsSD: EffectPresetWithParametersInput[]);
+    get targetChannelingEffectPresetsHD(): EffectPresetWithParameters[];
+    set targetChannelingEffectPresetsHD(targetChannelingEffectPresetsHD: EffectPresetWithParametersInput[]);
+    get targetChannelingEffectPresetsDE(): EffectPresetWithParameters[];
+    set targetChannelingEffectPresetsDE(targetChannelingEffectPresetsDE: EffectPresetWithParametersInput[]);
     get targetEffectPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresets(targetEffectPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
     get targetEffectPresetsSD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresetsSD(targetEffectPresetsSD: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
     get targetEffectPresetsHD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresetsHD(targetEffectPresetsHD: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
+    get targetEffectPresetsDE(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    set targetEffectPresetsDE(targetEffectPresetsDE: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
     get turnOffButtonPositionX(): number;
     set turnOffButtonPositionX(buttonPositionX: number);
     get turnOffButtonPositionY(): number;

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

@@ -3,6 +3,7 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
+local __TS__ArraySome = ____lualib.__TS__ArraySome
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
@@ -18,8 +19,10 @@ local array = ____arrays.array
 local map = ____arrays.map
 local mapIndexed = ____arrays.mapIndexed
 local ____attachment_2Dpreset = require("engine.object-data.auxiliary.attachment-preset")
+local attachmentPointToNodeFQN = ____attachment_2Dpreset.attachmentPointToNodeFQN
 local extractAttachmentPresetInputModelPath = ____attachment_2Dpreset.extractAttachmentPresetInputModelPath
 local extractAttachmentPresetInputNodeFQN = ____attachment_2Dpreset.extractAttachmentPresetInputNodeFQN
+local splitAttachmentNodeFQN = ____attachment_2Dpreset.splitAttachmentNodeFQN
 local toEffectPreset = ____attachment_2Dpreset.toEffectPreset
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
@@ -35,13 +38,22 @@ local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilit
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local ____sound = require("core.types.sound")
+local isSoundLabelCustom = ____sound.isSoundLabelCustom
 local Sound3D = ____sound.Sound3D
 local SoundSettings = ____sound.SoundSettings
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
+local ____local_2Dclient = require("engine.local-client")
+local LocalClient = ____local_2Dclient.LocalClient
 local castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
 local casterChannelingEffectPresetsByAbilityTypeId = {}
 local targetCastingEffectPresetsByAbilityTypeId = {}
+local targetChannelingEffectPresetsByAbilityTypeId = {}
+local targetChannelingEffectPresetsSDByAbilityTypeId = {}
+local targetChannelingEffectPresetsHDByAbilityTypeId = {}
+local targetChannelingEffectPresetsDEByAbilityTypeId = {}
 local targetEffectSoundPresetByAbilityTypeId = {}
 ____exports.AbilityType = __TS__Class()
 local AbilityType = ____exports.AbilityType
@@ -162,6 +174,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "effectModelPathsSD",
+    {
+        get = function(self)
+            return self:getStringsField("aeat:sd")
+        end,
+        set = function(self, effectModelPathsSD)
+            self:setStringsField("aeat:sd", effectModelPathsSD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "effectModelPathsHD",
+    {
+        get = function(self)
+            return self:getStringsField("aeat:hd")
+        end,
+        set = function(self, effectModelPathsHD)
+            self:setStringsField("aeat:hd", effectModelPathsHD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "effectModelPathsDE",
+    {
+        get = function(self)
+            return self:getStringsField("aeat:de")
+        end,
+        set = function(self, effectModelPathsDE)
+            self:setStringsField("aeat:de", effectModelPathsDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "iconPath",
@@ -201,6 +252,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "iconPathDE",
+    {
+        get = function(self)
+            return self:getStringField("aart:de")
+        end,
+        set = function(self, iconPathDE)
+            self:setStringField("aart:de", iconPathDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "isButtonVisible",
@@ -323,6 +387,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "missileModelPathDE",
+    {
+        get = function(self)
+            return self:getStringField("amat:de")
+        end,
+        set = function(self, missileModelPathDE)
+            self:setStringField("amat:de", missileModelPathDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "missileMovementArc",
@@ -351,13 +428,30 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "specialAttachmentPreset",
+    "specialEffectModelPaths",
+    {
+        get = function(self)
+            return self:getStringsField("asat")
+        end,
+        set = function(self, specialEffectModelPaths)
+            self:setStringsField("asat", specialEffectModelPaths)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "specialEffectAttachmentPoint",
     {
         get = function(self)
-            return self:getAttachmentPresetField("asat", "aspt")
+            local nodeName, nodeQualifiers = splitAttachmentNodeFQN(self:getStringField("aspt"))
+            return {nodeName = nodeName, nodeQualifiers = nodeQualifiers}
         end,
-        set = function(self, specialAttachmentPreset)
-            self:setAttachmentPresetField("asat", "aspt", specialAttachmentPreset)
+        set = function(self, specialEffectAttachmentPoint)
+            self:setStringField(
+                "aspt",
+                attachmentPointToNodeFQN(specialEffectAttachmentPoint)
+            )
         end
     },
     true
@@ -375,6 +469,58 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetChannelingEffectPresets",
+    {
+        get = function(self)
+            return targetChannelingEffectPresetsByAbilityTypeId[self.id] or ({})
+        end,
+        set = function(self, targetChannelingEffectPresets)
+            targetChannelingEffectPresetsByAbilityTypeId[self.id] = map(targetChannelingEffectPresets, toEffectPreset)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetChannelingEffectPresetsSD",
+    {
+        get = function(self)
+            return targetChannelingEffectPresetsSDByAbilityTypeId[self.id] or self.targetChannelingEffectPresets
+        end,
+        set = function(self, targetChannelingEffectPresetsSD)
+            targetChannelingEffectPresetsSDByAbilityTypeId[self.id] = map(targetChannelingEffectPresetsSD, toEffectPreset)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetChannelingEffectPresetsHD",
+    {
+        get = function(self)
+            return targetChannelingEffectPresetsHDByAbilityTypeId[self.id] or self.targetChannelingEffectPresets
+        end,
+        set = function(self, targetChannelingEffectPresetsHD)
+            targetChannelingEffectPresetsHDByAbilityTypeId[self.id] = map(targetChannelingEffectPresetsHD, toEffectPreset)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetChannelingEffectPresetsDE",
+    {
+        get = function(self)
+            return targetChannelingEffectPresetsDEByAbilityTypeId[self.id] or self.targetChannelingEffectPresets
+        end,
+        set = function(self, targetChannelingEffectPresetsDE)
+            targetChannelingEffectPresetsDEByAbilityTypeId[self.id] = map(targetChannelingEffectPresetsDE, toEffectPreset)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "targetEffectPresets",
@@ -456,6 +602,33 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetEffectPresetsDE",
+    {
+        get = function(self)
+            return self:getAttachmentPresetListField(
+                "atat:de",
+                array(
+                    6,
+                    function(i) return ("ata" .. tostring(i)) .. ":de" end
+                )
+            )
+        end,
+        set = function(self, targetEffectPresetsDE)
+            self:setAttachmentPresetListField(
+                "atat:de",
+                array(
+                    6,
+                    function(i) return ("ata" .. tostring(i)) .. ":de" end
+                ),
+                "atac:de",
+                targetEffectPresetsDE
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "turnOffButtonPositionX",
@@ -978,9 +1151,7 @@ for abilityTypeId, animationFQN in pairs(postcompile(function() return castAnima
         4,
         function(caster, ability)
             if ability:getField(ABILITY_RLF_CASTING_TIME) ~= 0 then
-                Timer:run(function()
-                    caster:playAnimation(animationFQN)
-                end)
+                Timer:run(caster, "playAnimation", animationFQN)
             end
         end
     )
@@ -1005,6 +1176,13 @@ for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEf
         )
     end
 end
+local unsupportedEffectSoundAbilityTypeIds = luaSetOf(fourCC("AAns"))
+Unit.abilityChannelingStartEvent:addListener(function(caster, ability)
+    local soundPresetId = ability:getField(ABILITY_SF_EFFECT_SOUND)
+    if isSoundLabelCustom(soundPresetId) or soundPresetId ~= "" and unsupportedEffectSoundAbilityTypeIds[ability.parentTypeId] ~= nil then
+        Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
+    end
+end)
 local casterCastingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
         casterCastingEffectPresetsByAbilityTypeId,
@@ -1091,18 +1269,123 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
+local targetChannelingEffectsDataByAbilityTypeId = postcompile(function()
+    local function toData(presets)
+        if presets == nil then
+            return nil
+        end
+        local attachmentPoints = map(presets, extractAttachmentPresetInputNodeFQN)
+        local parameters = map(presets, "parameters")
+        return {
+            modelPaths = map(presets, extractAttachmentPresetInputModelPath),
+            attachmentPoints = __TS__ArraySome(
+                attachmentPoints,
+                function(____, attachmentPoint) return attachmentPoint ~= "" end
+            ) and attachmentPoints or nil,
+            parameters = __TS__ArraySome(
+                presets,
+                function(____, preset) return preset.parameters ~= nil end
+            ) and parameters or nil
+        }
+    end
+    local abilityTypeIds = {}
+    for ____, presetsByAbilityTypeId in ipairs({targetChannelingEffectPresetsByAbilityTypeId, targetChannelingEffectPresetsSDByAbilityTypeId, targetChannelingEffectPresetsHDByAbilityTypeId, targetChannelingEffectPresetsDEByAbilityTypeId}) do
+        for abilityTypeId in pairs(presetsByAbilityTypeId) do
+            abilityTypeIds[abilityTypeId] = true
+        end
+    end
+    local result = {}
+    for abilityTypeId in pairs(abilityTypeIds) do
+        local presets = targetChannelingEffectPresetsByAbilityTypeId[abilityTypeId]
+        local presetsSD = targetChannelingEffectPresetsSDByAbilityTypeId[abilityTypeId]
+        local presetsHD = targetChannelingEffectPresetsHDByAbilityTypeId[abilityTypeId]
+        local presetsDE = targetChannelingEffectPresetsDEByAbilityTypeId[abilityTypeId]
+        local ____math_max_8 = math.max
+        local ____opt_0 = presetsSD or presets
+        local ____temp_6 = ____opt_0 and #____opt_0 or 0
+        local ____opt_2 = presetsHD or presets
+        local ____temp_7 = ____opt_2 and #____opt_2 or 0
+        local ____opt_4 = presetsDE or presets
+        result[abilityTypeId] = {
+            effectCount = ____math_max_8(____temp_6, ____temp_7, ____opt_4 and #____opt_4 or 0),
+            data = toData(presets),
+            dataSD = toData(presetsSD),
+            dataHD = toData(presetsHD),
+            dataDE = toData(presetsDE)
+        }
+    end
+    return result
+end)
+local targetChannelingEffectsByCaster = {}
+local function createTargetChannelingEffects(caster, abilityTypeId, xOrWidget, y)
+    local effectsData = targetChannelingEffectsDataByAbilityTypeId[abilityTypeId]
+    if effectsData == nil then
+        return
+    end
+    local graphicsMode = LocalClient.graphicsMode
+    local ____temp_10
+    if graphicsMode == 0 then
+        ____temp_10 = effectsData.dataSD
+    else
+        local ____temp_9
+        if graphicsMode == 1 then
+            ____temp_9 = effectsData.dataHD
+        else
+            ____temp_9 = effectsData.dataDE
+        end
+        ____temp_10 = ____temp_9
+    end
+    local data = ____temp_10 or effectsData.data
+    local modelPaths = data and data.modelPaths
+    local attachmentPoints = data and data.attachmentPoints
+    local parameters = data and data.parameters
+    local effects = {}
+    for i = 1, effectsData.effectCount do
+        local effectModelPath = modelPaths and modelPaths[i] or ""
+        local effectParameters = parameters and parameters[i]
+        if type(xOrWidget) == "number" then
+            effects[i] = Effect:create(effectModelPath, xOrWidget, y, effectParameters)
+        else
+            local attachmentPoint = attachmentPoints and attachmentPoints[i]
+            if attachmentPoint == nil or attachmentPoint == "" then
+                attachmentPoint = "origin"
+            end
+            effects[i] = Effect:create(effectModelPath, xOrWidget, attachmentPoint, effectParameters)
+        end
+    end
+    targetChannelingEffectsByCaster[caster] = effects
+end
+local function handleAbilityWidgetTargetChannelingStartEvent(caster, ability, target)
+    createTargetChannelingEffects(caster, ability.typeId, target)
+end
+local function handleAbilityPointTargetChannelingStartEvent(caster, ability, x, y)
+    createTargetChannelingEffects(caster, ability.typeId, x, y)
+end
 local function handleAbilityStopChannelingEvent(caster)
-    local effects = casterChannelingEffectsByCaster[caster]
-    if effects ~= nil then
-        for i = 1, #effects do
-            effects[i]:destroy()
+    local casterEffects = casterChannelingEffectsByCaster[caster]
+    if casterEffects ~= nil then
+        for i = 1, #casterEffects do
+            casterEffects[i]:destroy()
         end
         casterChannelingEffectsByCaster[caster] = nil
     end
+    local targetEffects = targetChannelingEffectsByCaster[caster]
+    if targetEffects ~= nil then
+        for i = 1, #targetEffects do
+            targetEffects[i]:destroy()
+        end
+        targetChannelingEffectsByCaster[caster] = nil
+    end
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
     Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
     Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
+for abilityTypeId in pairs(targetChannelingEffectsDataByAbilityTypeId) do
+    Unit.abilityWidgetTargetChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityWidgetTargetChannelingStartEvent)
+    Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityPointTargetChannelingStartEvent)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+end
 return ____exports