diff --git a/Change_log.txt b/Change_log.txt index 8da67ef..9051204 100755 --- a/Change_log.txt +++ b/Change_log.txt @@ -1,3 +1,6 @@ +**v2.9.8** +* Fixed: Unleashed Fury now works as expected + **v2.9.7** * Fixed: Ascendance not displayed while active, and during Ascendance Lava Burst are shown as suggestion diff --git a/Ele_GUI.lua b/Ele_GUI.lua index 74652b9..e9facbc 100755 --- a/Ele_GUI.lua +++ b/Ele_GUI.lua @@ -310,14 +310,11 @@ function Elementarist:CreateConfig() local FSBehaviourMenu = Elementarist:CreateDropDownMenu(L.CONFIG_BEHAVIOUR, Elementarist.configPanel, ElementaristDB, "Behaviour", {{text = Elementarist.Behaviours["1"]}, {text = Elementarist.Behaviours["2"]}},200) FSBehaviourMenu:SetPoint('TOPLEFT', 10, -268) - local UEEnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLE_UE_SPELL, Elementarist.configPanel, ElementaristDB, "EnableUE", false) - UEEnableBtn:SetPoint('TOPLEFT', 10, -298) - local EQEnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLE_EQ_SPELL, Elementarist.configPanel, ElementaristDB, "EnableEQ", false) - EQEnableBtn:SetPoint('TOPLEFT', 10, -328) + EQEnableBtn:SetPoint('TOPLEFT', 10, -298) local ThreatWarnBtn = Elementarist:CreateCheckButton(L.CONFIG_THREAT_WARNING, Elementarist.configPanel, ElementaristDB, "ThreatWarning", false) - ThreatWarnBtn:SetPoint('TOPLEFT', 10, -358) + ThreatWarnBtn:SetPoint('TOPLEFT', 10, -328) local ResetBtn = Elementarist:CreateButton(L.CONFIG_RESET_POSITIONS, Elementarist.configPanel) ResetBtn:SetWidth(160) @@ -325,7 +322,7 @@ function Elementarist:CreateConfig() ResetBtn:SetScript('OnClick', function() Elementarist:ResetPosition() end) - ResetBtn:SetPoint("TOPLEFT",10,-418) + ResetBtn:SetPoint("TOPLEFT",10,-388) ResetBtn:Show() Elementarist.configPanel.okay = function() diff --git a/Elementarist.lua b/Elementarist.lua index e8b8d56..c934eeb 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Elementarist 2.9.7 +-- Elementarist 2.9.8 -- -- Shows the advised spell for an elemental shaman for optimal DPS output. ------------------------------------------------------------------------------- @@ -8,7 +8,7 @@ Elementarist = {Locals = {}} local L = Elementarist.Locals -Elementarist.versionNumber = '2.9.7' +Elementarist.versionNumber = '2.9.8' Elementarist.playerName = UnitName("player") Elementarist.playerGUID = UnitGUID("player") Elementarist.targetGUID = nil @@ -745,7 +745,7 @@ function Elementarist:NextSpellElem(timeshift,exspell1,exspell2) -- if Tier6 talent is Unleashed Fury Unleash Elements if (Elementarist.tier6Talent == 16) then name, _, _, _, _, _, e, unitCaster = Elementarist:hasDeBuff("target", Elementarist.SpellList["Unleashed Fury"], "player"); - if (name) and (e - GetTime() - timeshift) then + if (name == nil) or (e - GetTime() - timeshift) then if (GetWeaponEnchantInfo()) and (exspell1 ~= Elementarist.SpellList["Unleash Elements"]) and (exspell2 ~= Elementarist.SpellList["Unleash Elements"]) and (IsSpellInRange(Elementarist.SpellList["Unleash Elements"], "target") == 1) then e = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Unleash Elements"]) if (e-timeshift <= 0) then @@ -770,11 +770,11 @@ function Elementarist:NextSpellElem(timeshift,exspell1,exspell2) -- check if Flame shock applied on target first name, _, _, _, _, _, fsExpiration, unitCaster = Elementarist:hasDeBuff("target", Elementarist.SpellList["Flame Shock"], "player"); + if (not fsExpiration) then + fsExpiration = 0 + end if (exspell1 ~= Elementarist.SpellList["Flame Shock"]) and (exspell2 ~= Elementarist.SpellList["Flame Shock"]) and (exspell1 ~= Elementarist.SpellList["Earth Shock"]) and (exspell2 ~= Elementarist.SpellList["Earth Shock"]) then if IsSpellInRange(Elementarist.SpellList["Flame Shock"], "target") == 1 then - if (not fsExpiration) then - fsExpiration = 0 - end d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Flame Shock"]) if ((d - timeshift) <= 0) then flameshockavail = true @@ -801,38 +801,6 @@ function Elementarist:NextSpellElem(timeshift,exspell1,exspell2) end end - -- Unleash Elements if LvB will be available after it, and target has FS debuff, and it will not expire before UE, and no LvB cast before UE - -- Weapon enchant has to be Flamtounge Weapon, and Unleash Elements are not on CD - if (ElementaristDB.EnableUE) then - if (exspell1 ~= Elementarist.SpellList["Unleash Elements"]) and (exspell2 ~= Elementarist.SpellList["Unleash Elements"]) then - if ( - (IsSpellInRange(Elementarist.SpellList["Unleash Elements"], "target") == 1) and - ( - ( (Elementarist.SpellList["Lava Burst"]) ~= spellInCast) and - ( (Elementarist.SpellList["Lava Burst"]) ~= exspell1) and - ( (Elementarist.SpellList["Lava Burst"]) ~= exspell2) - ) and - ( - (exspell1 == Elementarist.SpellList["Flame Shock"] ) or - (exspell2 == Elementarist.SpellList["Flame Shock"] ) or - (fsExpiration > timeshift + (2 * Elementarist.lastBaseGCD ) ) - ) - ) then - local hasMainHandEnchant, _, _, _, _, _ = GetWeaponEnchantInfo() - if (hasMainHandEnchant) then - d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Lava Burst"]) - e = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Unleash Elements"]) - if (d <= (timeshift + Elementarist.lastBaseGCD)) and ((e-timeshift) <= 0) then - return Elementarist.SpellList["Unleash Elements"] - end - end - end - end - end - - if (not fsExpiration) then - fsExpiration = 0 - end local ascendance, _, _, _, _, _, ascendanceExp = Elementarist:hasBuff("player",Elementarist.SpellList["AscendanceElementalBuff"]); if (ascendance == nil) then ascendanceExp = 0 diff --git a/Elementarist.toc b/Elementarist.toc index d51fdb7..b651a29 100755 --- a/Elementarist.toc +++ b/Elementarist.toc @@ -2,7 +2,7 @@ ## Title: Elementarist ## Notes: Elemental shaman spell rotation helper ## Author: Taracque, Felmosórongy of Arathor -## Version: 2.9.7 +## Version: 2.9.8 ## SavedVariables: ElementaristDB ## OptionalDeps: OmniCC, SpellFlash ## Dependencies: diff --git a/Localization_enUS.lua b/Localization_enUS.lua index 6e258b8..70b25e6 100755 --- a/Localization_enUS.lua +++ b/Localization_enUS.lua @@ -28,7 +28,6 @@ if GetLocale() then L.CONFIG_SHIELD_TRACKER_SCALE = "Shield tracker scale" L.CONFIG_SHIELD_TRACKER_ALPHA = "Shield tracker alpha" L.CONFIG_DISABLE_SHIELD_TRACKER = "Disable shield tracker" - L.CONFIG_ENABLE_UE_SPELL = "Enable Unleash Elements in rotation" -- new for 2.0 L.CONFIG_ENABLE_EQ_SPELL = "Enable Earthquake in rotation" -- new for 2.1.4