From a56badac8999e098dc97084e5571407a9aae9e77 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sat, 27 Feb 2010 13:40:00 +0000
Subject: [PATCH] mage: arcane mage fix warrior: devastate is no longer low
 priority paladin: allow to choose no sceal

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@232 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Ovale.lua           |    8 +++++++-
 Ovale.toc           |    2 +-
 defaut/Guerrier.lua |    2 +-
 defaut/Mage.lua     |    2 +-
 defaut/Paladin.lua  |    1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Ovale.lua b/Ovale.lua
index e10483c..4d2bdf8 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -1249,6 +1249,9 @@ function Ovale:GetActionInfo(element)
 
 	if (element.func == "Spell" ) then
 		spellName = self:GetSpellInfoOrNil(element.params[1])
+		if not spellName then
+			return nil
+		end
 		action = self.actionSort[spellName]
 		local cd = self:GetCD(spellName)
 		if cd and cd.start then
@@ -1294,13 +1297,16 @@ function Ovale:GetActionInfo(element)
 			itemId = element.params[1]
 		else
 			local _,_,id = string.find(GetInventoryItemLink("player",GetInventorySlotInfo(element.params[1])) or "","item:(%d+):%d+:%d+:%d+")
+			if not id then
+				return nil
+			end
 			itemId = tonumber(id)
 		end
 		
 		if (Ovale.trace) then
 			self:Print("Item "..nilstring(itemId))
 		end
-		
+
 		spellName = GetItemSpell(itemId)
 		actionUsable = (spellName~=nil)
 		
diff --git a/Ovale.toc b/Ovale.toc
index b35f2ae..d21275c 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.3.25
+## Version: 3.3.26
 ## OptionalDeps: Ace3, ButtonFacade, Recount, LibBabble-CreatureType-3.0
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index 3c8562c..6529e54 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -94,7 +94,7 @@ AddIcon help=main
         Spell(SHIELDSLAM)
         Spell(BLOODTHIRST)
         
-        if Mana(more 10) Spell(DEVASTATE priority=2)
+        if Mana(more 10) Spell(DEVASTATE)
      }
 
      if Stance(3) #berserker
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index 6b12b4b..8474d49 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -71,7 +71,7 @@ AddIcon help=main
        if TalentPoints(TALENTARCANEBARRAGE more 0)
        {
 				#Arcane spec
-				if DebuffExpires(ARCANEBLAST 0 stacks=4)
+				unless DebuffPresent(ARCANEBLAST stacks=3)
 					Spell(ARCANEBLAST)
 				if BuffPresent(MISSILEBARRAGE)
 					Spell(ARCANEMISSILES)
diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua
index 0a4c990..7078a3e 100644
--- a/defaut/Paladin.lua
+++ b/defaut/Paladin.lua
@@ -22,6 +22,7 @@ Define(HOLYWRATH 2812)
 Define(TALENTGUARDEDBYTHELIGHT 2194)
 Define(DIVINEPLEA 54428)
 
+AddListItem(sceau none L(None))
 AddListItem(sceau piete SpellName(SEALRIGHTEOUSNESS))
 AddListItem(sceau autorite SpellName(SEALCOMMAND))
 AddListItem(sceau vengeance SpellName(SEALVENGEANCE) default)
-- 
1.7.9.5