From 65f9d4d354161b3795d6cd4af1b046a454c35ba2 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Fri, 2 Oct 2009 18:01:46 +0000
Subject: [PATCH] - fix for balance druid - DK: added an option to refresh
 disease with the glyphed pestilence - warlock: removed
 recklessness curse

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@104 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Condition.lua        |   17 ++++++++++++-----
 Ovale.toc            |    2 +-
 defaut/Chevalier.lua |   15 +++++++++++++++
 defaut/Demoniste.lua |    1 -
 defaut/Druide.lua    |    6 ++++--
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/Condition.lua b/Condition.lua
index 2266cf0..cdf756c 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -258,11 +258,7 @@ Ovale.conditions=
 	BuffPresent = function(condition)
 		local timeLeft, stacksLeft = GetTargetAura(condition, "HELPFUL", "player")
 		
-		if (timeLeft and (not condition.stacks or stacksLeft>=condition.stacks)) then
-			return 0
-		else
-			return nil
-		end
+		return testbool(timeLeft and (not condition.stacks or stacksLeft>=condition.stacks),condition[2])
 	end,
 	Casting = function(condition)
 		local spell = UnitCastingInfo("player")
@@ -322,6 +318,17 @@ Ovale.conditions=
 			return nil
 		end
 	end,
+	Glyph = function(condition)
+		local present = false
+		for i = 1, GetNumGlyphSockets() do
+			local enalbled, glypType, glyphSpellID = GetGlyphSocketInfo(i)
+			if (glyphSpellID == condition[1]) then
+				present = true
+				break
+			end
+		end
+		return testbool(present, condition[2])
+	end,
 	HasFullControl = function(condition)
 		return testbool(HasFullControl(), condition[1])
 	end,
diff --git a/Ovale.toc b/Ovale.toc
index 262ef24..85dabdc 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.2.4
+## Version: 3.2.5
 ## OptionalDeps: Ace3, ButtonFacade
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua
index c232ef4..e461740 100644
--- a/defaut/Chevalier.lua
+++ b/defaut/Chevalier.lua
@@ -27,6 +27,12 @@ Define(DANCINGRUNEWEAPON 49028)
 Define(FROSTSTRIKE 49143)
 Define(HYSTERIA 49016)
 Define(SUMMONGARGOYLE 49206)
+Define(GLYPHDISEASE 63959)
+Define(ABOMINATIONMIGHT 53136)
+Define(TALENTABOMINATIONMIGHT 2105)
+Define(RAISEDEAD 46584)
+
+AddCheckBox(rolldes SpellName(GLYPHDISEASE))
 
 AddIcon
 {
@@ -54,12 +60,21 @@ AddIcon
 			Spell(BLOODSTRIKE)
 		}
 	}
+	if CheckBoxOn(rolldes) and Glyph(GLYPHDISEASE) and TargetDebuffExpires(FROSTFEVER 2 mine=1) and TargetDebuffPresent(FROSTFEVER mine=1) and
+		TargetDebuffExpires(BLOODPLAGUE 2 mine=1) and TargetDebuffPresent(BLOODPLAGUE mine=1)
+			Spell(PESTILENCE)
+			
+	if CheckBoxOn(rolldes) and TalentPoints(TALENTABOMINATIONMIGHT more 0) and BuffPresent(ABOMINATIONMIGHT no)
+		Spell(DEATHSTRIKE)
 	if TargetDebuffExpires(FROSTFEVER 0 mine=1) and Runes(frost 1)
 		Spell(ICYTOUCH)
 	if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and Runes(unholy 1)
 		Spell(PLAGUESTRIKE)
+	
 	Spell(FROSTSTRIKE usable=1)
 	Spell(DEATHCOIL usable=1)
+	
+	if PetPresent(no) Spell(RAISEDEAD)
 }
 
 AddIcon
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index 863a156..8c17d51 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -45,7 +45,6 @@ if TalentPoints(TALENTBACKDRAFT more 0) and TargetDebuffExpires(IMMOLATE 3 mine=
 if TargetDebuffExpires(IMMOLATE 1.5 mine=1 haste=spell) and
 		{TargetLifePercent(more 25) or TalentPoints(TALENTDECIMATION more 0)} 
 			Spell(IMMOLATE doNotRepeat=1)
-if List(curse recklessness) and TargetDebuffExpires(CURSERECKLESSNESS 2) Spell(CURSERECKLESSNESS)
 if List(curse doom) and TargetDebuffExpires(CURSEDOOM 0 mine=1) Spell(CURSEDOOM)
 if List(curse tongues) and TargetDebuffExpires(CURSETONGUES 2) Spell(CURSETONGUES)
 if List(curse weakness) and TargetDebuffExpires(CURSEWEAKNESS 2) Spell(CURSEWEAKNESS)
diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index d93b32d..fce9e29 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -24,6 +24,7 @@ Define(FEROCIOUSBITE 22568)
 Define(BERSERK 50334)
 Define(CLEARCASTING 16870)
 Define(CLAW 16827)
+Define(STARFALL 48505)
 
 AddCheckBox(multi L(AOE))
 AddCheckBox(mangle SpellName(MANGLECAT))
@@ -87,9 +88,9 @@ AddIcon
 		if CheckBoxOn(lucioles) and TargetDebuffExpires(FAERIEFIRE 2)
 			Spell(FAERIEFIRE)
 
-		if TargetDebuffExpires(INSECTSWARM 0)
+		if TargetDebuffExpires(INSECTSWARM 0 mine=1)
 			Spell(INSECTSWARM)  
-		if TargetDebuffExpires(MOONFIRE 0)
+		if TargetDebuffExpires(MOONFIRE 0 mine=1)
 			Spell(MOONFIRE)
 
 		if BuffPresent(ECLIPSEWRATH)
@@ -120,6 +121,7 @@ AddIcon
 
 AddIcon
 {
+	unless Stance(1) or Stance(3) Spell(STARFALL)
 	Spell(FORCEOFNATURE)
 	Spell(BERSERK)
 	Item(Trinket0Slot usable=1)
-- 
1.7.9.5