warscript 0.0.1-dev.1e8ee27 → 0.0.1-dev.1fcc915

package/engine/buff.lua

@@ -14,6 +14,7 @@ local Unit = ____unit.Unit
 local ____applicable = require("engine.object-data.entry.buff-type.applicable")
 local internalApplyBuff = ____applicable.internalApplyBuff
 local removeBuff = ____applicable.removeBuff
+local removeBuffApplicator = ____applicable.removeBuffApplicator
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
 local UnitAbility = ____ability.UnitAbility
@@ -58,6 +59,9 @@ local ____ability = require("engine.behaviour.ability")
 local AbilityBehavior = ____ability.AbilityBehavior
 local ____records = require("utility.records")
 local sortedKeysUnnested = ____records.sortedKeysUnnested
+local ____sound = require("core.types.sound")
+local Sound3D = ____sound.Sound3D
+local SoundSettings = ____sound.SoundSettings
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -112,6 +116,7 @@ local buffParametersKeys = {
     missProbability = true,
     damageFactor = true,
     receivedDamageFactor = true,
+    returnedMeleeDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
     maximumDuration = true,
@@ -131,6 +136,7 @@ local buffParametersKeys = {
     maximumDamageAbsorbed = true,
     destroysOnMaximumDamageAbsorbed = true,
     uniqueGroup = true,
+    destructionSoundPresetId = true,
     damageOnExpiration = true,
     healingOnExpiration = true,
     killsOnExpiration = true,
@@ -206,6 +212,7 @@ local buffNumberParameters = {
     "maxManaIncrease",
     "damageFactor",
     "receivedDamageFactor",
+    "returnedMeleeDamageFactor",
     "maximumAutoAttackCount",
     "maximumDamageDealtEventCount",
     "maximumDamageReceivedEventCount",
@@ -254,17 +261,21 @@ local function destroyBuff(buff)
     buff:destroy()
 end
 local function expireBuff(buff)
-    local remainingDamageOverDuration = buff[113] or 0
-    local remainingHealingOverDuration = buff[113] or 0
+    if buff.isDestroyed or buff[100] ~= 1 then
+        return
+    end
+    buff[100] = 2
+    local remainingDamageOverDuration = buff[114] or 0
+    local remainingHealingOverDuration = buff[114] or 0
     if remainingDamageOverDuration ~= 0 or remainingHealingOverDuration ~= 0 then
         buff:flashSpecialEffect()
         if remainingDamageOverDuration ~= 0 then
             (buff[102] or buff[101]):damageTarget(buff[101], remainingDamageOverDuration)
-            buff[113] = nil
+            buff[114] = nil
         end
         if remainingHealingOverDuration ~= 0 then
             (buff[102] or buff[101]):healTarget(buff[101], remainingHealingOverDuration)
-            buff[118] = nil
+            buff[119] = nil
         end
     end
     Timer:run(destroyBuff, buff)
@@ -272,8 +283,8 @@ local function expireBuff(buff)
 end
 local function buffDamageIntervalInitialTimerCallback(buff)
     buffDamageIntervalTimerCallback(buff)
-    local timer = buff[114]
-    local damageInterval = buff[112]
+    local timer = buff[115]
+    local damageInterval = buff[113]
     if timer ~= nil and damageInterval ~= nil and damageInterval > 0 then
         timer:start(damageInterval, true, buffDamageIntervalTimerCallback, buff)
     end
@@ -281,43 +292,43 @@ end
 buffDamageIntervalTimerCallback = function(buff)
     buff:flashSpecialEffect()
     local source = buff[102] or buff[101]
-    local remainingDamageOverDuration = buff[113] or 0
+    local remainingDamageOverDuration = buff[114] or 0
     if remainingDamageOverDuration ~= 0 then
-        local damageInterval = buff[112] or 0
+        local damageInterval = buff[113] or 0
         if damageInterval ~= 0 then
             local damage = remainingDamageOverDuration / (1 + buff.remainingDuration / damageInterval)
             source:damageTarget(buff[101], damage)
-            buff[113] = remainingDamageOverDuration - damage
+            buff[114] = remainingDamageOverDuration - damage
         end
     end
-    local damagePerInterval = buff[111] or 0
+    local damagePerInterval = buff[112] or 0
     if remainingDamageOverDuration == 0 or damagePerInterval ~= 0 then
         source:damageTarget(buff[101], damagePerInterval)
     end
 end
 local function buffHealingIntervalInitialTimerCallback(buff)
     buffHealingIntervalTimerCallback(buff)
-    local timer = buff[119]
-    local healingInterval = buff[117]
+    local timer = buff[120]
+    local healingInterval = buff[118]
     if timer ~= nil and healingInterval ~= nil and healingInterval > 0 then
         timer:start(healingInterval, true, buffHealingIntervalTimerCallback, buff)
     end
 end
 buffHealingIntervalTimerCallback = function(buff)
-    if buff[117] ~= buff[112] then
+    if buff[118] ~= buff[113] then
         buff:flashSpecialEffect()
     end
     local source = buff[102] or buff[101]
-    local remainingHealingOverDuration = buff[118] or 0
+    local remainingHealingOverDuration = buff[119] or 0
     if remainingHealingOverDuration ~= 0 then
-        local healingInterval = buff[117] or 0
+        local healingInterval = buff[118] or 0
         if healingInterval ~= 0 then
             local healing = remainingHealingOverDuration / (1 + buff.remainingDuration / healingInterval)
             source:healTarget(buff[101], healing)
-            buff[118] = remainingHealingOverDuration - healing
+            buff[119] = remainingHealingOverDuration - healing
         end
     end
-    local healingPerInterval = buff[116] or 0
+    local healingPerInterval = buff[117] or 0
     if remainingHealingOverDuration == 0 or healingPerInterval ~= 0 then
         source:healTarget(buff[101], healingPerInterval)
     end
@@ -397,7 +408,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     local missProbability = parameters and parameters.missProbability or defaultParameters.missProbability
     if missProbability ~= nil then
         missProbability = resolveNumberValue(ability, level, missProbability)
-        self[146] = missProbability
+        self[147] = missProbability
     end
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
@@ -442,17 +453,18 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     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)
+    self[105] = parameters and parameters.destructionSoundPresetId or defaultParameters and defaultParameters.destructionSoundPresetId
+    self[106] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_EFFECT, 0)
+    self[107] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_SPECIAL, 0)
     if parameters ~= nil or (next(defaultParameters)) ~= nil then
         for ____, buffBooleanParameter in ipairs(buffBooleanParameters) do
