warscript 0.0.1-dev.8895ff6 → 0.0.1-dev.89bc33b

package/engine/buff.lua

@@ -103,7 +103,8 @@ local buffParametersKeys = {
     damageIncrease = true,
     damageIncreaseFactor = true,
     armorIncrease = true,
-    armorIncreaseFactor = true,
+    maxHealthIncrease = true,
+    maxManaIncrease = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
     manaRegenerationRateIncreaseFactor = true,
@@ -126,6 +127,9 @@ local buffParametersKeys = {
     maximumAutoAttackCount = true,
     maximumDamageDealtEventCount = true,
     maximumDamageReceivedEventCount = true,
+    absorbedDamageFactor = true,
+    maximumDamageAbsorbed = true,
+    destroysOnMaximumDamageAbsorbed = true,
     uniqueGroup = true,
     damageOnExpiration = true,
     healingOnExpiration = true,
@@ -182,6 +186,7 @@ local function resolveAndSetNumberValue(buff, property, ability, level, value, d
     end
 end
 local buffBooleanParameters = {
+    "destroysOnMaximumDamageAbsorbed",
     "turnsIntoGhost",
     "stuns",
     "ignoresStunImmunity",
@@ -197,6 +202,8 @@ local buffNumberParameters = {
     "manaRegenerationRateIncreaseFactor",
     "evasionProbability",
     "armorIncrease",
+    "maxHealthIncrease",
+    "maxManaIncrease",
     "damageFactor",
     "receivedDamageFactor",
     "maximumAutoAttackCount",
@@ -210,6 +217,8 @@ local buffNumberParameters = {
     "healingOverDuration",
     "damageOnExpiration",
     "healingOnExpiration",
+    "absorbedDamageFactor",
+    "maximumDamageAbsorbed",
     "abilityCooldownFactor"
 }
 local unsuccessfulApplicationMarker = {}
@@ -245,6 +254,10 @@ local function destroyBuff(buff)
     buff:destroy()
 end
 local function expireBuff(buff)
+    if buff.isDestroyed or buff[100] ~= 1 then
+        return
+    end
+    buff[100] = 2
     local remainingDamageOverDuration = buff[113] or 0
     local remainingHealingOverDuration = buff[113] or 0
     if remainingDamageOverDuration ~= 0 or remainingHealingOverDuration ~= 0 then
@@ -388,14 +401,15 @@ 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[142] = missProbability
+        self[146] = missProbability
     end
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
         buffByTypeId = {}
         buffByTypeIdByUnit[_unit] = buffByTypeId
     end
-    local ____opt_15 = buffByTypeId[typeId]
+    self.previousBuff = buffByTypeId[typeId]
+    local ____opt_15 = self.previousBuff
     if ____opt_15 ~= nil then
         ____opt_15:destroy()
     end
@@ -472,7 +486,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)
@@ -525,7 +539,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[144]
+        local abilityCooldownModifier = self[148]
         if abilityCooldownModifier then
             COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:applyModifier(ability, abilityCooldownModifier)
         end
@@ -533,24 +547,38 @@ function Buff.prototype.onAbilityGained(self, ability)
 end
 function Buff.prototype.onAbilityLost(self, ability)
     if __TS__InstanceOf(ability, UnitAbility) then
-        local abilityCooldownModifier = self[144]
+        local abilityCooldownModifier = self[148]
         if abilityCooldownModifier then
             COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, abilityCooldownModifier)
         end
     end
 end
 function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+    self:flash(
+        self[105],
+        stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin",
+        widgetOrXOrParametersOrDuration,
+        yOrParametersOrDuration,
+        parametersOrDuration
+    )
+end
+function Buff.prototype.flashSpecialEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+    self:flash(
+        self[106],
+        stringValueByBuffTypeIdByFieldId[fourCC("fspt")][self.typeId] or "origin",
+        widgetOrXOrParametersOrDuration,
+        yOrParametersOrDuration,
+        parametersOrDuration
+    )
+end
+function Buff.prototype.flash(self, modelPath, attachmentPoint, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
-        Effect:flash(self[105], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+        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(
-            self[105],
-            isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
-            stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
-        )
+        local ____array_39 = __TS__SparseArrayNew(modelPath, isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit, attachmentPoint)
         local ____isWidgetProvided_38
         if isWidgetProvided then
             ____isWidgetProvided_38 = yOrParametersOrDuration
@@ -564,26 +592,22 @@ function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrPa
         )
     end
 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[106],
-        isWidgetProvided and widgetOrDuration or self._unit,
-        stringValueByBuffTypeIdByFieldId[fourCC("fspt")][self.typeId] or "origin"
-    )
-    local ____isWidgetProvided_42
-    if isWidgetProvided then
-        ____isWidgetProvided_42 = duration
-    else
-        ____isWidgetProvided_42 = widgetOrDuration
+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
-    __TS__SparseArrayPush(____array_43, ____isWidgetProvided_42)
-    ____Effect_flash_45(
-        ____Effect_44,
-        __TS__SparseArraySpread(____array_43)
-    )
 end
 function Buff.prototype.onCreate(self)
 end
@@ -613,25 +637,25 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    local previousAbilityCooldownModifier = self[144]
+    local previousAbilityCooldownModifier = self[148]
     if previousAbilityCooldownModifier then
         for ____, ability in ipairs(self._unit.abilities) do
             COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, previousAbilityCooldownModifier)
         end
     end
-    if self[139] then
+    if self[143] then
         unit:decrementInvulnerabilityCounter()
     end
-    if self[138] then
+    if self[142] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[136] then
-        if self[137] then
+    if self[140] then
+        if self[141] then
             unit:decrementForceStunCounter()
         end
         unit:decrementStunCounter()
     end
-    if self[135] then
+    if self[139] then
         unit:decrementGhostCounter()
     end
     if self._abilityTypeIds ~= nil then
@@ -668,13 +692,15 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getByTypeId(self, unit, typeId)
-    local ____opt_46 = buffByTypeIdByUnit[unit]
-    local buff = ____opt_46 and ____opt_46[typeId]
+    local ____opt_42 = buffByTypeIdByUnit[unit]
+    local buff = ____opt_42 and ____opt_42[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
@@ -683,9 +709,9 @@ function Buff.prototype.onExpiration(self)
     if self[121] ~= nil then
         (self[102] or unit):healTarget(unit, self[120] or 0)
     end
-    if self[141] then
+    if self[145] then
         unit:explode()
-    elseif self[140] then
+    elseif self[144] then
         unit:kill()
     end
 end
@@ -740,6 +766,18 @@ function Buff.prototype.onDamageDealt(self, target, event)
 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))
+        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
+            end
+            if ____self__138_44 and self[137] >= (self[136] or 0) then
+                self:destroy()
+            end
+        end
         local damageReceivedEventCount = (self[133] or 0) + 1
         self[133] = damageReceivedEventCount
         if damageReceivedEventCount == self[134] then
@@ -827,8 +865,8 @@ __TS__SetDescriptor(
                 return
             end
             self[112] = damageInterval
-            local ____opt_48 = self._timer
-            local elapsed = ____opt_48 and ____opt_48.elapsed or 0
+            local ____opt_45 = self._timer
+            local elapsed = ____opt_45 and ____opt_45.elapsed or 0
             local timer = self[114]
             if timer == nil then
                 timer = Timer:create()
@@ -907,8 +945,8 @@ __TS__SetDescriptor(
                 return
             end
             self[117] = healingInterval
-            local ____opt_50 = self._timer
-            local elapsed = ____opt_50 and ____opt_50.elapsed or 0
+            local ____opt_47 = self._timer
+            local elapsed = ____opt_47 and ____opt_47.elapsed or 0
             local timer = self[119]
             if timer == nil then
                 timer = Timer:create()
@@ -989,24 +1027,50 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "maxHealthIncrease",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.HEALTH)
+        end,
+        set = function(self, maxHealthIncrease)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.HEALTH, maxHealthIncrease)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "maxManaIncrease",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.MANA)
+        end,
+        set = function(self, maxManaIncrease)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.MANA, maxManaIncrease)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "turnsIntoGhost",
     {
         get = function(self)
-            local ____self__135_52 = self[135]
-            if ____self__135_52 == nil then
-                ____self__135_52 = false
+            local ____self__139_49 = self[139]
+            if ____self__139_49 == nil then
+                ____self__139_49 = false
             end
-            return ____self__135_52
+            return ____self__139_49
         end,
         set = function(self, turnsIntoGhost)
-            if not turnsIntoGhost and self[135] then
+            if not turnsIntoGhost and self[139] then
                 self.object:decrementGhostCounter()
-                self[135] = nil
-            elseif turnsIntoGhost and not self[135] then
+                self[139] = nil
+            elseif turnsIntoGhost and not self[139] then
                 self.object:incrementGhostCounter()
-                self[135] = true
+                self[139] = true
             end
         end
     },
