From d4fd330c1cd12f70ddb98f5118678f32f78863cb Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sat, 20 Feb 2010 20:00:21 +0000
Subject: [PATCH] bug fix with channelling

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@230 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Ovale.lua            |   19 ++++++++++++++-----
 Ovale.toc            |    2 +-
 OvaleCompile.lua     |    1 -
 defaut/Demoniste.lua |    2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Ovale.lua b/Ovale.lua
index ea27ee5..e10483c 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -378,7 +378,7 @@ end
 
 function Ovale:COMBAT_LOG_EVENT_UNFILTERED(event, ...)
 	local time, event, sourceGUID, sourceName, sourceFlags, destGUID, destName, destFlags = select(1, ...)
-	-- self:Print("event="..event.." source="..nilstring(sourceName).." destName="..nilstring(destName))
+	--self:Print("event="..event.." source="..nilstring(sourceName).." destName="..nilstring(destName).." " ..GetTime())
 	if sourceName == UnitName("player") then
 		if string.find(event, "SPELL_AURA_APPLIED") == 1 or string.find(event, "SPELL_DAMAGE")==1 or 
 				string.find(event, "SPELL_MISSED") == 1 or string.find(event, "SPELL_AURA_REFRESH") == 1 
@@ -387,7 +387,8 @@ function Ovale:COMBAT_LOG_EVENT_UNFILTERED(event, ...)
 			for i,v in ipairs(self.lastSpell) do
 				if v.name == spellName then
 					table.remove(self.lastSpell, i)
-					-- self:Print("on supprime "..spellName.." a "..GetTime())
+					--self:Print("on supprime "..spellName.." a "..GetTime())
+					--self:Print(UnitDebuff("target", "Etreinte de l'ombre"))
 					break
 				end
 			end
@@ -1019,7 +1020,11 @@ function Ovale:AddSpellToStack(spellName, startCast, endCast, nextCast, nocd)
 	self.attenteFinCast = nextCast
 	self.currentSpellName = spellName
 	self.startCast = startCast
-	self.currentTime = startCast+0.1
+	if startCast>=self.maintenant then
+		self.currentTime = startCast+0.1
+	else
+		self.currentTime = self.maintenant
+	end
 	
 	if Ovale.trace then
 		Ovale:Print("add spell "..spellName.." at "..startCast.." currentTime = "..nextCast)
@@ -1399,7 +1404,7 @@ function Ovale:CalculerMeilleureAction(element)
 			if (actionEnable and actionEnable>0) then
 				local restant
 				if (not actionCooldownDuration or actionCooldownStart==0) then
-					restant = 0
+					restant = self.currentTime
 				else
 					restant = actionCooldownDuration + actionCooldownStart
 				end
@@ -1416,6 +1421,7 @@ function Ovale:CalculerMeilleureAction(element)
 						local tickLength = (self.attenteFinCast - self.startCast) / ticks
 						local tickTime = self.startCast + tickLength
 						if (Ovale.trace) then
+							self:Print(spellName.." restant = " .. restant)
 							self:Print("ticks = "..ticks.." tickLength="..tickLength.." tickTime="..tickTime)
 						end	
 						for i=1,ticks-1 do
@@ -1425,6 +1431,9 @@ function Ovale:CalculerMeilleureAction(element)
 							end
 							tickTime = tickTime + tickLength
 						end
+						if (Ovale.trace) then
+							self:Print(spellName.." restant = " .. restant)
+						end	
 					end
 				end
 				if (Ovale.trace) then
@@ -1638,7 +1647,7 @@ function Ovale:CalculerMeilleureAction(element)
 						maxEcart = bestCastTime*0.75
 					elseif (priorite and priorite < meilleurePrioriteFils) then
 						-- A l'inverse, si il est moins prioritaire que le précédent, on ne le lance
-						-- que caster le nouveau sort ne repousse pas le meilleur
+						-- que si caster le nouveau sort ne repousse pas le meilleur
 						maxEcart = -newCastTime*0.75
 					else
 						maxEcart = -0.01
diff --git a/Ovale.toc b/Ovale.toc
index d3614f1..b35f2ae 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.24
+## Version: 3.3.25
 ## OptionalDeps: Ace3, ButtonFacade, Recount, LibBabble-CreatureType-3.0
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/OvaleCompile.lua b/OvaleCompile.lua
index 7aeac78..2e5e06e 100644
--- a/OvaleCompile.lua
+++ b/OvaleCompile.lua
@@ -72,7 +72,6 @@ local function HasGlyph(spellId)
 	for i = 1, GetNumGlyphSockets() do
 		local enalbled, glypType, glyphSpellID = GetGlyphSocketInfo(i)
 		if (glyphSpellID == spellId) then
-			print(spellId.." return true")
 			return true
 		end
 	end
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index 9059463..f28ddd9 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -45,7 +45,7 @@ AddListItem(curse weakness SpellName(CURSEWEAKNESS))
 SpellInfo(HAUNT cd=8)
 SpellInfo(CONFLAGRATE cd=10)
 SpellInfo(CHAOSBOLT cd=12)
-SpellInfo(DRAINSOUL canStopChannelling=3)
+SpellInfo(DRAINSOUL canStopChannelling=5)
 SpellAddTargetDebuff(CORRUPTION CORRUPTION=18)
 SpellAddTargetDebuff(CURSEAGONY CURSEAGONY=24)
 SpellAddTargetDebuff(CURSEELEMENTS CURSEELEMENTS=300)
-- 
1.7.9.5