-            local ____ability_24 = ability
-            local ____level_25 = level
-            local ____temp_23 = parameters and parameters[buffBooleanParameter]
-            if ____temp_23 == nil then
-                ____temp_23 = defaultParameters[buffBooleanParameter]
+            local ____ability_28 = ability
+            local ____level_29 = level
+            local ____temp_27 = parameters and parameters[buffBooleanParameter]
+            if ____temp_27 == nil then
+                ____temp_27 = defaultParameters[buffBooleanParameter]
             end
-            if resolveBooleanValue(____ability_24, ____level_25, ____temp_23) then
+            if resolveBooleanValue(____ability_28, ____level_29, ____temp_27) then
                 self[buffBooleanParameter] = true
             end
         end
@@ -468,11 +480,11 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         end
         local maximumDuration = parameters and parameters.maximumDuration or defaultParameters.maximumDuration
         if maximumDuration ~= nil then
-            self[108] = resolveNumberValue(ability, level, maximumDuration)
+            self[109] = resolveNumberValue(ability, level, maximumDuration)
         end
         local maximumRemainingDuration = parameters and parameters.maximumRemainingDuration or defaultParameters.maximumRemainingDuration
         if maximumRemainingDuration ~= nil then
-            self[109] = resolveNumberValue(ability, level, maximumRemainingDuration)
+            self[110] = resolveNumberValue(ability, level, maximumRemainingDuration)
         end
         local parametersAbilityTypeIds = parameters and parameters.abilityTypeIds or defaultParameters.abilityTypeIds
         if parametersAbilityTypeIds ~= nil then
@@ -482,7 +494,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
                 self._abilityTypeIds = abilityTypeIds
             end
             for ____, abilityTypeId in ipairs(sortedKeysUnnested(parametersAbilityTypeIds)) do
-                local abilityParameters = parametersAbilityTypeIds[abilityTypeId]
+                local abilityParameters = checkNotNull(parametersAbilityTypeIds[abilityTypeId])
                 local addedAbility = _unit:addAbility(abilityTypeId)
                 if addedAbility ~= nil then
                     _unit:makeAbilityPermanent(abilityTypeId, true)
@@ -535,7 +547,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
 end
 function Buff.prototype.onAbilityGained(self, ability)
     if __TS__InstanceOf(ability, UnitAbility) then
-        local abilityCooldownModifier = self[148]
+        local abilityCooldownModifier = self[149]
         if abilityCooldownModifier then
             COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:applyModifier(ability, abilityCooldownModifier)
         end
@@ -543,7 +555,7 @@ function Buff.prototype.onAbilityGained(self, ability)
 end
 function Buff.prototype.onAbilityLost(self, ability)
     if __TS__InstanceOf(ability, UnitAbility) then
-        local abilityCooldownModifier = self[148]
+        local abilityCooldownModifier = self[149]
         if abilityCooldownModifier then
             COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, abilityCooldownModifier)
         end
