Quantcast

balance druid: fix bug with faerie fire

Sidoine De Wispelaere [02-05-11 - 14:49]
balance druid: fix bug with faerie fire
feral druid: small fixes
fury warrior: fixes for execute phase
protection warrior: added victory rush
destruction warlock: do not cast bane of agony if bane of havoc is selected

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@351 d5049fe3-3747-40f7-a4b5-f36d6801af5f
Filename
Ovale.toc
defaut/Demoniste.lua
defaut/Druide.lua
defaut/Guerrier.lua
diff --git a/Ovale.toc b/Ovale.toc
index 1289371..129ba28 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: 4.0.23
+## Version: 4.0.24
 ## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index a9162b8..37d7e38 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -159,7 +159,7 @@ AddIcon help=main mastery=3
 	if TargetDebuffExpires(BANEOFDOOM 0 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1)
 	{
 		if List(bane doom) and TargetDeadIn(more 20) Spell(BANEOFDOOM)
-		if TargetDeadIn(more 10) unless List(cure havoc) Spell(BANEOFAGONY)
+		if TargetDeadIn(more 10) unless List(bane havoc) Spell(BANEOFAGONY)
 	}
 	if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 3) Spell(IMMOLATE)
 	if 1s after TargetDebuffPresent(IMMOLATE mine=1) Spell(CONFLAGRATE)
diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index fba8efa..848dbbc 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -90,7 +90,7 @@ ScoreSpells(FAERIEFERAL DEMOROAR MANGLEBEAR LACERATE SAVAGEROAR RIP
 AddIcon help=main mastery=1
 {
 	#Contributed by Grabielz
-	if CheckBoxOn(lucioles) and TargetDebuffExpires(FAERIEFIRE 3 mine=1 stacks=3) and TargetDebuffExpires(lowerarmor 2 mine=0) and TargetDeadIn(more 15)
+	if CheckBoxOn(lucioles) and TargetDebuffExpires(FAERIEFIREDEBUFF 3 mine=1 stacks=3) and TargetDebuffExpires(lowerarmor 2 mine=0) and TargetDeadIn(more 15)
 		Spell(FAERIEFIRE nored=1)

 	if Speed(more 0)
@@ -186,7 +186,7 @@ AddIcon help=main mastery=2
 		if ArmorSetParts(T11 more 3) and BuffExpires(STRENGTHOFTHEPANTHER 3 stacks=3) Spell(MANGLECAT)

 		#faerie_fire_feral,if=debuff.faerie_fire.stack<3|!(debuff.sunder_armor.up|debuff.expose_armor.up)
-		if CheckBoxOn(lucioles) and	TargetDebuffExpires(lowerarmor 2 mine=0) and TargetDebuffExpires(FAERIEFIREDEBUFF 3 stacks=3) and TargetDeadIn(more 15)
+		if CheckBoxOn(lucioles) and	TargetDebuffExpires(lowerarmor 0 mine=0) and TargetDebuffExpires(FAERIEFIREDEBUFF 2 stacks=3) and TargetDeadIn(more 15)
 			Spell(FAERIEFERAL)

 		#mangle_cat,if=debuff.mangle.remains<=2&(!debuff.mangle.up|debuff.mangle.remains>=0.0)
@@ -233,7 +233,7 @@ AddIcon help=main mastery=2
 			Spell(SAVAGEROAR)

 		#ferocious_bite,if=(target.time_to_die<=4&buff.combo_points.stack>=5)|target.time_to_die<=1
-		if {TargetDeadIn(less 4) and ComboPoints(more 4)} or TargetDeadIn(less 1) Spell(FEROCIOUSBITE)
+		if {TargetDeadIn(less 4) and ComboPoints(more 4)} or {TargetDeadIn(less 1) and ComboPoints(more 0)} Spell(FEROCIOUSBITE)
 		#ferocious_bite,if=level>80&buff.combo_points.stack>=5&dot.rip.remains>=14.0&buff.savage_roar.remains>=10.0
 		if ComboPoints(more 4) and TargetDebuffPresent(RIP 14 mine=1) and BuffPresent(SAVAGEROAR 10) Spell(FEROCIOUSBITE)
 		#shred,extend_rip=1,if=dot.rip.ticking&dot.rip.remains<=4&target.health_pct>25
@@ -246,7 +246,7 @@ AddIcon help=main mastery=2

 		#shred,if=buff.combo_points.stack<=4&dot.rake.remains>3.0&dot.rip.remains>3.0&(time_to_max_energy<=2.0|(buff.berserk.up&energy>=20))
 		if ComboPoints(less 5) and TargetDebuffPresent(RAKE 3 mine=1) and TargetDebuffPresent(RIP 3 mine=1) and {2s before Mana(more 99) or {BuffPresent(BERSERK) and Mana(more 20)}}
-			Spell(SHRED)
+			{Spell(SHRED) Spell(MANGLECAT)}
 		#shred,if=cooldown.tigers_fury.remains<=3.0
 		if 3s before Spell(TIGERSFURY) Spell(SHRED)
 		#shred,if=target.time_to_die<=dot.rake.duration
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index e536f50..b776f26 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -137,6 +137,7 @@ AddIcon help=main mastery=2
 		and TargetLifePercent(more 20) Spell(RAGINGBLOW)

     Spell(BLOODTHIRST)
+	if TargetLifePercent(less 20) Spell(EXECUTE)
 	Spell(VICTORYRUSH usable=1)
 	if BuffPresent(BLOODSURGE) Spell(SLAM)
 }
@@ -148,6 +149,7 @@ AddIcon help=main mastery=3
     if List(shout battle) and {Mana(less 20) or BuffExpires(strengthagility 3)} Spell(BATTLESHOUT nored=1)
 	if TargetClassification(worldboss) and CheckBoxOn(demo) and TargetDebuffExpires(lowerphysicaldamage 2) Spell(DEMOSHOUT nored=1)

+	if LifePercent(less 75) Spell(VICTORYRUSH usable=1)
 	if CheckBoxOn(multi)
 	{
 		if TargetDebuffExpires(RENDDEBUFF mine=1) Spell(REND)