warscript 0.0.1-dev.4363c65 → 0.0.1-dev.46a1ede

package/engine/buff.lua

@@ -35,6 +35,7 @@ local UnitBonusType = ____bonus.UnitBonusType
 local ____area_2Ddamage = require("engine.internal.mechanics.area-damage")
 local damageArea = ____area_2Ddamage.damageArea
 local ____preconditions = require("utility.preconditions")
+local check = ____preconditions.check
 local checkNotNull = ____preconditions.checkNotNull
 local ____effect = require("core.types.effect")
 local Effect = ____effect.Effect
@@ -44,8 +45,14 @@ local ____unit = require("engine.behaviour.unit")
 local UnitBehavior = ____unit.UnitBehavior
 local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
+local ____event = require("event")
+local Event = ____event.Event
 local ____ability_2Dduration = require("engine.internal.mechanics.ability-duration")
 local getAbilityDuration = ____ability_2Dduration.getAbilityDuration
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____destructable = require("core.types.destructable")
+local Destructable = ____destructable.Destructable
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -94,6 +101,8 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    evasionProbability = true,
+    damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
@@ -175,7 +184,9 @@ local buffNumberParameters = {
     "durationIncreaseOnAutoAttack",
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
+    "evasionProbability",
     "armorIncrease",
+    "damageFactor",
     "receivedDamageFactor",
     "maximumAutoAttackCount",
     "maximumDamageDealtEventCount",
@@ -214,7 +225,7 @@ local function selectBuffTypeIdWithLeastDuration(buffTypeIds, unit)
     return checkNotNull(firstNativeBuffTypeId)
 end
 local function destroyBuffIfItHasSameUniqueGroup(buff, uniqueGroup)
-    if buff[103] == uniqueGroup then
+    if buff[104] == uniqueGroup then
         buff:destroy()
     end
 end
@@ -222,17 +233,17 @@ local function destroyBuff(buff)
     buff:destroy()
 end
 local function expireBuff(buff)
-    local remainingDamageOverDuration = buff[112] or 0
-    local remainingHealingOverDuration = buff[112] or 0
+    local remainingDamageOverDuration = buff[113] or 0
+    local remainingHealingOverDuration = buff[113] or 0
     if remainingDamageOverDuration ~= 0 or remainingHealingOverDuration ~= 0 then
         buff:flashSpecialEffect()
         if remainingDamageOverDuration ~= 0 then
-            (buff[101] or buff[100]):damageTarget(buff[100], remainingDamageOverDuration)
-            buff[112] = nil
+            (buff[102] or buff[101]):damageTarget(buff[101], remainingDamageOverDuration)
+            buff[113] = nil
         end
         if remainingHealingOverDuration ~= 0 then
-            (buff[101] or buff[100]):healTarget(buff[100], remainingHealingOverDuration)
-            buff[117] = nil
+            (buff[102] or buff[101]):healTarget(buff[101], remainingHealingOverDuration)
+            buff[118] = nil
         end
     end
     Timer:run(destroyBuff, buff)
@@ -240,56 +251,57 @@ local function expireBuff(buff)
 end
 local function buffDamageIntervalInitialTimerCallback(buff)
     buffDamageIntervalTimerCallback(buff)
-    local timer = buff[113]
-    local damageInterval = buff[111]
+    local timer = buff[114]
+    local damageInterval = buff[112]
     if timer ~= nil and damageInterval ~= nil and damageInterval > 0 then
         timer:start(damageInterval, true, buffDamageIntervalTimerCallback, buff)
     end
 end
 buffDamageIntervalTimerCallback = function(buff)
     buff:flashSpecialEffect()
-    local source = buff[101] or buff[100]
-    local remainingDamageOverDuration = buff[112] or 0
+    local source = buff[102] or buff[101]
+    local remainingDamageOverDuration = buff[113] or 0
     if remainingDamageOverDuration ~= 0 then
-        local damageInterval = buff[111] or 0
+        local damageInterval = buff[112] or 0
         if damageInterval ~= 0 then
             local damage = remainingDamageOverDuration / (1 + buff.remainingDuration / damageInterval)
-            source:damageTarget(buff[100], damage)
-            buff[112] = remainingDamageOverDuration - damage
+            source:damageTarget(buff[101], damage)
+            buff[113] = remainingDamageOverDuration - damage
         end
     end
-    local damagePerInterval = buff[110] or 0
+    local damagePerInterval = buff[111] or 0
     if remainingDamageOverDuration == 0 or damagePerInterval ~= 0 then
-        source:damageTarget(buff[100], damagePerInterval)
+        source:damageTarget(buff[101], damagePerInterval)
     end
 end
 local function buffHealingIntervalInitialTimerCallback(buff)
     buffHealingIntervalTimerCallback(buff)
-    local timer = buff[118]
-    local healingInterval = buff[116]
+    local timer = buff[119]
+    local healingInterval = buff[117]
     if timer ~= nil and healingInterval ~= nil and healingInterval > 0 then
         timer:start(healingInterval, true, buffHealingIntervalTimerCallback, buff)
     end
 end
 buffHealingIntervalTimerCallback = function(buff)
-    if buff[116] ~= buff[111] then
+    if buff[117] ~= buff[112] then
         buff:flashSpecialEffect()
     end
-    local source = buff[101] or buff[100]
-    local remainingHealingOverDuration = buff[117] or 0
+    local source = buff[102] or buff[101]
+    local remainingHealingOverDuration = buff[118] or 0
     if remainingHealingOverDuration ~= 0 then
-        local healingInterval = buff[116] or 0
+        local healingInterval = buff[117] or 0
         if healingInterval ~= 0 then
             local healing = remainingHealingOverDuration / (1 + buff.remainingDuration / healingInterval)
-            source:healTarget(buff[100], healing)
-            buff[117] = remainingHealingOverDuration - healing
+            source:healTarget(buff[101], healing)
+            buff[118] = remainingHealingOverDuration - healing
         end
     end
-    local healingPerInterval = buff[115] or 0
+    local healingPerInterval = buff[116] or 0
     if remainingHealingOverDuration == 0 or healingPerInterval ~= 0 then
-        source:healTarget(buff[100], healingPerInterval)
+        source:healTarget(buff[101], healingPerInterval)
     end
 end
+local buffDestroyEvent = __TS__New(Event)
 ____exports.Buff = __TS__Class()
 local Buff = ____exports.Buff
 Buff.name = "Buff"
@@ -298,7 +310,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     UnitBehavior.prototype.____constructor(self, _unit)
     self._unit = _unit
     self.parameters = nil
-    self[100] = _unit
+    self[100] = 0
+    self[101] = _unit
     local typeId
     local polarity
     local resistanceType
@@ -390,11 +403,11 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     self._level = level
     self._spellStealPriority = spellStealPriority
     self._learnLevelMinimum = learnLevelMinimum
-    self[101] = source
-    self[102] = duration or 0
-    self[103] = uniqueGroup
-    self[104] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_EFFECT, 0)
-    self[105] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_SPECIAL, 0)
+    self[102] = source
+    self[103] = duration or 0
+    self[104] = uniqueGroup
+    self[105] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_EFFECT, 0)
+    self[106] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_SPECIAL, 0)
     if parameters ~= nil or (next(defaultParameters)) ~= nil then
         for ____, buffBooleanParameter in ipairs(buffBooleanParameters) do
             local ____ability_22 = ability
