warscript 0.0.1-dev.1bb9186 → 0.0.1-dev.1c7aecc

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

@@ -0,0 +1,52 @@
+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.WebAbilityType = __TS__Class()
+local WebAbilityType = ____exports.WebAbilityType
+WebAbilityType.name = "WebAbilityType"
+__TS__ClassExtends(WebAbilityType, AbilityType)
+WebAbilityType.BASE_ID = fourCC("Aweb")
+__TS__SetDescriptor(
+    WebAbilityType.prototype,
+    "airUnitLoweringDuration",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ens1")
+        end,
+        set = function(self, airUnitLoweringDuration)
+            self:setNumberLevelField("Ens1", airUnitLoweringDuration)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    WebAbilityType.prototype,
+    "airUnitHeight",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ens2")
+        end,
+        set = function(self, airUnitHeight)
+            self:setNumberLevelField("Ens2", airUnitHeight)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    WebAbilityType.prototype,
+    "meleeAttackRange",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ens3")
+        end,
+        set = function(self, meleeAttackRange)
+            self:setNumberLevelField("Ens3", meleeAttackRange)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -3,15 +3,15 @@ import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";
 import { AnimationName } from "../auxiliary/animation-name";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
-import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
+import { AttachmentPresetInput, EffectPresetWithParameters, EffectPresetWithParametersInput } from "../auxiliary/attachment-preset";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { Race } from "../auxiliary/race";
-import { SoundPresetName } from "../auxiliary/sound-preset-name";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
 import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { BuffTypeId } from "./buff-type";
 import { LightningTypeId } from "./lightning-type";
-export type AbilityTypeId = ObjectDataEntryId & {
+import { SoundPresetId } from "./sound-preset";
+export type AbilityTypeId = ObjectDataEntryId & number & {
     readonly __abilityTypeId: unique symbol;
 };
 export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId> {
@@ -27,11 +27,11 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set buttonPositionX(buttonPositionX: number);
     get buttonPositionY(): number;
     set buttonPositionY(buttonPositionY: number);
-    get casterCastingEffectPresets(): AttachmentPreset[];
-    set casterCastingEffectPresets(casterCastingEffectPresets: AttachmentPresetInput[]);
-    get casterChannelingEffectPresets(): AttachmentPreset[];
-    set casterChannelingEffectPresets(casterChannelingEffectPresets: AttachmentPresetInput[]);
-    get casterAttachmentPresets(): TupleOf<AttachmentPreset, 0 | 1 | 2>;
+    get casterCastingEffectPresets(): EffectPresetWithParameters[];
+    set casterCastingEffectPresets(casterCastingEffectPresets: EffectPresetWithParametersInput[]);
+    get casterChannelingEffectPresets(): EffectPresetWithParameters[];
+    set casterChannelingEffectPresets(casterChannelingEffectPresets: EffectPresetWithParametersInput[]);
+    get casterAttachmentPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2>;
     set casterAttachmentPresets(casterAttachmentPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2>);
     get effectModelPaths(): string[];
     set effectModelPaths(effectModelPaths: string[]);
@@ -63,15 +63,17 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set missileMovementArc(missileMovementArc: number);
     get missileMovementSpeed(): number;
     set missileMovementSpeed(missileMovementSpeed: number);
-    get specialAttachmentPreset(): AttachmentPreset | undefined;
+    get specialAttachmentPreset(): EffectPresetWithParameters | undefined;
     set specialAttachmentPreset(specialAttachmentPreset: AttachmentPresetInput | undefined);
-    get targetCastingEffectPresets(): AttachmentPreset[];
+    get targetCastingEffectPresets(): EffectPresetWithParameters[];
     set targetCastingEffectPresets(targetCastingEffectPresets: AttachmentPresetInput[]);
-    get targetEffectPresets(): TupleOf<AttachmentPreset, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    get targetChannelingEffectPresets(): EffectPresetWithParameters[];
+    set targetChannelingEffectPresets(targetChannelingEffectPresets: 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<AttachmentPreset, 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<AttachmentPreset, 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 turnOffButtonPositionX(): number;
     set turnOffButtonPositionX(buttonPositionX: number);
@@ -111,10 +113,12 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set turnOffTooltipText(turnOffTooltipText: ObjectDataEntryLevelFieldValueSupplier<string>);
     get turnOffTooltipExtendedText(): string[];
     set turnOffTooltipExtendedText(turnOffTooltipExtendedText: ObjectDataEntryLevelFieldValueSupplier<string>);
-    get soundPresetName(): SoundPresetName;
-    set soundPresetName(soundPresetName: SoundPresetName);
-    get loopingSoundPresetName(): SoundPresetName;
-    set loopingSoundPresetName(loopingSoundPresetName: SoundPresetName);
+    get casterEffectSoundPresetId(): SoundPresetId | undefined;
+    set casterEffectSoundPresetId(casterEffectSoundPresetId: SoundPresetId | undefined);
+    get casterEffectLoopingSoundPresetId(): SoundPresetId;
+    set casterEffectLoopingSoundPresetId(casterEffectLoopingSoundPresetId: SoundPresetId);
+    get targetEffectSoundPresetId(): SoundPresetId | undefined;
+    set targetEffectSoundPresetId(targetEffectSoundPresetId: SoundPresetId | undefined);
     get allowedTargetCombatClassifications(): CombatClassifications[];
     set allowedTargetCombatClassifications(allowedTargetCombatClassifications: ObjectDataEntryLevelFieldValueSupplier<CombatClassifications>);
     get areaOfEffect(): number[];

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

@@ -2,6 +2,7 @@ local ____lualib = require("lualib_bundle")
 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 ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
@@ -19,7 +20,7 @@ local mapIndexed = ____arrays.mapIndexed
 local ____attachment_2Dpreset = require("engine.object-data.auxiliary.attachment-preset")
 local extractAttachmentPresetInputModelPath = ____attachment_2Dpreset.extractAttachmentPresetInputModelPath
 local extractAttachmentPresetInputNodeFQN = ____attachment_2Dpreset.extractAttachmentPresetInputNodeFQN
-local toAttachmentPreset = ____attachment_2Dpreset.toAttachmentPreset
+local toEffectPreset = ____attachment_2Dpreset.toEffectPreset
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
 local stringArrayToCombatClassifications = ____combat_2Dclassification.stringArrayToCombatClassifications
@@ -33,11 +34,19 @@ local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.u
 local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 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 castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
 local casterChannelingEffectPresetsByAbilityTypeId = {}
 local targetCastingEffectPresetsByAbilityTypeId = {}
+local targetChannelingEffectPresetsByAbilityTypeId = {}
+local targetEffectSoundPresetByAbilityTypeId = {}
 ____exports.AbilityType = __TS__Class()
 local AbilityType = ____exports.AbilityType
 AbilityType.name = "AbilityType"
@@ -113,7 +122,7 @@ __TS__SetDescriptor(
             return casterCastingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, casterCastingEffectPresets)
-            casterCastingEffectPresetsByAbilityTypeId[self.id] = map(casterCastingEffectPresets, toAttachmentPreset)
+            casterCastingEffectPresetsByAbilityTypeId[self.id] = map(casterCastingEffectPresets, toEffectPreset)
         end
     },
     true
@@ -126,7 +135,7 @@ __TS__SetDescriptor(
             return casterChannelingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, casterChannelingEffectPresets)
-            casterChannelingEffectPresetsByAbilityTypeId[self.id] = map(casterChannelingEffectPresets, toAttachmentPreset)
+            casterChannelingEffectPresetsByAbilityTypeId[self.id] = map(casterChannelingEffectPresets, toEffectPreset)
         end
     },
     true
@@ -271,10 +280,10 @@ __TS__SetDescriptor(
     "lightningTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("alig")
+            return self:getObjectDataEntryNumericIdsField("alig")
         end,
         set = function(self, lightningTypeIds)
-            self:setObjectDataEntryIdsField("alig", lightningTypeIds)
+            self:setObjectDataEntryNumericIdsField("alig", lightningTypeIds)
         end
     },
     true
@@ -365,7 +374,20 @@ __TS__SetDescriptor(
             return targetCastingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, targetCastingEffectPresets)
-            targetCastingEffectPresetsByAbilityTypeId[self.id] = map(targetCastingEffectPresets, toAttachmentPreset)
+            targetCastingEffectPresetsByAbilityTypeId[self.id] = map(targetCastingEffectPresets, toEffectPreset)
+        end
+    },
+    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
@@ -508,7 +530,7 @@ __TS__SetDescriptor(
     "techTreeDependencies",
     {
         get = function(self)
-            local techTreeDependencyIds = self:getObjectDataEntryIdsField("areq")
+            local techTreeDependencyIds = self:getObjectDataEntryNumericIdsField("areq")
             local techTreeDependencyInternalLevels = self:getNumbersField("arqa")
             return mapIndexed(
                 techTreeDependencyIds,
@@ -528,7 +550,7 @@ __TS__SetDescriptor(
                 map(techTreeDependencies, extractTechTreeDependencyInputLevel),
                 function(techTreeDependencyLevel) return techTreeDependencyLevel + 1 end
             )
-            self:setObjectDataEntryIdsField("areq", techTreeDependencyIds)
+            self:setObjectDataEntryNumericIdsField("areq", techTreeDependencyIds)
             self:setNumbersField("arqa", techTreeDependencyInternalLevels)
         end
     },
@@ -718,26 +740,40 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "soundPresetName",
+    "casterEffectSoundPresetId",
     {
         get = function(self)
-            return self:getStringField("aefs")
+            local casterEffectSoundPresetId = self:getStringField("aefs")
+            return casterEffectSoundPresetId ~= "" and casterEffectSoundPresetId or nil
         end,
-        set = function(self, soundPresetName)
-            self:setStringField("aefs", soundPresetName)
+        set = function(self, casterEffectSoundPresetId)
+            self:setStringField("aefs", casterEffectSoundPresetId or "")
         end
     },
     true
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "loopingSoundPresetName",
+    "casterEffectLoopingSoundPresetId",
     {
         get = function(self)
             return self:getStringField("aefl")
         end,
-        set = function(self, loopingSoundPresetName)
-            self:setStringField("aefl", loopingSoundPresetName)
+        set = function(self, casterEffectLoopingSoundPresetId)
+            self:setStringField("aefl", casterEffectLoopingSoundPresetId)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetEffectSoundPresetId",
+    {
+        get = function(self)
+            return targetEffectSoundPresetByAbilityTypeId[self.id]
+        end,
+        set = function(self, targetEffectSoundPresetId)
+            targetEffectSoundPresetByAbilityTypeId[self.id] = targetEffectSoundPresetId
         end
     },
     true
@@ -796,10 +832,10 @@ __TS__SetDescriptor(
     "buffTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsLevelField("abuf")
+            return self:getObjectDataEntryNumericIdsLevelField("abuf")
         end,
         set = function(self, buffTypeIds)
-            self:setObjectDataEntryIdsLevelField("abuf", buffTypeIds)
+            self:setObjectDataEntryNumericIdsLevelField("abuf", buffTypeIds)
         end
     },
     true
@@ -848,10 +884,10 @@ __TS__SetDescriptor(
     "effectBuffTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsLevelField("aeff")
+            return self:getObjectDataEntryNumericIdsLevelField("aeff")
         end,
         set = function(self, effectBuffTypeIds)
-            self:setObjectDataEntryIdsLevelField("aeff", effectBuffTypeIds)
+            self:setObjectDataEntryNumericIdsLevelField("aeff", effectBuffTypeIds)
         end
     },
     true
@@ -959,13 +995,38 @@ 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
     )
 end
+for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEffectSoundPresetByAbilityTypeId end)) do
+    if soundPresetId ~= nil then
+        Unit.abilityWidgetTargetChannelingStartEvent[abilityTypeId]:addListener(
+            4,
+            function(caster, ability, target)
+                if __TS__InstanceOf(target, Unit) then
+                    Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, target)
+                else
+                    Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, target.x, target.y)
+                end
+            end
+        )
+        Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(
+            4,
+            function(caster, ability, x, y)
+                Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, x, y)
+            end
+        )
+    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,
@@ -978,10 +1039,17 @@ local casterCastingEffectAttachmentPointsByAbilityTypeId = postcompile(function(
         function(casterCastingEffectPresets) return map(casterCastingEffectPresets, extractAttachmentPresetInputNodeFQN) end
     )
 end)
