From ea15b5708549c1e4a77317e4dbbd6439915782e6 Mon Sep 17 00:00:00 2001
From: Taracque <taracque@taracque.hu>
Date: Tue, 28 Aug 2012 17:44:15 +0200
Subject: [PATCH] Adjusted unholy priority list.

---
 DKCrutch.lua |   45 ++++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/DKCrutch.lua b/DKCrutch.lua
index 05c82e7..b534d72 100755
--- a/DKCrutch.lua
+++ b/DKCrutch.lua
@@ -39,6 +39,7 @@ DKCrutch.SpellList = {
 	["Death Strike"] = GetSpellInfo(49998),
 	["Rune Strike"] = GetSpellInfo(56815),
 	["Heart Strike"] = GetSpellInfo(55050),
+	["Blood Boil"] = GetSpellInfo(48721),
 
 -- buff, procs
 	["Sudden Doom"] = GetSpellInfo(81340),
@@ -523,12 +524,6 @@ function DKCrutch:AdviseFrostAbility()
 		return "Pillar of Frost"
 	end
 
-	-- Blood Tap if count of death runes != 2
-	local btcd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Blood Tap"])
-	if (btcd) and (btcd <= 1) and (DKCrutch.runesUp[4] ~= 2) then
-		return "Blood Tap"
-	end
-
 	-- raise dead if not on cd and has Rune of the Fallen Crusader buff
 	cd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Raise Dead"])
 	if (cd) and (cd<=0) and (DKCrutch:hasBuff("player", DKCrutch.SpellList["Unholy Strength"])) then
@@ -615,11 +610,6 @@ function DKCrutch:AdviseFrostAbility()
 		return "Howling Blast"
 	end
 
-	-- Blood Tap
-	if (btcd) and (btcd <= 1) then
-		return "Blood Tap"
-	end
-
 	-- Horn of Winter
 	cd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Horn of Winter"])
 	if (cd) and (cd <= 1) then
@@ -678,25 +668,33 @@ function DKCrutch:AdviseUnholyAbility()
 		return "Dark Transformation"
 	end
 	
-	-- Death and Decay (or Scourge strike), if 4 death runes are up, or 2 unholy runes are up
+	-- Scourge strike (or Death and Decay), if 4 death runes are up, or 2 unholy runes are up
 	local ddcd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Death and Decay"])
 	local sscd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Scourge Strike"])
 	if (DKCrutch.runesUp[4] == 4) or (DKCrutch.runesUp[2] == 2) then
-		if (ddcd) and (ddcd <= 1) then
+		if (ddcd) and (ddcd <= 1) and (DKCrutch.person["foeCount"]>1) then
 			return "Death and Decay"
-		else 
+		else
 			if (sscd) and (sscd <= 1) then
 				return "Scourge Strike"
 			end
 		end
 	end
 	
+	-- Blood boil, if AoE
+	if (DKCrutch.person["foeCount"]>1) then
+		local fscd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Blood Boil"])
+		if (fscd) and (fscd <= 1) then
+			return "Blood Boil"
+		end
+	else
 	-- Festering Strike if (blood=2 or frost=2)
-	local fscd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Festering Strike"])
-	if (fscd) and (fscd <= 1) and ( (DKCrutch.runesUp[1] == 2) or (DKCrutch.runesUp[3] == 2) ) then
-		return "Festering Strike"
+		local fscd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Festering Strike"])
+		if (fscd) and (fscd <= 1) and ( (DKCrutch.runesUp[1] == 2) or (DKCrutch.runesUp[3] == 2) ) then
+			return "Festering Strike"
+		end
 	end
-	
+
 	-- Death coil if Sudden Doom proc, or runic power > 90
 	local dccd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Death Coil"])
 	if (dccd) and (dccd <= 1) and (
@@ -706,11 +704,6 @@ function DKCrutch:AdviseUnholyAbility()
 		return "Death Coil"
 	end
 	
-	-- Death and Decay
-	if (ddcd) and (ddcd <= 1) then
-		return "Death and Decay"
-	end
-	
 	-- Scourge Strike
 	if (sscd) and (sscd <= 1) then
 		return "Scourge Strike"
@@ -726,12 +719,6 @@ function DKCrutch:AdviseUnholyAbility()
 		return "Death Coil"
 	end
 	
-	-- Blood Tap
-	cd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Blood Tap"])
-	if (cd) and (cd <= 1) and (DKCrutch.runesUp[2] ==0) and (DKCrutch.runesUp[4] < 4) then
-		return "Blood Tap"
-	end
-	
 	-- Empower Rune Weapon
 	cd = DKCrutch:GetSpellCooldownRemaining(DKCrutch.SpellList["Empower Rune Weapon"])
 	if (cd) and (cd <= 1) and (DKCrutch.runesUp[2] == 0) then
-- 
1.7.9.5