diff --git a/Ele_GUI.lua b/Ele_GUI.lua index 4f7ad49..8a1227f 100755 --- a/Ele_GUI.lua +++ b/Ele_GUI.lua @@ -634,14 +634,6 @@ function Elementarist:CreateGUI() Elementarist.displayFrame_dps = displayFrame_dps Elementarist.cooldownFrame = cooldownFrame - if (Elementarist.Masque) then - Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_next); - Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_next1); - Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_next2); - Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_misc); - Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_int); - end - local debuffTracker = CreateFrame("Frame","ElementaristDebuffTrackerFrame",UIParent) debuffTracker:SetFrameStrata("BACKGROUND") debuffTracker:SetWidth(175) @@ -679,9 +671,6 @@ function Elementarist:CreateGUI() auraCooldownFrame:ClearAllPoints() auraCooldownFrame:SetPoint("TOPLEFT", Elementarist.debuffTracker, "TOPLEFT", 0, 0) Elementarist.auraCooldownFrame["main"] = auraCooldownFrame - if (Elementarist.Masque) then - Elementarist.MasqueGroup:AddButton( Elementarist.auraCooldownFrame["main"] ); - end for i=1,10,1 do local debuffTracker_cd = CreateFrame("Frame","$parent_debuff_" .. tostring(i), ElementaristDebuffTrackerFrame) @@ -701,9 +690,6 @@ function Elementarist:CreateGUI() auraCooldownFrame:ClearAllPoints() auraCooldownFrame:SetPoint("TOPLEFT", 50 + ( 25 * ( math.floor( (i - 1) / 2) ) ), - (25 * ( (i - 1) % 2) ) ) Elementarist.auraCooldownFrame["mini_" .. tostring(i)] = auraCooldownFrame - if (Elementarist.Masque) then - Elementarist.MasqueGroup:AddButton( Elementarist.auraCooldownFrame["mini_" .. tostring(i)] ); - end end local shieldTracker = CreateFrame("Frame","ElementaristShieldTrackerFrame",UIParent) diff --git a/Elementarist.lua b/Elementarist.lua index ce301c8..ed35e2d 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Elementarist 3.2.2 +-- Elementarist 3.2.3 -- -- Shows the advised spell for an elemental shaman for optimal DPS output. ------------------------------------------------------------------------------- @@ -8,7 +8,7 @@ Elementarist = {Locals = {}} local L = Elementarist.Locals -Elementarist.versionNumber = '3.2.2'; +Elementarist.versionNumber = '3.2.3'; Elementarist.enabled = true; Elementarist.playerName = UnitName("player") Elementarist.playerGUID = UnitGUID("player") @@ -36,8 +36,6 @@ Elementarist.DebugChat = DEFAULT_CHAT_FRAME Elementarist.inParty = 0 Elementarist.OmniCC = _G['OmniCC'] Elementarist.SpellFlash = _G['SpellFlashAddon']; -Elementarist.Masque = _G['Masque']; -Elementarist.MasqueGroup = nil; Elementarist.SFHistory = { ["spell"] = nil, ["misc"] = nil, @@ -200,9 +198,6 @@ function Elementarist.events.ADDON_LOADED(addon) if addon == "SpellFlash" then Elementarist.SpellFlash = _G['SpellFlashAddon'] end - if addon == "Masque" then - Elementarist.Masque = _G['Masque'] - end if addon ~= "Elementarist" then return end -- load defaults, if first start @@ -230,12 +225,7 @@ function Elementarist.events.ADDON_LOADED(addon) -- Coop with other addons Elementarist.OmniCC = _G['OmniCC'] Elementarist.SpellFlash = _G['SpellFlashAddon'] - Elementarist.Masque = _G['Masque'] - if (Elementarist.Masque) then - Elementarist.MasqueGroup = Elementarist.Masque:Group("Elementarist", "MainGroup"); - end - -- Create GUI Elementarist:CreateGUI() Elementarist.displayFrame:SetScale(ElementaristDB.scale) diff --git a/Elementarist.toc b/Elementarist.toc index a18d42f..dd6c2af 100755 --- a/Elementarist.toc +++ b/Elementarist.toc @@ -1,10 +1,10 @@ -## Interface: 50300 +## Interface: 50400 ## Title: Elementarist ## Notes: Elemental shaman spell rotation helper ## Author: Taracque, Felmosórongy of Arathor -## Version: 3.2.2 +## Version: 3.2.3 ## SavedVariables: ElementaristDB -## OptionalDeps: OmniCC, SpellFlash, Masque +## OptionalDeps: OmniCC, SpellFlash ## Dependencies: Elementarist.lua diff --git a/modules/elemental.lua b/modules/elemental.lua index 55acb33..ef84539 100755 --- a/modules/elemental.lua +++ b/modules/elemental.lua @@ -184,14 +184,14 @@ Elementarist.elemental = { end end - -- Earth shock if Lightning Shield count >=7 and not on cd, and FS debuff remaining > FS cooldown, or FS debuff remaining between FS and FS cd + 2sec and LS count>=5 + -- Earth shock if Lightning Shield count >=6 and not on cd, and FS debuff remaining > FS cooldown, or FS debuff remaining between FS and FS cd + 2sec and LS count>=5 if ( (exspell1 ~= Elementarist.SpellList["Earth Shock"]) and (exspell2 ~= Elementarist.SpellList["Earth Shock"]) and (exspell1 ~= Elementarist.SpellList["Flame Shock"]) and (exspell2 ~= Elementarist.SpellList["Flame Shock"]) ) then if ( (fsExpiration - GetTime() - timeshift) > Elementarist.lastShockCD ) then d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Earth Shock"]) local _, _, _, lscount = Elementarist:hasBuff("player",Elementarist.SpellList["Lightning Shield"]) if ( ( (d) and ((d-timeshift) <= 0) and (lscount) ) and ( -- Earth Shock is available, and has lightning shield - (lscount>=7) or -- Lightning shield has 7 charge + (lscount>=6) or -- Lightning shield has 6 charge ( (lscount>=5) and ( (fsExpiration - GetTime() - timeshift) < Elementarist.lastShockCD + 2 ) ) -- or, has 5 or more charges but FS expiration within 2 secs to FS CD ) ) then