added starsurge mechanism to eclipse
Sidoine De Wispelaere [10-09-10 - 11:26]
added starsurge mechanism to eclipse
added sunfire to druid default script
better debug data about function calls
git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@263 d5049fe3-3747-40f7-a4b5-f36d6801af5f
diff --git a/Condition.lua b/Condition.lua
index 28832e0..89f3fd8 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -313,7 +313,7 @@ local function GetTargetAura(condition, filter, target)
end
if Ovale.trace then
- Ovale:Print("GetTargetAura = start = ".. nilstring(aura.start) .. " end = "..nilstring(aura.ending).." stacks = " ..nilstring(aura.stacks).."/"..stacks)
+ Ovale:Print("GetTargetAura = start=".. nilstring(aura.start) .. " end="..nilstring(aura.ending).." stacks=" ..nilstring(aura.stacks).."/"..stacks)
end
if (not condition.mine or aura.mine) and aura.stacks>=stacks then
diff --git a/Ovale.lua b/Ovale.lua
index 5ebfd87..6cd999c 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -1091,6 +1091,13 @@ function Ovale:AddSpellToStack(spellName, startCast, endCast, nextCast, nocd)
self.state.eclipse = 100
end
end
+ if newSpellInfo.starsurge then
+ if self.state.eclipse < 0 then
+ self.state.eclipse = self.state.eclipse - newSpellInfo.starsurge
+ else
+ self.state.eclipse = self.state.eclipse + newSpellInfo.starsurge
+ end
+ end
if newSpellInfo.holy then
self.state.holy = self.state.holy + newSpellInfo.holy
if self.state.holy < 0 then
@@ -1544,7 +1551,11 @@ function Ovale:CalculerMeilleureAction(element)
local start, ending = classe(element.params)
if (Ovale.trace) then
- self:Print("Function "..element.func.." returned "..nilstring(start)..","..nilstring(ending))
+ local parameterList = element.func.."("
+ for k,v in pairs(element.params) do
+ parameterList = parameterList..k.."="..v..","
+ end
+ self:Print("Function "..parameterList.." returned "..nilstring(start)..","..nilstring(ending))
end
return start, ending
diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index d17a850..2d6d5d3 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -47,8 +47,10 @@ Define(SHRED 5221) #cat behind
Define(STARFALL 48505) #moonkin cd aoe
Define(STARFIRE 2912) #moonkin
SpellInfo(STARFIRE eclipse=20)
-Define(STARSURGE 78674) #moonkin 10 lunar+solar
- SpellInfo(STARSURGE cd=15)
+Define(STARSURGE 78674) #moonkin 15 lunar+solar
+ SpellInfo(STARSURGE cd=15 starsurge=15)
+Define(SUNFIRE 93402)
+ SpellAddTargetDebuff(SUNFIRE SUNFIRE=18)
Define(SURVIVALINSTINCTS 61336) #cat+bear surv cd
Define(SWIPEBEAR 779) #bear aoe
Define(SWIPECAT 62078) #cat aoe
@@ -103,6 +105,8 @@ AddIcon help=main mastery=1
{
if TargetDebuffExpires(INSECTSWARM 0 mine=1) and TargetDeadIn(more 6)
Spell(INSECTSWARM)
+ if TargetDebuffExpires(SUNFIRE 0 mine=1) and TargetDeadIn(more 6)
+ Spell(SUNFIRE)
Spell(WRATH)
}
diff --git a/defaut/Pretre.lua b/defaut/Pretre.lua
index 28fc05e..adbe274 100644
--- a/defaut/Pretre.lua
+++ b/defaut/Pretre.lua
@@ -51,7 +51,8 @@ AddIcon help=main mastery=3
if TargetDebuffExpires(SHADOWWORDPAIN 2 mine=1) and TargetDeadIn(more 6) Spell(SHADOWWORDPAIN)
if TargetDebuffExpires(VAMPIRICTOUCH 3 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(VAMPIRICTOUCH)
- if BuffPresent(SHADOWORB stacks=3) Spell(MINDBLAST)
+ #if BuffPresent(SHADOWORB stacks=3) May need to uncomment this with high mastery rating
+ Spell(MINDBLAST)
unless CheckBoxOn(multidot) and OtherDebuffPresent(DEVOURINGPLAGUE)
{