+local casterCastingEffectParametersByAbilityTypeId = postcompile(function()
+    return mapValues(
+        casterCastingEffectPresetsByAbilityTypeId,
+        function(casterCastingEffectPresets) return map(casterCastingEffectPresets, "parameters") end
+    )
+end)
 local casterCastingEffectsByCaster = {}
 local function handleAbilityCastingStartEvent(caster, ability)
     local effectModelPaths = casterCastingEffectModelPathsByAbilityTypeId[ability.typeId]
     local attachmentPoints = casterCastingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = casterCastingEffectParametersByAbilityTypeId[ability.typeId]
     local effects = {}
     if effectModelPaths ~= nil then
         for i = 1, #effectModelPaths do
@@ -990,7 +1058,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
             if attachmentPoint == nil or attachmentPoint == "" then
                 attachmentPoint = "origin"
             end
-            effects[i] = Effect:createTarget(effectModelPath, caster, attachmentPoint)
+            effects[i] = Effect:create(effectModelPath, caster, attachmentPoint, parameters and parameters[i])
         end
     end
     casterCastingEffectsByCaster[caster] = effects
@@ -1021,10 +1089,17 @@ local casterChannelingEffectAttachmentPointsByAbilityTypeId = postcompile(functi
         function(casterChannelingEffectPresets) return map(casterChannelingEffectPresets, extractAttachmentPresetInputNodeFQN) end
     )
 end)
