diff --git a/Elementarist.lua b/Elementarist.lua
index f0ab4b4..35d7587 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -72,14 +72,8 @@ Elementarist.SpellList = {
["Thunderstorm"] = GetSpellInfo(51490),
["Purge"] = GetSpellInfo(370),
["Wind Shear"] = GetSpellInfo(57994),
- ["Elemental Mastery"] = GetSpellInfo(16166),
["Earth Shock"] = GetSpellInfo(8042),
- ["Searing Totem"] = GetSpellInfo(3599),
["Magma Totem"] = GetSpellInfo(8190),
- ["Lightning Shield"] = GetSpellInfo(324),
- ["Unleash Flame"] = GetSpellInfo(73683),
- ["Earthquake"] = GetSpellInfo(61882),
- ["Elemental Blast"] = GetSpellInfo(117014),
["Ascendance"] = GetSpellInfo(114049),
["Echo of the Elements"] = GetSpellInfo(108283),
-- racials
@@ -98,10 +92,6 @@ Elementarist.SpellList = {
["Draenic Intellect Flask"] =GetSpellInfo(156070),
["Greater Draenic Intellect Flask"] =GetSpellInfo(156079),
["Lifeblood"] = GetSpellInfo(55503),
- ["AscendanceElementalBuff"] = GetSpellInfo(114050),
-
- -- debuff
- ["Unleashed Fury"] = GetSpellInfo(118470),
}
Elementarist.auraCooldownFrame = {
["main"] = nil
diff --git a/modules/elemental.lua b/modules/elemental.lua
index 0998fc2..6d9cd2a 100755
--- a/modules/elemental.lua
+++ b/modules/elemental.lua
@@ -7,22 +7,21 @@ Elementarist.elemental = {
};
Initialize = function(self)
Elementarist:LoadSpells({
- ["Unleash Flame"] = GetSpellInfo(165462),
- ["Elemental Fusion"] = GetSpellInfo(157174),
- ["Glyph of Flame Shock"] = GetSpellInfo(55447),
- ["Healing Stream Totem"] = GetSpellInfo(5394),
- ["Liquid Magma"] = GetSpellInfo(152255),
- ["Enhanced Chain Lightning"] = GetSpellInfo(157766),
+ ["Elemental Mastery"] = GetSpellInfo(16166),
["Flame Shock"] = GetSpellInfo(188389),
["Totem Mastery"] = GetSpellInfo(210643),
["Fire Elemental"] = GetSpellInfo(198067),
- ["Icefury"] = GetSpellInfo(210714)
+ ["Storm Elemental"] = GetSpellInfo(192249),
+ ["Icefury"] = GetSpellInfo(210714),
+ ["Earthquake Totem"] = GetSpellInfo(61882),
+ ["Elemental Blast"] = GetSpellInfo(117014),
+ ["AscendanceElementalBuff"] = GetSpellInfo(114050),
});
Elementarist.role = "DPS";
Elementarist.trackAura = Elementarist.SpellList["Flame Shock"] -- Spell used in Aura Tracking window
Elementarist.trackFilter = "PLAYER|HARMFUL";
- Elementarist.trackDuration = 39;
+ Elementarist.trackDuration = 30;
end;
-----------------------------------------------------
@@ -67,7 +66,9 @@ Elementarist.elemental = {
-- Set Global Coolodown
Elementarist.lastBaseGCD = 1.5 - (1.5 * Elementarist.spellHaste * .01)
- if (not timeshift) then timeshift = 0 end
+ if (not timeshift) then
+ timeshift = 0
+ end
-- Adjust current spell to deal with timming issue
if (spellInCast) then
@@ -206,9 +207,9 @@ Elementarist.elemental = {
end
-- Earthquake if 3 or more targets
- if (Elementarist.person["foeCount"]>=3) and Elementarist:SpellAvailable(Elementarist.SpellList["Earthquake"]) then
- if (Elementarist:Count(Elementarist.SpellList["Earthquake"],spellInCast,exspell1,exspell2) == 0) then
- return Elementarist.SpellList["Earthquake"]
+ if (Elementarist.person["foeCount"]>=3) and Elementarist:SpellAvailable(Elementarist.SpellList["Earthquake Totem"]) then
+ if (Elementarist:Count(Elementarist.SpellList["Earthquake Totem"],spellInCast,exspell1,exspell2) == 0) then
+ return Elementarist.SpellList["Earthquake Totem"]
end
end
@@ -308,6 +309,14 @@ Elementarist.elemental = {
return Elementarist.SpellList["Fire Elemental"]
end
end
+
+ -- Storm Elemental
+ if Elementarist:SpellAvailable(Elementarist.SpellList["Storm Elemental"]) then
+ d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Storm Elemental"])
+ if d <= 0.5 then
+ return Elementarist.SpellList["Storm Elemental"]
+ end
+ end
-- Ascendance
if Elementarist:SpellAvailable(Elementarist.SpellList["Ascendance"]) then