@@ -1017,25 +1081,25 @@ __TS__SetDescriptor(
     "stuns",
     {
         get = function(self)
-            local ____self__136_53 = self[136]
-            if ____self__136_53 == nil then
-                ____self__136_53 = false
+            local ____self__140_50 = self[140]
+            if ____self__140_50 == nil then
+                ____self__140_50 = false
             end
-            return ____self__136_53
+            return ____self__140_50
         end,
         set = function(self, stuns)
-            if not stuns and self[136] then
-                if self[137] then
+            if not stuns and self[140] then
+                if self[141] then
                     self.object:decrementForceStunCounter()
                 end
                 self.object:decrementStunCounter()
-                self[136] = nil
-            elseif stuns and not self[136] then
-                if self[137] then
+                self[140] = nil
+            elseif stuns and not self[140] then
+                if self[141] then
                     self.object:incrementForceStunCounter()
                 end
                 self.object:incrementStunCounter()
-                self[136] = true
+                self[140] = true
             end
         end
     },
@@ -1046,23 +1110,23 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__137_54 = self[137]
-            if ____self__137_54 == nil then
-                ____self__137_54 = false
+            local ____self__141_51 = self[141]
+            if ____self__141_51 == nil then
+                ____self__141_51 = false
             end
-            return ____self__137_54
+            return ____self__141_51
         end,
         set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[137] then
-                if self[136] then
+            if not ignoresStunImmunity and self[141] then
+                if self[140] then
                     self.object:decrementForceStunCounter()
                 end
-                self[137] = nil
-            elseif ignoresStunImmunity and not self[137] then
-                if self[136] then
+                self[141] = nil
+            elseif ignoresStunImmunity and not self[141] then
+                if self[140] then
                     self.object:incrementForceStunCounter()
                 end
-                self[137] = true
+                self[141] = true
             end
         end
     },