@@ -419,11 +432,11 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         end
         local maximumDuration = parameters and parameters.maximumDuration or defaultParameters.maximumDuration
         if maximumDuration ~= nil then
-            self[107] = resolveNumberValue(ability, level, maximumDuration)
+            self[108] = resolveNumberValue(ability, level, maximumDuration)
         end
         local maximumRemainingDuration = parameters and parameters.maximumRemainingDuration or defaultParameters.maximumRemainingDuration
         if maximumRemainingDuration ~= nil then
-            self[108] = resolveNumberValue(ability, level, maximumRemainingDuration)
+            self[109] = resolveNumberValue(ability, level, maximumRemainingDuration)
         end
         local parametersAbilityTypeIds = parameters and parameters.abilityTypeIds or defaultParameters.abilityTypeIds
         if parametersAbilityTypeIds ~= nil then
@@ -480,6 +493,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         timer:start(duration, false, expireBuff, self)
         self._timer = timer
     end
+    self:onCreate()
+    self[100] = 1
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
     local ____opt_36 = self._bonusIdByBonusType
@@ -494,33 +509,37 @@ function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
     end
     bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
 end
-function Buff.prototype.flashEffect(self, widgetOrDuration, duration)
-    local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_40 = Effect
-    local ____Effect_flash_41 = Effect.flash
-    local ____array_39 = __TS__SparseArrayNew(
-        self[104],
-        isWidgetProvided and widgetOrDuration or self._unit,
-        stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
-    )
-    local ____isWidgetProvided_38
-    if isWidgetProvided then
-        ____isWidgetProvided_38 = duration
+function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+    if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
+        Effect:flash(self[105], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
-        ____isWidgetProvided_38 = widgetOrDuration
+        local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
+        local ____Effect_40 = Effect
+        local ____Effect_flash_41 = Effect.flash
+        local ____array_39 = __TS__SparseArrayNew(
+            self[105],
+            isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
+            stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
+        )
+        local ____isWidgetProvided_38
+        if isWidgetProvided then
+            ____isWidgetProvided_38 = yOrParametersOrDuration
+        else
+            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+        end
+        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
+        ____Effect_flash_41(
+            ____Effect_40,
+            __TS__SparseArraySpread(____array_39)
+        )
     end
-    __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-    ____Effect_flash_41(
-        ____Effect_40,
-        __TS__SparseArraySpread(____array_39)
-    )
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
     local ____Effect_44 = Effect
     local ____Effect_flash_45 = Effect.flash
     local ____array_43 = __TS__SparseArrayNew(
-        self[105],
+        self[106],
         isWidgetProvided and widgetOrDuration or self._unit,
         stringValueByBuffTypeIdByFieldId[fourCC("fspt")][self.typeId] or "origin"
     )
@@ -536,21 +555,25 @@ function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
         __TS__SparseArraySpread(____array_43)
     )
 end
