fixes for death knight

diff --git a/Condition.lua b/Condition.lua
index 1db023c..3a9008b 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -713,7 +713,7 @@ Ovale.conditions=
 		end
 	end,
 	Speed = function(condition)
-		return compare(GetUnitSpeed(getTarget(condition.target))*100/7, condition[1], condition[2])
+		return compare(GetUnitSpeed("player")*100/7, condition[1], condition[2])
 	end,
 	-- Test if the player is in a given stance
 	-- 1 : the stance
@@ -854,6 +854,9 @@ Ovale.conditions=

 		return compare(difference, condition[1], condition[2])
 	end,
+	TargetSpeed = function(condition)
+		return compare(GetUnitSpeed(getTarget(condition.target))*100/7, condition[1], condition[2])
+	end,
 	-- Test if the target's target is the player (or is not)
 	-- 1 : "yes" (it should be the player) or "no"
 	TargetTargetIsPlayer = function(condition)
diff --git a/Ovale.toc b/Ovale.toc
index 95a2459..1860488 100644
--- a/Ovale.toc
+++ b/Ovale.toc
@@ -3,7 +3,7 @@
 ## Notes: Show the icon of the next spell to cast
 ## Notes-frFR: Affiche l'icône du prochain sort à lancer
 ## Author: Sidoine
-## Version: 4.0.12
+## Version: 4.0.13
 ## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua
index 7cd6b6c..21361ff 100644
--- a/defaut/Chevalier.lua
+++ b/defaut/Chevalier.lua
@@ -66,13 +66,17 @@ Define(VAMPIRICBLOOD 55233) #blood
 Define(GLYPHHOWLINGBLAST 63335)

 #Buffs and debuffs
+Define(SCARLETFEVER 81130)
 Define(BLOODPLAGUE 55078)
+	SpellInfo(BLOODPLAGUE duration=15)
 Define(FROSTFEVER 55095)
+	SpellInfo(FROSTFEVER duration=15)
 Define(KILLINGMACHINE 51124)
 Define(SHADOWINFUSION 91342)
 Define(SUDDENDOOM 81340)

 AddCheckBox(horn SpellName(HORNOFWINTER))
+AddCheckBox(scarlet SpellName(SCARLETFEVER) mastery=1 default)

 ScoreSpells(HOWLINGBLAST HEARTSTRIKE BLOODSTRIKE DEATHSTRIKE SCOURGESTRIKE OBLITERATE HEARTSTRIKE
 				PESTILENCE ICYTOUCH PLAGUESTRIKE FROSTSTRIKE DEATHCOIL)
@@ -82,20 +86,39 @@ AddIcon help=main mastery=1
 	Spell(DANCINGRUNEWEAPON usable=1)

 	if BuffExpires(strengthagility 2) and CheckBoxOn(horn) Spell(HORNOFWINTER)
+	if TargetDebuffExpires(lowerphysicaldamage) and CheckBoxOn(scarlet) and TargetClassification(worldboss)
+		Spell(BLOODBOIL)
+	Spell(RUNESTRIKE usable=1)

-	if TargetDebuffPresent(FROSTFEVER mine=1) and TargetDebuffPresent(BLOODPLAGUE mine=1)
-	{
-		if Runes(blood 1) and {CheckBoxOff(rolldes) or Runes(blood 2)} Spell(HEARTSTRIKE)
-		if Runes(unholy 1 nodeath=1) and Runes(frost 1 nodeath=1) Spell(DEATHSTRIKE)
-	}
+	if Runes(unholy 1) and Runes(frost 1) Spell(DEATHSTRIKE)
+	if Runes(blood 1) Spell(HEARTSTRIKE)
+
+	if Mana(more 39) Spell(DEATHCOIL usable=1)
+	if CheckBoxOn(horn) Spell(HORNOFWINTER priority=2)
+}

+AddIcon help=aoe mastery=1
+{
+	if BuffExpires(strengthagility 2) and CheckBoxOn(horn) Spell(HORNOFWINTER)
+	Spell(RUNESTRIKE usable=1)
+
+	if Runes(unholy 1) Spell(DEATHANDECAY usable=1)
+
 	if TargetDebuffExpires(FROSTFEVER 0 mine=1) and Runes(frost 1) Spell(ICYTOUCH)
 	if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and Runes(unholy 1) Spell(PLAGUESTRIKE)
+
+	if {OtherDebuffPresent(BLOODPLAGUE) or OtherDebuffPresent(FROSTFEVER)} and {TargetDebuffPresent(BLOODPLAGUE) or TargetDebuffPresent(FROSTFEVER)}
+		if Runes(blood 1) Spell(BLOODBOIL usable=1)
+	if TargetDebuffPresent(BLOODPLAGUE) and TargetDebuffPresent(FROSTFEVER)
+	{
+		if Runes(blood 1)
+			unless OtherDebuffPresent(BLOODPLAGUE) and OtherDebuffPresent(FROSTFEVER)
+				Spell(PESTILENCE usable=1)
+		if Runes(unholy 1) and Runes(frost 1) Spell(DEATHSTRIKE)
+		if Runes(blood 1) Spell(HEARTSTRIKE)
+	}

-	if PetPresent(no) Spell(RAISEDEAD)
-	Spell(RUNESTRIKE usable=1)
 	if Mana(more 39) Spell(DEATHCOIL usable=1)
-	if CheckBoxOn(horn) Spell(HORNOFWINTER priority=2)
 }

 AddIcon help=main mastery=2
