From 1a8f2fa3e6e7c3e2f1d030296c74523bbcc96280 Mon Sep 17 00:00:00 2001
From: "Johnny C. Lam" <jlam88@gmail.com>
Date: Sun, 17 Mar 2013 10:58:39 +0000
Subject: [PATCH] Fix energy regeneration calculations for rogues.

Rogues don't always show their own self-buff for "melee_haste" and it
always needs to be stripped out.

Restrict the focus calculation to hunters and make the function more
efficient.

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@793 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 OvaleState.lua |   48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/OvaleState.lua b/OvaleState.lua
index 9b1bc1b..e950ce7 100644
--- a/OvaleState.lua
+++ b/OvaleState.lua
@@ -59,55 +59,65 @@ function OvaleState:StartNewFrame()
 end
 
 function OvaleState:UpdatePowerRates()
+	local class = OvalePaperDoll.class
+
 	for k,v in pairs(OvaleData.power) do
 		self.powerRate[k] = 0
 	end
 
-	self.powerRate.energy = 10 * OvalePaperDoll:GetMeleeHasteMultiplier()
-	self.powerRate.focus = 4 * OvalePaperDoll:GetRangedHasteMultiplier()
-
-	-- Strip off 10% ranged attack speed bonus that doesn't count toward focus regeneration.
-	for _, v in pairs(OvaleData.buffSpellList.melee_haste) do
-		if OvaleState:GetAura("player", v) then
-			self.powerRate.focus = self.powerRate.focus / 1.1
-			break
+	-- Base power regeneration for all classes, based on power type.
+	local energyRegen = 10 * OvalePaperDoll:GetMeleeHasteMultiplier()
+	local focusRegen = 4 * OvalePaperDoll:GetRangedHasteMultiplier()
+
+	-- Strip off 10% attack speed bonus that doesn't count toward power regeneration.
+	if class == "HUNTER" then
+		-- Strip off 10% attack speed bonus that doesn't count toward focus regeneration.
+		for _, v in pairs(OvaleData.buffSpellList.melee_haste) do
+			if OvaleState:GetAura("player", v) then
+				focusRegen = focusRegen / 1.1
+				break
+			end
 		end
-	end
-
-	if OvalePaperDoll.class == "MONK" then
+	elseif class == "MONK" then
 		-- Way of the Monk (monk)
 		if OvaleEquipement:HasTwoHandedWeapon() then
 			-- Strip off 40% melee attack speed bonus for two-handed weapon.
-			self.powerRate.energy = self.powerRate.energy / 1.4
+			energyRegen = energyRegen / 1.4
 		end
 
 		-- Ascension (monk)
 		if OvaleData:GetTalentPoints(8) > 0 then
-			self.powerRate.energy = self.powerRate.energy * 1.15
+			energyRegen = energyRegen * 1.15
 		end
 
 		-- Stance of the Sturdy Ox (brewmaster monk)
 		if OvaleStance:IsStance("monk_stance_of_the_sturdy_ox") then
-			self.powerRate.energy = self.powerRate.energy * 1.1
+			energyRegen = energyRegen * 1.1
+		end
+	elseif class == "ROGUE" then
+		-- Rogue attack-speed self-buff incorrectly counts towards its melee haste.
+		if OvalePaperDoll.level >= 30 then
+			energyRegen = energyRegen / 1.1
 		end
-	end
 
-	if OvalePaperDoll.class == "ROGUE" then
 		-- Blade Flurry (combat rogue)
 		if OvaleState:GetAura("player", 13877, true) then
-			self.powerRate.energy = self.powerRate.energy * 0.8
+			energyRegen = energyRegen * 0.8
 		end
 
 		-- Vitality (combat rogue)
 		if OvalePaperDoll.specialization == 2 then
-			self.powerRate.energy = self.powerRate.energy * 1.2
+			energyRegen = energyRegen * 1.2
 		end
 
 		-- Adrenaline Rush (rogue)
 		if OvaleState:GetAura("player", 13750, true) then
-			self.powerRate.energy = self.powerRate.energy * 2
+			energyRegen = energyRegen * 2
 		end
 	end
+
+	self.powerRate.energy = energyRegen
+	self.powerRate.focus = focusRegen
 end
 
 function OvaleState:Reset()
-- 
1.7.9.5