+function Buff.prototype.onCreate(self)
+end
 function Buff.prototype.onDestroy(self)
+    check(self[100] ~= 0, "Cannot destroy a buff that has not finished creating yet.")
+    self[100] = 2
     local unit = self._unit
     if getUnitAbility(unit.handle, self.typeId) == self.handle then
         removeBuff(unit.handle, self.typeId)
     end
     buffByTypeIdByUnit[unit][self.typeId] = nil
-    local healingIntervalTimer = self[118]
+    local healingIntervalTimer = self[119]
     if healingIntervalTimer ~= nil then
         healingIntervalTimer:destroy()
-        self[118] = nil
+        self[119] = nil
     end
-    local damageIntervalTimer = self[113]
+    local damageIntervalTimer = self[114]
     if damageIntervalTimer ~= nil then
         damageIntervalTimer:destroy()
-        self[113] = nil
+        self[114] = nil
     end
     if self._timer ~= nil then
         self._timer:destroy()
@@ -560,11 +583,11 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[136] then
+    if self[137] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[134] then
-        if self[135] then
+    if self[135] then
+        if self[136] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
@@ -579,6 +602,8 @@ function Buff.prototype.onDestroy(self)
             removeUnitBonus(unit, bonusType, bonusId)
         end
     end
+    Event.invoke(buffDestroyEvent, self)
+    self[100] = 3
     return UnitBehavior.prototype.onDestroy(self)
 end
 function Buff.apply(self, ...)