+local casterChannelingEffectParametersByAbilityTypeId = postcompile(function()
+    return mapValues(
+        casterChannelingEffectPresetsByAbilityTypeId,
+        function(casterChannelingEffectPresets) return map(casterChannelingEffectPresets, "parameters") end
+    )
+end)
 local casterChannelingEffectsByCaster = {}
 local function handleAbilityChannelingStartEvent(caster, ability)
     local effectModelPaths = casterChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
     local attachmentPoints = casterChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = casterChannelingEffectParametersByAbilityTypeId[ability.typeId]
     local effects = {}
     if effectModelPaths ~= nil then
         for i = 1, #effectModelPaths do
@@ -1033,23 +1108,89 @@ local function handleAbilityChannelingStartEvent(caster, ability)
             if attachmentPoint == nil or attachmentPoint == "" then
                 attachmentPoint = "origin"
             end
-            effects[i] = Effect:createTarget(effectModelPath, caster, attachmentPoint)
+            effects[i] = Effect:create(effectModelPath, caster, attachmentPoint, parameters and parameters[i])
         end
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
+local targetChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, extractAttachmentPresetInputModelPath) end
+    )
+end)
+local targetChannelingEffectAttachmentPointsByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, extractAttachmentPresetInputNodeFQN) end
+    )
+end)
+local targetChannelingEffectParametersByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, "parameters") end
+    )
+end)
+local targetChannelingEffectsByCaster = {}
+local function handleAbilityWidgetTargetChannelingStartEvent(caster, ability, target)
+    local effectModelPaths = targetChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
+    local attachmentPoints = targetChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = targetChannelingEffectParametersByAbilityTypeId[ability.typeId]
+    local effects = {}
+    if effectModelPaths ~= nil then
+        for i = 1, #effectModelPaths do
+            local effectModelPath = effectModelPaths[i]
+            local attachmentPoint = attachmentPoints and attachmentPoints[i]
+            if attachmentPoint == nil or attachmentPoint == "" then
+                attachmentPoint = "origin"
+            end
+            effects[i] = Effect:create(effectModelPath, target, attachmentPoint, parameters and parameters[i])
+        end
+    end
+    targetChannelingEffectsByCaster[caster] = effects
+end
+local function handleAbilityPointTargetChannelingStartEvent(caster, ability, x, y)
+    local effectModelPaths = targetChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
+    local attachmentPoints = targetChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = targetChannelingEffectParametersByAbilityTypeId[ability.typeId]
+    local effects = {}
+    if effectModelPaths ~= nil then
+        for i = 1, #effectModelPaths do
+            local effectModelPath = effectModelPaths[i]
+            local attachmentPoint = attachmentPoints and attachmentPoints[i]
+            if attachmentPoint == nil or attachmentPoint == "" then
+                attachmentPoint = "origin"
+            end
+            effects[i] = Effect:create(effectModelPath, x, y, parameters and parameters[i])
+        end
+    end
+    targetChannelingEffectsByCaster[caster] = effects
+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(targetChannelingEffectModelPathsByAbilityTypeId) 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

