From 1c57cebff1d6f0dae99dfec3d828a4d360fa0140 Mon Sep 17 00:00:00 2001 From: Taracque Date: Mon, 23 May 2011 10:41:54 +0200 Subject: [PATCH] Earthquake can now disabled from rotation. --- Ele_GUI.lua | 9 ++++++--- Elementarist.lua | 13 ++++++++----- Localization_enUS.lua | 4 +++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Ele_GUI.lua b/Ele_GUI.lua index dc9f794..0f11715 100755 --- a/Ele_GUI.lua +++ b/Ele_GUI.lua @@ -307,8 +307,11 @@ function Elementarist:CreateConfig() local UEEnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLE_UE_SPELL, Elementarist.configPanel, ElementaristDB, "EnableUE", false) UEEnableBtn:SetPoint('TOPLEFT', 10, -318) + local EQEnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLE_EQ_SPELL, Elementarist.configPanel, ElementaristDB, "EnableEQ", false) + EQEnableBtn:SetPoint('TOPLEFT', 10, -348) + local ThreatWarnBtn = Elementarist:CreateCheckButton(L.CONFIG_THREAT_WARNING, Elementarist.configPanel, ElementaristDB, "ThreatWarning", false) - ThreatWarnBtn:SetPoint('TOPLEFT', 10, -348) + ThreatWarnBtn:SetPoint('TOPLEFT', 10, -378) local ResetBtn = Elementarist:CreateButton(L.CONFIG_RESET_POSITIONS, Elementarist.configPanel) ResetBtn:SetWidth(160) @@ -316,7 +319,7 @@ function Elementarist:CreateConfig() ResetBtn:SetScript('OnClick', function() Elementarist:ResetPosition() end) - ResetBtn:SetPoint("TOPLEFT",10,-378) + ResetBtn:SetPoint("TOPLEFT",10,-408) ResetBtn:Show() Elementarist.configPanel.okay = function() @@ -342,8 +345,8 @@ function Elementarist:CreateConfig() ElementaristDB.shieldalpha = 1 ElementaristDB.FireNova = true ElementaristDB.Behaviour = Elementarist.Behaviours["1"] - -- ElementaristDB.CLBehaviour = Elementarist.CLBehaviours["0"] ElementaristDB.EnableUE = false + ElementaristDB.EnableEQ = false ElementaristDB.ThreatWarning = true Elementarist:ResetPosition() end diff --git a/Elementarist.lua b/Elementarist.lua index 622602b..98341ff 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -247,6 +247,7 @@ function Elementarist:InitSettings() if ElementaristDB.CLBehaviour == nil then ElementaristDB.CLBehaviour = Elementarist.CLBehaviours["0"] end if ElementaristDB.EnableUE == nil then ElementaristDB.EnableUE = false end if ElementaristDB.ThreatWarning == nil then ElementaristDB.ThreatWarning = true end + if ElementaristDB.EnableEQ == nil then ElementaristDB.EnableEQ = false end if not ElementaristDB.x then ElementaristDB.x = -200 end if not ElementaristDB.y then ElementaristDB.y = -200 end if not ElementaristDB.relativePoint then ElementaristDB.relativePoint = "CENTER" end @@ -770,11 +771,13 @@ function Elementarist:NextSpell(timeshift,exspell1,exspell2) end -- if >=4 foes are available, and Earthquake not on cd - if (exspell1 ~= Elementarist.SpellList["Earthquake"]) and (exspell2 ~= Elementarist.SpellList["Earthquake"]) then - if (Elementarist.person["foeCount"]>=4) then - d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Earthquake"]) - if ((d-timeshift) <= 0) then - return Elementarist.SpellList["Earthquake"] + if (ElementaristDB.EnableEQ) then + if (exspell1 ~= Elementarist.SpellList["Earthquake"]) and (exspell2 ~= Elementarist.SpellList["Earthquake"]) then + if (Elementarist.person["foeCount"]>=4) then + d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Earthquake"]) + if ((d-timeshift) <= 0) then + return Elementarist.SpellList["Earthquake"] + end end end end diff --git a/Localization_enUS.lua b/Localization_enUS.lua index 6f5543c..b982c0b 100755 --- a/Localization_enUS.lua +++ b/Localization_enUS.lua @@ -29,5 +29,7 @@ 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" + L.CONFIG_ENABLE_UE_SPELL = "Enable Unleash Elements in rotation" +-- new for 2.0 + L.CONFIG_ENABLE_EQ_SPELL = "Enable Earthquake in rotation" end \ No newline at end of file -- 1.7.9.5