From 3ac2390d79707a66637a5c44390e94e92e34e60a Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Wed, 30 Apr 2014 18:34:45 +0000 Subject: [PATCH] Properly annotate auras that stack. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1343 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- scripts/leafkiller_druid.lua | 8 ++++---- scripts/ovale_druid_spells.lua | 6 +++--- scripts/ovale_hunter_spells.lua | 7 +++++-- scripts/ovale_paladin_spells.lua | 4 ++-- scripts/ovale_priest_spells.lua | 4 ++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/scripts/leafkiller_druid.lua b/scripts/leafkiller_druid.lua index 56fb76a..ab3f2c4 100644 --- a/scripts/leafkiller_druid.lua +++ b/scripts/leafkiller_druid.lua @@ -108,7 +108,7 @@ Define(HURRICANE 16914) # Shared buffs Define(DREAM_OF_CENARIUS 145152) - SpellInfo(DREAM_OF_CENARIUS duration=30) + SpellInfo(DREAM_OF_CENARIUS duration=30 maxstacks=2) Define(NATURES_VIGIL 124974) SpellInfo(NATURES_VIGIL cd=180) SpellAddBuff(NATURES_VIGIL NATURES_VIGIL=1) @@ -118,7 +118,7 @@ Define(PRIMAL_FURY 16961) Define(TRICKS 57933) SpellAddBuff(TRICKS TRICKS=1) Define(WEAKENED_ARMOR 113746) - SpellInfo(WEAKENED_ARMOR duration=30) + SpellInfo(WEAKENED_ARMOR duration=30 maxstacks=3) Define(WEAKENED_BLOWS 115798) SpellInfo(WEAKENED_BLOWS duration=30) Define(CLEARCASTING 135700) @@ -206,10 +206,10 @@ Define(GLYPH_OF_SAVAGERY 127540) # Shared spells Define(FAERIE_FERAL 770) SpellInfo(FAERIE_FERAL duration=300 cd=6) - SpellAddTargetDebuff(FAERIE_FERAL FAERIE_FERAL=1 WEAKENED_ARMOR=1) + SpellAddTargetDebuff(FAERIE_FERAL FAERIE_FERAL=1 WEAKENED_ARMOR=3) Define(FAERIE_SWARM 102355) SpellInfo(FAERIE_SWARM duration=300 cd=6) - SpellAddTargetDebuff(FAERIE_SWARM FAERIE_SWARM=1 WEAKENED_ARMOR=1) + SpellAddTargetDebuff(FAERIE_SWARM FAERIE_SWARM=1 WEAKENED_ARMOR=3) # Cat spells Define(BERSERK_CAT 106951) #cat cd buff diff --git a/scripts/ovale_druid_spells.lua b/scripts/ovale_druid_spells.lua index da98ccb..feb7713 100644 --- a/scripts/ovale_druid_spells.lua +++ b/scripts/ovale_druid_spells.lua @@ -36,7 +36,7 @@ Define(displacer_beast_talent 2) Define(dream_of_cenarius_caster_buff 145151) SpellInfo(dream_of_cenarius_caster_buff duration=30) Define(dream_of_cenarius_melee_buff 145152) - SpellInfo(dream_of_cenarius_melee_buff duration=30) + SpellInfo(dream_of_cenarius_melee_buff duration=30 maxstacks=2) Define(dream_of_cenarius_talent 17) Define(faerie_fire 770) SpellInfo(faerie_fire cd=6 if_stance=druid_bear_form) @@ -72,7 +72,7 @@ Define(glyph_of_skull_bash 116216) Define(glyph_of_survival_instincts 114223) Define(healing_touch 5185) SpellAddBuff(healing_touch dream_of_cenarius_caster_buff=1 mastery=balance talent=dream_of_cenarius_talent) - SpellAddBuff(healing_touch dream_of_cenarius_melee_buff=1 mastery=feral talent=dream_of_cenarius_talent) + SpellAddBuff(healing_touch dream_of_cenarius_melee_buff=2 mastery=feral talent=dream_of_cenarius_talent) SpellAddBuff(healing_touch predatory_swiftness_buff=0 ) Define(heart_of_the_wild 108292) SpellInfo(heart_of_the_wild cd=360) @@ -240,7 +240,7 @@ Define(typhoon 132469) SpellInfo(typhoon cd=30) Define(typhoon_talent 9) Define(weakened_armor_debuff 113746) - SpellInfo(weakened_armor_debuff duration=30) + SpellInfo(weakened_armor_debuff duration=30 maxstacks=3) Define(wild_charge 102401) SpellInfo(wild_charge cd=15) Define(wild_charge_bear 16979) diff --git a/scripts/ovale_hunter_spells.lua b/scripts/ovale_hunter_spells.lua index 577c1d8..d7e7568 100644 --- a/scripts/ovale_hunter_spells.lua +++ b/scripts/ovale_hunter_spells.lua @@ -64,7 +64,9 @@ Define(disengage 781) SpellInfo(disengage cd=20) SpellInfo(disengage addcd=-10 talent=crouching_tiger_hidden_chimera_talent) Define(explosive_shot 53301) - SpellInfo(explosive_shot buffnocd=lock_and_load_buff buff_focus_none=lock_and_load_buff cd=6 focus=25) + SpellInfo(explosive_shot cd=6 focus=25) + SpellInfo(explosive_shot buffnocd=lock_and_load_buff buff_focus_none=lock_and_load_buff if_spell=lock_and_load) + SpellAddBuff(explosive_shot lock_and_load_buff=-1 if_spell=lock_and_load) SpellAddTargetDebuff(explosive_shot hunters_mark_debuff=1) Define(explosive_trap 13813) SpellInfo(explosive_trap cd=30) @@ -88,8 +90,9 @@ Define(kill_command 34026) SpellAddTargetDebuff(kill_command hunters_mark=1) Define(kill_shot 53351) SpellInfo(kill_shot cd=10) +Define(lock_and_load 56343) Define(lock_and_load_buff 56453) - SpellInfo(lock_and_load_buff duration=12) + SpellInfo(lock_and_load_buff duration=12 maxstacks=2) Define(lynx_rush 120697) SpellInfo(lynx_rush cd=90) SpellAddTargetDebuff(lynx_rush lynx_rush_debuff=1) diff --git a/scripts/ovale_paladin_spells.lua b/scripts/ovale_paladin_spells.lua index 0051e92..4afbca4 100644 --- a/scripts/ovale_paladin_spells.lua +++ b/scripts/ovale_paladin_spells.lua @@ -22,7 +22,7 @@ Define(avenging_wrath_buff 31884) SpellInfo(avenging_wrath_buff duration=20) SpellInfo(avenging_wrath_buff addduration=10 talent=sanctified_wrath_talent) Define(bastion_of_glory_buff 114637) - SpellInfo(bastion_of_glory_buff duration=20) + SpellInfo(bastion_of_glory_buff duration=20 maxstacks=5) Define(bastion_of_power_buff 144569) SpellInfo(bastion_of_power_buff duration=20) Define(beacon_of_light 53563) @@ -47,7 +47,7 @@ Define(crusader_strike 35395) SpellAddTargetDebuff(crusader_strike weakened_blows=1 mastery=protection) Define(daybreak 88821) Define(daybreak_buff 88819) - SpellInfo(daybreak_buff duration=10) + SpellInfo(daybreak_buff duration=10 maxstacks=2) Define(devotion_aura 31821) SpellInfo(devotion_aura cd=180) SpellInfo(devotion_aura addcd=-60 glyph=glyph_of_devotion_aura) diff --git a/scripts/ovale_priest_spells.lua b/scripts/ovale_priest_spells.lua index 94fd600..9417056 100644 --- a/scripts/ovale_priest_spells.lua +++ b/scripts/ovale_priest_spells.lua @@ -48,7 +48,7 @@ Define(mind_flay 15407) Define(mind_sear 48045) SpellInfo(mind_sear channel=5 haste=spell) Define(mind_spike 73510) - SpellAddBuff(mind_spike surge_of_darkness_buff=0 mastery=shadow talent=from_darkness_comes_light_talent) + SpellAddBuff(mind_spike surge_of_darkness_buff=-1 mastery=shadow talent=from_darkness_comes_light_talent) Define(mindbender 123040) SpellInfo(mindbender cd=60) Define(mindbender_talent 8) @@ -72,7 +72,7 @@ Define(shadowform 15473) Define(silence 15487) SpellInfo(silence cd=45) Define(surge_of_darkness_buff 87160) - SpellInfo(surge_of_darkness_buff duration=10) + SpellInfo(surge_of_darkness_buff duration=10 maxstacks=2) Define(vampiric_embrace 15286) SpellInfo(vampiric_embrace cd=180) Define(vampiric_touch 34914) -- 1.7.9.5