From 33a4914028fac8623609d1ed2f5c2741371a6d33 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sun, 6 Mar 2011 16:12:18 +0000
Subject: [PATCH] bug fix for arcane mage and frost mage

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@364 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Ovale.lua       |   10 ++++++++++
 defaut/Mage.lua |   10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Ovale.lua b/Ovale.lua
index 51fca8f..c076a35 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -386,6 +386,16 @@ local options =
 					desc = L["Ce caractère est affiché dans un coin de l'icône pour indiquer si la cible est à portée"],
 					get = function(info) return Ovale.db.profile.apparence.targetText end,
 					set = function(info, value) Ovale.db.profile.apparence.targetText = value; Ovale:UpdateFrame() end
+				},
+				controlDX =
+				{
+					order = 20,
+					type = "range",
+					name = L["Position horizontale des contrôles"],
+					desc = L["Décalage entre les icônes et les listes et les boîtes à cocher"],
+					min = 1, max = 100, step = 1,
+					get = function(info) return Ovale.db.profile.apparence.fontScale end,
+					set = function(info,value) Ovale.db.profile.apparence.fontScale = value; Ovale:UpdateFrame() end
 				}
 			}
 		},
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index 2ea6eb7..f30777f 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -112,17 +112,17 @@ AddIcon help=cd mastery=1
     if TargetIsInterruptible(yes) Spell(COUNTERSPELL)
 	
 	#/conjure_mana_gem,if=cooldown.evocation.remains<44&target.time_to_die<44&mana_gem_charges=0
-	if ItemCount(MANAGEMITEM less 1 charges=1) and {spell(EVOCATION)<44} and TargetDieIn(less 44)
+	if ItemCount(MANAGEMITEM less 1 charges=1) and {spell(EVOCATION)<44} and TargetDeadIn(less 44)
 		Spell(CONJUREMANAGEM)
 	#if=(cooldown.evocation.remains<30&buff.arcane_blast.stack=4)|cooldown.evocation.remains>90|target.time_to_die<40
-	if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLAST stacks=4)} or {spell(EVOCATION)>90} or TargetDieIn(less 40)
+	if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLAST stacks=4)} or {spell(EVOCATION)>90} or TargetDeadIn(less 40)
 	{
 		Item(Trinket0Slot usable=1)
 		Item(Trinket1Slot usable=1)
 		#if ItemCount(VOLCANICPOTION more 0) Item(VOLCANICPOTION)
 	}
 	
-	if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLAST stacks=4)} or TargetDieIn(less 40)
+	if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLAST stacks=4)} or TargetDeadIn(less 40)
 	{
 		#action_list_str += "/arcane_power,if=(cooldown.evocation.remains<30&buff.arcane_blast.stack=4)|target.time_to_die<40";
 		Spell(ARCANEPOWER)
@@ -131,7 +131,7 @@ AddIcon help=cd mastery=1
 	}
 	
     #action_list_str += "/mirror_image,if=buff.arcane_power.up|(cooldown.arcane_power.remains>20&target.time_to_die>15)";
-    if BuffPresent(ARCANEPOWER) or {{spell(ARCANEPOWER)>0} and TargetDieIn(more 15)} Spell(MIRRORIMAGE)
+    if BuffPresent(ARCANEPOWER) or {{spell(ARCANEPOWER)>0} and TargetDeadIn(more 15)} Spell(MIRRORIMAGE)
 	#/flame_orb,if=target.time_to_die>=10
     if TargetDeadIn(more 10) Spell(FLAMEORB)
 	#/presence_of_mind,arcane_blast
@@ -208,7 +208,7 @@ AddIcon help=cd mastery=3
     }
     if TargetDeadIn(more 11) Spell(FLAMEORB)
     if TargetDeadIn(more 24) Spell(MIRRORIMAGE)
-    Spell(ICYVEINS)
+    unless BuffPresent(ICYVEINS) Spell(ICYVEINS)
     Item(Trinket0Slot usable=1)
     Item(Trinket1Slot usable=1)
 }
-- 
1.7.9.5