package/engine/object-data/entry/buff-type/applicable.lua

@@ -10,8 +10,8 @@ local ____exports = {}
 local preparePhysicalPositiveApplicatorAbility
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
-local ____cripple = require("engine.object-data.entry.ability-type.cripple")
-local CrippleAbilityType = ____cripple.CrippleAbilityType
+local ____curse = require("engine.object-data.entry.ability-type.curse")
+local CurseAbilityType = ____curse.CurseAbilityType
 local ____searing_2Darrows = require("engine.object-data.entry.ability-type.searing-arrows")
 local SearingArrowsAbilityType = ____searing_2Darrows.SearingArrowsAbilityType
 local ____slow_2Dpoison = require("engine.object-data.entry.ability-type.slow-poison")
@@ -30,7 +30,6 @@ local ____arrays = require("utility.arrays")
 local chunked = ____arrays.chunked
 local map = ____arrays.map
 local max = ____arrays.max
-local toLuaSet = ____arrays.toLuaSet
 local ____blood_2Dlust = require("engine.object-data.entry.ability-type.blood-lust")
 local BloodLustAbilityType = ____blood_2Dlust.BloodLustAbilityType
 local ____berserk = require("engine.object-data.entry.ability-type.berserk")
@@ -43,22 +42,11 @@ local ____permanent_2Dimmolation = require("engine.object-data.entry.ability-typ
 local PermanentImmolationAbilityType = ____permanent_2Dimmolation.PermanentImmolationAbilityType
 local ____cast_2Dability = require("engine.internal.mechanics.cast-ability")
 local castAbility = ____cast_2Dability.castAbility
-local createItem = CreateItem
-local getAbilityId = BlzGetAbilityId
-local getItemAbility = BlzGetItemAbility
-local getOwningPlayer = GetOwningPlayer
-local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
-local itemAddAbility = BlzItemAddAbility
-local removeItem = RemoveItem
 local setAbilityIntegerField = BlzSetAbilityIntegerField
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
-local setItemBooleanField = BlzSetItemBooleanField
 local setPlayerTechResearched = SetPlayerTechResearched
 local unitAddAbility = UnitAddAbility
-local unitAddItem = UnitAddItem
 local unitDisableAbility = BlzUnitDisableAbility
-local unitDropItemSlot = UnitDropItemSlot
-local unitInventorySize = UnitInventorySize
 local unitRemoveAbility = UnitRemoveAbility
 local compiletimeApplicableBuffTypes = {}
 ____exports.ApplicableBuffType = __TS__Class()
@@ -86,7 +74,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
         abilityType.buttonPositionY = -11
         abilityType.casterAttachmentPresets = {}
         abilityType.targetEffectPresets = {}
-        abilityType.soundPresetName = ""
+        abilityType.casterEffectSoundPresetId = nil
         abilityType.learnLevelMinimum = 6
         abilityType.race = "other"
         abilityType.shouldCheckTechTreeDependencies = false
@@ -113,12 +101,10 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
         local applicatorAbilityTypeIdByApplicatorType = {}
         if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
             if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CrippleAbilityType, applicableBuffType)
