From 7a4663433adbd2467f67d265c7e8205d9ccbc892 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sun, 14 Mar 2010 17:07:40 +0000
Subject: [PATCH] fix for warrior, death knight and mage scripts

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@243 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 defaut/Chevalier.lua |   13 ++++++--
 defaut/Guerrier.lua  |   17 +++++-----
 defaut/Mage.lua      |   86 ++++++++++++++++++++++++++------------------------
 3 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua
index 5f1439b..38d1666 100644
--- a/defaut/Chevalier.lua
+++ b/defaut/Chevalier.lua
@@ -34,7 +34,8 @@ Define(TALENTABOMINATIONMIGHT 2105)
 Define(RAISEDEAD 46584)
 Define(HORNOFWINTER 57330)
 Define(STRENGTHOFEARTHTOTEM 8075)
-
+Define(GLYPHOFRAISEDEAD 60200)
+Define(BLOODTAP 45529)
 
 AddCheckBox(rolldes SpellName(GLYPHDISEASE) default glyph=GLYPHDISEASE)
 
@@ -110,10 +111,18 @@ AddIcon help=main
 		Spell(PLAGUESTRIKE)
 		
 	Spell(FROSTSTRIKE usable=1)
-	if PetPresent(no) Spell(RAISEDEAD)
+	if PetPresent(no) and Glyph(RAISEDEAD) Spell(RAISEDEAD)
 	
 	if Mana(more 39) Spell(DEATHCOIL usable=1)
 	Spell(HORNOFWINTER priority=2)
+
+	unless Runes(frost 1) and Runes(unholy 1) Spell(BLOODTAP)
+	
+	if Runes(blood 2 nodeath=1)
+	{
+		Spell(HEARTSTRIKE priority=2)
+		Spell(BLOODSTRIKE priority=2)
+	}
 }
 
 AddIcon help=offgcd
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index 6529e54..56f8e49 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -74,6 +74,12 @@ AddIcon help=main
             and TargetDebuffExpires(CURSEOFWEAKNESS 0)
           Spell(DEMOSHOUT nored=1)
          
+	if CheckBoxOn(sunder) and TargetDebuffExpires(SUNDER 2 stacks=5) and TargetDebuffPresent(SUNDER stacks=4)
+	{
+		Spell(DEVASTATE nored=1)
+		Spell(SUNDER nored=1)
+	}
+	
      if Stance(2) #Defense
      {
         if TargetClassification(worldboss)
@@ -145,16 +151,11 @@ AddIcon help=main
         Spell(DEVASTATE)
      }
 
