Signed-off-by: BillLive <bill@live.com.au>
BillLive [01-16-16 - 00:24]
Signed-off-by: BillLive <bill@live.com.au>
diff --git a/modules/elemental.lua b/modules/elemental.lua
index 25b5bc5..d0ac513 100755
--- a/modules/elemental.lua
+++ b/modules/elemental.lua
@@ -81,7 +81,7 @@ Elementarist.elemental = {
-- Set elemental fussion buff count
local _, _, _, efCount = Elementarist:hasBuff("player",Elementarist.SpellList["Elemental Fusion"])
if (efCount == nil) then efCount = 0 end
- if (efCount < 2)and (EFTalent) then if (Elementarist:Count(Elementarist.SpellList["Lava Burst"],spellInCast) == 0) then efCount = efCount +1 end end
+ if (efCount < 2)and (EFTalent) then if (Elementarist:Count(Elementarist.SpellList["Lava Burst"],spellInCast,exspell1,exspell2) >= 1) then efCount = efCount +1 end end
-----------------------------------------------------
-- Timing calulatutions
@@ -231,6 +231,7 @@ Elementarist.elemental = {
if (efCount>=2) then
if (Elementarist:hasBuff("player",Elementarist.SpellList["Unleash Flame"]) or Elementarist:Count(Elementarist.SpellList["Unleash Flame"],spellInCast,exspell1,exspell2) > 0)then
if (fsExpiration - currentTime - timeshift) < (fsDuration * fsRefreshPercentage ) then
+ Elementarist:Debug(GetTime()..' Priority 3: EFCount=', efCount)
return Elementarist.SpellList["Flame Shock"]
end
end
@@ -281,6 +282,7 @@ Elementarist.elemental = {
d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Flame Shock"])
if ((d - timeshift) <= 0) then
if ((fsExpiration - GetTime() - timeshift) < (fsDuration * 0.3) ) then
+ Elementarist:Debug(GetTime()..' Priority 6: EFCount=', efCount)
return Elementarist.SpellList["Flame Shock"]
end
end