-                applicatorAbilityType.movementSpeedDecreaseFactor = 0
-                applicatorAbilityType.attackSpeedDecreaseFactor = 0
-                applicatorAbilityType.damageDecreaseFactor = 0
+                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                applicatorAbilityType.missProbability = 0
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852189] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
             end
             if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
                 local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
@@ -135,6 +121,10 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 applicatorAbilityType.damagePerSecond = 0
                 applicatorAbilityType.movementSpeedDecreaseFactor = 0
                 applicatorAbilityType.attackSpeedDecreaseFactor = 0
+                applicatorAbilityType.isDamageStacking = false
+                applicatorAbilityType.isMovementSpeedFactorStacking = false
+                applicatorAbilityType.isAttackSpeedFactorStacking = false
+                applicatorAbilityType.isAbleToKill = false
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
                 applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
             end
@@ -142,6 +132,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
                 applicatorAbilityType.attackSpeedIncreaseFactor = 0
                 applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                applicatorAbilityType.receivedDamageIncreaseFactor = 0
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
                 if applicatorAbilityType.levelCount > 1 then
                     multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType
@@ -204,15 +195,6 @@ local EVASION_ABILITY_TYPE_IDS = postcompile(function()
         "AIcs"
     }, fourCC))
 end)
-local INVENTORY_ABILITY_TYPE_IDS = postcompile(function()
-    return toLuaSet(AbilityType:getAllIdsByBaseIds(map({
-        "AInv",
-        "Aihn",
-        "Aien",
-        "Aion",
-        "Aiun"
-    }, fourCC)))
-end)
 local SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
     local abilityType = SearingArrowsAbilityType:create()
     abilityType.isInternal = true
