From 82706c8246ecd1486d2c691c225e0c856b481f1f Mon Sep 17 00:00:00 2001
From: "Johnny C. Lam" <jlam88@gmail.com>
Date: Mon, 11 Mar 2013 03:51:13 +0000
Subject: [PATCH] Track ranged haste separately from melee haste in
 OvalePaperDoll.

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

diff --git a/OvalePaperDoll.lua b/OvalePaperDoll.lua
index 07a3444..155561b 100644
--- a/OvalePaperDoll.lua
+++ b/OvalePaperDoll.lua
@@ -15,6 +15,7 @@ OvalePaperDoll = Ovale:NewModule("OvalePaperDoll", "AceEvent-3.0")
 --<private-static-properties>
 local GetMasteryEffect = GetMasteryEffect
 local GetMeleeHaste = GetMeleeHaste
+local GetRangedHaste = GetRangedHaste
 local GetSpellBonusDamage = GetSpellBonusDamage
 local GetSpellBonusHealing = GetSpellBonusHealing
 local UnitAttackPower = UnitAttackPower
@@ -39,6 +40,8 @@ OvalePaperDoll.rangedAttackPower = 0
 OvalePaperDoll.masteryEffect = 0
 -- percent increase to melee haste
 OvalePaperDoll.meleeHaste = 0
+-- percent increase to ranged haste
+OvalePaperDoll.rangedHaste = 0
 -- percent increase to spell haste
 OvalePaperDoll.spellHaste = 0
 -- spellpower
@@ -51,6 +54,7 @@ function OvalePaperDoll:OnEnable()
 	self:RegisterEvent("MASTERY_UPDATE")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD")
 	self:RegisterEvent("UNIT_ATTACK_POWER")
+	self:RegisterEvent("UNIT_RANGEDDAMAGE")
 	self:RegisterEvent("UNIT_RANGED_ATTACK_POWER")
 	self:RegisterEvent("UNIT_SPELL_HASTE")
 	self:RegisterEvent("UNIT_SPELL_POWER")
@@ -61,6 +65,7 @@ function OvalePaperDoll:OnDisable()
 	self:UnregisterEvent("MASTERY_UPDATE")
 	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
 	self:UnregisterEvent("UNIT_ATTACK_POWER")
+	self:UnregisterEvent("UNIT_RANGEDDAMAGE")
 	self:UnregisterEvent("UNIT_RANGED_ATTACK_POWER")
 	self:UnregisterEvent("UNIT_SPELL_HASTE")
 	self:UnregisterEvent("UNIT_SPELL_POWER")
@@ -90,6 +95,11 @@ function OvalePaperDoll:UNIT_ATTACK_POWER(event, unitId)
 	self.attackPower = base + posBuff + negBuff
 end
 
+function OvalePaperDoll:UNIT_RANGEDDAMAGE(event, unitId)
+	if unitId ~= "player" then return end
+	self.rangedHaste = GetRangedHaste()
+end
+
 function OvalePaperDoll:UNIT_RANGED_ATTACK_POWER(event, unitId)
 	if unitId ~= "player" then return end
 	local base, posBuff, negBuff = UnitRangedAttackPower(unitId)
@@ -143,16 +153,20 @@ function OvalePaperDoll:UNIT_STATS(event, unitId)
 	self.spirit = UnitStat(unitId, 5)
 end
 
-function OvalePaperDoll:GetSpellHasteMultiplier()
-	return 1 + self.spellHaste / 100
+function OvalePaperDoll:GetMasteryMultiplier()
+	return 1 + self.masteryEffect / 100
 end
 
 function OvalePaperDoll:GetMeleeHasteMultiplier()
 	return 1 + self.meleeHaste / 100
 end
 
-function OvalePaperDoll:GetMasteryMultiplier()
-	return 1 + self.masteryEffect / 100
+function OvalePaperDoll:GetRangedHasteMultiplier()
+	return 1 + self.rangedHaste / 100
+end
+
+function OvalePaperDoll:GetSpellHasteMultiplier()
+	return 1 + self.spellHaste / 100
 end
 
 function OvalePaperDoll:Debug()
@@ -167,6 +181,7 @@ function OvalePaperDoll:Debug()
 	Ovale:Print("Spell bonus healing: " ..self.spellBonusHealing)
 	Ovale:Print("Spell haste effect: " ..self.spellHaste.. "%")
 	Ovale:Print("Melee haste effect: " ..self.meleeHaste.. "%")
+	Ovale:Print("Ranged haste effect: " ..self.rangedHaste.. "%")
 	Ovale:Print("Mastery effect: " ..self.masteryEffect.. "%")
 end
 --</public-static-methods>
-- 
1.7.9.5