@@ -615,72 +640,72 @@ function Buff.getByTypeId(self, unit, typeId)
 end
 function Buff.prototype.onExpiration(self)
     local unit = self.unit
-    if self[119] ~= nil then
-        (self[101] or unit):damageTarget(unit, self[119] or 0)
-    end
     if self[120] ~= nil then
-        (self[101] or unit):healTarget(unit, self[119] or 0)
+        (self[102] or unit):damageTarget(unit, self[120] or 0)
+    end
+    if self[121] ~= nil then
+        (self[102] or unit):healTarget(unit, self[120] or 0)
     end
-    if self[139] then
+    if self[140] then
         unit:explode()
-    elseif self[138] then
+    elseif self[139] then
         unit:kill()
     end
 end
 function Buff.prototype.onDeath(self, source)
     local unit = self.unit
-    if self[121] ~= nil then
+    if self[122] ~= nil then
         damageArea(
-            self[101] or unit,
-            self[121],
+            self[102] or unit,
+            self[122],
             unit.x,
             unit.y,
+            self[124] or 0,
             self[123] or 0,
-            self[122] or 0,
+            self[126] or 0,
             self[125] or 0,
-            self[124] or 0,
-            self[127] or 0,
-            self[126] or 0
+            self[128] or 0,
+            self[127] or 0
         )
     end
 end
 function Buff.prototype.onDamageDealt(self, target, event)
     if event.isAttack then
-        if self[106] ~= nil then
-            local durationIncrease = self[106]
-            local maximumDuration = self[107] or 0
+        if self[107] ~= nil then
+            local durationIncrease = self[107]
+            local maximumDuration = self[108] or 0
             if maximumDuration > 0 then
                 durationIncrease = min(
                     durationIncrease,
-                    max(0, maximumDuration - self[102])
+                    max(0, maximumDuration - self[103])
                 )
             end
             local remainingDuration = self.remainingDuration + durationIncrease
-            local maximumRemainingDuration = self[108] or 0
+            local maximumRemainingDuration = self[109] or 0
             if maximumRemainingDuration > 0 then
                 remainingDuration = min(remainingDuration, maximumRemainingDuration)
             end
             self.remainingDuration = remainingDuration
         end
-        local autoAttackCount = (self[128] or 0) + 1
-        self[128] = autoAttackCount
-        if autoAttackCount == self[129] then
+        local autoAttackCount = (self[129] or 0) + 1
+        self[129] = autoAttackCount
+        if autoAttackCount == self[130] then
             self:destroy()
         end
     end
-    if event.amount ~= 0 then
-        local damageDealtEventCount = (self[130] or 0) + 1
-        self[130] = damageDealtEventCount
-        if damageDealtEventCount == self[131] then
+    if event.originalAmount ~= 0 then
+        local damageDealtEventCount = (self[131] or 0) + 1
+        self[131] = damageDealtEventCount
+        if damageDealtEventCount == self[132] then
             self:destroy()
         end
     end
 end
 function Buff.prototype.onDamageReceived(self, source, event)
-    if event.amount ~= 0 then
-        local damageReceivedEventCount = (self[132] or 0) + 1
-        self[132] = damageReceivedEventCount
-        if damageReceivedEventCount == self[133] then
+    if event.originalAmount ~= 0 then
+        local damageReceivedEventCount = (self[133] or 0) + 1
+        self[133] = damageReceivedEventCount
+        if damageReceivedEventCount == self[134] then
             self:destroy()
         end
     end
@@ -690,7 +715,7 @@ __TS__SetDescriptor(
     Buff.prototype,
     "source",
     {get = function(self)
-        return self[101] or self._unit
+        return self[102] or self._unit
     end},
     true
 )