@@ -244,8 +226,8 @@ Unit.abilityCastingStartEvent[SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID]:addListener(
 )
 ---
 -- @internal For use by internal systems only.
-____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, movementSpeedIncreaseFactor)
-    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852189 or 852173) or 0)
+____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, missProbability)
+    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852190 or 852173) or 0)
     local ____opt_1 = applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffTypeId]
     local applicatorAbilityTypeId = ____opt_1 and ____opt_1[applicatorType]
     if applicatorAbilityTypeId == nil then
@@ -267,8 +249,7 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             applicatorAbilityTypeId,
             preparePhysicalPositiveApplicatorAbility,
             level,
-            duration or 0,
-            movementSpeedIncreaseFactor
+            duration or 0
         )
         if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
@@ -298,6 +279,9 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             ability:setField(ABILITY_RLF_DURATION_HERO, level, actualDuration)
             ability:setField(ABILITY_IF_PRIORITY, spellStealPriority or 0)
             ability:setField(ABILITY_IF_REQUIRED_LEVEL, learnLevelMinimum or 6)
+            if missProbability ~= nil and applicatorType == 852190 then
+                ability:setField(ABILITY_RLF_CHANCE_TO_MISS_CRS, missProbability)
+            end
         end,
         applicatorType,
         unit
@@ -309,16 +293,13 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
     end
     return success
 end
-preparePhysicalPositiveApplicatorAbility = function(ability, level, duration, movementSpeedIncreaseFactor)
+preparePhysicalPositiveApplicatorAbility = function(ability, level, duration)
     if level == nil then
         setAbilityIntegerField(ability, ABILITY_IF_LEVELS, 1)
         level = 1
     end
     setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_NORMAL, level, duration)
     setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_HERO, level, duration)
-    if movementSpeedIncreaseFactor ~= nil then
-        setAbilityRealLevelField(ability, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
-    end
 end
 ---
 -- @internal For use by internal systems only.