From 67bb589a959d6b89d005eb3a1f90037728838461 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Thu, 16 Jul 2009 18:52:29 +0000
Subject: [PATCH] jkk9_JJK- druid: rake is not a finishing move! - druid:
 savageroar should be kept at all cost - paladin: increased
 crusader strike and hammer of wrath priority - paladin:
 added divine wrath option - warrior: sunder armor is an
 option - warrior: heroic strike in combat stance

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@89 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Ovale.toc           |    2 +-
 defaut/Druide.lua   |    6 ++++--
 defaut/Guerrier.lua |   22 +++++++++++++---------
 defaut/Paladin.lua  |   16 +++++++++++-----
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/Ovale.toc b/Ovale.toc
index 602cdf0..78fecb1 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: 3.1.18
+## Version: 3.1.19
 ## OptionalDeps: Ace3, ButtonFacade
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index a321021..2ded741 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -50,14 +50,16 @@ AddIcon
 
 	if Stance(3) # cat
 	{
+		if ComboPoints(more 0) and BuffExpires(SAVAGEROAR 2) Spell(SAVAGEROAR)
+	
 		if CheckBoxOn(lucioles) and	TargetDebuffExpires(FAERIEFERAL 2)
 			Spell(FAERIEFERAL)
 
-    
+    	if TargetDebuffExpires(RAKE 0) Spell(RAKE)
+	
 		if ComboPoints(more 4) and Mana(more 70)
 		{
 			if BuffExpires(SAVAGEROAR 5) Spell(SAVAGEROAR)
-			if TargetDebuffExpires(RAKE 0) Spell(RAKE)
 			if TargetDebuffExpires(RIP 0) Spell(RIP)
 			Spell(FEROCIOUSBITE)
 		}
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index c776714..ab283dd 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -37,6 +37,7 @@ Define(CURSEOFWEAKNESS 50511)
 AddCheckBox(multi L(AOE))
 AddCheckBox(demo SpellName(DEMOSHOUT))
 AddCheckBox(whirlwind SpellName(WHIRLWIND))
+AddCheckBox(sunder SpellName(SUNDER))
 AddListItem(shout none L(None))
 AddListItem(shout battle SpellName(BATTLESHOUT))
 AddListItem(shout command SpellName(COMMANDSHOUT))
@@ -91,16 +92,18 @@ AddIcon
         if HasShield() Spell(SHIELDSLAM)
         Spell(SHOCKWAVE)
         Spell(CONCUSSIONBLOW)
-        
+    
         if CheckBoxOn(whirlwind) Spell(WHIRLWIND)
         Spell(BLOODTHIRST)
         if BuffPresent(SLAMBUFF) Spell(SLAM)
+     
         Spell(MORTALSTRIKE)
-        Spell(DEVASTATE)
-        
+   
         if TalentPoints(SLAMTALENT more 1)
-          Spell(SLAM)
-     }
+		    Spell(SLAM priority=2)
+
+        Spell(DEVASTATE)
+    }
 
      if Stance(1) #combat
      {
@@ -109,9 +112,10 @@ AddIcon
         if BuffPresent(SUDDENDEATH) or TargetLifePercent(less 20) Spell(EXECUTE)
         Spell(MORTALSTRIKE)
         Spell(OVERPOWER usable=1)
-        if TalentPoints(SLAMTALENT more 1)
-          Spell(SLAM priority=2)
-
+     
+         if TalentPoints(SLAMTALENT more 1)
+		    Spell(SLAM priority=2)
+ 
 		#Some other specs stuff, just in case
 		Spell(BLOODTHIRST)
         if HasShield() Spell(SHIELDSLAM)
@@ -120,7 +124,7 @@ AddIcon
         Spell(DEVASTATE)
      }
 
-     if TargetDebuffExpires(SUNDER 5 stacks=5)
+     if CheckBoxOn(sunder) and TargetDebuffExpires(SUNDER 5 stacks=5)
         Spell(SUNDER)
 }
 
diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua
index 16373bf..a382455 100644
--- a/defaut/Paladin.lua
+++ b/defaut/Paladin.lua
@@ -11,7 +11,7 @@ Define(JUDGEWISDOM 53408)
 Define(CONSECRATE 26573)
 Define(DIVINESTORM 53385)
 Define(HAMMEROFWRATH 24275)
-Define(INQUISITION 35395)
+Define(CRUSADERSTRIKE 35395)
 Define(HOLYSHOCK 20473)
 Define(THEARTOFWAR 59578)
 Define(FLASHOFLIGHT 19750)
@@ -20,6 +20,7 @@ Define(AVENGINGWRATH 31884)
 Define(SHIELDOFRIGHTEOUSNESS 53600)
 Define(HOLYSHIELD 20925)
 Define(HAMMEROFTHERIGHTEOUS 53595)
+Define(HOLYWRATH 2812)
 
 AddListItem(sceau piete SpellName(SEALRIGHTEOUSNESS))
 AddListItem(sceau autorite SpellName(SEALCOMMAND))
@@ -29,6 +30,7 @@ AddListItem(jugement lumiere SpellName(JUDGELIGHT))
 AddListItem(jugement sagesse SpellName(JUDGEWISDOM))
 AddCheckBox(consecration SpellName(CONSECRATE))
 AddCheckBox(tempete SpellName(DIVINESTORM))
+AddCheckBox(coleredivine SpellName(HOLYWRATH))
 
 AddIcon
 {
@@ -44,19 +46,23 @@ AddIcon
           if BuffExpires(SEALVENGEANCE 3) Spell(SEALVENGEANCE)
           if BuffExpires(SEALCORRUPTION 3) Spell(SEALCORRUPTION)
      }
-     if List(jugement lumiere) Spell(JUDGELIGHT)
-     if List(jugement sagesse) Spell(JUDGEWISDOM)
      if TargetTargetIsPlayer(yes) Spell(HOLYSHIELD)
      Spell(HAMMEROFTHERIGHTEOUS)
+     
+     Spell(CRUSADERSTRIKE)
      Spell(HAMMEROFWRATH usable=1)
-     Spell(INQUISITION)
+     if List(jugement lumiere) Spell(JUDGELIGHT)
+     if List(jugement sagesse) Spell(JUDGEWISDOM)
      if CheckBoxOn(tempete) Spell(DIVINESTORM)
      if CheckBoxOn(consecration) Spell(CONSECRATE)
+     Spell(EXORCISM)
+     if CheckBoxOn(coleredivine) Spell(HOLYWRATH)
+     
      Spell(HOLYSHOCK) 
      if HasShield() Spell(SHIELDOFRIGHTEOUSNESS)
-     Spell(EXORCISM)
      if BuffPresent(THEARTOFWAR) Spell(FLASHOFLIGHT priority=2)
 }
+
 AddIcon
 {
      Spell(AVENGINGWRATH)
-- 
1.7.9.5