@@ -707,13 +732,13 @@ __TS__SetDescriptor(
     "remainingDamageOverDuration",
     {
         get = function(self)
-            return self[112] or 0
+            return self[113] or 0
         end,
         set = function(self, remainingDamageOverDuration)
-            local remainingDamageOverDurationDelta = remainingDamageOverDuration - (self[112] or 0)
-            self[112] = remainingDamageOverDuration ~= 0 and remainingDamageOverDuration or nil
-            local damageOverDuration = (self[109] or 0) + remainingDamageOverDurationDelta
-            self[109] = damageOverDuration ~= 0 and damageOverDuration or nil
+            local remainingDamageOverDurationDelta = remainingDamageOverDuration - (self[113] or 0)
+            self[113] = remainingDamageOverDuration ~= 0 and remainingDamageOverDuration or nil
+            local damageOverDuration = (self[110] or 0) + remainingDamageOverDurationDelta
+            self[110] = damageOverDuration ~= 0 and damageOverDuration or nil
         end
     },
     true
@@ -723,13 +748,13 @@ __TS__SetDescriptor(
     "damageOverDuration",
     {
         get = function(self)
-            return self[109] or 0
+            return self[110] or 0
         end,
         set = function(self, damageOverDuration)
-            local damageOverDurationDelta = damageOverDuration - (self[109] or 0)
-            self[109] = damageOverDuration ~= 0 and damageOverDuration or nil
-            local remainingDamageOverDuration = (self[112] or 0) + damageOverDurationDelta
-            self[112] = remainingDamageOverDuration ~= 0 and remainingDamageOverDuration or nil
+            local damageOverDurationDelta = damageOverDuration - (self[110] or 0)
+            self[110] = damageOverDuration ~= 0 and damageOverDuration or nil
+            local remainingDamageOverDuration = (self[113] or 0) + damageOverDurationDelta
+            self[113] = remainingDamageOverDuration ~= 0 and remainingDamageOverDuration or nil
         end
     },
     true
@@ -739,10 +764,10 @@ __TS__SetDescriptor(
     "damagePerInterval",
     {
         get = function(self)
-            return self[110] or 0
+            return self[111] or 0
         end,
         set = function(self, damagePerInterval)
-            self[110] = damagePerInterval ~= 0 and damagePerInterval or nil
+            self[111] = damagePerInterval ~= 0 and damagePerInterval or nil
         end
     },
     true
@@ -752,25 +777,25 @@ __TS__SetDescriptor(
     "damageInterval",
     {
         get = function(self)
-            return self[111] or 0
+            return self[112] or 0
         end,
         set = function(self, damageInterval)
             if damageInterval <= 0 then
-                self[111] = damageInterval ~= 0 and damageInterval or nil
-                local timer = self[113]
+                self[112] = damageInterval ~= 0 and damageInterval or nil
+                local timer = self[114]
                 if timer ~= nil then
                     timer:destroy()
-                    self[113] = nil
+                    self[114] = nil
                 end
                 return
             end
-            self[111] = damageInterval
+            self[112] = damageInterval
             local ____opt_48 = self._timer
             local elapsed = ____opt_48 and ____opt_48.elapsed or 0
-            local timer = self[113]
+            local timer = self[114]
             if timer == nil then
                 timer = Timer:create()
-                self[113] = timer
+                self[114] = timer
             end
             local initialDelay = damageInterval - (elapsed >= damageInterval and math.fmod(elapsed, damageInterval) or elapsed)
             if initialDelay == damageInterval then
@@ -787,13 +812,13 @@ __TS__SetDescriptor(
     "remainingHealingOverDuration",
     {
         get = function(self)
-            return self[117] or 0
+            return self[118] or 0
         end,
         set = function(self, remainingHealingOverDuration)
-            local remainingHealingOverDurationDelta = remainingHealingOverDuration - (self[117] or 0)
-            self[112] = remainingHealingOverDuration ~= 0 and remainingHealingOverDuration or nil
-            local healingOverDuration = (self[114] or 0) + remainingHealingOverDurationDelta
-            self[114] = healingOverDuration ~= 0 and healingOverDuration or nil
+            local remainingHealingOverDurationDelta = remainingHealingOverDuration - (self[118] or 0)
+            self[113] = remainingHealingOverDuration ~= 0 and remainingHealingOverDuration or nil
+            local healingOverDuration = (self[115] or 0) + remainingHealingOverDurationDelta
+            self[115] = healingOverDuration ~= 0 and healingOverDuration or nil
         end
     },
     true
@@ -803,13 +828,13 @@ __TS__SetDescriptor(
     "healingOverDuration",
     {
         get = function(self)
-            return self[114] or 0
+            return self[115] or 0
         end,
         set = function(self, healingOverDuration)
-            local healingOverDurationDelta = healingOverDuration - (self[114] or 0)
-            self[114] = healingOverDuration ~= 0 and healingOverDuration or nil
-            local remainingHealingOverDuration = (self[117] or 0) + healingOverDurationDelta
-            self[117] = remainingHealingOverDuration ~= 0 and remainingHealingOverDuration or nil
+            local healingOverDurationDelta = healingOverDuration - (self[115] or 0)
+            self[115] = healingOverDuration ~= 0 and healingOverDuration or nil
+            local remainingHealingOverDuration = (self[118] or 0) + healingOverDurationDelta
+            self[118] = remainingHealingOverDuration ~= 0 and remainingHealingOverDuration or nil
         end
     },
     true
@@ -819,10 +844,10 @@ __TS__SetDescriptor(
     "healingPerInterval",
     {
         get = function(self)
-            return self[115] or 0
+            return self[116] or 0
         end,
         set = function(self, healingPerInterval)
-            self[115] = healingPerInterval ~= 0 and healingPerInterval or nil
+            self[116] = healingPerInterval ~= 0 and healingPerInterval or nil
         end
     },
     true
@@ -832,25 +857,25 @@ __TS__SetDescriptor(
     "healingInterval",
     {
         get = function(self)
-            return self[116] or 0
+            return self[117] or 0
         end,
         set = function(self, healingInterval)
             if healingInterval <= 0 then
-                self[116] = healingInterval ~= 0 and healingInterval or nil
-                local timer = self[118]
+                self[117] = healingInterval ~= 0 and healingInterval or nil
+                local timer = self[119]
                 if timer ~= nil then
                     timer:destroy()
-                    self[118] = nil
+                    self[119] = nil
                 end
                 return
             end
-            self[116] = healingInterval
+            self[117] = healingInterval
             local ____opt_50 = self._timer
             local elapsed = ____opt_50 and ____opt_50.elapsed or 0
-            local timer = self[118]
+            local timer = self[119]
             if timer == nil then
                 timer = Timer:create()
-                self[118] = timer
+                self[119] = timer
             end
             local initialDelay = healingInterval - (elapsed >= healingInterval and math.fmod(elapsed, healingInterval) or elapsed)
             if initialDelay == healingInterval then
@@ -867,10 +892,10 @@ __TS__SetDescriptor(
     "damageOnExpiration",
     {
         get = function(self)
-            return self[119] or 0
+            return self[120] or 0
         end,
         set = function(self, damageOnExpiration)
-            self[119] = damageOnExpiration ~= 0 and damageOnExpiration or nil
+            self[120] = damageOnExpiration ~= 0 and damageOnExpiration or nil
         end
     },
     true
@@ -880,10 +905,23 @@ __TS__SetDescriptor(
     "healingOnExpiration",
     {
         get = function(self)
-            return self[120] or 0
+            return self[121] or 0
         end,
         set = function(self, healingOnExpiration)
-            self[120] = healingOnExpiration ~= 0 and healingOnExpiration or nil
+            self[121] = healingOnExpiration ~= 0 and healingOnExpiration or nil
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "damageFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.DAMAGE_FACTOR)
+        end,
+        set = function(self, damageFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.DAMAGE_FACTOR, damageFactor)
         end
     },
     true
@@ -919,25 +957,25 @@ __TS__SetDescriptor(
     "stuns",
     {
         get = function(self)
-            local ____self__134_52 = self[134]
-            if ____self__134_52 == nil then
-                ____self__134_52 = false
+            local ____self__135_52 = self[135]
+            if ____self__135_52 == nil then
+                ____self__135_52 = false
             end
-            return ____self__134_52
+            return ____self__135_52
         end,
         set = function(self, stuns)
-            if not stuns and self[134] then
-                if self[135] then
+            if not stuns and self[135] then
+                if self[136] then
                     self.object:decrementStunCounter()
                 end
                 self.object:decrementStunCounter()
-                self[134] = nil
-            elseif stuns and not self[134] then
-                if self[135] then
+                self[135] = nil
+            elseif stuns and not self[135] then
+                if self[136] then
                     self.object:incrementStunCounter()
                 end
                 self.object:incrementStunCounter()
-                self[134] = true
+                self[135] = true
             end
         end
     },
@@ -948,23 +986,23 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__135_53 = self[135]
-            if ____self__135_53 == nil then
-                ____self__135_53 = false
+            local ____self__136_53 = self[136]
+            if ____self__136_53 == nil then
+                ____self__136_53 = false
             end
-            return ____self__135_53
+            return ____self__136_53
         end,
         set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[135] then
-                if self[134] then
+            if not ignoresStunImmunity and self[136] then
+                if self[135] then
                     self.object:decrementStunCounter()
                 end
-                self[135] = nil
-            elseif ignoresStunImmunity and not self[135] then
-                if self[134] then
+                self[136] = nil
+            elseif ignoresStunImmunity and not self[136] then
+                if self[135] then
                     self.object:incrementStunCounter()
                 end
-                self[135] = true
+                self[136] = true
             end
         end
     },
@@ -975,19 +1013,19 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__136_54 = self[136]
-            if ____self__136_54 == nil then
-                ____self__136_54 = false
+            local ____self__137_54 = self[137]
+            if ____self__137_54 == nil then
+                ____self__137_54 = false
             end
-            return ____self__136_54
+            return ____self__137_54
         end,
         set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[136] then
+            if not disablesAutoAttack and self[137] then
                 self.object:decrementDisableAutoAttackCounter()
-                self[136] = nil
-            elseif disablesAutoAttack and not self[136] then
+                self[137] = nil
+            elseif disablesAutoAttack and not self[137] then
                 self.object:incrementDisableAutoAttackCounter()
-                self[136] = true
+                self[137] = true
             end
         end
     },
@@ -998,19 +1036,19 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__137_55 = self[137]
-            if ____self__137_55 == nil then
-                ____self__137_55 = false
+            local ____self__138_55 = self[138]
+            if ____self__138_55 == nil then
+                ____self__138_55 = false
             end
-            return ____self__137_55
+            return ____self__138_55
         end,
         set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[137] then
+            if not providesInvulnerability and self[138] then
                 self.object:decrementInvulnerabilityCounter()
-                self[137] = nil
-            elseif providesInvulnerability and not self[137] then
+                self[138] = nil
+            elseif providesInvulnerability and not self[138] then
                 self.object:incrementInvulnerabilityCounter()
-                self[137] = true
+                self[138] = true
             end
         end
     },
@@ -1021,17 +1059,17 @@ __TS__SetDescriptor(
     "killsOnExpiration",
     {
         get = function(self)
-            local ____self__138_56 = self[138]
-            if ____self__138_56 == nil then
-                ____self__138_56 = false
+            local ____self__139_56 = self[139]
+            if ____self__139_56 == nil then
+                ____self__139_56 = false
             end
-            return ____self__138_56
+            return ____self__139_56
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[138] then
-                self[138] = nil
-            elseif killsOnExpiration and not self[138] then
-                self[138] = true
+            if not killsOnExpiration and self[139] then
+                self[139] = nil
+            elseif killsOnExpiration and not self[139] then
+                self[139] = true
             end
         end
     },
@@ -1042,17 +1080,17 @@ __TS__SetDescriptor(
     "explodesOnExpiration",
     {
         get = function(self)
-            local ____self__139_57 = self[139]
-            if ____self__139_57 == nil then
-                ____self__139_57 = false
+            local ____self__140_57 = self[140]
+            if ____self__140_57 == nil then
+                ____self__140_57 = false
             end
-            return ____self__139_57
+            return ____self__140_57
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[139] then
-                self[139] = nil
-            elseif killsOnExpiration and not self[139] then
-                self[139] = true
+            if not killsOnExpiration and self[140] then
+                self[140] = nil
+            elseif killsOnExpiration and not self[140] then
+                self[140] = true
             end
         end
     },
@@ -1063,13 +1101,13 @@ __TS__SetDescriptor(
     "maximumDamageDealtEventCount",
     {
         get = function(self)
-            return self[131] or 0
+            return self[132] or 0
         end,
         set = function(self, maximumDamageDealtEventCount)
             if maximumDamageDealtEventCount == 0 then
-                self[131] = nil
+                self[132] = nil
             else
-                self[131] = maximumDamageDealtEventCount
+                self[132] = maximumDamageDealtEventCount
             end
         end
     },
@@ -1080,13 +1118,13 @@ __TS__SetDescriptor(
     "maximumDamageReceivedEventCount",
     {
         get = function(self)
-            return self[133] or 0
+            return self[134] or 0
         end,
         set = function(self, maximumDamageReceivedEventCount)
             if maximumDamageReceivedEventCount == 0 then
-                self[133] = nil
+                self[134] = nil
             else
-                self[133] = maximumDamageReceivedEventCount
+                self[134] = maximumDamageReceivedEventCount
             end
         end
     },
@@ -1097,13 +1135,13 @@ __TS__SetDescriptor(
     "maximumAutoAttackCount",
     {
         get = function(self)
-            return self[129] or 0
+            return self[130] or 0
         end,
         set = function(self, maximumAutoAttackCount)
             if maximumAutoAttackCount == 0 then
-                self[129] = nil
+                self[130] = nil
             else
-                self[129] = maximumAutoAttackCount
+                self[130] = maximumAutoAttackCount
             end
         end
     },
@@ -1114,10 +1152,10 @@ __TS__SetDescriptor(
     "durationIncreaseOnAutoAttack",
     {
         get = function(self)
-            return self[106] or 0
+            return self[107] or 0
         end,
         set = function(self, durationIncreaseOnAutoAttack)
-            self[106] = durationIncreaseOnAutoAttack
+            self[107] = durationIncreaseOnAutoAttack
         end
     },
     true
@@ -1148,11 +1186,24 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "evasionProbability",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.EVASION_PROBABILITY)
+        end,
+        set = function(self, evasionProbability)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.EVASION_PROBABILITY, evasionProbability)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "duration",
     {get = function(self)
-        return self[102]
+        return self[103]
     end},
     true
 )
@@ -1169,7 +1220,7 @@ __TS__SetDescriptor(
             local ____opt_60 = self._timer
             local remainingDurationDelta = ____remainingDuration_62 - (____opt_60 and ____opt_60.remaining or 0)
             if remainingDurationDelta ~= 0 then
-                self[102] = self[102] + remainingDurationDelta
+                self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
                     Timer:run(destroyBuff, self)
                 else
@@ -1195,10 +1246,11 @@ __TS__SetDescriptor(
         end
     },
     true
-);
+)
+Buff.destroyEvent = buffDestroyEvent;
 (function(self)
     local function destroyBuffIfNeeded(buff)
-        if getUnitAbility(buff[100].handle, buff.typeId) ~= buff.handle then
+        if getUnitAbility(buff[101].handle, buff.typeId) ~= buff.handle and buff[100] == 1 then
             buff:destroy()
         end
     end