From 9017cfb184c38d640f336b0df8a221a2aae451ca Mon Sep 17 00:00:00 2001
From: Taracque <taracque@taracque.hu>
Date: Sun, 30 Sep 2012 18:21:07 +0200
Subject: [PATCH] Fixed Elemental Blast and Uleashed Fury

---
 Change_log.txt   |    3 +++
 Elementarist.lua |   16 +++++++++++-----
 Elementarist.toc |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Change_log.txt b/Change_log.txt
index 78c6250..64a548c 100755
--- a/Change_log.txt
+++ b/Change_log.txt
@@ -1,3 +1,6 @@
+**v2.9.6**
+* Fixed: Elemental Blast and Unleashed Fury
+
 **v2.9.5**
 * Added: Ascendance
 
diff --git a/Elementarist.lua b/Elementarist.lua
index a8f24f5..20c93b3 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Elementarist 2.9.5
+-- Elementarist 2.9.6
 --
 -- Shows the advised spell for an elemental shaman for optimal DPS output.
 -------------------------------------------------------------------------------
@@ -8,7 +8,7 @@ Elementarist = {Locals = {}}
 
 local L = Elementarist.Locals
 
-Elementarist.versionNumber = '2.9.5'
+Elementarist.versionNumber = '2.9.6'
 Elementarist.playerName = UnitName("player")
 Elementarist.playerGUID = UnitGUID("player")
 Elementarist.targetGUID = nil
@@ -80,6 +80,9 @@ Elementarist.SpellList = {
 	["Flask of the Warm Sun"] = GetSpellInfo(105691),
 	["Lifeblood"] = GetSpellInfo(55503),
 	
+	-- debuff
+	["Unleashed Fury"] = GetSpellInfo(118470),
+	
 	-- resto
 	["Healing Wave"] = GetSpellInfo(331),
 	["Greater Healing Wave"] = GetSpellInfo(77472),
@@ -740,13 +743,16 @@ function Elementarist:NextSpellElem(timeshift,exspell1,exspell2)
 	
 	-- if Tier6 talent is Unleashed Fury Unleash Elements
 	if (Elementarist.tier6Talent == 16) then
-		if (GetWeaponEnchantInfo()) and (exspell1 ~= Elementarist.SpellList["Unleash Elements"]) and (exspell2 ~= Elementarist.SpellList["Unleash Elements"]) then
-			return Elementarist.SpellList["Unleash Elements"];
+		name, _, _, _, _, _, e, unitCaster = Elementarist:hasDeBuff("target", Elementarist.SpellList["unleashed Fury"], "player");
+		if (name) and (e - GetTime() - timeshift) then
+			if (GetWeaponEnchantInfo()) and (exspell1 ~= Elementarist.SpellList["Unleash Elements"]) and (exspell2 ~= Elementarist.SpellList["Unleash Elements"]) then
+				return Elementarist.SpellList["Unleash Elements"];
+			end
 		end
 	-- if Tier6 talent is Elemental Blast use it
 	elseif (Elementarist.tier6Talent == 18) then
 		if (exspell1 ~= Elementarist.SpellList["Elemental Blast"]) and (exspell2 ~= Elementarist.SpellList["Elemental Blast"]) then
-			d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Flame Shock"])
+			d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Elemental Blast"])
 			if ((d - timeshift) <= 0) then
 				return Elementarist.SpellList["Elemental Blast"]
 			end
diff --git a/Elementarist.toc b/Elementarist.toc
index 6167b6d..5affa70 100755
--- a/Elementarist.toc
+++ b/Elementarist.toc
@@ -2,7 +2,7 @@
 ## Title: Elementarist
 ## Notes: Elemental shaman spell rotation helper
 ## Author: Taracque, Felmosórongy of Arathor
-## Version: 2.9.5
+## Version: 2.9.6
 ## SavedVariables: ElementaristDB
 ## OptionalDeps: OmniCC, SpellFlash
 ## Dependencies: 
-- 
1.7.9.5