From b9bc55fea20db9ef58e41a60e8f94ac2c9663cea Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Thu, 8 May 2014 17:27:40 +0000 Subject: [PATCH] Warlock: Add useful actions to optional left/right icons. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1409 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- scripts/ovale_warlock.lua | 28 +++++++++++++++++++++++++--- scripts/ovale_warlock_spells.lua | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/scripts/ovale_warlock.lua b/scripts/ovale_warlock.lua index d207f6a..7f8d8f2 100644 --- a/scripts/ovale_warlock.lua +++ b/scripts/ovale_warlock.lua @@ -146,10 +146,14 @@ AddFunction AfflictionPrecombatCdActions AddIcon mastery=affliction size=small checkboxon=opt_icons_left { + if target.IsAggroed() Spell(soulshatter) + if TalentPoints(dark_regeneration_talent) Spell(dark_regeneration) } AddIcon mastery=affliction size=small checkboxon=opt_icons_left { + if TalentPoints(sacrificial_pact_talent) Spell(sacrificial_pact) + if TalentPoints(dark_bargain_talent) Spell(dark_bargain) } AddIcon mastery=affliction help=shortcd @@ -182,6 +186,7 @@ AddIcon mastery=affliction help=cd AddIcon mastery=affliction size=small checkboxon=opt_icons_right { + Spell(demonic_circle_teleport) } AddIcon mastery=affliction size=small checkboxon=opt_icons_right @@ -191,8 +196,17 @@ AddIcon mastery=affliction size=small checkboxon=opt_icons_right ### Demonology icons. -AddIcon mastery=demonology size=small checkboxon=opt_icons_left {} -AddIcon mastery=demonology size=small checkboxon=opt_icons_left {} +AddIcon mastery=demonology size=small checkboxon=opt_icons_left +{ + if target.IsAggroed() Spell(soulshatter) + if TalentPoints(dark_regeneration_talent) Spell(dark_regeneration) +} + +AddIcon mastery=demonology size=small checkboxon=opt_icons_left +{ + if TalentPoints(sacrificial_pact_talent) Spell(sacrificial_pact) + if TalentPoints(dark_bargain_talent) Spell(dark_bargain) +} AddIcon mastery=demonology help=offgcd { @@ -252,7 +266,10 @@ AddIcon mastery=demonology help=cd Spell(summon_doomguard) } -AddIcon mastery=demonology size=small checkboxon=opt_icons_right {} +AddIcon mastery=demonology size=small checkboxon=opt_icons_right +{ + Spell(demonic_circle_teleport) +} AddIcon mastery=demonology size=small checkboxon=opt_icons_right { @@ -377,10 +394,14 @@ AddFunction DestructionPrecombatCdActions AddIcon mastery=destruction size=small checkboxon=opt_icons_left { + if target.IsAggroed() Spell(soulshatter) + if TalentPoints(dark_regeneration_talent) Spell(dark_regeneration) } AddIcon mastery=destruction size=small checkboxon=opt_icons_left { + if TalentPoints(sacrificial_pact_talent) Spell(sacrificial_pact) + if TalentPoints(dark_bargain_talent) Spell(dark_bargain) } AddIcon mastery=destruction help=shortcd @@ -417,6 +438,7 @@ AddIcon mastery=destruction help=cd AddIcon mastery=destruction size=small checkboxon=opt_icons_right { + Spell(demonic_circle_teleport) } AddIcon mastery=destruction size=small checkboxon=opt_icons_right diff --git a/scripts/ovale_warlock_spells.lua b/scripts/ovale_warlock_spells.lua index 7f49ada..5226fc3 100644 --- a/scripts/ovale_warlock_spells.lua +++ b/scripts/ovale_warlock_spells.lua @@ -35,6 +35,12 @@ Define(corruption_debuff 146739) Define(curse_of_the_elements 1490) SpellInfo(curse_of_the_elements burningembers=0 if_spell=burning_embers) SpellInfo(curse_of_the_elements buff_burningembers=fire_and_brimstone_buff buff_burningembers_amount=10 if_spell=fire_and_brimstone) +Define(dark_bargain 110913) + SpellInfo(dark_bargain cd=180) +Define(dark_bargain_talent 9) +Define(dark_regeneration 108359) + SpellInfo(dark_regeneration cd=120) +Define(dark_regeneration_talent 1) Define(dark_intent 109773) Define(dark_soul_knowledge 113861) SpellInfo(dark_soul_knowledge cd=120) @@ -51,6 +57,8 @@ Define(dark_soul_misery 113860) SpellAddBuff(dark_soul_misery dark_soul_misery_buff=1) Define(dark_soul_misery_buff 113858) SpellInfo(dark_soul_misery_buff duration=20) +Define(demonic_circle_teleport 48020) + SpellInfo(demonic_circle_teleport cd=30) Define(demonic_fury 104315) Define(doom 603) SpellInfo(doom demonicfury=60 stance=warlock_metamophosis) @@ -80,6 +88,7 @@ Define(grimoire_of_sacrifice_buff 108503) SpellInfo(grimoire_of_sacrifice_buff duration=3600) Define(grimoire_of_sacrifice_talent 15) Define(grimoire_of_service_talent 14) +Define(grimoire_of_supremacy_talent 13) Define(hand_of_guldan 105174) SpellAddTargetDebuff(hand_of_guldan shadowflame_debuff=1) Define(haunt 48181) @@ -128,6 +137,9 @@ Define(rain_of_fire 5740) Define(rain_of_fire_debuff 5740) Define(rain_of_fire_aftermath 104232) Define(rain_of_fire_aftermath_debuff 104232) +Define(sacrificial_pact 108416) + SpellInfo(sacrificial_pact cd=60) +Define(sacrificial_pact_talent 8) Define(seed_of_corruption 27243) SpellAddTargetDebuff(seed_of_corruption seed_of_corruption_debuff=1) Define(seed_of_corruption_debuff 27243) @@ -144,6 +156,9 @@ Define(shadowburn 17877) SpellInfo(shadowburn burningembers=10 if_spell=burning_embers) Define(shadowflame_debuff 47960) SpellInfo(shadowflame_debuff duration=6 haste=spell tick=1) +Define(shadowfury 30283) + SpellInfo(shadowfury cd=30) +Define(shadowfury_talent 6) Define(skull_banner_buff 114206) SpellInfo(skull_banner_buff duration=10) Define(soul_fire 6353) @@ -163,12 +178,17 @@ Define(soulburn_seed_of_corruption 114790) SpellAddTargetDebuff(soulburn_seed_of_corruption soulburn_seed_of_corruption_debuff=1) Define(soulburn_seed_of_corruption_debuff 114790) SpellInfo(soulburn_seed_of_corruption_debuff duration=18 haste=spell tick=3) +Define(soulshatter 29858) + SpellInfo(soulshatter cd=120) Define(summon_doomguard 18540) SpellInfo(summon_doomguard cd=600) Define(summon_infernal 1122) SpellInfo(summon_infernal cd=600) Define(touch_of_chaos 103964) SpellInfo(touch_of_chaos demonicfury=40 stance=warlock_metamophosis) +Define(unbound_will 108482) + SpellInfo(unbound_will cd=60) +Define(unbound_will_talent 12) Define(unstable_affliction 30108) SpellAddTargetDebuff(unstable_affliction unstable_affliction_debuff=1) Define(unstable_affliction_debuff 30108) -- 1.7.9.5