From eb0482a556680f31ff2e4779e6d80fb29a050972 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sun, 17 Oct 2010 22:43:39 +0000
Subject: [PATCH] some changes to druid and warrior script

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@307 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 defaut/Druide.lua   |   33 +++++++++++++++++++--------------
 defaut/Guerrier.lua |   10 +++++-----
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index 7d045fd..8346d6e 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -165,28 +165,34 @@ AddIcon help=main mastery=2
 	{
 		if BuffPresent(STAMPEDE) Spell(RAVAGE)
 		
-		if ComboPoints(more 0) and BuffExpires(SAVAGEROAR 2) Spell(SAVAGEROAR priority=4)
-	
 		if CheckBoxOn(lucioles) and	TargetDebuffExpires(lowerarmor 2) and TargetDebuffExpires(FAERIEFIREDEBUFF stacks=3) and TargetDeadIn(more 15)
 			Spell(FAERIEFERAL)
 
-		#De-synchronize Roar and Rip
-		if ComboPoints(more 2) and BuffExpires(SAVAGEROAR 6) and less than 6s between BuffExpires(SAVAGEROAR) and TargetDebuffExpires(RIP mine=1 forceduration=22) 
-		{
-			unless TargetDebuffExpires(RIP 6 mine=1) Spell(SAVAGEROAR priority=4)
-		}
+		#De-synchronize Roar and Rip if are both present but will expire with less than 6 seconds between
+		#TODO: don't work correctly, I think
+		#if ComboPoints(more 2) and BuffPresent(SAVAGEROAR 6) and TargetDebuffPresent(RIP 6 mine=1) and 
+		#		less than 6s between BuffExpires(SAVAGEROAR) and TargetDebuffExpires(RIP mine=1 forceduration=22) 
+		#{
+		#	Spell(RIP)
+		#}
 
 		#Extends Rip with shred if glyph
 		if Glyph(GLYPHOFSHRED) and TargetDebuffPresent(RIP mine=1) and TargetDebuffExpires(RIP 4 mine=1) and Counter(ripshreds less 3) Spell(SHRED)
 
+		#Enter fury before applying rip
+		
 		if ComboPoints(more 4)
 		{
 			if TargetDeadIn(less 7) Spell(FEROCIOUSBITE priority=4)
-			if TargetDebuffExpires(RIP 0 mine=1) Spell(RIP priority=4)
-			if TargetDebuffPresent(RIP 10 mine=1) and BuffPresent(SAVAGEROAR 6)
+			#Rip has priority over Savage Roar
+			if BuffExpires(BERSERK 0) and TargetDebuffExpires(RIP 1 mine=1) Spell(TIGERSFURY)
+			if TargetDebuffExpires(RIP 0 mine=1) Spell(RIP)
+			if BuffExpires(SAVAGEROAR 2) Spell(SAVAGEROAR)
+			#If both are already present for at least 6 seconds, try Ferocious bite
+			if {TargetDebuffPresent(RIP 10 mine=1) and BuffPresent(SAVAGEROAR 6)} or TargetLifePercent(less 25)
 			{
-				if BuffExpires(BERSERK 0) or {BuffPresent(BERSERK) and Mana(less 20)}
-					Spell(FEROCIOUSBITE)
+				#if BuffExpires(BERSERK 0) or {BuffPresent(BERSERK) and Mana(less 20)} I don't know what is the point of this
+				Spell(FEROCIOUSBITE)
 			}
 		}
 		
@@ -201,7 +207,7 @@ AddIcon help=main mastery=2
 			if BuffPresent(CLEARCASTING) or TargetDeadIn(less 10) or BuffPresent(BERSERK) 
 					Spell(SHRED)
 			if ComboPoints(less 5) and TargetDebuffExpires(RIP 3 mine=1) Spell(SHRED)
-			if ComboPoints(less 1) and BuffExpires(SAVAGEROAR 2) Spell(SHRED)
+			#if ComboPoints(less 1) and BuffExpires(SAVAGEROAR 2) Spell(SHRED) no longer necessary, savage roar upkeeping is less important
 		}
 		if CheckBoxOff(shred) Spell(CLAW)
 	}
@@ -209,8 +215,7 @@ AddIcon help=main mastery=2
 
 AddIcon help=cd mastery=2
 {
-	Spell(BERSERK)
-	unless BuffPresent(BERSERK) if Mana(less 40) Spell(TIGERSFURY)
+	unless BuffPresent(TIGERSFURY) Spell(BERSERK)
 	Item(Trinket0Slot usable=1)
 	Item(Trinket1Slot usable=1)
 }
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index a991a7c..e1e4537 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -115,13 +115,13 @@ AddIcon help=main mastery=2
 	if CheckBoxOn(multi) Spell(WHIRLWIND)
 	Spell(COLOSSUSSMASH)
     if TargetLifePercent(less 20) and BuffExpires(EXECUTIONER 0 stacks=5) Spell(EXECUTE)
-	Spell(BLOODTHIRST)
 	Spell(RAGINGBLOW usable=1)
-    Spell(VICTORYRUSH usable=1)
-	if TargetLifePercent(less 20) and BuffExpires(EXECUTIONER 3) Spell(EXECUTE)
+    if TargetLifePercent(less 20) Spell(EXECUTE) #Just spam execute
+	Spell(BLOODTHIRST)
+	Spell(VICTORYRUSH usable=1)
+	#if TargetLifePercent(less 20) and BuffExpires(EXECUTIONER 3) Spell(EXECUTE)
 	if BuffPresent(BLOODSURGE) Spell(SLAM)
-    if TargetLifePercent(less 20) Spell(EXECUTE)
-	if BuffExpires(DEATHWISH) and BuffExpires(RECKLESSNESS) and BuffExpires(ENRAGE) Spell(BERSERKERRAGE)
+    if BuffExpires(DEATHWISH) and BuffExpires(RECKLESSNESS) and BuffExpires(ENRAGE) Spell(BERSERKERRAGE)
 }
 
 
-- 
1.7.9.5