From 028f4e95fac329fafe20d50b4140771e8fdd29dd Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Thu, 18 Jun 2020 21:40:47 +0300 Subject: [PATCH] from retail --- WeakAuras/RegionTypes/RegionPrototype.lua | 12 ++++++------ WeakAuras/Types.lua | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/WeakAuras/RegionTypes/RegionPrototype.lua b/WeakAuras/RegionTypes/RegionPrototype.lua index 63351a2..d77b041 100644 --- a/WeakAuras/RegionTypes/RegionPrototype.lua +++ b/WeakAuras/RegionTypes/RegionPrototype.lua @@ -52,12 +52,12 @@ end -- Adjusted Duration function WeakAuras.regionPrototype.AddAdjustedDurationToDefault(default) - default.useAdjustedMax = false; - default.useAdjustedMin = false; + default.useAdjustededMax = false; + default.useAdjustededMin = false; end function WeakAuras.regionPrototype.AddAdjustedDurationOptions(options, data, order) - options.useAdjustedMin = { + options.useAdjustededMin = { type = "toggle", width = WeakAuras.normalWidth, name = L["Set Minimum Progress"], @@ -83,7 +83,7 @@ function WeakAuras.regionPrototype.AddAdjustedDurationOptions(options, data, ord hidden = function() return not (not data.useAdjustededMin and data.useAdjustededMax) end, }; - options.useAdjustedMax = { + options.useAdjustededMax = { type = "toggle", width = WeakAuras.normalWidth, name = L["Set Maximum Progress"], @@ -505,9 +505,9 @@ function WeakAuras.regionPrototype.modify(parent, region, data) if (defaultsForRegion and defaultsForRegion.alpha) then region:SetRegionAlpha(data.alpha); end - local hasAdjustedMin = defaultsForRegion and defaultsForRegion.useAdjustedMin ~= nil and data.useAdjustededMin + local hasAdjustedMin = defaultsForRegion and defaultsForRegion.useAdjustededMin ~= nil and data.useAdjustededMin and data.adjustedMin; - local hasAdjustedMax = defaultsForRegion and defaultsForRegion.useAdjustedMax ~= nil and data.useAdjustededMax + local hasAdjustedMax = defaultsForRegion and defaultsForRegion.useAdjustededMax ~= nil and data.useAdjustededMax and data.adjustedMax; region.adjustedMin = nil diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua index 87434a4..e94d328 100644 --- a/WeakAuras/Types.lua +++ b/WeakAuras/Types.lua @@ -380,7 +380,10 @@ WeakAuras.subevent_prefix_types = { DAMAGE_SHIELD_MISSED = L["Damage Shield Missed"], PARTY_KILL = L["Party Kill"], UNIT_DIED = L["Unit Died"], - UNIT_DESTROYED = L["Unit Destroyed"] + UNIT_DESTROYED = L["Unit Destroyed"], + UNIT_DISSIPATES = L["Unit Dissipates"], + ENCHANT_APPLIED = L["Enchant Applied"], + ENCHANT_REMOVED = L["Enchant Removed"] } WeakAuras.subevent_actual_prefix_types = {