diff --git a/Change_log.txt b/Change_log.txt index f74e5bd..4f6e42d 100644 --- a/Change_log.txt +++ b/Change_log.txt @@ -1,3 +1,6 @@ +**v2.1.4** +* Added: Option to disable misc and int frames. + **v2.1.3** * Bugfix: Fixed some spell IDs. diff --git a/Ele_GUI.lua b/Ele_GUI.lua index 08db624..72b1748 100644 --- a/Ele_GUI.lua +++ b/Ele_GUI.lua @@ -168,6 +168,10 @@ function Elementarist:ApplySettings() Elementarist.shieldTracker:SetAlpha(ElementaristDB.shieldalpha) Elementarist.shieldTracker:SetScale(ElementaristDB.shieldscale) end + if (ElementaristDB.disableMini) then + Elementarist:SetTexture(Elementarist.textureList["int"],"") + Elementarist:SetTexture(Elementarist.textureList["misc"],"") + end end function Elementarist:StoreUIValues() @@ -187,15 +191,18 @@ function Elementarist:CreateConfig() -- Register in the Interface Addon Options GUI -- Set the name for the Category for the Options Panel Elementarist.configPanel.name = "Elementarist"; - + local EnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLED, Elementarist.configPanel, ElementaristDB, "enabled", false) - EnableBtn:SetPoint('TOPLEFT', 10, -8) + EnableBtn:SetPoint('TOPLEFT', 10, -8) + + local EnableEleBtn = Elementarist:CreateCheckButton(L.CONFIG_ONLY_ON_ELE, Elementarist.configPanel, ElementaristDB, "disableIfNotEle", false) + EnableEleBtn:SetPoint('TOPLEFT', 40, -28) - local EnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ONLY_ON_ELE, Elementarist.configPanel, ElementaristDB, "disableIfNotEle", false) - EnableBtn:SetPoint('TOPLEFT', 40, -28) + local DisableMini = Elementarist:CreateCheckButton(L.CONFIG_DISABLE_MINI, Elementarist.configPanel, ElementaristDB, "disableMini", false) + DisableMini:SetPoint('TOPLEFT', 40, -48) local LockBtn = Elementarist:CreateCheckButton(L.CONFIG_LOCK_FRAMES, Elementarist.configPanel, ElementaristDB, "locked", false) - LockBtn:SetPoint('TOPLEFT', 10, -58) + LockBtn:SetPoint('TOPLEFT', 10, -78) local Scale = Elementarist:CreateSlider(L.CONFIG_SPELL_ADV_SCALE, Elementarist.configPanel, .25, 3, .1) Scale:SetScript('OnShow', function(self) @@ -209,10 +216,9 @@ function Elementarist:CreateConfig() if not self.onShow then ElementaristDB.scale=value Elementarist.displayFrame:SetScale(value) - end end) - Scale:SetPoint("TOPLEFT",10,-98) + Scale:SetPoint("TOPLEFT",10,-118) Scale:Show() local Alpha = Elementarist:CreateSlider(L.CONFIG_SPELL_ADV_ALPHA, Elementarist.configPanel, .0, 1, .1) @@ -228,11 +234,11 @@ function Elementarist:CreateConfig() Elementarist.displayFrame:SetAlpha(value) end end) - Alpha:SetPoint("TOPLEFT",200,-98) + Alpha:SetPoint("TOPLEFT",200,-118) Alpha:Show() local DebuffDisableBtn = Elementarist:CreateCheckButton(L.CONFIG_DISABLE_DEBUFF_TRACKER, Elementarist.configPanel, ElementaristDB, "debuffdisabled", false) - DebuffDisableBtn:SetPoint('TOPLEFT', 10, -158) + DebuffDisableBtn:SetPoint('TOPLEFT', 10, -178) local DebuffScale = Elementarist:CreateSlider(L.CONFIG_DEBUFF_TRACKER_SCALE, Elementarist.configPanel, .25, 3, .1) DebuffScale:SetScript('OnShow', function(self) @@ -247,7 +253,7 @@ function Elementarist:CreateConfig() Elementarist.debuffTracker:SetScale(value) end end) - DebuffScale:SetPoint("TOPLEFT",10,-138) + DebuffScale:SetPoint("TOPLEFT",10,-158) DebuffScale:Show() local DebuffAlpha = Elementarist:CreateSlider(L.CONFIG_DEBUFF_TRACKER_ALPHA, Elementarist.configPanel, .0, 1, .1) @@ -263,11 +269,11 @@ function Elementarist:CreateConfig() Elementarist.debuffTracker:SetAlpha(value) end end) - DebuffAlpha:SetPoint("TOPLEFT",200,-138) + DebuffAlpha:SetPoint("TOPLEFT",200,-158) DebuffAlpha:Show() local ShieldDisableBtn = Elementarist:CreateCheckButton(L.CONFIG_DISABLE_SHIELD_TRACKER, Elementarist.configPanel, ElementaristDB, "shielddisabled", false) - ShieldDisableBtn:SetPoint('TOPLEFT', 10, -218) + ShieldDisableBtn:SetPoint('TOPLEFT', 10, -238) local ShieldScale = Elementarist:CreateSlider(L.CONFIG_SHIELD_TRACKER_SCALE, Elementarist.configPanel, .25, 3, .1) ShieldScale:SetScript('OnShow', function(self) @@ -282,7 +288,7 @@ function Elementarist:CreateConfig() Elementarist.shieldTracker:SetScale(value) end end) - ShieldScale:SetPoint("TOPLEFT",10,-198) + ShieldScale:SetPoint("TOPLEFT",10,-218) ShieldScale:Show() local ShieldAlpha = Elementarist:CreateSlider(L.CONFIG_SHIELD_TRACKER_ALPHA, Elementarist.configPanel, .0, 1, .1) @@ -298,25 +304,23 @@ function Elementarist:CreateConfig() Elementarist.shieldTracker:SetAlpha(value) end end) - ShieldAlpha:SetPoint("TOPLEFT",200,-198) + ShieldAlpha:SetPoint("TOPLEFT",200,-218) ShieldAlpha:Show() local FireNovaBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLE_NOVA, Elementarist.configPanel, ElementaristDB, "FireNova", false) - FireNovaBtn:SetPoint('TOPLEFT', 10, -248) + FireNovaBtn:SetPoint('TOPLEFT', 10, -268) local FSBehaviourMenu = Elementarist:CreateDropDownMenu(L.CONFIG_BEHAVIOUR, Elementarist.configPanel, ElementaristDB, "Behaviour", {{text = Elementarist.Behaviours["1"]}, {text = Elementarist.Behaviours["2"]}},200) - FSBehaviourMenu:SetPoint('TOPLEFT', 10, -278) + FSBehaviourMenu:SetPoint('TOPLEFT', 10, -298) - -- local CLBehaviourMenu = Elementarist:CreateDropDownMenu(L.CONFIG_CLSTBEHAVIOUR, Elementarist.configPanel, ElementaristDB, "CLBehaviour", {{text = Elementarist.CLBehaviours["0"]}, {text = Elementarist.CLBehaviours["1"]}, {text = Elementarist.CLBehaviours["2"]}},200) - -- CLBehaviourMenu:SetPoint('TOPLEFT', 10, -308) local UEEnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLE_UE_SPELL, Elementarist.configPanel, ElementaristDB, "EnableUE", false) - UEEnableBtn:SetPoint('TOPLEFT', 10, -308) + UEEnableBtn:SetPoint('TOPLEFT', 10, -328) local EQEnableBtn = Elementarist:CreateCheckButton(L.CONFIG_ENABLE_EQ_SPELL, Elementarist.configPanel, ElementaristDB, "EnableEQ", false) - EQEnableBtn:SetPoint('TOPLEFT', 10, -338) + EQEnableBtn:SetPoint('TOPLEFT', 10, -358) local ThreatWarnBtn = Elementarist:CreateCheckButton(L.CONFIG_THREAT_WARNING, Elementarist.configPanel, ElementaristDB, "ThreatWarning", false) - ThreatWarnBtn:SetPoint('TOPLEFT', 10, -368) + ThreatWarnBtn:SetPoint('TOPLEFT', 10, -388) local ResetBtn = Elementarist:CreateButton(L.CONFIG_RESET_POSITIONS, Elementarist.configPanel) ResetBtn:SetWidth(160) @@ -324,7 +328,7 @@ function Elementarist:CreateConfig() ResetBtn:SetScript('OnClick', function() Elementarist:ResetPosition() end) - ResetBtn:SetPoint("TOPLEFT",10,-398) + ResetBtn:SetPoint("TOPLEFT",10,-418) ResetBtn:Show() Elementarist.configPanel.okay = function() @@ -343,6 +347,7 @@ function Elementarist:CreateConfig() ElementaristDB.locked = false ElementaristDB.enabled = true ElementaristDB.disableIfNotEle = true + ElementaristDB.disableMini = false ElementaristDB.debuffdisabled = false ElementaristDB.shielddisabled = false ElementaristDB.alpha = 0.8 diff --git a/Elementarist.lua b/Elementarist.lua index bf6880f..65fe978 100644 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Elementarist 2.1.3 +-- Elementarist 2.1.4 -- -- 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.1.3' +Elementarist.versionNumber = '2.1.4' Elementarist.playerName = UnitName("player") Elementarist.playerGUID = UnitGUID("player") Elementarist.targetGUID = nil @@ -252,6 +252,7 @@ function Elementarist:InitSettings() if ElementaristDB.locked == nil then ElementaristDB.locked = false end if ElementaristDB.enabled == nil then ElementaristDB.enabled = true end if ElementaristDB.disableIfNotEle == nil then ElementaristDB.disableIfNotEle = true end + if ElementaristDB.disableMini == nil then ElementaristDB.disableMini = false end if ElementaristDB.debuffdisabled == nil then ElementaristDB.debuffdisabled = false end if ElementaristDB.shielddisabled == nil then ElementaristDB.shielddisabled = false end if ElementaristDB.alpha == nil then ElementaristDB.alpha = 0.8 end @@ -1095,24 +1096,24 @@ function Elementarist:DecideSpells() local spell2 = Elementarist:NextSpell(ct1+ct2,spell,spell1) Elementarist:SetTexture(Elementarist.textureList["next2"],GetSpellTexture(spell2)) - local icon - - spell,icon = Elementarist:MiscSpell() - Elementarist:FlashSpell(spell,"misc") - - if (icon) then - Elementarist:SetTexture(Elementarist.textureList["misc"],icon) - else - if (spell) then - Elementarist:SetTexture(Elementarist.textureList["misc"],GetSpellTexture(spell)) + if (not ElementaristDB.disableMini) then + local icon + + spell,icon = Elementarist:MiscSpell() + Elementarist:FlashSpell(spell,"misc") + + if (icon) then + Elementarist:SetTexture(Elementarist.textureList["misc"],icon) + else + if (spell) then + Elementarist:SetTexture(Elementarist.textureList["misc"],GetSpellTexture(spell)) + end end + + spell = Elementarist:IntSpell() + Elementarist:FlashSpell(spell,"int") + Elementarist:SetTexture(Elementarist.textureList["int"],GetSpellTexture(spell)) end - - spell = Elementarist:IntSpell() - Elementarist:FlashSpell(spell,"int") - Elementarist:SetTexture(Elementarist.textureList["int"],GetSpellTexture(spell)) - - end function Elementarist:OnUpdate(elapsed) diff --git a/Localization_enUS.lua b/Localization_enUS.lua index d5136b3..7f40a3d 100755 --- a/Localization_enUS.lua +++ b/Localization_enUS.lua @@ -32,4 +32,6 @@ if GetLocale() then 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 + L.CONFIG_DISABLE_MINI = "Disable mini frames" end \ No newline at end of file