diff --git a/Change_log.txt b/Change_log.txt index b5e1b08..d04e3f8 100755 --- a/Change_log.txt +++ b/Change_log.txt @@ -1,3 +1,6 @@ +**v3.3.1** +* Fixed: Lightning shield tracking + **v3.3.0** * Change: 6.0 compatibility diff --git a/Ele_GUI.lua b/Ele_GUI.lua index a7d88bc..8ede23e 100755 --- a/Ele_GUI.lua +++ b/Ele_GUI.lua @@ -354,11 +354,8 @@ function Elementarist:CreateConfig() local ThreatWarnBtn = Elementarist:CreateCheckButton(L.CONFIG_THREAT_WARNING, Elementarist.configPanel, ElementaristDB, "ThreatWarning", false) ThreatWarnBtn:SetPoint('TOPLEFT', 10, -258) - local StormlashAnnounceBtn = Elementarist:CreateCheckButton(L.CONFIG_ANNOUNCE_STORMLASH, Elementarist.configPanel, ElementaristDB, "AnnounceStormlash", false) - StormlashAnnounceBtn:SetPoint('TOPLEFT', 10, -288) - local EleLayout = Elementarist:CreateDropDownMenu(L.CONFIG_LAYOUT, Elementarist.configPanel, ElementaristDB, "Layout", {{text = Elementarist.EleLayout["1"]}, {text = Elementarist.EleLayout["2"]}},200) - EleLayout:SetPoint('TOPLEFT', 10, -318) + EleLayout:SetPoint('TOPLEFT', 10, -288) local ResetBtn = Elementarist:CreateButton(L.CONFIG_RESET_POSITIONS, Elementarist.configPanel) ResetBtn:SetWidth(160) @@ -366,7 +363,7 @@ function Elementarist:CreateConfig() ResetBtn:SetScript('OnClick', function() Elementarist:ResetPosition() end) - ResetBtn:SetPoint("TOPLEFT",10,-348) + ResetBtn:SetPoint("TOPLEFT",10,-318) ResetBtn:Show() Elementarist.configPanel.okay = function() diff --git a/Elementarist.lua b/Elementarist.lua index 84fc2f7..ff820e8 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Elementarist 3.3.0 +-- Elementarist 3.3.1 -- -- 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.0'; +Elementarist.versionNumber = '3.3.1'; Elementarist.enabled = true; Elementarist.playerName = UnitName("player") Elementarist.playerGUID = UnitGUID("player") @@ -43,7 +43,6 @@ Elementarist.SFHistory = { } Elementarist.talent = "" Elementarist.role = "" -Elementarist.StormlashID = nil Elementarist.talentUnsure = true Elementarist.callbacks = {}; Elementarist.tier6Talent = nil diff --git a/modules/elemental.lua b/modules/elemental.lua index 627fffb..4ae669c 100755 --- a/modules/elemental.lua +++ b/modules/elemental.lua @@ -183,15 +183,15 @@ Elementarist.elemental = { end end - -- 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 + -- Earth shock if Lightning Shield count >=14 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>=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 + (lscount>=14) or -- Lightning shield has 14 charge + ( (lscount>=12) and ( (fsExpiration - GetTime() - timeshift) < Elementarist.lastShockCD + 2 ) ) -- or, has 12 or more charges but FS expiration within 2 secs to FS CD ) ) then return Elementarist.SpellList["Earth Shock"]