@@ -551,7 +563,7 @@ function Buff.prototype.onAbilityLost(self, ability)
 end
 function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     self:flash(
-        self[105],
+        self[106],
         stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin",
         widgetOrXOrParametersOrDuration,
         yOrParametersOrDuration,
@@ -560,7 +572,7 @@ function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrPa
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     self:flash(
-        self[106],
+        self[107],
         stringValueByBuffTypeIdByFieldId[fourCC("fspt")][self.typeId] or "origin",
         widgetOrXOrParametersOrDuration,
         yOrParametersOrDuration,
@@ -572,44 +584,64 @@ function Buff.prototype.flash(self, modelPath, attachmentPoint, widgetOrXOrParam
         Effect:flash(modelPath, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
         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(modelPath, isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit, attachmentPoint)
-        local ____isWidgetProvided_38
+        local ____Effect_44 = Effect
+        local ____Effect_flash_45 = Effect.flash
+        local ____array_43 = __TS__SparseArrayNew(modelPath, isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit, attachmentPoint)
+        local ____isWidgetProvided_42
         if isWidgetProvided then
-            ____isWidgetProvided_38 = yOrParametersOrDuration
+            ____isWidgetProvided_42 = yOrParametersOrDuration
         else
-            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+            ____isWidgetProvided_42 = widgetOrXOrParametersOrDuration
         end
-        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-        ____Effect_flash_41(
-            ____Effect_40,
-            __TS__SparseArraySpread(____array_39)
+        __TS__SparseArrayPush(____array_43, ____isWidgetProvided_42)
+        ____Effect_flash_45(
+            ____Effect_44,
+            __TS__SparseArraySpread(____array_43)
         )
     end
 end
 function Buff.prototype.expire(self)
     expireBuff(self)
 end
+function Buff.prototype.dispel(self, source)
+    if self.isDestroyed or self[100] ~= 1 then
+        return
+    end
+    self[100] = 2
+    do
+        pcall(function()
+            self:onDispel(source)
+        end)
+        do
+            self:destroy()
+        end
+    end
+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
+    local destructionSoundPresetId = self[105]
+    if destructionSoundPresetId ~= nil then
+        Sound3D:playFromLabel(destructionSoundPresetId, SoundSettings.Ability, unit)
+    end
     if getUnitAbility(unit.handle, self.typeId) == self.handle then
         removeBuff(unit.handle, self.typeId)
+    else
+        removeBuffApplicator(unit.handle, self.typeId)
     end
     buffByTypeIdByUnit[unit][self.typeId] = nil
-    local healingIntervalTimer = self[119]
+    local healingIntervalTimer = self[120]
     if healingIntervalTimer ~= nil then
         healingIntervalTimer:destroy()
-        self[119] = nil
+        self[120] = nil
     end
-    local damageIntervalTimer = self[114]
+    local damageIntervalTimer = self[115]
     if damageIntervalTimer ~= nil then
         damageIntervalTimer:destroy()
-        self[114] = nil
+        self[115] = nil
     end
     if self._timer ~= nil then
         self._timer:destroy()
@@ -619,25 +651,25 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    local previousAbilityCooldownModifier = self[148]
+    local previousAbilityCooldownModifier = self[149]
     if previousAbilityCooldownModifier then
         for ____, ability in ipairs(self._unit.abilities) do
             COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, previousAbilityCooldownModifier)
         end
     end
-    if self[143] then
+    if self[144] then
         unit:decrementInvulnerabilityCounter()
     end
-    if self[142] then
+    if self[143] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[140] then
-        if self[141] then
+    if self[141] then
+        if self[142] then
             unit:decrementForceStunCounter()
         end
         unit:decrementStunCounter()
     end
-    if self[139] then
+    if self[140] then
         unit:decrementGhostCounter()
     end
     if self._abilityTypeIds ~= nil then
@@ -674,49 +706,51 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getByTypeId(self, unit, typeId)
-    local ____opt_42 = buffByTypeIdByUnit[unit]
-    local buff = ____opt_42 and ____opt_42[typeId]
+    local ____opt_46 = buffByTypeIdByUnit[unit]
+    local buff = ____opt_46 and ____opt_46[typeId]
     if __TS__InstanceOf(buff, self) then
         return buff
     end
     return nil
 end
+function Buff.prototype.onDispel(self, source)
+end
 function Buff.prototype.onExpiration(self)
     local unit = self.unit
-    if self[120] ~= nil then
-        (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)
+        (self[102] or unit):damageTarget(unit, self[121] or 0)
+    end
+    if self[122] ~= nil then
+        (self[102] or unit):healTarget(unit, self[121] or 0)
     end
-    if self[145] then
+    if self[146] then
         unit:explode()
-    elseif self[144] then
+    elseif self[145] then
         unit:kill()
     end
 end
 function Buff.prototype.onDeath(self, source)
     local unit = self.unit
-    if self[122] ~= nil then
+    if self[123] ~= nil then
         damageArea(
             self[102] or unit,
-            self[122],
+            self[123],
             unit.x,
             unit.y,
+            self[125] or 0,
             self[124] or 0,
-            self[123] or 0,
+            self[127] or 0,
             self[126] or 0,
-            self[125] or 0,
-            self[128] or 0,
-            self[127] or 0
+            self[129] or 0,
+            self[128] or 0
         )
     end
 end
 function Buff.prototype.onDamageDealt(self, target, event)
     if event.isAttack then
-        if self[107] ~= nil then
-            local durationIncrease = self[107]
-            local maximumDuration = self[108] or 0
+        if self[108] ~= nil then
+            local durationIncrease = self[108]
+            local maximumDuration = self[109] or 0
             if maximumDuration > 0 then
                 durationIncrease = min(
                     durationIncrease,
@@ -724,43 +758,43 @@ function Buff.prototype.onDamageDealt(self, target, event)
                 )
             end
             local remainingDuration = self.remainingDuration + durationIncrease
-            local maximumRemainingDuration = self[109] or 0
+            local maximumRemainingDuration = self[110] or 0
             if maximumRemainingDuration > 0 then
                 remainingDuration = min(remainingDuration, maximumRemainingDuration)
             end
             self.remainingDuration = remainingDuration
         end
-        local autoAttackCount = (self[129] or 0) + 1
-        self[129] = autoAttackCount
-        if autoAttackCount == self[130] then
+        local autoAttackCount = (self[130] or 0) + 1
+        self[130] = autoAttackCount
+        if autoAttackCount == self[131] then
             self:destroy()
         end
     end
     if event.originalAmount ~= 0 then
-        local damageDealtEventCount = (self[131] or 0) + 1
-        self[131] = damageDealtEventCount
-        if damageDealtEventCount == self[132] then
+        local damageDealtEventCount = (self[132] or 0) + 1
+        self[132] = damageDealtEventCount
+        if damageDealtEventCount == self[133] then
             self:destroy()
         end
     end
 end
 function Buff.prototype.onDamageReceived(self, source, event)
     if event.originalAmount ~= 0 then
-        local absorbedDamage = min(event.amount * (self[135] or 1), (self[136] or 0) - (self[137] or 0))
+        local absorbedDamage = min(event.amount * (self[136] or 1), (self[137] or 0) - (self[138] or 0))
         if absorbedDamage > 0 then
             event.amount = event.amount - absorbedDamage
-            self[137] = (self[137] or 0) + absorbedDamage
-            local ____self__138_44 = self[138]
-            if ____self__138_44 == nil then
-                ____self__138_44 = true
+            self[138] = (self[138] or 0) + absorbedDamage
+            local ____self__139_48 = self[139]
+            if ____self__139_48 == nil then
+                ____self__139_48 = true
             end
-            if ____self__138_44 and self[137] >= (self[136] or 0) then
+            if ____self__139_48 and self[138] >= (self[137] or 0) then
                 self:destroy()
             end
         end
-        local damageReceivedEventCount = (self[133] or 0) + 1
-        self[133] = damageReceivedEventCount
-        if damageReceivedEventCount == self[134] then
+        local damageReceivedEventCount = (self[134] or 0) + 1
+        self[134] = damageReceivedEventCount
+        if damageReceivedEventCount == self[135] then
             self:destroy()
         end
     end
@@ -787,13 +821,13 @@ __TS__SetDescriptor(
     "remainingDamageOverDuration",
     {
         get = function(self)
-            return self[113] or 0
+            return self[114] or 0
         end,
         set = function(self, remainingDamageOverDuration)
-            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
+            local remainingDamageOverDurationDelta = remainingDamageOverDuration - (self[114] or 0)
+            self[114] = remainingDamageOverDuration ~= 0 and remainingDamageOverDuration or nil
+            local damageOverDuration = (self[111] or 0) + remainingDamageOverDurationDelta
+            self[111] = damageOverDuration ~= 0 and damageOverDuration or nil
         end
     },
     true
@@ -803,13 +837,13 @@ __TS__SetDescriptor(
     "damageOverDuration",
     {
         get = function(self)
-            return self[110] or 0
+            return self[111] or 0
         end,
         set = function(self, damageOverDuration)
-            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
+            local damageOverDurationDelta = damageOverDuration - (self[111] or 0)
+            self[111] = damageOverDuration ~= 0 and damageOverDuration or nil
+            local remainingDamageOverDuration = (self[114] or 0) + damageOverDurationDelta
+            self[114] = remainingDamageOverDuration ~= 0 and remainingDamageOverDuration or nil
         end
     },
     true
@@ -819,10 +853,10 @@ __TS__SetDescriptor(
     "damagePerInterval",
     {
         get = function(self)
-            return self[111] or 0
+            return self[112] or 0
         end,
         set = function(self, damagePerInterval)
-            self[111] = damagePerInterval ~= 0 and damagePerInterval or nil
+            self[112] = damagePerInterval ~= 0 and damagePerInterval or nil
         end
     },
     true
@@ -832,25 +866,25 @@ __TS__SetDescriptor(
     "damageInterval",
     {
         get = function(self)
-            return self[112] or 0
+            return self[113] or 0
         end,
         set = function(self, damageInterval)
             if damageInterval <= 0 then
-                self[112] = damageInterval ~= 0 and damageInterval or nil
-                local timer = self[114]
+                self[113] = damageInterval ~= 0 and damageInterval or nil
+                local timer = self[115]
                 if timer ~= nil then
                     timer:destroy()
-                    self[114] = nil
+                    self[115] = nil
                 end
                 return
             end
-            self[112] = damageInterval
-            local ____opt_45 = self._timer
-            local elapsed = ____opt_45 and ____opt_45.elapsed or 0
-            local timer = self[114]
+            self[113] = damageInterval
+            local ____opt_49 = self._timer
+            local elapsed = ____opt_49 and ____opt_49.elapsed or 0
+            local timer = self[115]
             if timer == nil then
                 timer = Timer:create()
-                self[114] = timer
+                self[115] = timer
             end
             local initialDelay = damageInterval - (elapsed >= damageInterval and math.fmod(elapsed, damageInterval) or elapsed)
             if initialDelay == damageInterval then
@@ -867,13 +901,13 @@ __TS__SetDescriptor(
     "remainingHealingOverDuration",
     {
         get = function(self)
-            return self[118] or 0
+            return self[119] or 0
         end,
         set = function(self, remainingHealingOverDuration)
-            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
+            local remainingHealingOverDurationDelta = remainingHealingOverDuration - (self[119] or 0)
+            self[114] = remainingHealingOverDuration ~= 0 and remainingHealingOverDuration or nil
+            local healingOverDuration = (self[116] or 0) + remainingHealingOverDurationDelta
+            self[116] = healingOverDuration ~= 0 and healingOverDuration or nil
         end
     },
     true
@@ -883,13 +917,13 @@ __TS__SetDescriptor(
     "healingOverDuration",
     {
         get = function(self)
-            return self[115] or 0
+            return self[116] or 0
         end,
         set = function(self, healingOverDuration)
-            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
+            local healingOverDurationDelta = healingOverDuration - (self[116] or 0)
+            self[116] = healingOverDuration ~= 0 and healingOverDuration or nil
+            local remainingHealingOverDuration = (self[119] or 0) + healingOverDurationDelta
+            self[119] = remainingHealingOverDuration ~= 0 and remainingHealingOverDuration or nil
         end
     },
     true
@@ -899,10 +933,10 @@ __TS__SetDescriptor(
     "healingPerInterval",
     {
         get = function(self)
-            return self[116] or 0
+            return self[117] or 0
         end,
         set = function(self, healingPerInterval)
-            self[116] = healingPerInterval ~= 0 and healingPerInterval or nil
+            self[117] = healingPerInterval ~= 0 and healingPerInterval or nil
         end
     },
     true
@@ -912,25 +946,25 @@ __TS__SetDescriptor(
     "healingInterval",
     {
         get = function(self)
-            return self[117] or 0
+            return self[118] or 0
         end,
         set = function(self, healingInterval)
             if healingInterval <= 0 then
-                self[117] = healingInterval ~= 0 and healingInterval or nil
-                local timer = self[119]
+                self[118] = healingInterval ~= 0 and healingInterval or nil
+                local timer = self[120]
                 if timer ~= nil then
                     timer:destroy()
-                    self[119] = nil
+                    self[120] = nil
                 end
                 return
             end
-            self[117] = healingInterval
-            local ____opt_47 = self._timer
-            local elapsed = ____opt_47 and ____opt_47.elapsed or 0
-            local timer = self[119]
+            self[118] = healingInterval
+            local ____opt_51 = self._timer
+            local elapsed = ____opt_51 and ____opt_51.elapsed or 0
+            local timer = self[120]
             if timer == nil then
                 timer = Timer:create()
-                self[119] = timer
+                self[120] = timer
             end
             local initialDelay = healingInterval - (elapsed >= healingInterval and math.fmod(elapsed, healingInterval) or elapsed)
             if initialDelay == healingInterval then
@@ -947,10 +981,10 @@ __TS__SetDescriptor(
     "damageOnExpiration",
     {
         get = function(self)
-            return self[120] or 0
+            return self[121] or 0
         end,
         set = function(self, damageOnExpiration)
-            self[120] = damageOnExpiration ~= 0 and damageOnExpiration or nil
+            self[121] = damageOnExpiration ~= 0 and damageOnExpiration or nil
         end
     },
     true
@@ -960,10 +994,10 @@ __TS__SetDescriptor(
     "healingOnExpiration",
     {
         get = function(self)
-            return self[121] or 0
+            return self[122] or 0
         end,
         set = function(self, healingOnExpiration)
-            self[121] = healingOnExpiration ~= 0 and healingOnExpiration or nil
+            self[122] = healingOnExpiration ~= 0 and healingOnExpiration or nil
         end
     },
     true
@@ -994,6 +1028,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "returnedMeleeDamageFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.RETURNED_MELEE_DAMAGE_FACTOR)
+        end,
+        set = function(self, returnedMeleeDamageFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.RETURNED_MELEE_DAMAGE_FACTOR, returnedMeleeDamageFactor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "armorIncrease",
@@ -1038,19 +1085,19 @@ __TS__SetDescriptor(
     "turnsIntoGhost",
     {
         get = function(self)
-            local ____self__139_49 = self[139]
-            if ____self__139_49 == nil then
-                ____self__139_49 = false
+            local ____self__140_53 = self[140]
+            if ____self__140_53 == nil then
+                ____self__140_53 = false
             end
-            return ____self__139_49
+            return ____self__140_53
         end,
         set = function(self, turnsIntoGhost)
-            if not turnsIntoGhost and self[139] then
+            if not turnsIntoGhost and self[140] then
                 self.object:decrementGhostCounter()
-                self[139] = nil
-            elseif turnsIntoGhost and not self[139] then
+                self[140] = nil
+            elseif turnsIntoGhost and not self[140] then
                 self.object:incrementGhostCounter()
-                self[139] = true
+                self[140] = true
             end
         end
     },
@@ -1061,25 +1108,25 @@ __TS__SetDescriptor(
     "stuns",
     {
         get = function(self)
-            local ____self__140_50 = self[140]
-            if ____self__140_50 == nil then
-                ____self__140_50 = false
+            local ____self__141_54 = self[141]
+            if ____self__141_54 == nil then
+                ____self__141_54 = false
             end
-            return ____self__140_50
+            return ____self__141_54
         end,
         set = function(self, stuns)
-            if not stuns and self[140] then
-                if self[141] then
+            if not stuns and self[141] then
+                if self[142] then
                     self.object:decrementForceStunCounter()
                 end
                 self.object:decrementStunCounter()
-                self[140] = nil
-            elseif stuns and not self[140] then
-                if self[141] then
+                self[141] = nil
+            elseif stuns and not self[141] then
+                if self[142] then
                     self.object:incrementForceStunCounter()
                 end
                 self.object:incrementStunCounter()
-                self[140] = true
+                self[141] = true
             end
         end
     },
@@ -1090,23 +1137,23 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__141_51 = self[141]
-            if ____self__141_51 == nil then
-                ____self__141_51 = false
+            local ____self__142_55 = self[142]
+            if ____self__142_55 == nil then
+                ____self__142_55 = false
             end
-            return ____self__141_51
+            return ____self__142_55
         end,
         set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[141] then
-                if self[140] then
+            if not ignoresStunImmunity and self[142] then
+                if self[141] then
                     self.object:decrementForceStunCounter()
                 end
-                self[141] = nil
-            elseif ignoresStunImmunity and not self[141] then
-                if self[140] then
+                self[142] = nil
+            elseif ignoresStunImmunity and not self[142] then
+                if self[141] then
                     self.object:incrementForceStunCounter()
                 end
-                self[141] = true
+                self[142] = true
             end
         end
     },
@@ -1117,19 +1164,19 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__142_52 = self[142]
-            if ____self__142_52 == nil then
-                ____self__142_52 = false
+            local ____self__143_56 = self[143]
+            if ____self__143_56 == nil then
+                ____self__143_56 = false
             end
-            return ____self__142_52
+            return ____self__143_56
         end,
         set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[142] then
+            if not disablesAutoAttack and self[143] then
                 self.object:decrementDisableAutoAttackCounter()
-                self[142] = nil
-            elseif disablesAutoAttack and not self[142] then
+                self[143] = nil
+            elseif disablesAutoAttack and not self[143] then
                 self.object:incrementDisableAutoAttackCounter()
-                self[142] = true
+                self[143] = true
             end
         end
     },
@@ -1140,19 +1187,19 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__143_53 = self[143]
-            if ____self__143_53 == nil then
-                ____self__143_53 = false
+            local ____self__144_57 = self[144]
+            if ____self__144_57 == nil then
+                ____self__144_57 = false
             end
-            return ____self__143_53
+            return ____self__144_57
         end,
         set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[143] then
+            if not providesInvulnerability and self[144] then
                 self.object:decrementInvulnerabilityCounter()
-                self[143] = nil
-            elseif providesInvulnerability and not self[143] then
+                self[144] = nil
+            elseif providesInvulnerability and not self[144] then
                 self.object:incrementInvulnerabilityCounter()
-                self[143] = true
+                self[144] = true
             end
         end
     },
@@ -1163,17 +1210,17 @@ __TS__SetDescriptor(
     "killsOnExpiration",
     {
         get = function(self)
-            local ____self__144_54 = self[144]
-            if ____self__144_54 == nil then
-                ____self__144_54 = false
+            local ____self__145_58 = self[145]
+            if ____self__145_58 == nil then
+                ____self__145_58 = false
             end
-            return ____self__144_54
+            return ____self__145_58
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[144] then
-                self[144] = nil
-            elseif killsOnExpiration and not self[144] then
-                self[144] = true
+            if not killsOnExpiration and self[145] then
+                self[145] = nil
+            elseif killsOnExpiration and not self[145] then
+                self[145] = true
             end
         end
     },
@@ -1184,17 +1231,17 @@ __TS__SetDescriptor(
     "explodesOnExpiration",
     {
         get = function(self)
-            local ____self__145_55 = self[145]
-            if ____self__145_55 == nil then
-                ____self__145_55 = false
+            local ____self__146_59 = self[146]
+            if ____self__146_59 == nil then
+                ____self__146_59 = false
             end
-            return ____self__145_55
+            return ____self__146_59
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[145] then
-                self[145] = nil
-            elseif killsOnExpiration and not self[145] then
-                self[145] = true
+            if not killsOnExpiration and self[146] then
+                self[146] = nil
+            elseif killsOnExpiration and not self[146] then
+                self[146] = true
             end
         end
     },
@@ -1205,13 +1252,13 @@ __TS__SetDescriptor(
     "maximumDamageDealtEventCount",
     {
         get = function(self)
-            return self[132] or 0
+            return self[133] or 0
         end,
         set = function(self, maximumDamageDealtEventCount)
             if maximumDamageDealtEventCount == 0 then
-                self[132] = nil
+                self[133] = nil
             else
-                self[132] = maximumDamageDealtEventCount
+                self[133] = maximumDamageDealtEventCount
             end
         end
     },
@@ -1222,13 +1269,13 @@ __TS__SetDescriptor(
     "maximumDamageReceivedEventCount",
     {
         get = function(self)
-            return self[134] or 0
+            return self[135] or 0
         end,
         set = function(self, maximumDamageReceivedEventCount)
             if maximumDamageReceivedEventCount == 0 then
-                self[134] = nil
+                self[135] = nil
             else
-                self[134] = maximumDamageReceivedEventCount
+                self[135] = maximumDamageReceivedEventCount
             end
         end
     },
@@ -1239,13 +1286,13 @@ __TS__SetDescriptor(
     "maximumAutoAttackCount",
     {
         get = function(self)
-            return self[130] or 0
+            return self[131] or 0
         end,
         set = function(self, maximumAutoAttackCount)
             if maximumAutoAttackCount == 0 then
-                self[130] = nil
+                self[131] = nil
             else
-                self[130] = maximumAutoAttackCount
+                self[131] = maximumAutoAttackCount
             end
         end
     },
@@ -1256,10 +1303,10 @@ __TS__SetDescriptor(
     "durationIncreaseOnAutoAttack",
     {
         get = function(self)
-            return self[107] or 0
+            return self[108] or 0
         end,
         set = function(self, durationIncreaseOnAutoAttack)
-            self[107] = durationIncreaseOnAutoAttack
+            self[108] = durationIncreaseOnAutoAttack
         end
     },
     true
@@ -1343,13 +1390,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_56 = self._timer
-            return ____opt_56 and ____opt_56.remaining or 0
+            local ____opt_60 = self._timer
+            return ____opt_60 and ____opt_60.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_60 = remainingDuration
-            local ____opt_58 = self._timer
-            local remainingDurationDelta = ____remainingDuration_60 - (____opt_58 and ____opt_58.remaining or 0)
+            local ____remainingDuration_64 = remainingDuration
+            local ____opt_62 = self._timer
+            local remainingDurationDelta = ____remainingDuration_64 - (____opt_62 and ____opt_62.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1364,7 +1411,7 @@ __TS__SetDescriptor(
                         remainingDuration,
                         self._spellStealPriority,
                         self._learnLevelMinimum,
-                        self[146]
+                        self[147]
                     ) then
                         local timer = self._timer
                         if timer == nil then
@@ -1384,13 +1431,13 @@ __TS__SetDescriptor(
     "absorbedDamageFactor",
     {
         get = function(self)
-            return self[135] or 1
+            return self[136] or 1
         end,
         set = function(self, absorbedDamageFactor)
             if absorbedDamageFactor == 1 then
-                self[135] = nil
+                self[136] = nil
             else
-                self[135] = absorbedDamageFactor
+                self[136] = absorbedDamageFactor
             end
         end
     },
@@ -1401,13 +1448,13 @@ __TS__SetDescriptor(
     "maximumDamageAbsorbed",
     {
         get = function(self)
-            return self[136] or 0
+            return self[137] or 0
         end,
         set = function(self, maximumDamageAbsorbed)
             if maximumDamageAbsorbed == 0 then
-                self[136] = nil
+                self[137] = nil
             else
-                self[136] = maximumDamageAbsorbed
+                self[137] = maximumDamageAbsorbed
             end
         end
     },
@@ -1417,7 +1464,7 @@ __TS__SetDescriptor(
     Buff.prototype,
     "damageAbsorbed",
     {get = function(self)
-        return self[137] or 0
+        return self[138] or 0
     end},
     true
 )
@@ -1426,20 +1473,20 @@ __TS__SetDescriptor(
     "destroysOnMaximumDamageAbsorbed",
     {
         get = function(self)
-            local ____self__138_61 = self[138]
-            if ____self__138_61 == nil then
-                ____self__138_61 = true
+            local ____self__139_65 = self[139]
+            if ____self__139_65 == nil then
+                ____self__139_65 = true
             end
-            return ____self__138_61
+            return ____self__139_65
         end,
         set = function(self, destroysOnMaximumDamageAbsorbed)
-            local ____destroysOnMaximumDamageAbsorbed_62
+            local ____destroysOnMaximumDamageAbsorbed_66
             if destroysOnMaximumDamageAbsorbed then
-                ____destroysOnMaximumDamageAbsorbed_62 = nil
+                ____destroysOnMaximumDamageAbsorbed_66 = nil
             else
-                ____destroysOnMaximumDamageAbsorbed_62 = false
+                ____destroysOnMaximumDamageAbsorbed_66 = false
             end
-            self[138] = ____destroysOnMaximumDamageAbsorbed_62
+            self[139] = ____destroysOnMaximumDamageAbsorbed_66
         end
     },
     true
@@ -1449,10 +1496,10 @@ __TS__SetDescriptor(
     "abilityCooldownFactor",
     {
         get = function(self)
-            return self[147] or 1
+            return self[148] or 1
         end,
         set = function(self, abilityCooldownFactor)
-            local previousAbilityCooldownModifier = self[148]
+            local previousAbilityCooldownModifier = self[149]
             if previousAbilityCooldownModifier then
                 for ____, ability in ipairs(self._unit.abilities) do
                     COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, previousAbilityCooldownModifier)
@@ -1464,8 +1511,8 @@ __TS__SetDescriptor(
             for ____, ability in ipairs(self._unit.abilities) do
                 COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:applyModifier(ability, modifier)
             end
-            self[148] = modifier
-            self[147] = abilityCooldownFactor
+            self[149] = modifier
+            self[148] = abilityCooldownFactor
         end
     },
     true
@@ -1473,35 +1520,40 @@ __TS__SetDescriptor(
 Buff.createdEvent = buffCreatedEvent
 Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
 (function(self)
-    local function destroyBuffIfNeeded(buff)
-        if getUnitAbility(buff[101].handle, buff.typeId) ~= buff.handle and buff[100] == 1 then
-            buff:destroy()
+    local function destroyBuffIfNeeded(buff, isDispel, source)
+        local currentHandle = getUnitAbility(buff[101].handle, buff.typeId)
+        if currentHandle ~= buff.handle and buff[100] == 1 then
+            if isDispel and currentHandle == nil and buff.unit.isAlive and buff.resistanceType == 1 and (buff._timer == nil or buff.remainingDuration > 0) then
+                buff:dispel(source)
+            else
+                buff:destroy()
+            end
         end
     end
-    ____exports.checkBuff = function(unit, buffTypeId)
+    ____exports.checkBuff = function(unit, buffTypeId, isDispel, source)
         local buffByTypeId = buffByTypeIdByUnit[unit]
         if buffByTypeId ~= nil then
             local buff = buffByTypeId[buffTypeId]
             if buff ~= nil then
-                destroyBuffIfNeeded(buff)
+                destroyBuffIfNeeded(buff, isDispel, source)
             end
         end
     end
-    ____exports.checkBuffs = function(unit)
-        ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
+    ____exports.checkBuffs = function(unit, isDispel, source)
+        ____exports.Buff:forAll(unit, destroyBuffIfNeeded, isDispel, source)
     end
     Unit.abilityChannelingStartEvent:addListener(
         0,
         function(caster)
-            ____exports.checkBuffs(caster)
-            Timer:run(____exports.checkBuffs, caster)
+            ____exports.checkBuffs(caster, true, caster)
+            Timer:run(____exports.checkBuffs, caster, true, caster)
         end
     )
     Unit.abilityUnitTargetChannelingStartEvent:addListener(
         0,
         function(caster, ability, target)
-            ____exports.checkBuffs(target)
-            Timer:run(____exports.checkBuffs, target)
+            ____exports.checkBuffs(target, true, caster)
+            Timer:run(____exports.checkBuffs, target, true, caster)
         end
     )
     Unit.abilityPointTargetChannelingStartEvent:addListener(
@@ -1512,17 +1564,40 @@ Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
                 y,
                 ability:getField(ABILITY_RLF_AREA_OF_EFFECT)
             )
-            forEach(units, ____exports.checkBuffs)
-            Timer:run(forEach, units, ____exports.checkBuffs)
+            forEach(units, ____exports.checkBuffs, true, caster)
+            Timer:run(
+                forEach,
+                units,
+                ____exports.checkBuffs,
+                true,
+                caster
+            )
+        end
+    )
+    Unit.abilityNoTargetChannelingStartEvent:addListener(
+        0,
+        function(caster, ability)
+            local radius = ability:getField(ABILITY_RLF_AREA_OF_EFFECT)
+            if radius > 0 then
+                local units = Unit:getInCollisionRange(caster.x, caster.y, radius)
+                forEach(units, ____exports.checkBuffs, true, caster)
+                Timer:run(
+                    forEach,
+                    units,
+                    ____exports.checkBuffs,
+                    true,
+                    caster
+                )
+            end
         end
     )
     Unit.onDamage:addListener(
         0,
         function(source, target)
             if source ~= nil then
-                ____exports.checkBuffs(source)
+                Timer:run(____exports.checkBuffs, source, false)
             end
-            ____exports.checkBuffs(target)
+            Timer:run(____exports.checkBuffs, target, false)
         end
     )
     buffCreatedEvent:addListener(function(buff)