From 7a499246082301fb4c0d94f83e7b54afac65e5a9 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sun, 25 Jan 2009 11:17:23 +0000
Subject: [PATCH] bug fixes for paladin

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@10 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 .pkgmeta           |    2 +-
 Condition.lua      |    9 +++++++++
 OvaleIcone.lua     |    2 +-
 defaut/Paladin.lua |   10 ++++++++--
 embeds.xml         |    2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.pkgmeta b/.pkgmeta
index b69b217..66edb34 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -10,5 +10,5 @@ externals:
     Libs/AceEvent-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceEvent-3.0
     Libs/AceLocale-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
     Libs/LibStub: svn://svn.wowace.com/wow/ace3/mainline/trunk/LibStub
-    
+    Libs/LibBabble-CreatureType-3.0: svn://svn.wowace.com/wow/libbabble-creaturetype-3-0/mainline/trunk
     
\ No newline at end of file
diff --git a/Condition.lua b/Condition.lua
index 9155db4..62554b1 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -1,3 +1,5 @@
+local LBCT = LibStub("LibBabble-CreatureType-3.0"):GetLookupTable()
+
 local function compare(a, comparison, b)
 	if (comparison == "more") then
 		if (not b or (a~=nil and a>b)) then
@@ -216,6 +218,13 @@ Ovale.conditions=
 			return nil
 		end
 	end,
+	TargetCreatureType = function(condition)
+		if (UnitCreatureType("target") == LBCT[condition[1]]) then
+			return 0
+		else
+			return nil
+		end		
+	end,
 	-- Test if a debuff will expire on the target after a given time, or if there is less than the
 	-- given number of stacks (if stackable)
 	-- 1 : buff spell id
diff --git a/OvaleIcone.lua b/OvaleIcone.lua
index 25539d6..247b654 100644
--- a/OvaleIcone.lua
+++ b/OvaleIcone.lua
@@ -17,7 +17,7 @@
 		Ovale.trace = true
 	end
 	
-	if (self.masterNode.params.nocd == 1 and minAttente~=0) then
+	if (self.masterNode.params.nocd == 1 and minAttente>1.5) then
 		minAttente = nil
 	end
 		
diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua
index 0988a0b..af6416c 100644
--- a/defaut/Paladin.lua
+++ b/defaut/Paladin.lua
@@ -17,6 +17,9 @@ Define(THEARTOFWAR 59578)
 Define(FLASHOFLIGHT 19750)
 Define(EXORCISM 879)
 Define(AVENGINGWRATH 31884)
+Define(SHIELDOFRIGHTEOUSNESS 53600)
+Define(HOLYSHIELD 20925)
+Define(HAMMEROFTHERIGHTEOUS 53595)
 
 AddListItem(sceau piete SpellName(SEALRIGHTEOUSNESS))
 AddListItem(sceau autorite SpellName(SEALCOMMAND))
@@ -43,12 +46,15 @@ AddIcon
      }
      if List(jugement lumiere) Spell(JUDGELIGHT)
      if List(jugement sagesse) Spell(JUDGEWISDOM)
-     if TargetLifePercent(less 35) Spell(HAMMEROFWRATH)
+     if TargetTargetIsPlayer(yes) Spell(HOLYSHIELD)
+     Spell(HAMMEROFTHERIGHTEOUS)
+     Spell(HAMMEROFWRATH usable=1)
      Spell(INQUISITION)
      if CheckBoxOn(tempete) Spell(DIVINESTORM)
      if CheckBoxOn(consecration) Spell(CONSECRATE)
      Spell(HOLYSHOCK) 
-     Spell(EXORCISM usable=1)
+     if HasShield() Spell(SHIELDOFRIGHTEOUSNESS)
+     if TargetCreatureType(Undead) Spell(EXORCISM usable=1)
      if BuffPresent(THEARTOFWAR) Spell(FLASHOFLIGHT priority=2)
 }
 AddIcon
diff --git a/embeds.xml b/embeds.xml
index e343580..7f3aded 100644
--- a/embeds.xml
+++ b/embeds.xml
@@ -10,5 +10,5 @@
   <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" />
   <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml" />
   <Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml" />
-
+  <Include file="Libs\LibBabble-CreatureType-3.0\lib.xml" />
 </Ui>
-- 
1.7.9.5