@@ -1073,19 +1137,19 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__138_55 = self[138]
-            if ____self__138_55 == nil then
-                ____self__138_55 = false
+            local ____self__142_52 = self[142]
+            if ____self__142_52 == nil then
+                ____self__142_52 = false
             end
-            return ____self__138_55
+            return ____self__142_52
         end,
         set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[138] then
+            if not disablesAutoAttack and self[142] then
                 self.object:decrementDisableAutoAttackCounter()
-                self[138] = nil
-            elseif disablesAutoAttack and not self[138] then
+                self[142] = nil
+            elseif disablesAutoAttack and not self[142] then
                 self.object:incrementDisableAutoAttackCounter()
-                self[138] = true
+                self[142] = true
             end
         end
     },
@@ -1096,19 +1160,19 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__139_56 = self[139]
-            if ____self__139_56 == nil then
-                ____self__139_56 = false
+            local ____self__143_53 = self[143]
+            if ____self__143_53 == nil then
+                ____self__143_53 = false
             end
-            return ____self__139_56
+            return ____self__143_53
         end,
         set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[139] then
+            if not providesInvulnerability and self[143] then
                 self.object:decrementInvulnerabilityCounter()
-                self[139] = nil
-            elseif providesInvulnerability and not self[139] then
+                self[143] = nil
+            elseif providesInvulnerability and not self[143] then
                 self.object:incrementInvulnerabilityCounter()
-                self[139] = true
+                self[143] = true
             end
         end
     },