@@ -127,9 +150,25 @@ AddIcon help=main mastery=2
 	}
 }

+AddIcon help=aoe mastery=2
+{
+	if Runes(unholy 1) and Runes(frost 1) Spell(HOWLINGBLAST)
+	if Runes(unholy 1) Spell(DEATHANDECAY usable=1)
+	if Runes(blood 1)
+	{
+		if TargetDebuffPresent(BLOODPLAGUE) and TargetDebuffPresent(FROSTFEVER)
+			unless OtherDebuffPresent(BLOODPLAGUE) and OtherDebuffPresent(FROSTFEVER)
+				Spell(PESTILENCE usable=1)
+		if {TargetDebuffPresent(BLOODPLAGUE) or TargetDebuffPresent(FROSTFEVER)}
+				and {OtherDebuffPresent(BLOODPLAGUE) or OtherDebuffPresent(FROSTFEVER)}
+			Spell(BLOODBOIL usable=1)
+	}
+}
+
 AddIcon help=main mastery=3
 {
 	if BuffExpires(strengthagility 2) and CheckBoxOn(horn) Spell(HORNOFWINTER)
+	if PetPresent(no) Spell(RAISEDEAD)

 	if TargetDebuffPresent(FROSTFEVER mine=1) and TargetDebuffPresent(BLOODPLAGUE mine=1)
 	{
@@ -142,19 +181,23 @@ AddIcon help=main mastery=3
 	if TargetDebuffExpires(FROSTFEVER 0 mine=1) and Runes(frost 1) Spell(ICYTOUCH)
 	if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and Runes(unholy 1) Spell(PLAGUESTRIKE)

-	if PetPresent(no) Spell(RAISEDEAD)
 	if Mana(more 34) Spell(DEATHCOIL usable=1)

 	if CheckBoxOn(horn) Spell(HORNOFWINTER priority=2)
 }

-AddIcon help=aoe
+AddIcon help=aoe mastery=3
 {
-	if Runes(unholy 1) and Runes(frost 1) Spell(HOWLINGBLAST)
-	if TargetDebuffPresent(BLOODPLAGUE) or TargetDebuffPresent(FROSTFEVER)
-		Spell(PESTILENCE usable=1)
-	Spell(DEATHANDECAY usable=1)
-	Spell(BLOODBOIL usable=1)
+	if Runes(unholy 1) Spell(DEATHANDECAY usable=1)
+	if Runes(blood 1)
+	{
+		if TargetDebuffPresent(BLOODPLAGUE) and TargetDebuffPresent(FROSTFEVER)
+			unless OtherDebuffPresent(BLOODPLAGUE) and OtherDebuffPresent(FROSTFEVER)
+				Spell(PESTILENCE usable=1)
+		if {TargetDebuffPresent(BLOODPLAGUE) or TargetDebuffPresent(FROSTFEVER)}
+				and {OtherDebuffPresent(BLOODPLAGUE) or OtherDebuffPresent(FROSTFEVER)}
+			Spell(BLOODBOIL usable=1)
+	}
 }

 AddIcon help=cd
@@ -167,6 +210,7 @@ AddIcon help=cd
 		Spell(UNBREAKABLEARMOR)
 		Spell(ICEBOUNDFORTITUDE)
 	}
+	if PetPresent(no) Spell(RAISEDEAD)
 	Spell(SUMMONGARGOYLE)
 	Item(Trinket0Slot usable=1)
 	Item(Trinket1Slot usable=1)
diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua
index e8aea5c..d2fa6ba 100644
--- a/defaut/Paladin.lua
+++ b/defaut/Paladin.lua
@@ -70,10 +70,10 @@ AddIcon help=main mastery=2

 	if CheckBoxOn(aoe)
 	{
-		Spell(HAMMEROFTHERIGHTEOUS)
 		if HolyPower(more 0) and BuffExpires(INQUISITION) Spell(INQUISITION)
-		Spell(HOLYWRATH)
+		Spell(HAMMEROFTHERIGHTEOUS)
 		Spell(CONSECRATE)
+		Spell(HOLYWRATH)
 	}
 	if CheckBoxOff(aoe)
 	{
@@ -81,8 +81,9 @@ AddIcon help=main mastery=2
 		Spell(CRUSADERSTRIKE)
 	}
 	Spell(JUDGEMENT)
-	Spell(HOLYWRATH)
 	Spell(AVENGERSSHIELD)
+	Spell(HOLYWRATH)
+	Spell(CONSECRATE priority=2)
 }

 AddIcon help=cd mastery=2