warscript 0.0.1-dev.9c98c3a → 0.0.1-dev.9d07b64

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
@@ -40,11 +43,17 @@ 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
@@ -141,13 +150,13 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "casterAttachmentPresets",
+    "casterEffectPresets",
     {
         get = function(self)
             return self:getAttachmentPresetListField("acat", {"acap", "aca1"})
         end,
-        set = function(self, casterAttachmentPresets)
-            self:setAttachmentPresetListField("acat", {"acap", "aca1"}, "acac", casterAttachmentPresets)
+        set = function(self, casterEffectPresets)
+            self:setAttachmentPresetListField("acat", {"acap", "aca1"}, "acac", casterEffectPresets)
         end
     },
     true
@@ -165,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",
@@ -204,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",
@@ -326,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",
@@ -354,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
@@ -378,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",
@@ -459,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",
@@ -1099,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

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

@@ -65,123 +65,127 @@ function ApplicableBuffType.wrap(self, other)
     return __TS__New(____exports.ApplicableBuffType, other.object)
 end
 ApplicableBuffType.BASE_ID = fourCC("BHbz")
-local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(postcompile(function()
-    local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
-        local abilityType = abilityTypeConstructor:create()
-        abilityType.isInternal = true
-        abilityType.levelCount = applicableBuffType.levelCount
-        abilityType.buttonPositionX = 0
-        abilityType.buttonPositionY = -11
-        abilityType.casterAttachmentPresets = {}
-        abilityType.targetEffectPresets = {}
-        abilityType.casterEffectSoundPresetId = nil
-        abilityType.learnLevelMinimum = 6
-        abilityType.race = "other"
-        abilityType.shouldCheckTechTreeDependencies = false
-        abilityType.techTreeDependencies = {}
-        abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
-            4,
-            2,
-            2097152,
-            8,
-            1048576,
-            16
-        )
-        abilityType.areaOfEffect = 0
-        abilityType.castRange = 999999
-        abilityType.cooldown = 0
-        abilityType.manaCost = 0
-        abilityType.buffDuration = 0
-        abilityType.heroBuffDuration = 0
-        return abilityType
-    end
-    local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
-    local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
-    for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
-        local applicatorAbilityTypeIdByApplicatorType = {}
-        if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
-                applicatorAbilityType.missProbability = 0
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(
+    postcompile(function()
+        local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
+            local abilityType = abilityTypeConstructor:create()
+            abilityType.isInternal = true
+            abilityType.levelCount = applicableBuffType.levelCount
+            abilityType.buttonPositionX = 0
+            abilityType.buttonPositionY = -11
+            abilityType.casterEffectPresets = {}
+            abilityType.targetEffectPresets = {}
+            abilityType.casterEffectSoundPresetId = nil
+            abilityType.learnLevelMinimum = 6
+            abilityType.race = "other"
+            abilityType.shouldCheckTechTreeDependencies = false
+            abilityType.techTreeDependencies = {}
+            abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
+                4,
+                2,
+                2097152,
+                8,
+                1048576,
+                16
+            )
+            abilityType.areaOfEffect = 0
+            abilityType.castRange = 999999
+            abilityType.cooldown = 0
+            abilityType.manaCost = 0
+            abilityType.buffDuration = 0
+            abilityType.heroBuffDuration = 0
+            return abilityType
+        end
+        local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
+        local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
+        for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
+            local applicatorAbilityTypeIdByApplicatorType = {}
+            if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                    applicatorAbilityType.missProbability = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+                end
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
+                    applicatorAbilityType.attackSpeedIncreaseFactor = 0
+                    applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                    applicatorAbilityType.scaleIncrease = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                end
             end
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
-                applicatorAbilityType.attackSpeedIncreaseFactor = 0
-                applicatorAbilityType.movementSpeedIncreaseFactor = 0
-                applicatorAbilityType.scaleIncrease = 0
+            if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
+                    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
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    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
+                    end
+                    applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+                end
+            end
+            if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
+                local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
+                applicatorAbilityType.levelCount = 1
+                applicatorAbilityType.damagePerInterval = 0
+                applicatorAbilityType.castRange = 0
+                applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
             end
+            applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
         end
-        if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
-                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
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                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
+        local applicatorUpgradeIds = {}
+        local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
+        for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
+            local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
+            local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
+            local applicatorUpgrade = BlankUpgrade:create()
+            applicatorUpgrade.isInternal = true
+            applicatorUpgrade.levelCount = maxLevelCount - 1
+            applicatorUpgrade.effects = map(
+                applicatorAbilityTypeIds,
+                function(applicatorAbilityTypeId)
+                    return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
                 end
-                applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+            )
+            applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
+            for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
+                applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
             end
         end
-        if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
-            local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
-            applicatorAbilityType.levelCount = 1
-            applicatorAbilityType.damagePerInterval = 0
-            applicatorAbilityType.castRange = 0
-            applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
-            applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-            applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
+        for ____, unitType in ipairs(UnitType:getAll()) do
+            local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
+            __TS__SparseArrayPush(
+                ____array_0,
+                table.unpack(applicatorUpgradeIds)
+            )
+            unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
         end
-        applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
-    end
-    local applicatorUpgradeIds = {}
-    local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
-    for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
-        local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
-        local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
-        local applicatorUpgrade = BlankUpgrade:create()
-        applicatorUpgrade.isInternal = true
-        applicatorUpgrade.levelCount = maxLevelCount - 1
-        applicatorUpgrade.effects = map(
-            applicatorAbilityTypeIds,
-            function(applicatorAbilityTypeId)
-                return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
-            end
-        )
-        applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
-        for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
-            applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
-        end
-    end
-    for ____, unitType in ipairs(UnitType:getAll()) do
-        local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
-        __TS__SparseArrayPush(
-            ____array_0,
-            table.unpack(applicatorUpgradeIds)
-        )
-        unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
-    end
-    return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
-end))
+        return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
+    end),
+    1,
+    2
+)
 local EVASION_ABILITY_TYPE_IDS = postcompile(function()
     return AbilityType:getAllIdsByBaseIds(map({
         "AEev",
@@ -301,14 +305,21 @@ preparePhysicalPositiveApplicatorAbility = function(ability, level, duration)
     setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_NORMAL, level, duration)
     setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_HERO, level, duration)
 end
----
+--- Removes the ability that keeps a hidden buff on the unit. A leftover applicator
+-- makes the next hidden application fail, since the unit already has the ability.
+-- 
 -- @internal For use by internal systems only.
-____exports.removeBuff = function(unit, applicableBuffTypeId)
+____exports.removeBuffApplicator = function(unit, applicableBuffTypeId)
     local ____opt_3 = applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffTypeId]
     local applicatorAbilityTypeId = ____opt_3 and ____opt_3[0]
     if applicatorAbilityTypeId ~= nil then
         unitRemoveAbility(unit, applicatorAbilityTypeId)
     end
+end
+---
+-- @internal For use by internal systems only.
+____exports.removeBuff = function(unit, applicableBuffTypeId)
+    ____exports.removeBuffApplicator(unit, applicableBuffTypeId)
     return unitRemoveAbility(unit, applicableBuffTypeId)
 end
 return ____exports