diff --git a/Ele_GUI.lua b/Ele_GUI.lua index 807b2e0..82f09b1 100755 --- a/Ele_GUI.lua +++ b/Ele_GUI.lua @@ -263,8 +263,8 @@ function Elementarist:ApplySettings() Elementarist.displayFrame_next:SetPoint("TOPLEFT", 0, -80) Elementarist.displayFrame_next1:SetPoint("TOPLEFT", 50, -80) Elementarist.displayFrame_next2:SetPoint("TOPLEFT", 100, -80) - Elementarist.displayFrame_misc:SetPoint("TOPLEFT",0, -20); - Elementarist.displayFrame_int:SetPoint("TOPLEFT",120, -20); + Elementarist.displayFrame_misc:SetPoint("TOPLEFT",-10, -20); + Elementarist.displayFrame_int:SetPoint("TOPLEFT",130, -20); Elementarist.displayFrame_dps:SetPoint("TOPLEFT", 45, -20) Elementarist.displayFrame_next:SetHeight(50); Elementarist.displayFrame_next:SetWidth(50); @@ -272,10 +272,10 @@ function Elementarist:ApplySettings() Elementarist.displayFrame_next1:SetWidth(50); Elementarist.displayFrame_next2:SetHeight(50); Elementarist.displayFrame_next2:SetWidth(50); - Elementarist.displayFrame_misc:SetHeight(30); - Elementarist.displayFrame_misc:SetWidth(30); - Elementarist.displayFrame_int:SetWidth(30); - Elementarist.displayFrame_int:SetHeight(30); + Elementarist.displayFrame_misc:SetHeight(40); + Elementarist.displayFrame_misc:SetWidth(40); + Elementarist.displayFrame_int:SetWidth(40); + Elementarist.displayFrame_int:SetHeight(40); end end diff --git a/Elementarist.lua b/Elementarist.lua index 876963c..1a13b21 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -554,6 +554,7 @@ function Elementarist.events.COMBAT_LOG_EVENT_UNFILTERED(timestamp, event, hideC if srcName == Elementarist.playerName then if (srcGUID == Elementarist.playerGUID) and (spellName==Elementarist.trackAura) and (Elementarist.auraCooldowns[dstGUID]) then Elementarist.auraCooldowns[dstGUID]["action"] = GetTime() + Elementarist:TrackAuraSaveBuffStatus() end if (event=="SPELL_CAST_START") then Elementarist.SFHistory.spell = nil @@ -1102,8 +1103,9 @@ function Elementarist:OnUpdate(elapsed) Elementarist.timeSinceLastUpdate = Elementarist.timeSinceLastUpdate + elapsed if (Elementarist.timeSinceLastUpdate > (1.5 - (1.5 * Elementarist.spellHaste * .01)) * 0.3) then - Elementarist:DecideSpells() Elementarist:TrackAuraSaveBuffStatus() + Elementarist:DecideSpells() + end if (not ElementaristDB.debuffdisabled) then Elementarist.AuraTrackerUpdate = Elementarist.AuraTrackerUpdate + elapsed diff --git a/Elementarist.toc b/Elementarist.toc index 63a35f1..9e23b50 100755 --- a/Elementarist.toc +++ b/Elementarist.toc @@ -7,6 +7,7 @@ ## OptionalDeps: OmniCC, SpellFlash ## Dependencies: + Elementarist.lua Ele_GUI.lua Localization_enUS.lua diff --git a/modules/elemental.lua b/modules/elemental.lua index 539ba79..4b6a3f6 100755 --- a/modules/elemental.lua +++ b/modules/elemental.lua @@ -221,8 +221,7 @@ Elementarist.elemental = { if Elementarist.inCombat == false then -- Searing Totem - if (Elementarist:ZeroCount(Elementarist.SpellList["Searing Totem"],spellInCast,exspell1,exspell2) ) and - Elementarist:SpellAvailable(Elementarist.SpellList["Searing Totem"])then + if (Elementarist:ZeroCount(Elementarist.SpellList["Searing Totem"],spellInCast,exspell1,exspell2) ) then local haveFireTotem,fireTotemName,fireTotemStart,fireTotemDuration = GetTotemInfo(1); if (fireTotemName == "") or (fireTotemDuration and (fireTotemStart + fireTotemDuration - GetTime() ) <= timeshift) then return Elementarist.SpellList["Searing Totem"]; @@ -230,8 +229,7 @@ Elementarist.elemental = { end -- Opening Uleash flame prior to combat - if (Elementarist:ZeroCount(Elementarist.SpellList["Unleash Flame"],spellInCast,exspell1,exspell2) ) and - Elementarist:SpellAvailable(Elementarist.SpellList["Unleash Flame"]) then + if (Elementarist:ZeroCount(Elementarist.SpellList["Unleash Flame"],spellInCast,exspell1,exspell2) ) then d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Unleash Flame"]) if (d-timeshift <= 0) then return Elementarist.SpellList["Unleash Flame"]; @@ -254,7 +252,6 @@ Elementarist.elemental = { end else if (Elementarist:ZeroCount(Elementarist.SpellList["Searing Totem"],spellInCast,exspell1,exspell2) ) and - Elementarist:SpellAvailable(Elementarist.SpellList["Searing Totem"])and ((fireTotemName == "") or (fireTotemDuration and (fireTotemStart + fireTotemDuration - GetTime() ) <= timeshift)) then return Elementarist.SpellList["Searing Totem"]; @@ -392,7 +389,7 @@ Elementarist.elemental = { if (eqCharges<maxEqCharges) and (((cdStart + cdLength)- GetTime()) - timeshift <= 0) then eqCharges = eqCharges + 1; end - eqCharges = eqCharges - Elementarist:ZeroCount(Elementarist.SpellList["Earthquake"],spellInCast,exspell1,exspell2); + eqCharges = eqCharges - Elementarist:Count(Elementarist.SpellList["Earthquake"],spellInCast,exspell1,exspell2); eclBuff, _, _, _, _, _, eclExp = Elementarist:hasBuff("player",Elementarist.SpellList["Enhanced Chain Lightning"]); if (eqCharges > 0) and (eclBuff) then d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Earthquake"])