From 32a3d5c08e6e299ad912d0c5a9e86a331d26ad73 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sun, 17 Oct 2010 13:17:11 +0000
Subject: [PATCH] rogue script fixes

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@294 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Ovale.lua         |   22 ++++++++++++++++++++--
 defaut/Voleur.lua |   24 ++++++++++++++++++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/Ovale.lua b/Ovale.lua
index 931f175..7aae410 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -383,6 +383,24 @@ local options =
 							if spellId then	Ovale:Print(name..": "..spellId.." ("..tostring(enabled)..")") end
 						end
 					end
+				},
+				spell =
+				{
+					order = -8,
+					name = "List player spells",
+					type = "execute",
+					func = function()
+						local i=1
+						while true do
+							local skillType, spellId = GetSpellBookItemInfo(i, BOOKTYPE_SPELL)
+							if not spellId then
+								break
+							end
+							local spellName = GetSpellBookItemName(i, BOOKTYPE_SPELL)
+							Ovale:Print(spellName..": "..spellId)
+							i = i + 1
+						end
+					end					
 				}
 			}
 		}
@@ -604,8 +622,8 @@ end
 --Called for each combat log event
 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).." " ..GetTime())
 	if sourceName == UnitName("player") then
+		self:Print("event="..event.." source="..nilstring(sourceName).." destName="..nilstring(destName).." " ..GetTime())
 		--Called when a missile reached or missed its target
 		--Update lastSpell accordingly
 		if string.find(event, "SPELL_CAST_SUCCESS") == 1 or string.find(event, "SPELL_DAMAGE")==1 
@@ -758,7 +776,7 @@ function Ovale:UNIT_SPELLCAST_INTERRUPTED(event, unit, name, rank, lineId, spell
 end
 
 function Ovale:UNIT_SPELLCAST_SUCCEEDED(event, unit, name, rank, lineId, spellId)
---	self:Print("UNIT_SPELLCAST_SUCCEEDED "..event.." name="..name.." lineId="..lineId.." spellId="..spellId)
+	self:Print("UNIT_SPELLCAST_SUCCEEDED "..event.." name="..name.." lineId="..lineId.." spellId="..spellId.. " time="..GetTime())
 end
 
 function Ovale:AddSpellToList(spellId, lineId, startTime, endTime, channeled)
diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua
index 79841e2..2a7f798 100644
--- a/defaut/Voleur.lua
+++ b/defaut/Voleur.lua
@@ -4,6 +4,8 @@ Ovale.defaut["ROGUE"] =
 Define(ADRENALINERUSH 13750)
 	SpellInfo(ADRENALINERUSH cd=180)
 	SpellAddBuff(ADRENALINERUSH ADRENALINERUSH=15)
+Define(BACKSTAB 53)
+	SpellInfo(BACKSTAB combo=1)
 Define(BLADEFLURRY 13877)
 	SpellAddBuff(BLADEFLURRY BLADEFLURRY=15 cd=30)
 Define(CLOACKOFSHADOWS 31224)
@@ -14,6 +16,8 @@ Define(ENVENOM 32645)
 	SpellInfo(ENVENOM combo=-5)
 Define(EVISCERATE 2098)
 	SpellInfo(EVISCERATE combo=-5)
+Define(HEMORRHAGE 16511)
+	SpellInfo(HEMORRHAGE combo=1)
 Define(KILLINGSPREE 51690)
 	SpellInfo(KILLINGSPREE cd=120)
 	SpellAddBuff(KILLINGSPREE KILLINGSPREE=2)
@@ -23,6 +27,9 @@ Define(MUTILATE 1329)
 	SpellInfo(MUTILATE combo=1)
 Define(PREPARATION 14185)
 	SpellInfo(PREPARATION cd=300)
+Define(REVEALINGSTRIKE 84617)
+	SpellInfo(REVEALINGSTRIKE combo=1)
+	SpellAddBuff(REVEALINGSTRIKE REVEALINGSTRIKE=15)
 Define(RUPTURE 1943)
 	SpellInfo(RUPTURE combo=-5)
 	SpellAddTargetDebuff(RUPTURE RUPTURE=8)
@@ -59,14 +66,18 @@ AddIcon help=main mastery=1
 			Spell(RUPTURE)
 		Spell(ENVENOM)
 	}
-	if ComboPoints(less 4) Spell(MUTILATE)
+	if ComboPoints(less 4)
+	{
+		if TargetLifePercent(less 35) Spell(BACKSTAB)
+		Spell(MUTILATE)
+	}
 }
 
 AddIcon help=main mastery=2
 {
 	unless BuffPresent(SLICEANDDICE) if ComboPoints(more 0)	Spell(SLICEANDDICE)
 	
-	if ComboPoints(more 3) and Mana(more 69)
+	if BuffPresent(REVEALINGSTRIKE) and Mana(more 69)
 	{
 		if BuffExpires(SLICEANDDICE 12) Spell(SLICEANDDICE)
 		
@@ -75,6 +86,7 @@ AddIcon help=main mastery=2
 		Spell(EVISCERATE)
 	}
 	
+	if ComboPoints(more 3) Spell(REVEALINGSTRIKE)	
 	if ComboPoints(less 4) Spell(SINISTERSTRIKE)
 }
 
@@ -82,7 +94,7 @@ AddIcon help=main mastery=3
 {
 	unless BuffPresent(SLICEANDDICE) if ComboPoints(more 0)	Spell(SLICEANDDICE)
 	
-	if ComboPoints(more 3) and Mana(more 69)
+	if ComboPoints(more 4) and Mana(more 69)
 	{
 		if BuffExpires(SLICEANDDICE 12) Spell(SLICEANDDICE)
 		
@@ -91,7 +103,11 @@ AddIcon help=main mastery=3
 		Spell(EVISCERATE)
 	}
 	
-	if ComboPoints(less 4) Spell(SINISTERSTRIKE)
+	if ComboPoints(less 4)
+	{
+		if TargetDebuffExpires(bleed 0) Spell(HEMORRHAGE)
+		Spell(BACKSTAB)
+	}
 }
 
 AddIcon help=cd
-- 
1.7.9.5