From 9d33d9f1faff66f05031040ea7505f36522d90df Mon Sep 17 00:00:00 2001 From: Taracque Date: Tue, 13 Jan 2015 16:10:18 +0100 Subject: [PATCH] Added: 3 new layout Added: Shield tracker cooldown can be disabled --- Change_log.txt | 4 +++ Ele_GUI.lua | 90 ++++++++++++++++++++++++++++++++++++++++--------- Elementarist.lua | 8 +++-- Elementarist.toc | 2 +- Localization_enUS.lua | 4 +++ Localization_frFR.lua | 4 +++ Localization_zhCN.lua | 4 +++ 7 files changed, 96 insertions(+), 20 deletions(-) diff --git a/Change_log.txt b/Change_log.txt index 697846d..2b55015 100755 --- a/Change_log.txt +++ b/Change_log.txt @@ -1,3 +1,7 @@ +***v3.3.7 +* Added: 3 new layout +* Added: Shield tracker cooldown can be disabled + ***v3.3.6 * Fixed: Ligthning Shield charge count is 17 for Earth Shock * Added: Lava Burst predicted, if Echo of the Elements buff is active diff --git a/Ele_GUI.lua b/Ele_GUI.lua index 3449f9a..01ceb2d 100755 --- a/Ele_GUI.lua +++ b/Ele_GUI.lua @@ -173,6 +173,17 @@ function Elementarist:ApplySettings() end end end + if (ElementaristDB.shieldcooldowndisabled) then + Elementarist.shieldCooldownFrame:Hide(); + Elementarist.textList["shield"]:SetJustifyH("CENTER"); + Elementarist.textList["shield"]:SetJustifyV("CENTER"); + Elementarist.textList["shield"]:SetTextHeight(32); + else + Elementarist.textList["shield"]:SetJustifyH("RIGHT"); + Elementarist.textList["shield"]:SetJustifyV("BOTTOM"); + Elementarist.textList["shield"]:SetTextHeight(16); + Elementarist.shieldCooldownFrame:Show(); + end if (Elementarist.displayFrame) then Elementarist.displayFrame:SetAlpha(ElementaristDB.alpha) Elementarist.displayFrame:SetScale(ElementaristDB.scale) @@ -185,7 +196,7 @@ function Elementarist:ApplySettings() Elementarist:SetTexture(Elementarist.textureList["int"],"") Elementarist:SetTexture(Elementarist.textureList["misc"],"") end - if (ElementaristDB.Layout == L.LAYOUT_GROW) then -- grow layout + if (ElementaristDB.Layout == L.LAYOUT_GROW) or (ElementaristDB.Layout == L.LAYOUT_GROW_TOP) then -- grow layout Elementarist.displayFrame_next:SetPoint("TOPLEFT", 45, -30) Elementarist.displayFrame_next1:SetPoint("TOPLEFT", 55, -10) Elementarist.displayFrame_next2:SetPoint("TOPLEFT", 65, 0) @@ -196,16 +207,57 @@ function Elementarist:ApplySettings() Elementarist.displayFrame_next2:SetHeight(20) Elementarist.displayFrame_next2:SetWidth(20) end - if (ElementaristDB.Layout == L.LAYOUT_RIGHTTOLEFT) then -- right to left flow layout - Elementarist.displayFrame_next:SetPoint("TOPLEFT", 0, 0) - Elementarist.displayFrame_next1:SetPoint("TOPLEFT", 50, 0) - Elementarist.displayFrame_next2:SetPoint("TOPLEFT", 100, 0) - Elementarist.displayFrame_next:SetHeight(50) - Elementarist.displayFrame_next:SetWidth(50) - Elementarist.displayFrame_next1:SetHeight(50) - Elementarist.displayFrame_next1:SetWidth(50) - Elementarist.displayFrame_next2:SetHeight(50) - Elementarist.displayFrame_next2:SetWidth(50) + if (ElementaristDB.Layout == L.LAYOUT_RIGHTTOLEFT) or (ElementaristDB.Layout == L.LAYOUT_RIGHTTOLEFT_WIDE) or (ElementaristDB.Layout == L.LAYOUT_SINGLE) then -- right to left flow layout + local hShift = 0; + if (ElementaristDB.Layout == L.LAYOUT_RIGHTTOLEFT_WIDE) or (ElementaristDB.Layout == L.LAYOUT_SINGLE) then + hShift = 80 + end + Elementarist.displayFrame_next:SetPoint("TOPLEFT", hShift, 0) + Elementarist.displayFrame_next1:SetPoint("TOPLEFT", hShift + 50, 0) + Elementarist.displayFrame_next2:SetPoint("TOPLEFT", hShift + 100, 0) + Elementarist.displayFrame_next:SetHeight(50); + Elementarist.displayFrame_next:SetWidth(50); + Elementarist.displayFrame_next1:SetHeight(50); + Elementarist.displayFrame_next1:SetWidth(50); + Elementarist.displayFrame_next2:SetHeight(50); + Elementarist.displayFrame_next2:SetWidth(50); + end + if (ElementaristDB.Layout == L.LAYOUT_SINGLE) then + Elementarist.displayFrame_next1:Hide(); + Elementarist.displayFrame_next2:Hide(); + else + Elementarist.displayFrame_next1:Show(); + Elementarist.displayFrame_next2:Show(); + end + if (ElementaristDB.Layout == L.LAYOUT_GROW_TOP) then + Elementarist.displayFrame_misc:SetPoint("TOPLEFT",0, 0); + Elementarist.displayFrame_int:SetPoint("TOPLEFT",110, 0); + Elementarist.displayFrame:SetWidth(150); + Elementarist.displayFrame:SetHeight(120); + elseif (ElementaristDB.Layout == L.LAYOUT_RIGHTTOLEFT_WIDE) or (ElementaristDB.Layout == L.LAYOUT_SINGLE) then + if (ElementaristDB.Layout == L.LAYOUT_SINGLE) then + Elementarist.displayFrame:SetWidth(130); + else + Elementarist.displayFrame:SetWidth(230); + end + Elementarist.displayFrame:SetHeight(50); + Elementarist.displayFrame_misc:SetPoint("TOPLEFT",0, 0); + Elementarist.displayFrame_int:SetPoint("TOPLEFT",0, -25); + Elementarist.displayFrame_dps:SetPoint("TOPLEFT",30, -10); + Elementarist.displayFrame_misc:SetHeight(25); + Elementarist.displayFrame_misc:SetWidth(25); + Elementarist.displayFrame_int:SetWidth(25); + Elementarist.displayFrame_int:SetHeight(25); + else + Elementarist.displayFrame:SetWidth(150); + Elementarist.displayFrame:SetHeight(120); + Elementarist.displayFrame_misc:SetPoint("TOPLEFT",0, -80); + Elementarist.displayFrame_int:SetPoint("TOPLEFT",110, -80); + Elementarist.displayFrame_dps:SetPoint("TOPLEFT", 45, -90) + Elementarist.displayFrame_misc:SetHeight(40); + Elementarist.displayFrame_misc:SetWidth(40); + Elementarist.displayFrame_int:SetWidth(40); + Elementarist.displayFrame_int:SetHeight(40); end end @@ -320,6 +372,9 @@ function Elementarist:CreateConfig() local ShieldDisableBtn = Elementarist:CreateCheckButton(L.CONFIG_DISABLE_SHIELD_TRACKER, Elementarist.configPanel, ElementaristDB, "shielddisabled", false) ShieldDisableBtn:SetPoint('TOPLEFT', 10, -248) + local ShieldDisableCDBtn = Elementarist:CreateCheckButton(L.CONFIG_DISABLE_SHIELD_TRACKER_CD, Elementarist.configPanel, ElementaristDB, "shieldcooldowndisabled", false) + ShieldDisableCDBtn:SetPoint('TOPLEFT', 200, -248) + local ShieldScale = Elementarist:CreateSlider(L.CONFIG_SHIELD_TRACKER_SCALE, Elementarist.configPanel, .25, 3, .1) ShieldScale:SetScript('OnShow', function(self) self.onShow = true @@ -355,7 +410,7 @@ function Elementarist:CreateConfig() local ThreatWarnBtn = Elementarist:CreateCheckButton(L.CONFIG_THREAT_WARNING, Elementarist.configPanel, ElementaristDB, "ThreatWarning", false) ThreatWarnBtn:SetPoint('TOPLEFT', 10, -278) - local EleLayout = Elementarist:CreateDropDownMenu(L.CONFIG_LAYOUT, Elementarist.configPanel, ElementaristDB, "Layout", {{text = L.LAYOUT_GROW},{text = L.LAYOUT_RIGHTTOLEFT}}, 200) + local EleLayout = Elementarist:CreateDropDownMenu(L.CONFIG_LAYOUT, Elementarist.configPanel, ElementaristDB, "Layout", {{text = L.LAYOUT_GROW},{text = L.LAYOUT_RIGHTTOLEFT},{text = L.LAYOUT_GROW_TOP},{text = L.LAYOUT_RIGHTTOLEFT_WIDE},{text = L.LAYOUT_SINGLE}}, 200) EleLayout:SetPoint('TOPLEFT', 10, -308) local ResetBtn = Elementarist:CreateButton(L.CONFIG_RESET_POSITIONS, Elementarist.configPanel) @@ -699,10 +754,13 @@ function Elementarist:CreateGUI() Elementarist.textureList["shield"] = t t = shieldTracker_cd:CreateFontString("$parent_ShieldText","OVERLAY","GameFontHighlightLarge"); - t:SetPoint("BOTTOMRIGHT",shieldTracker,"BOTTOMRIGHT",-5,5) --- t:SetAllPoints(shieldTracker) - t:SetAlpha(1) - t:SetText("") +-- t:SetPoint("BOTTOMRIGHT",shieldTracker,"BOTTOMRIGHT",-5,5) + t:SetAllPoints(shieldTracker) + t:SetAlpha(1); + t:SetText(""); + t:SetJustifyH("RIGHT"); + t:SetJustifyV("BOTTOM"); + t:SetTextHeight(16); Elementarist.textList["shield"] = t local shieldCooldownFrame = CreateFrame("Cooldown","$parent_shieldcooldown", ElementaristShieldTrackerFrame, "CooldownFrameTemplate") diff --git a/Elementarist.lua b/Elementarist.lua index b30662e..f072562 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Elementarist 3.3.6 +-- Elementarist 3.3.7 -- -- 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.3.6'; +Elementarist.versionNumber = '3.3.7'; Elementarist.enabled = true; Elementarist.playerName = UnitName("player") Elementarist.playerGUID = UnitGUID("player") @@ -628,7 +628,9 @@ function Elementarist:UpdateShieldTracker() if (name) then Elementarist:SetTexture(Elementarist.textureList["shield"],icon) Elementarist.textList["shield"]:SetText(format('%.0f', count)) - Elementarist.shieldCooldownFrame:SetCooldown( e-d, d) + if (not ElementaristDB.shieldcooldowndisabled) then + Elementarist.shieldCooldownFrame:SetCooldown( e-d, d) + end else Elementarist:SetTexture(Elementarist.textureList["shield"],"") Elementarist.textList["shield"]:SetText("") diff --git a/Elementarist.toc b/Elementarist.toc index 81033b0..286b4e6 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: 3.3.6 +## Version: 3.3.7 ## SavedVariables: ElementaristDB ## OptionalDeps: OmniCC, SpellFlash ## Dependencies: diff --git a/Localization_enUS.lua b/Localization_enUS.lua index fbe840d..83856f8 100755 --- a/Localization_enUS.lua +++ b/Localization_enUS.lua @@ -41,4 +41,8 @@ if GetLocale() then L.CONFIG_ANNOUNCE_STORMLASH = "Announce Stormlash Totem in Raid/Party chat" -- new for 3.3.3 L.CONFIG_DISABLE_ADVISOR = "Disable spell advisor" + L.CONFIG_DISABLE_SHIELD_TRACKER_CD = "Disable shield cooldown tracker" + L.LAYOUT_GROW_TOP = "Growing icons, misc. on top" + L.LAYOUT_RIGHTTOLEFT_WIDE = "Right to left, wide" + L.LAYOUT_SINGLE = "Single spell" end \ No newline at end of file diff --git a/Localization_frFR.lua b/Localization_frFR.lua index c38dac3..84cc066 100755 --- a/Localization_frFR.lua +++ b/Localization_frFR.lua @@ -20,6 +20,7 @@ if GetLocale() then L["CONFIG_DISABLE_DEBUFF_TRACKER"] = "Désactiver le suivi des débuffs" L["CONFIG_DISABLE_MINI"] = "Désactiver les mini cadres" L["CONFIG_DISABLE_SHIELD_TRACKER"] = "Désactiver le suivi du bouclier" + L["CONFIG_DISABLE_SHIELD_TRACKER_CD"] = "Disable shield cooldown tracker" -- Requires localization L["CONFIG_ENABLED"] = "Activé" L["CONFIG_ENABLE_EQ_SPELL"] = "Active Tremblement de terre en rotation" L["CONFIG_ENABLE_HS_TOTEM"] = "Show Healing Stream Totem" -- Requires localization @@ -34,7 +35,10 @@ if GetLocale() then L["CONFIG_SPELL_ADV_SCALE"] = "échelle du sort conseiller" L["CONFIG_THREAT_WARNING"] = "Avertissement de menace" L["LAYOUT_GROW"] = "Growing icons" -- Requires localization + L["LAYOUT_GROW_TOP"] = "Growing icons, misc. on top" -- Requires localization L["LAYOUT_RIGHTTOLEFT"] = "Right to left" -- Requires localization + L["LAYOUT_RIGHTTOLEFT_WIDE"] = "Right to left, wide" -- Requires localization + L["LAYOUT_SINGLE"] = "Single spell" -- Requires localization L["THREAT_WARNING_PREFIX"] = "Général" L["THREAT_WARNING_SUFFIX"] = "% de menace!" end \ No newline at end of file diff --git a/Localization_zhCN.lua b/Localization_zhCN.lua index a818fbc..747e2bf 100755 --- a/Localization_zhCN.lua +++ b/Localization_zhCN.lua @@ -20,6 +20,7 @@ if GetLocale() then L["CONFIG_DISABLE_DEBUFF_TRACKER"] = "禁用 debuff 追踪器" L["CONFIG_DISABLE_MINI"] = "禁用迷你框体" L["CONFIG_DISABLE_SHIELD_TRACKER"] = "禁用护盾追踪器" + L["CONFIG_DISABLE_SHIELD_TRACKER_CD"] = "Disable shield cooldown tracker" -- Requires localization L["CONFIG_ENABLED"] = "启用" L["CONFIG_ENABLE_EQ_SPELL"] = "循环中启用地震术" L["CONFIG_ENABLE_HS_TOTEM"] = "显示治疗之泉图腾" @@ -34,7 +35,10 @@ if GetLocale() then L["CONFIG_SPELL_ADV_SCALE"] = "法术建议器尺寸" L["CONFIG_THREAT_WARNING"] = "威胁值警告" L["LAYOUT_GROW"] = "渐变图标" + L["LAYOUT_GROW_TOP"] = "Growing icons, misc. on top" -- Requires localization L["LAYOUT_RIGHTTOLEFT"] = "左置" + L["LAYOUT_RIGHTTOLEFT_WIDE"] = "Right to left, wide" -- Requires localization + L["LAYOUT_SINGLE"] = "Single spell" -- Requires localization L["THREAT_WARNING_PREFIX"] = "" -- Requires localization L["THREAT_WARNING_SUFFIX"] = "% 威胁值过高！" end \ No newline at end of file -- 1.7.9.5