From 4aca3aa364e622286b9d758ba1bcf54c080e65c0 Mon Sep 17 00:00:00 2001 From: Taracque Date: Wed, 22 Oct 2014 17:44:17 +0200 Subject: [PATCH] Some enhancement updates --- modules/enhancement.lua | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/modules/enhancement.lua b/modules/enhancement.lua index 176818f..6fb9f1a 100755 --- a/modules/enhancement.lua +++ b/modules/enhancement.lua @@ -15,12 +15,13 @@ Elementarist.enhancement = { ["Healing Stream Totem"] = GetSpellInfo(5394), ["Maelstrom Weapon"] = GetSpellInfo(51530), ["Stormstrike"] = GetSpellInfo(17364), - ["Windstrike"] = GetSpellInfo(115356), + ["Windstrike"] = (115357), ["Lava Lash"] = GetSpellInfo(60103), ["Unleash Flame"] = GetSpellInfo(165462), ["Unleash Elements"] = GetSpellInfo(73680), ["Frost Shock"] = GetSpellInfo(8056), - ["Flask of Spring Blossoms"] = GetSpellInfo(76084) + ["Flask of Spring Blossoms"] = GetSpellInfo(76084), + ["AscendanceEnhancementBuff"] = GetSpellInfo(114051) }); Elementarist.role = "DPS"; @@ -119,19 +120,37 @@ Elementarist.enhancement = { -- if Maelstrom Weapon has 5 stacks cast Lightning Bolt local _, _, _, mwcount = Elementarist:hasBuff("player",Elementarist.SpellList["Maelstrom Weapon"]) if (mwcount) and (mwcount >= 5) then - if IsSpellInRange(Elementarist.SpellList["Lightning Bolt"], "target") == 1 then + if (IsSpellInRange(Elementarist.SpellList["Lightning Bolt"], "target") == 1) and (exspell1 ~= Elementarist.SpellList["Lightning Bolt"]) and (exspell2 ~= Elementarist.SpellList["Lightning Bolt"]) then return Elementarist.SpellList["Lightning Bolt"] end end -- stormstrike/windstrike - d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Stormstrike"]) + local ascendance, _, _, _, _, _, ascendanceExp = Elementarist:hasBuff("player",Elementarist.SpellList["AscendanceEnhancementBuff"]); + if (ascendance == nil) then + ascendanceExp = 0 + end + d = nil + if (ascendance) and ((ascendanceExp-GetTime()-timeshift) > 0) then + d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Windstrike"]) + end + if (d == nil) then + d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Stormstrike"]) + end if ( ((d - timeshift) <= 0) and (exspell1 ~= Elementarist.SpellList["Stormstrike"]) and - (exspell2 ~= Elementarist.SpellList["Stormstrike"]) + (exspell2 ~= Elementarist.SpellList["Stormstrike"]) and + (exspell1 ~= Elementarist.SpellList["Windstrike"]) and + (exspell2 ~= Elementarist.SpellList["Windstrike"]) ) then - return Elementarist.SpellList["Stormstrike"] + if (ascendance) and ((ascendanceExp-GetTime()-timeshift) > 0) then + Elementarist:Debug("Windstrike",ascendanceExp) + return Elementarist.SpellList["Windstrike"] + else + Elementarist:Debug("Stormstrike",ascendanceExp) + return Elementarist.SpellList["Stormstrike"] + end end -- Lava Lash -- 1.7.9.5