From 0dcc63d1600f8c7aeaa4de6953c48b108349de87 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Mon, 5 May 2014 18:02:47 +0000 Subject: [PATCH] Druid: Omen of Clarity is different for ferals and resto druids. Also fix the AOE checkbox for resto druids. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1375 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleSimulationCraft.lua | 2 ++ scripts/ovale_druid.lua | 44 +++++++++++++---------------- scripts/ovale_druid_spells.lua | 61 +++++++++++++++++++++------------------- 3 files changed, 53 insertions(+), 54 deletions(-) diff --git a/OvaleSimulationCraft.lua b/OvaleSimulationCraft.lua index ca9daaf..632b5ad 100644 --- a/OvaleSimulationCraft.lua +++ b/OvaleSimulationCraft.lua @@ -263,11 +263,13 @@ do ["dream_of_cenarius"] = "dream_of_cenarius_melee", ["force_of_nature"] = "force_of_nature_melee", ["heart_of_the_wild"] = "heart_of_the_wild_melee", + ["omen_of_clarity"] = "omen_of_clarity_melee", ["stealth"] = "prowl", }, restoration = { ["force_of_nature"] = "force_of_nature_heal", ["heart_of_the_wild"] = "heart_of_the_wild_heal", + ["omen_of_clarity"] = "omen_of_clarity_heal", }, }, paladin = { diff --git a/scripts/ovale_druid.lua b/scripts/ovale_druid.lua index e09b386..10d0dcc 100644 --- a/scripts/ovale_druid.lua +++ b/scripts/ovale_druid.lua @@ -227,7 +227,7 @@ AddFunction FeralFillerActions #rake,if=target.time_to_die-dot.rake.remains>3&action.rake.tick_damage*(dot.rake.ticks_remain+1)-dot.rake.tick_dmg*dot.rake.ticks_remain>action.mangle_cat.hit_damage if target.TimeToDie() - target.DebuffRemains(rake_debuff) > 3 and target.Damage(rake_debuff) * { target.TicksRemain(rake_debuff) + 1 } - target.LastEstimatedDamage(rake_debuff) * target.TicksRemain(rake_debuff) > target.Damage(mangle_cat) Spell(rake) #shred,if=(buff.omen_of_clarity.react|buff.berserk.up|energy.regen>=15)&buff.king_of_the_jungle.down - if { BuffPresent(omen_of_clarity_buff) or BuffPresent(berserk_cat_buff) or EnergyRegen() >= 15 } and BuffExpires(king_of_the_jungle_buff) Spell(shred) + if { BuffPresent(omen_of_clarity_melee_buff) or BuffPresent(berserk_cat_buff) or EnergyRegen() >= 15 } and BuffExpires(king_of_the_jungle_buff) Spell(shred) #mangle_cat,if=buff.king_of_the_jungle.down if BuffExpires(king_of_the_jungle_buff) Spell(mangle_cat) } @@ -246,7 +246,7 @@ AddFunction FeralBasicActions #savage_roar,if=buff.savage_roar.remains<3 if BuffRemains(savage_roar_buff) < 3 SavageRoar() #tigers_fury,if=energy<=35&!buff.omen_of_clarity.react - if Energy() <= 35 and not BuffPresent(omen_of_clarity_buff) Spell(tigers_fury) + if Energy() <= 35 and not BuffPresent(omen_of_clarity_melee_buff) Spell(tigers_fury) #rip,if=combo_points>=5&target.health.pct<=25&action.rip.tick_damage%dot.rip.tick_dmg>=1.15 if ComboPoints() >= 5 and target.HealthPercent() <= 25 and target.Damage(rip_debuff) / target.LastEstimatedDamage(rip_debuff) >= 1.15 Spell(rip) #ferocious_bite,if=combo_points>=5&target.health.pct<=25&dot.rip.ticking @@ -254,7 +254,7 @@ AddFunction FeralBasicActions #rip,if=combo_points>=5&dot.rip.remains<2 if ComboPoints() >= 5 and target.DebuffRemains(rip_debuff) < 2 Spell(rip) #thrash_cat,if=buff.omen_of_clarity.react&dot.thrash_cat.remains<3 - if BuffPresent(omen_of_clarity_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 Spell(thrash_cat) + if BuffPresent(omen_of_clarity_melee_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 Spell(thrash_cat) #rake,cycle_targets=1,if=dot.rake.remains<3|action.rake.tick_damage>dot.rake.tick_dmg if target.DebuffRemains(rake_debuff) < 3 or target.Damage(rake_debuff) > target.LastEstimatedDamage(rake_debuff) Spell(rake) #pool_resource,for_next=1 @@ -266,7 +266,7 @@ AddFunction FeralBasicActions #ferocious_bite,if=combo_points>=5&dot.rip.ticking if ComboPoints() >= 5 and target.DebuffPresent(rip_debuff) Spell(ferocious_bite) #run_action_list,name=filler,if=buff.omen_of_clarity.react - if BuffPresent(omen_of_clarity_buff) FeralFillerActions() + if BuffPresent(omen_of_clarity_melee_buff) FeralFillerActions() #run_action_list,name=filler,if=buff.feral_fury.react if BuffPresent(feral_fury_buff) FeralFillerActions() #run_action_list,name=filler,if=(combo_points<5&dot.rip.remains<3.0)|(combo_points=0&buff.savage_roar.remains<2) @@ -296,7 +296,7 @@ AddFunction FeralBasicPredictiveActions #savage_roar,if=buff.savage_roar.remains<3 if BuffRemains(savage_roar_buff) < 3 SavageRoar() #tigers_fury,if=energy<=35&!buff.omen_of_clarity.react - if Energy() <= 35 and not BuffPresent(omen_of_clarity_buff) Spell(tigers_fury) + if Energy() <= 35 and not BuffPresent(omen_of_clarity_melee_buff) Spell(tigers_fury) #rip,if=combo_points>=5&target.health.pct<=25&action.rip.tick_damage%dot.rip.tick_dmg>=1.15 if ComboPoints() >= 5 and target.HealthPercent() <= 25 and target.Damage(rip_debuff) / target.LastEstimatedDamage(rip_debuff) >= 1.15 Spell(rip) #ferocious_bite,if=combo_points>=5&target.health.pct<=25&dot.rip.ticking @@ -304,7 +304,7 @@ AddFunction FeralBasicPredictiveActions #rip,if=combo_points>=5&dot.rip.remains<2 if ComboPoints() >= 5 and target.DebuffRemains(rip_debuff) < 2 Spell(rip) #thrash_cat,if=buff.omen_of_clarity.react&dot.thrash_cat.remains<3 - if BuffPresent(omen_of_clarity_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 Spell(thrash_cat) + if BuffPresent(omen_of_clarity_melee_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 Spell(thrash_cat) #rake,cycle_targets=1,if=dot.rake.remains<3|action.rake.tick_damage>dot.rake.tick_dmg if target.DebuffRemains(rake_debuff) < 3 or target.Damage(rake_debuff) > target.LastEstimatedDamage(rake_debuff) Spell(rake) #pool_resource,for_next=1 @@ -332,7 +332,7 @@ AddFunction FeralBasicCdActions if { target.HealthPercent() < 30 and BuffPresent(berserk_cat_buff) } or target.TimeToDie() <= 40 UsePotionAgility() # Synchronize display with Tiger's Fury buff in main actions. - if { Energy() <= 35 and not BuffPresent(omen_of_clarity_buff) } or BuffPresent(tigers_fury_buff) + if { Energy() <= 35 and not BuffPresent(omen_of_clarity_melee_buff) } or BuffPresent(tigers_fury_buff) { #berserk,if=buff.tigers_fury.up Spell(berserk_cat) @@ -353,7 +353,7 @@ AddFunction FeralAoeActions if BuffExpires(savage_roar_buff) or { BuffRemains(savage_roar_buff) < 3 and ComboPoints() > 0 } SavageRoar() #use_item,slot=hands,if=buff.tigers_fury.up #tigers_fury,if=energy<=35&!buff.omen_of_clarity.react - if Energy() <= 35 and not BuffPresent(omen_of_clarity_buff) Spell(tigers_fury) + if Energy() <= 35 and not BuffPresent(omen_of_clarity_melee_buff) Spell(tigers_fury) #berserk,if=buff.tigers_fury.up if BuffPresent(tigers_fury_buff) Spell(berserk_cat) #pool_resource,for_next=1 @@ -375,7 +375,7 @@ AddFunction FeralAoeActions #swipe_cat,if=cooldown.tigers_fury.remains<3 if SpellCooldown(tigers_fury) < 3 Spell(swipe_cat) #swipe_cat,if=buff.omen_of_clarity.react - if BuffPresent(omen_of_clarity_buff) Spell(swipe_cat) + if BuffPresent(omen_of_clarity_melee_buff) Spell(swipe_cat) #swipe_cat,if=energy.time_to_max<=1 if TimeToMaxEnergy() <= 1 Spell(swipe_cat) } @@ -419,9 +419,9 @@ AddFunction FeralAdvancedActions #savage_roar,if=buff.savage_roar.down if BuffExpires(savage_roar_buff) SavageRoar() #tigers_fury,if=energy<=35&!buff.omen_of_clarity.react - if Energy() <= 35 and not BuffPresent(omen_of_clarity_buff) Spell(tigers_fury) + if Energy() <= 35 and not BuffPresent(omen_of_clarity_melee_buff) Spell(tigers_fury) #thrash_cat,if=buff.omen_of_clarity.react&dot.thrash_cat.remains<3&target.time_to_die>=6 - if BuffPresent(omen_of_clarity_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 and target.TimeToDie() >= 6 Spell(thrash_cat) + if BuffPresent(omen_of_clarity_melee_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 and target.TimeToDie() >= 6 Spell(thrash_cat) #ferocious_bite,if=target.time_to_die<=1&combo_points>=3 if target.TimeToDie() <= 1 and ComboPoints() >= 3 Spell(ferocious_bite) #savage_roar,if=buff.savage_roar.remains<=3&combo_points>0&target.health.pct<25 @@ -459,7 +459,7 @@ AddFunction FeralAdvancedActions #ferocious_bite,if=combo_points>=5&dot.rip.ticking if ComboPoints() >= 5 and target.DebuffPresent(rip_debuff) Spell(ferocious_bite) #run_action_list,name=filler,if=buff.omen_of_clarity.react - if BuffPresent(omen_of_clarity_buff) FeralFillerActions() + if BuffPresent(omen_of_clarity_melee_buff) FeralFillerActions() #run_action_list,name=filler,if=buff.feral_fury.react if BuffPresent(feral_fury_buff) FeralFillerActions() #run_action_list,name=filler,if=(combo_points<5&dot.rip.remains<3.0)|(combo_points=0&buff.savage_roar.remains<2) @@ -492,9 +492,9 @@ AddFunction FeralAdvancedPredictiveActions #savage_roar,if=buff.savage_roar.down if BuffExpires(savage_roar_buff) SavageRoar() #tigers_fury,if=energy<=35&!buff.omen_of_clarity.react - if Energy() <= 35 and not BuffPresent(omen_of_clarity_buff) Spell(tigers_fury) + if Energy() <= 35 and not BuffPresent(omen_of_clarity_melee_buff) Spell(tigers_fury) #thrash_cat,if=buff.omen_of_clarity.react&dot.thrash_cat.remains<3&target.time_to_die>=6 - if BuffPresent(omen_of_clarity_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 and target.TimeToDie() >= 6 Spell(thrash_cat) + if BuffPresent(omen_of_clarity_melee_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 and target.TimeToDie() >= 6 Spell(thrash_cat) #ferocious_bite,if=target.time_to_die<=1&combo_points>=3 if target.TimeToDie() <= 1 and ComboPoints() >= 3 Spell(ferocious_bite) #savage_roar,if=buff.savage_roar.remains<=3&combo_points>0&target.health.pct<25 @@ -549,7 +549,7 @@ AddFunction FeralAdvancedCdActions { # Synchronize display with Tiger's Fury buff in main actions. if target.TimeToDie() < 18 and SpellCooldown(tigers_fury) > 6 Spell(berserk_cat) - if { Energy() <= 35 and not BuffPresent(omen_of_clarity_buff) } or BuffPresent(tigers_fury_buff) + if { Energy() <= 35 and not BuffPresent(omen_of_clarity_melee_buff) } or BuffPresent(tigers_fury_buff) { #berserk,if=buff.tigers_fury.up|(target.time_to_die<18&cooldown.tigers_fury.remains>6) Spell(berserk_cat) @@ -557,7 +557,7 @@ AddFunction FeralAdvancedCdActions UseItemActions() } - unless { BuffPresent(omen_of_clarity_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 and target.TimeToDie() >= 6 and Spell(thrash_cat) } + unless { BuffPresent(omen_of_clarity_melee_buff) and target.DebuffRemains(thrash_cat_debuff) < 3 and target.TimeToDie() >= 6 and Spell(thrash_cat) } or { target.TimeToDie() <= 1 and ComboPoints() >= 3 or Spell(ferocious_bite) } or { BuffRemains(savage_roar_buff) <= 3 and ComboPoints() > 0 and target.HealthPercent() < 25 and SavageRoar() } { @@ -768,7 +768,7 @@ AddFunction RestorationMainActions # Cast instant/mana-free Healing Touch or Regrowth. if BuffStacks(sage_mender_buff) == 5 Spell(healing_touch) - if BuffPresent(omen_of_clarity_buff) + if BuffPresent(omen_of_clarity_heal_buff) { if Glyph(glyph_of_regrowth) Spell(regrowth) Spell(healing_touch) @@ -800,7 +800,7 @@ AddFunction RestorationAoeActions if BuffPresent(tree_of_life_buff) { Spell(wild_growth) - if BuffPresent(omen_of_clarity_buff) Spell(regrowth) + if BuffPresent(omen_of_clarity_heal_buff) Spell(regrowth) Spell(lifebloom) } @@ -824,11 +824,6 @@ AddFunction RestorationCdActions if TalentPoints(natures_vigil_talent) Spell(natures_vigil) } -AddFunction RestorationPrecombatActions -{ - if BuffRemains(harmony_buff) < 10 Spell(nourish) -} - ### Restoration icons. AddIcon mastery=restoration size=small checkboxon=opt_icons_left @@ -853,11 +848,10 @@ AddIcon mastery=restoration help=shortcd AddIcon mastery=restoration help=main { - if InCombat(no) RestorationPrecombatActions() RestorationMainActions() } -AddIcon mastery=restoration help=aoe checkboxon=aoe +AddIcon mastery=restoration help=aoe checkboxon=opt_aoe { RestorationAoeActions() } diff --git a/scripts/ovale_druid_spells.lua b/scripts/ovale_druid_spells.lua index c717772..c9d2416 100644 --- a/scripts/ovale_druid_spells.lua +++ b/scripts/ovale_druid_spells.lua @@ -66,9 +66,9 @@ Define(feral_rage_buff 146874) Define(ferocious_bite 22568) SpellInfo(ferocious_bite combo=finisher energy=25 physical=1) SpellInfo(ferocious_bite buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(ferocious_bite buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(ferocious_bite buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellInfo(ferocious_bite damage=FeralFerociousBiteDamage mastery=feral) - SpellAddBuff(ferocious_bite omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(ferocious_bite omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(force_of_nature_caster 33831) SpellInfo(force_of_nature_caster gcd=0) Define(force_of_nature_heal 102693) @@ -103,7 +103,7 @@ Define(healing_touch 5185) SpellAddBuff(healing_touch dream_of_cenarius_tank_buff=0 mastery=guardian talent=dream_of_cenarius_talent) SpellAddBuff(healing_touch harmony_buff=1 if_spell=harmony) SpellAddBuff(healing_touch natures_swiftness_buff=0 if_spell=natures_swiftness) - SpellAddBuff(healing_touch omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(healing_touch omen_of_clarity_heal_buff=0 if_spell=omen_of_clarity_heal) SpellAddBuff(healing_touch predatory_swiftness_buff=0 if_spell=predatory_swiftness) SpellAddBuff(healing_touch sage_mender_buff=0 itemset=T16_heal itemcount=2) SpellAddTargetBuff(healing_touch lifebloom_buff=refresh if_spell=lifebloom) @@ -141,8 +141,8 @@ Define(lunar_eclipse_buff 48518) Define(maim 22570) SpellInfo(maim cd=10 combo=finisher energy=35 physical=1) SpellInfo(maim buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(maim buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) - SpellAddBuff(maim omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellInfo(maim buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) + SpellAddBuff(maim omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(malfurions_gift 92364) Define(mangle_bear 33878) SpellInfo(mangle_bear buffnocd=mangle_no_cooldown_buff cd=6 rage=-5) @@ -151,14 +151,14 @@ Define(mangle_cat 33876) SpellInfo(mangle_cat combo=1 energy=35 physical=1) SpellInfo(mangle_cat critcombo=1 if_spell=primal_fury) SpellInfo(mangle_cat buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(mangle_cat buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(mangle_cat buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellInfo(mangle_cat damage=FeralMangleCatDamage mastery=feral) - SpellAddBuff(mangle_cat omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(mangle_cat omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) SpellList(mangle_no_cooldown_buff berserk_bear_buff son_of_ursoc_buff) Define(mark_of_the_wild 1126) Define(maul 6807) SpellInfo(maul cd=3 rage=30) - SpellAddBuff(maul omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(maul omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(might_of_ursoc 106922) SpellInfo(might_of_ursoc cd=180) SpellInfo(might_of_ursoc addcd=120 glyph=glyph_of_might_of_ursoc) @@ -184,11 +184,14 @@ Define(natures_vigil_talent 18) Define(nourish 50464) SpellAddBuff(nourish harmony_buff=1 if_spell=harmony) SpellAddBuff(nourish natures_swiftness_buff=0 if_spell=natures_swiftness) - SpellAddBuff(nourish omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(nourish omen_of_clarity_heal_buff=0 if_spell=omen_of_clarity_heal) SpellAddTargetBuff(nourish lifebloom_buff=refresh if_spell=lifebloom) -Define(omen_of_clarity 16864) -Define(omen_of_clarity_buff 135700) - SpellInfo(omen_of_clarity_buff duration=15) +Define(omen_of_clarity_heal 113043) +Define(omen_of_clarity_heal_buff 16870) + SpellInfo(omen_of_clarity_heal_buff duration=15) +Define(omen_of_clarity_melee 16864) +Define(omen_of_clarity_melee_buff 135700) + SpellInfo(omen_of_clarity_melee_buff duration=15) Define(predatory_swiftness 16974) Define(predatory_swiftness_buff 69369) SpellInfo(predatory_swiftness_buff duration=8) @@ -197,8 +200,8 @@ Define(rake 1822) SpellInfo(rake combo=1 energy=35 physical=1) SpellInfo(rake critcombo=1 if_spell=primal_fury) SpellInfo(rake buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(rake buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) - SpellAddBuff(rake omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellInfo(rake buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) + SpellAddBuff(rake omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) SpellAddTargetDebuff(rake rake_debuff=1) Define(rake_debuff 1822) SpellInfo(rake_debuff duration=15 tick=3) @@ -209,9 +212,9 @@ Define(ravage 6785) SpellInfo(ravage combo=1 energy=45 physical=1) SpellInfo(ravage critcombo=1 if_spell=primal_fury) SpellInfo(ravage buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(ravage buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(ravage buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellInfo(ravage damage=FeralRavageDamage mastery=feral) - SpellAddBuff(ravage omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(ravage omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(rebirth 20484) SpellInfo(rebirth cd=600) SpellAddBuff(rebirth dream_of_cenarius_tank_buff=0 mastery=guardian talent=dream_of_cenarius_talent) @@ -219,7 +222,7 @@ Define(rebirth 20484) Define(regrowth 8936) SpellAddBuff(regrowth harmony_buff=1 if_spell=harmony) SpellAddBuff(regrowth natures_swiftness_buff=0 if_spell=natures_swiftness) - SpellAddBuff(regrowth omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(regrowth omen_of_clarity_heal_buff=0 if_spell=omen_of_clarity_heal) SpellAddTargetBuff(regrowth regrowth_buff=1 glyph=!glyph_of_regrowth) SpellAddTargetBuff(regrowth lifebloom_buff=refresh if_spell=lifebloom) Define(regrowth_buff 8936) @@ -235,8 +238,8 @@ Define(rip 1079) SpellInfo(rip combo=finisher energy=30) SpellAddTargetDebuff(rip rip_debuff=1) SpellInfo(rip buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(rip buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) - SpellAddBuff(rip omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellInfo(rip buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) + SpellAddBuff(rip omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(rip_debuff 1079) SpellInfo(rip_debuff duration=16 resetcounter=ripshreds tick=2) SpellInfo(rip_debuff addduration=4 itemset=T14_melee itemcount=4) @@ -257,24 +260,24 @@ Define(savage_roar 52610) SpellInfo(savage_roar combo=finisher energy=25 min_combo=1) SpellInfo(savage_roar duration=12 adddurationcp=6) SpellInfo(savage_roar buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(savage_roar buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(savage_roar buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellAddBuff(savage_roar savage_roar=1) - SpellAddBuff(savage_roar omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(savage_roar omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(savage_roar_glyphed 127538) SpellInfo(savage_roar_glyphed combo=finisher energy=25) SpellInfo(savage_roar_glyphed duration=12 adddurationcp=6) SpellInfo(savage_roar_glyphed buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(savage_roar_glyphed buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(savage_roar_glyphed buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellAddBuff(savage_roar_glyphed savage_roar_glyphed=1) - SpellAddBuff(savage_roar_glyphed omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(savage_roar_glyphed omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) SpellList(savage_roar_buff savage_roar savage_roar_glyphed) Define(shred 5221) SpellInfo(shred combo=1 energy=40 physical=1) SpellInfo(shred critcombo=1 if_spell=primal_fury) SpellInfo(shred buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(shred buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(shred buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellInfo(shred damage=FeralShredDamage mastery=feral) - SpellAddBuff(shred omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(shred omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(shooting_stars_buff 93400) SpellInfo(shooting_stars_buff duration=12) Define(skull_bash_bear 106839) @@ -316,9 +319,9 @@ Define(swipe_bear 779) Define(swipe_cat 62078) SpellInfo(swipe_cat combo=1 energy=45 physical=1) SpellInfo(swipe_cat buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(swipe_cat buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(swipe_cat buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellInfo(swipe_cat damage=FeralSwipeCatDamage mastery=feral) - SpellAddBuff(swipe_cat omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(swipe_cat omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) Define(symbiosis_mirror_image 110621) SpellInfo(symbiosis_mirror_image cd=180) Define(thrash_bear 77758) @@ -329,9 +332,9 @@ Define(thrash_bear_debuff 77758) Define(thrash_cat 106830) SpellInfo(thrash_cat energy=50 physical=1) SpellInfo(thrash_cat buff_energy_half=berserk_cat_buff if_stance=druid_cat_form) - SpellInfo(thrash_cat buff_energy_none=omen_of_clarity_buff if_spell=omen_of_clarity) + SpellInfo(thrash_cat buff_energy_none=omen_of_clarity_melee_buff if_spell=omen_of_clarity_melee) SpellInfo(thrash_cat damage=FeralThrashCatDamage mastery=feral) - SpellAddBuff(thrash_cat omen_of_clarity_buff=0 if_spell=omen_of_clarity) + SpellAddBuff(thrash_cat omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee) SpellAddTargetDebuff(thrash_cat thrash_cat_debuff=1) Define(thrash_cat_debuff 106830) SpellInfo(thrash_cat_debuff duration=15 tick=3 physical=1) -- 1.7.9.5