warscript 0.0.1-dev.4414935 → 0.0.1-dev.459629d

package/engine/local-client.lua

@@ -1,10 +1,11 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
-local __TS__New = ____lualib.__TS__New
 local ____exports = {}
+local actualizeTargetingModeState
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
@@ -18,6 +19,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
@@ -62,6 +65,10 @@ local function compareUnitsSelectionPriority(a, b)
 end
 local mainSelectedUnitChangeEvent
 local previousMainSelectedUnit
+local lastTargetingModeState = false
+local targetingModeEnterEvent = __TS__New(Event)
+local targetingModeLeaveEvent = __TS__New(Event)
+local targetingModeStateChangeEvent = __TS__New(Event)
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
@@ -128,6 +135,13 @@ __TS__ObjectDefineProperty(
         return isLocalClientActive()
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isMinimized",
+    {get = function(self)
+        return getLocalClientHeight() == 0
+    end}
+)
 __TS__ObjectDefineProperty(
     LocalClient,
     "mouseFocusUnit",
@@ -181,6 +195,16 @@ __TS__ObjectDefineProperty(
         return mainSelectedUnitChangeEvent
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isInTargetingMode",
+    {get = function(self)
+        return actualizeTargetingModeState()
+    end}
+)
+LocalClient.targetingModeEnterEvent = targetingModeEnterEvent
+LocalClient.targetingModeLeaveEvent = targetingModeLeaveEvent
+LocalClient.targetingModeStateChangeEvent = targetingModeStateChangeEvent
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)
@@ -188,6 +212,37 @@ LocalClient.onDisconnect = __TS__New(
     end,
     function() return  end
 )
