From 9a7aeb9d1904630102aa518f776f921927a3d8b1 Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Sat, 16 Oct 2010 19:58:21 +0000 Subject: [PATCH] feral druid: glyph of rip=>glyph of shred warlock: added improved soulfire git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@288 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- defaut/Demoniste.lua | 21 ++++++++++++++------- defaut/Druide.lua | 3 +-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index 3877e3e..222d7ed 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -44,6 +44,7 @@ Define(SHADOWBOLT 686) SpellAddTargetDebuff(SHADOWBOLT SHADOWEMBRACE=12) Define(SHADOWBURN 17877) Define(SOULFIRE 6353) + SpellAddBuff(SOULFIRE IMPROVEDSOULFIREBUFF=15) Define(SOULBURN 74434) Define(SUMMONFELGUARD 18540) Define(UNSTABLEAFFLICTION 30108) @@ -54,8 +55,10 @@ Define(UNSTABLEAFFLICTION 30108) Define(DECIMATION 63167) Define(MOLTENCORE 71165) Define(EMPOWEREDIMP 47283) +Define(IMPROVEDSOULFIREBUFF 85383) #Talent +Define(IMPROVEDSOULFIRE 11197) AddListItem(curse elements SpellName(CURSEELEMENTS)) AddListItem(curse tongues SpellName(CURSETONGUES)) @@ -76,7 +79,7 @@ AddIcon help=main mastery=1 if TargetDebuffExpires(HAUNT 1.5 mine=1) Spell(HAUNT) if TargetDebuffExpires(UNSTABLEAFFLICTION 1.5 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(UNSTABLEAFFLICTION) - if TargetDebuffExpires(CORRUPTION 0 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) + if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) if TargetDebuffExpires(BANEOFDOOM 0 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1) { if List(curse doom) and TargetDeadIn(more 20) Spell(BANEOFDOOM) @@ -89,7 +92,6 @@ AddIcon help=main mastery=1 AddIcon help=cd mastery=1 { Spell(SUMMONFELGUARD) - Spell(SOULBURN usable=1) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } @@ -103,7 +105,7 @@ AddIcon help=main mastery=2 if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(IMMOLATE) if TargetDebuffPresent(IMMOLATE) Spell(HANDOFGULDAN) - if TargetDebuffExpires(CORRUPTION 0 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) + if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) if TargetDebuffExpires(BANEOFDOOM 0 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1) { if List(curse doom) and TargetDeadIn(more 60) Spell(BANEOFDOOM) @@ -119,7 +121,6 @@ AddIcon help=cd mastery=2 Spell(METAMORPHOSIS) Spell(DEMONICEMPOWERMENT) Spell(SUMMONFELGUARD) - Spell(SOULBURN usable=1) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } @@ -131,9 +132,11 @@ AddIcon help=main mastery=3 if List(curse elements) and TargetDebuffExpires(CURSEELEMENTS 2) and TargetDeadIn(more 8) Spell(CURSEELEMENTS) if List(curse weakness) and TargetDebuffExpires(CURSEWEAKNESS 2) and TargetDeadIn(more 8) Spell(CURSEWEAKNESS) - if 1s after TargetDebuffPresent(IMMOLATE mine=1) Spell(CONFLAGRATE) + if TalentPoints(IMPROVEDSOULFIRE more 0) and TargetLifePercent(more 80) and + BuffExpires(IMPROVEDSOULFIREBUFF) Spell(SOULFIRE) + if 1s after TargetDebuffPresent(IMMOLATE mine=1) Spell(CONFLAGRATE) if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(IMMOLATE) - if TargetDebuffExpires(CORRUPTION 0 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) + if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) if TargetDebuffExpires(BANEOFDOOM 0 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1) { if List(curse doom) and TargetDeadIn(more 60) Spell(BANEOFDOOM) @@ -147,9 +150,13 @@ AddIcon help=main mastery=3 AddIcon help=cd mastery=3 { Spell(SUMMONFELGUARD) - Spell(SOULBURN usable=1) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } +AddIcon size=small +{ + Spell(SOULBURN usable=1) +} + ]] diff --git a/defaut/Druide.lua b/defaut/Druide.lua index 9ada052..2669236 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -64,7 +64,6 @@ Define(WRATH 5176) #moonkin #Glyphs Define(GLYPHOFSHRED 54815) -Define(GLYPHOFRIP 54818) #Buff Define(CLEARCASTING 16870) @@ -178,7 +177,7 @@ AddIcon help=main mastery=2 } #Extends Rip with shred if glyph - if Glyph(GLYPHOFRIP) and TargetDebuffPresent(RIP mine=1) and TargetDebuffExpires(RIP 4 mine=1) and Counter(ripshreds less 3) Spell(SHRED) + if Glyph(GLYPHOFSHRED) and TargetDebuffPresent(RIP mine=1) and TargetDebuffExpires(RIP 4 mine=1) and Counter(ripshreds less 3) Spell(SHRED) if ComboPoints(more 4) { -- 1.7.9.5