From dfbb8f679cf161539f80aa0334e3a55309f43522 Mon Sep 17 00:00:00 2001
From: Taracque <taracque@taracque.hu>
Date: Wed, 6 Mar 2013 11:43:42 +0100
Subject: [PATCH] Updated to 5.2 fixed: Blood Shield now correctly visible on
 Blood spec (displayed in the proc frame)

---
 DKCrutch.lua            |   18 +++++++++---------
 DKCrutch.toc            |    4 ++--
 DKCrutch_GUI.lua        |    2 --
 media/blood_charges.tga |  Bin 45544 -> 45544 bytes
 4 files changed, 11 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 media/blood_charges.tga

diff --git a/DKCrutch.lua b/DKCrutch.lua
index 8503cec..e3d3924 100755
--- a/DKCrutch.lua
+++ b/DKCrutch.lua
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- DKCrutch 0.7.2
+-- DKCrutch 0.8.0
 --
 -- Death Knight rune tracker and ability advisor
 -------------------------------------------------------------------------------
@@ -8,7 +8,7 @@ DKCrutch = {Locals = {}}
 
 local L = DKCrutch.Locals
 
-DKCrutch.versionNumber = '0.7.2'
+DKCrutch.versionNumber = '0.8.0'
 DKCrutch.talent = ""
 DKCrutch.talentUnsure = true
 DKCrutch.DebugMode = false
@@ -58,7 +58,7 @@ DKCrutch.SpellList = {
 	["Unholy Strength"] = GetSpellInfo(53365),
 	["Killing Machine"] = GetSpellInfo(51124),
 	["Freezing Fog"] = GetSpellInfo(59052),
-	["Blood Shield"] = GetSpellInfo(77513),
+	["Blood Shield"] = GetSpellInfo(77535),
 	["Shadow Infusion"] = GetSpellInfo(91342),	-- buff pet
 	["Blood Charge"] = GetSpellInfo(114851),
 
@@ -299,9 +299,9 @@ end
 
 function DKCrutch:CountPerson(time, event, sguid, sname, sflags, dguid, dname, dflags)
 	local suffix = event:match(".+(_.-)$")
-	local stype = (tonumber(sguid:sub(5,5), 16)) % 8
-	local dtype = (tonumber(dguid:sub(5,5), 16)) % 8
 	if DKCrutch.HostileFilter[suffix] then
+		local stype = (tonumber(sguid:sub(5,5), 16)) % 8
+		local dtype = (tonumber(dguid:sub(5,5), 16)) % 8
 		if (bit.band(dflags, COMBATLOG_OBJECT_REACTION_HOSTILE) == COMBATLOG_OBJECT_REACTION_HOSTILE) and (bit.band(dflags, COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) == COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) and ((dtype==0) or (dtype==3)) then
 			if ((not DKCrutch.person["foe"][dguid]) or (DKCrutch.person["foe"][dguid]==0)) then
 				DKCrutch.person["foeCount"] = DKCrutch.person["foeCount"] + 1
@@ -360,19 +360,19 @@ function DKCrutch:hasBuff(unit, spellName, stealableOnly, getByID)
 	local _
 	local i = 1
 	while true do
-		local name, rank, icon, count, buffType, duration, expirationTime, source, isStealable, _, spellId, _, _, v1 = UnitBuff(unit, i)
+		local name, rank, icon, count, buffType, duration, expirationTime, source, isStealable, _, spellId, _, _, v1, v2 = UnitBuff(unit, i)
 		if not name then
 			break
 		end
 		if (not getByID) and (name) and (spellName) then
 			if string.match(name, spellName) then
 				if (not stealableOnly) or (isStealable) then
-					return name, rank, icon, count, buffType, duration, expirationTime, unitCaster, isStealable, v1
+					return name, rank, icon, count, buffType, duration, expirationTime, unitCaster, isStealable, v1, v2
 				end
 			end
 		else
 			if (getByID == spellId) then
-				return name, rank, icon, count, buffType, duration, expirationTime, unitCaster, isStealable, v1
+				return name, rank, icon, count, buffType, duration, expirationTime, unitCaster, isStealable, v1, v2
 			end
 		end
 		i = i + 1
@@ -488,7 +488,7 @@ function DKCrutch:AdviseAbility( hasTarget )
 	if (DKCrutch.talent == "blood") then
 		-- killing machine proc
 		if (not DKCrutchDB.procDisabled) then
-			name,_,icon,_,_,d,e,_,_,value = DKCrutch:hasBuff("player", DKCrutch.SpellList["Blood Shield"])
+			name,_,icon,_,_,d,e,_,_,_,value = DKCrutch:hasBuff("player", DKCrutch.SpellList["Blood Shield"])
 			if (name) then
 				DKCrutch:ProcIcon(name,icon,d,e,value)
 			end
diff --git a/DKCrutch.toc b/DKCrutch.toc
index 77d7af7..84eb8db 100755
--- a/DKCrutch.toc
+++ b/DKCrutch.toc
@@ -1,8 +1,8 @@
-## Interface: 50100
+## Interface: 50200
 ## Title: DKCrutch
 ## Notes: Death Knight rune tracker and rotation helper
 ## Author: Taracque, Dšgrov‡s of Arathor
-## Version: 0.7.2
+## Version: 0.8.0
 ## SavedVariables: DKCrutchDB
 ## OptionalDeps:
 ## Dependencies:
diff --git a/DKCrutch_GUI.lua b/DKCrutch_GUI.lua
index 5cbe06f..b89cb5a 100755
--- a/DKCrutch_GUI.lua
+++ b/DKCrutch_GUI.lua
@@ -533,7 +533,6 @@ function DKCrutch:ResetDB()
 			["relativePoint"] = "CENTER",
 		}
 	end
-
 	if (force) then
 		DKCrutchDB.locked = false
 		DKCrutchDB.enabled = true
@@ -605,7 +604,6 @@ function DKCrutch:ResetPosition()
 	DKCrutch.weaponFrame:SetPoint(DKCrutchDB.weapon.relativePoint,DKCrutchDB.weapon.x,DKCrutchDB.weapon.y)
 	DKCrutch.debuffFrame:ClearAllPoints()
 	DKCrutch.debuffFrame:SetPoint(DKCrutchDB.debuff.relativePoint,DKCrutchDB.debuff.x,DKCrutchDB.debuff.y)
-
 end
 
 function DKCrutch:MakeDraggable(frame,store)
diff --git a/media/blood_charges.tga b/media/blood_charges.tga
old mode 100644
new mode 100755
-- 
1.7.9.5