-     if CheckBoxOn(sunder) and TargetDebuffExpires(SUNDER 5 stacks=5) 
-     {
-		if TargetDebuffPresent(SUNDER)
-		{
-			Spell(DEVASTATE nored=1)
-			Spell(SUNDER nored=1)
-		}
+	if CheckBoxOn(sunder) and TargetDebuffExpires(SUNDER 10 stacks=5)
+	{
 	    Spell(DEVASTATE priority=2 nored=1)
 		Spell(SUNDER priority=2 nored=1)
-     }
+    }
 }
 
 AddIcon help=offgcd
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index 20f7187..d0a8f8a 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -1,10 +1,12 @@
 Ovale.defaut["MAGE"]=
 [[
+#Modified by Arconer
 Define(TALENTLIVINGBOMB 1852)
 Define(TALENTPIERCINGICE 61)
 Define(TALENTCHILLEDTOTHEBONES 1856)
 Define(TALENTARCANEBARRAGE 1847)
 Define(TALENTIMPROVEDSCORSH 25)
+Define(TALENTBRAINFREEZE 1854)
 
 Define(HOTSTREAK 48108)
 Define(IMPROVEDSCORCH 22959)
@@ -17,6 +19,9 @@ Define(FIREBALL 133)
 
 Define(FROSTBOLT 116)
 Define(DEEPFREEZE 44572)
+Define(BRAINFREEZE 57761)
+Define(PUSHLIMIT 70753)
+Define(FINGERFROST 44544)
 
 Define(ARCANEBARRAGE 44425)
 Define(ARCANEMISSILES 5143)
@@ -52,53 +57,52 @@ ScoreSpells(SCORCH PYROBLAST LIVINGBOMB FROSTFIREBOLT FIREBALL SUMMONWATERELEMEN
 
 AddIcon help=main
 {
-		unless InCombat()
-		{
-			if BuffExpires(MAGEARMOR 400) and BuffExpires(MOLTENARMOR 400) and BuffExpires(ICEARMOR 400)
-				Spell(MOLTENARMOR)
-		}
-		
-       if TalentPoints(TALENTLIVINGBOMB more 0)
-       {
-              #Fire spec
-              if TargetDebuffExpires(IMPROVEDSCORCH 6) and CheckBoxOn(scorch) and TargetDeadIn(more 15) Spell(SCORCH)
-              if BuffPresent(HOTSTREAK) Spell(PYROBLAST)
-              if TargetDebuffExpires(LIVINGBOMB 0 mine=1) and TargetDeadIn(more 12) Spell(LIVINGBOMB)
-              if TalentPoints(TALENTPIERCINGICE more 0)
-                     Spell(FROSTFIREBOLT)
-              if TalentPoints(TALENTPIERCINGICE less 1)
-                     Spell(FIREBALL)
-       }
+	unless InCombat()
+	{
+		if BuffExpires(MAGEARMOR 400) and BuffExpires(MOLTENARMOR 400) and BuffExpires(ICEARMOR 400)
+		Spell(MOLTENARMOR)
+	}
+
+	if TalentPoints(TALENTLIVINGBOMB more 0)
+	{
+		#Fire spec
+		if TargetDebuffExpires(IMPROVEDSCORCH 6) and CheckBoxOn(scorch) and TargetDeadIn(more 15) Spell(SCORCH)
+		if BuffPresent(HOTSTREAK) Spell(PYROBLAST)
+		if TargetDebuffExpires(LIVINGBOMB 0 mine=1) and TargetDeadIn(more 12) Spell(LIVINGBOMB)
+		if TalentPoints(TALENTPIERCINGICE more 0)
+			Spell(FROSTFIREBOLT)
+		if TalentPoints(TALENTPIERCINGICE less 1)
+			Spell(FIREBALL)
+	}
        
-       if TalentPoints(TALENTCHILLEDTOTHEBONES more 0)
-       {
-              #Frost spec
-              if PetPresent(no) Spell(SUMMONWATERELEMENTAL)
-              if TargetClassification(worldboss) Spell(DEEPFREEZE)
-              Spell(FROSTBOLT)
-       }
+	if TalentPoints(TALENTCHILLEDTOTHEBONES more 0)
+	{
+		#Frost spec
+		if PetPresent(no) Spell(SUMMONWATERELEMENTAL)
+		if BuffPresent(FINGERFROST) Spell(DEEPFREEZE)
+		if BuffPresent(BRAINFREEZE) and BuffExpires(PUSHLIMIT 1) Spell(FIREBALL)
+		Spell(FROSTBOLT)
+	}
        
-       if TalentPoints(TALENTARCANEBARRAGE more 0)
-       {
-				#Arcane spec
-				unless DebuffPresent(ARCANEBLAST stacks=4)
-					Spell(ARCANEBLAST)
-				if BuffPresent(MISSILEBARRAGE)
-					Spell(ARCANEMISSILES)
-				if CheckBoxOn(abarr) Spell(ARCANEBARRAGE)
-				Spell(ARCANEMISSILES)
-       }
+	if TalentPoints(TALENTARCANEBARRAGE more 0)
+    {
+            #Arcane spec
+                   
+            if BuffPresent(MISSILEBARRAGE) and DebuffPresent(ARCANEBLAST stacks=4)
+                Spell(ARCANEMISSILES)
+			Spell(ARCANEBLAST)
+    }
 }
 
 AddIcon help=cd
 {
-       Spell(MIRRORIMAGE)
-       if DebuffPresent(ARCANEBLAST stacks=3) Spell(ARCANEPOWER)
-       Spell(COMBUSTION)
-       Spell(ICYVEINS)
-       Spell(PRESENCEOFMIND)
-       Item(Trinket0Slot usable=1)
-       Item(Trinket1Slot usable=1)
+	Spell(MIRRORIMAGE)
+	if DebuffPresent(ARCANEBLAST stacks=3) Spell(ARCANEPOWER)
+	Spell(COMBUSTION)
+	Spell(ICYVEINS)
+	Spell(PRESENCEOFMIND)
+	Item(Trinket0Slot usable=1)
+	Item(Trinket1Slot usable=1)
 }
 
 ]]
\ No newline at end of file
-- 
1.7.9.5