From 89c9297c3ecc29c3b68fa58d97350b1b292a36a6 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Wed, 9 Dec 2009 18:53:20 +0000
Subject: [PATCH] - fix for demonology warlock - fix for enhancement shaman

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@166 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Ovale.lua            |    9 ++++++++-
 Ovale.toc            |    2 +-
 defaut/Chaman.lua    |   18 ++++++++++--------
 defaut/Demoniste.lua |    3 +++
 defaut/Mage.lua      |    2 +-
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Ovale.lua b/Ovale.lua
index 8bd4ffc..e14697b 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -905,11 +905,18 @@ function Ovale:AddSpellToStack(spellName, startCast, endCast, nextCast)
 						local newAura = self:GetAura(target, filter, spell)
 						newAura.mine = true
 						local duration = spellData
+						local stacks = duration
 						local spellName = self:GetSpellInfoOrNil(spell)
 						if spellName and self.spellInfo[spellName] and self.spellInfo[spellName].duration then
 							duration = self.spellInfo[spellName].duration
 						end
-						if newAura.ending and newAura.ending >= endCast then
+						if stacks<0 and newAura.ending then
+							newAura.stacks = newAura.stacks + stacks
+							if newAura.stacks<=0 then
+								newAura.stacks = 0
+								newAura.ending = 0
+							end 
+						elseif newAura.ending and newAura.ending >= endCast then
 							newAura.ending = endCast + duration
 							newAura.stacks = newAura.stacks + 1
 						else
diff --git a/Ovale.toc b/Ovale.toc
index 75ffc47..de199a6 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.3.1
+## Version: 3.3.2
 ## OptionalDeps: Ace3, ButtonFacade, Recount
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua
index 12b55b7..3cf5b5f 100644
--- a/defaut/Chaman.lua
+++ b/defaut/Chaman.lua
@@ -49,7 +49,7 @@ AddListItem(fire wrath SpellName(TOTEMOFWRATH))
 AddListItem(fire nova SpellName(FIRENOVATOTEM))
 AddListItem(fire tong SpellName(FLAMETONGTOTEM))
 AddListItem(fire frost SpellName(FROSTRESISTANCETOTEM))
-AddListItem(fire magma SpellName(MAGMATOTEM))
+AddListItem(fire magma SpellName(MAGMATOTEM) default)
 AddListItem(fire searing SpellName(SEARINGTOTEM))
 AddListItem(water clean SpellName(CLEANSINGTOTEM))
 AddListItem(water fire SpellName(FIRERESISTANCETOTEM))
@@ -99,15 +99,17 @@ AddIcon help=main
 	{
 		if WeaponEnchantExpires(mainhand 2) Spell(WINDFURYWEAPON)
 		if WeaponEnchantExpires(offhand 2) Spell(FLAMETHONG)
-		if TargetDebuffExpires(FLAMESHOCK 0 mine=1) Spell(FLAMESHOCK)
-		if TargetDebuffExpires(FLAMESHOCK 1.5 haste=spell mine=1) and 1.5s before Spell(LAVALASH)
-			Spell(FLAMESHOCK)
-		if TargetDebuffPresent(FLAMESHOCK 5 mine=1) Spell(EARTHSHOCK)
-		if BuffExpires(LIGHTNINGSHIELD 0) Spell(LIGHTNINGSHIELD)
-		Spell(STORMSTRIKE)
-		if TargetDebuffPresent(FLAMESHOCK 1.5 haste=spell mine=1) Spell(LAVALASH)
+		
 		if CheckBoxOn(aoe) and BuffPresent(MAELSTROMWEAPON stacks=5) Spell(CHAINLIGHTNING)
 		if BuffPresent(MAELSTROMWEAPON stacks=5) Spell(LIGHTNINGBOLT)
+		if TargetDebuffPresent(STORMSTRIKE) Spell(EARTHSHOCK)
+		Spell(STORMSTRIKE)
+		Spell(EARTHSHOCK)
+		if TotemExpires(fire) and List(fire magma) Spell(MAGMATOTEM)
+		if BuffExpires(LIGHTNINGSHIELD 0) Spell(LIGHTNINGSHIELD)
+		Spell(LAVALASH)
+		if CheckBoxOn(aoe) and BuffPresent(MAELSTROMWEAPON stacks=3) Spell(CHAINLIGHTNING priority=2)
+		if BuffPresent(MAELSTROMWEAPON stacks=3) Spell(LIGHTNINGBOLT priority=2)
 	}
 }
 
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index 68d8e70..8859f8b 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -45,6 +45,9 @@ SpellAddTargetDebuff(CURSEDOOM CURSEDOOM=60)
 SpellAddTargetDebuff(UNSTABLEAFFLICTION UNSTABLEAFFLICTION=15)
 SpellAddTargetDebuff(IMMOLATE IMMOLATE=15)
 SpellAddBuff(SHADOWBOLT SHADOWEMBRACE=12)
+SpellAddBuff(INCINERATE MOLTENCORE=-1)
+SpellAddBuff(IMMOLATE MOLTENCORE=-1)
+
 ScoreSpells(CURSEELEMENTS SHADOWBOLT HAUNT UNSTABLEAFFLICTION IMMOLATE CONFLAGRATE CURSEDOOM CURSETONGUES CURSEWEAKNESS
 	CURSEAGONY CORRUPTION SOULFIRE DRAINSOUL INCINERATE SHADOWBOLT)
 
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index 16c5ff4..f57fa9e 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -62,7 +62,7 @@ AddIcon help=main
        if TalentPoints(TALENTCHILLEDTOTHEBONES more 0)
        {
               #Frost spec
-              Spell(SUMMONWATERELEMENTAL)
+              if PetPresent(no) Spell(SUMMONWATERELEMENTAL)
               if TargetClassification(worldboss) Spell(DEEPFREEZE)
               Spell(FROSTBOLT)
        }
-- 
1.7.9.5