@@ -1119,17 +1183,17 @@ __TS__SetDescriptor(
     "killsOnExpiration",
     {
         get = function(self)
-            local ____self__140_57 = self[140]
-            if ____self__140_57 == nil then
-                ____self__140_57 = false
+            local ____self__144_54 = self[144]
+            if ____self__144_54 == nil then
+                ____self__144_54 = false
             end
-            return ____self__140_57
+            return ____self__144_54
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[140] then
-                self[140] = nil
-            elseif killsOnExpiration and not self[140] then
-                self[140] = true
+            if not killsOnExpiration and self[144] then
+                self[144] = nil
+            elseif killsOnExpiration and not self[144] then
+                self[144] = true
             end
         end
     },
@@ -1140,17 +1204,17 @@ __TS__SetDescriptor(
     "explodesOnExpiration",
     {
         get = function(self)
-            local ____self__141_58 = self[141]
-            if ____self__141_58 == nil then
-                ____self__141_58 = false
+            local ____self__145_55 = self[145]
+            if ____self__145_55 == nil then
+                ____self__145_55 = false
             end
-            return ____self__141_58
+            return ____self__145_55
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[141] then
-                self[141] = nil
-            elseif killsOnExpiration and not self[141] then
-                self[141] = true
+            if not killsOnExpiration and self[145] then
+                self[145] = nil
+            elseif killsOnExpiration and not self[145] then
+                self[145] = true
             end
         end
     },
@@ -1275,9 +1339,23 @@ __TS__SetDescriptor(
 __TS__SetDescriptor(
     Buff.prototype,
     "duration",
-    {get = function(self)
-        return self[103]
-    end},
+    {
+        get = function(self)
+            return self[103]
+        end,
+        set = function(self, duration)
+            if duration <= 0 then
+                local timer = self._timer
+                if timer ~= nil then
+                    timer:destroy()
+                    self._timer = nil
+                end
+                self[103] = 0
+            else
+                self.remainingDuration = self.remainingDuration + (duration - self[103])
+            end
+        end
+    },
     true
 )
 __TS__SetDescriptor(
@@ -1285,13 +1363,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_59 = self._timer
-            return ____opt_59 and ____opt_59.remaining or 0
+            local ____opt_56 = self._timer
+            return ____opt_56 and ____opt_56.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_63 = remainingDuration
-            local ____opt_61 = self._timer
-            local remainingDurationDelta = ____remainingDuration_63 - (____opt_61 and ____opt_61.remaining or 0)
+            local ____remainingDuration_60 = remainingDuration
+            local ____opt_58 = self._timer
+            local remainingDurationDelta = ____remainingDuration_60 - (____opt_58 and ____opt_58.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1306,7 +1384,7 @@ __TS__SetDescriptor(
                         remainingDuration,
                         self._spellStealPriority,
                         self._learnLevelMinimum,
-                        self[142]
+                        self[146]
                     ) then
                         local timer = self._timer
                         if timer == nil then
@@ -1321,15 +1399,80 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "absorbedDamageFactor",
+    {
+        get = function(self)
+            return self[135] or 1
+        end,
+        set = function(self, absorbedDamageFactor)
+            if absorbedDamageFactor == 1 then
+                self[135] = nil
+            else
+                self[135] = absorbedDamageFactor
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "maximumDamageAbsorbed",
+    {
+        get = function(self)
+            return self[136] or 0
+        end,
+        set = function(self, maximumDamageAbsorbed)
+            if maximumDamageAbsorbed == 0 then
+                self[136] = nil
+            else
+                self[136] = maximumDamageAbsorbed
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "damageAbsorbed",
+    {get = function(self)
+        return self[137] or 0
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "destroysOnMaximumDamageAbsorbed",
+    {
+        get = function(self)
+            local ____self__138_61 = self[138]
+            if ____self__138_61 == nil then
+                ____self__138_61 = true
+            end
+            return ____self__138_61
+        end,
+        set = function(self, destroysOnMaximumDamageAbsorbed)
+            local ____destroysOnMaximumDamageAbsorbed_62
+            if destroysOnMaximumDamageAbsorbed then
+                ____destroysOnMaximumDamageAbsorbed_62 = nil
+            else
+                ____destroysOnMaximumDamageAbsorbed_62 = false
+            end
+            self[138] = ____destroysOnMaximumDamageAbsorbed_62
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "abilityCooldownFactor",
     {
         get = function(self)
-            return self[143] or 1
+            return self[147] or 1
         end,
         set = function(self, abilityCooldownFactor)
-            local previousAbilityCooldownModifier = self[144]
+            local previousAbilityCooldownModifier = self[148]
             if previousAbilityCooldownModifier then
                 for ____, ability in ipairs(self._unit.abilities) do
                     COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:removeModifier(ability, previousAbilityCooldownModifier)
@@ -1341,8 +1484,8 @@ __TS__SetDescriptor(
             for ____, ability in ipairs(self._unit.abilities) do
                 COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD:applyModifier(ability, modifier)
             end
-            self[144] = modifier
-            self[143] = abilityCooldownFactor
+            self[148] = modifier
+            self[147] = abilityCooldownFactor
         end
     },
     true
@@ -1350,35 +1493,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(
@@ -1389,17 +1537,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)