From f2436bae8554cfe6ef9a80e1cbb69d21fa7dee57 Mon Sep 17 00:00:00 2001 From: BillLive Date: Sat, 16 Jan 2016 10:54:31 +1030 Subject: [PATCH] Signed-off-by: BillLive --- modules/elemental.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 1.7.9.5