+local commandButtons = array(
+    12,
+    function(i) return Frame:byOrigin(ORIGIN_FRAME_COMMAND_BUTTON, i) end
+)
+local function getTargetingModeState()
+    for i = 0, 10 do
+        if commandButtons[i + 1].visible then
+            return false
+        end
+    end
+    return commandButtons[12].visible
+end
+actualizeTargetingModeState = function()
+    if getTargetingModeState() then
+        if not lastTargetingModeState then
+            lastTargetingModeState = true
+            Event.invoke(targetingModeEnterEvent)
+            Event.invoke(targetingModeStateChangeEvent)
+        end
+        return true
+    end
+    if lastTargetingModeState then
+        lastTargetingModeState = false
+        Event.invoke(targetingModeLeaveEvent)
+        Event.invoke(targetingModeStateChangeEvent)
+    end
+    return false
+end
+Timer.onPeriod[1 / 64]:addListener(function()
+    actualizeTargetingModeState()
+end)
 warpack.afterMapInit(function()
     rawset(
         ____exports.LocalClient,

package/engine/object-data/auxiliary/unit-attribute.lua

@@ -1,5 +1,5 @@
 local ____exports = {}
-____exports.UnitAttribute = UnitAttribute or ({})
+____exports.UnitAttribute = ____exports.UnitAttribute or ({})
 ____exports.UnitAttribute.STRENGTH = 1
 ____exports.UnitAttribute[____exports.UnitAttribute.STRENGTH] = "STRENGTH"
 ____exports.UnitAttribute.INTELLIGENCE = 2

package/engine/object-data/entry/ability-type/{armor-increase.d.ts → armor-bonus.d.ts}

@@ -1,8 +1,8 @@
 /** @noSelfInFile */
 import { AbilityType, AbilityTypeId } from "../ability-type";
 import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
-export declare class ArmorIncreaseAbilityType extends AbilityType {
+export declare class ArmorBonusAbilityType extends AbilityType {
     static readonly BASE_ID: AbilityTypeId;
-    get armorIncrease(): number[];
-    set armorIncrease(armorIncrease: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get armorBonus(): number[];
+    set armorBonus(armorBonus: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

package/engine/object-data/entry/ability-type/{armor-increase.lua → armor-bonus.lua}

@@ -5,20 +5,20 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
-____exports.ArmorIncreaseAbilityType = __TS__Class()
-local ArmorIncreaseAbilityType = ____exports.ArmorIncreaseAbilityType
-ArmorIncreaseAbilityType.name = "ArmorIncreaseAbilityType"
-__TS__ClassExtends(ArmorIncreaseAbilityType, AbilityType)
-ArmorIncreaseAbilityType.BASE_ID = fourCC("AId1")
+____exports.ArmorBonusAbilityType = __TS__Class()
+local ArmorBonusAbilityType = ____exports.ArmorBonusAbilityType
+ArmorBonusAbilityType.name = "ArmorBonusAbilityType"
+__TS__ClassExtends(ArmorBonusAbilityType, AbilityType)
+ArmorBonusAbilityType.BASE_ID = fourCC("AId1")
 __TS__SetDescriptor(
-    ArmorIncreaseAbilityType.prototype,
-    "armorIncrease",
+    ArmorBonusAbilityType.prototype,
+    "armorBonus",
     {
         get = function(self)
             return self:getNumberLevelField("Idef")
         end,
-        set = function(self, armorIncrease)
-            self:setNumberLevelField("Idef", armorIncrease)
+        set = function(self, armorBonus)
+            self:setNumberLevelField("Idef", armorBonus)
         end
     },
     true

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

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

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

@@ -0,0 +1,26 @@
+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.HealthBonusAbilityType = __TS__Class()
+local HealthBonusAbilityType = ____exports.HealthBonusAbilityType
+HealthBonusAbilityType.name = "HealthBonusAbilityType"
+__TS__ClassExtends(HealthBonusAbilityType, AbilityType)
+HealthBonusAbilityType.BASE_ID = fourCC("AIlf")
+__TS__SetDescriptor(
+    HealthBonusAbilityType.prototype,
+    "healthBonus",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ilif")
+        end,
+        set = function(self, healthBonus)
+            self:setNumberLevelField("Ilif", healthBonus)
+        end
+    },
+    true
+)
+return ____exports

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

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

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

@@ -0,0 +1,26 @@
+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.ManaBonusAbilityType = __TS__Class()
+local ManaBonusAbilityType = ____exports.ManaBonusAbilityType
+ManaBonusAbilityType.name = "ManaBonusAbilityType"
+__TS__ClassExtends(ManaBonusAbilityType, AbilityType)
+ManaBonusAbilityType.BASE_ID = fourCC("AImb")
+__TS__SetDescriptor(
+    ManaBonusAbilityType.prototype,
+    "manaBonus",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Iman")
+        end,
+        set = function(self, manaBonus)
+            self:setNumberLevelField("Iman", manaBonus)
+        end
+    },
+    true
+)
+return ____exports

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

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

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

@@ -0,0 +1,26 @@
+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.ReincarnationAbilityType = __TS__Class()
+local ReincarnationAbilityType = ____exports.ReincarnationAbilityType
+ReincarnationAbilityType.name = "ReincarnationAbilityType"
+__TS__ClassExtends(ReincarnationAbilityType, AbilityType)
+ReincarnationAbilityType.BASE_ID = fourCC("AOre")
+__TS__SetDescriptor(
+    ReincarnationAbilityType.prototype,
+    "reincarnationDelay",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ore1")
+        end,
+        set = function(self, reincarnationDelay)
+            self:setNumberLevelField("Ore1", reincarnationDelay)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -67,6 +67,8 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set specialAttachmentPreset(specialAttachmentPreset: AttachmentPresetInput | undefined);
     get targetCastingEffectPresets(): EffectPresetWithParameters[];
     set targetCastingEffectPresets(targetCastingEffectPresets: AttachmentPresetInput[]);
+    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<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;

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

@@ -45,6 +45,7 @@ local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
 local casterChannelingEffectPresetsByAbilityTypeId = {}
 local targetCastingEffectPresetsByAbilityTypeId = {}
+local targetChannelingEffectPresetsByAbilityTypeId = {}
 local targetEffectSoundPresetByAbilityTypeId = {}
 ____exports.AbilityType = __TS__Class()
 local AbilityType = ____exports.AbilityType
@@ -378,6 +379,19 @@ __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,
     "targetEffectPresets",
@@ -1099,18 +1113,84 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     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

@@ -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.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
+                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
-        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
+        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
-    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",

package/engine/object-field/ability.lua

@@ -519,9 +519,9 @@ __TS__SetDescriptor(
 )
 ____exports.resolveCurrentAbilityDependentValue = function(ability, value)
     if __TS__InstanceOf(value, ____exports.AbilityField) then
-        return value:getValue(ability)
+        return value:getValue(ability, true)
     elseif __TS__InstanceOf(value, ____exports.AbilityLevelField) then
-        return value:getValue(ability, ability.level)
+        return value:getValue(ability, ability.level, true)
     elseif type(value) == "function" then
         return value(ability)
     else