From 2a8157869487018887b668e91fb7056a2aa806f1 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sun, 13 Jul 2014 11:32:32 +0000 Subject: [PATCH] Fix use of deprecated features of Ovale. * Use "specialization" instead of deprecated "mastery" parameter. * Use "checkbox=name" instead of deprecated "checkboxon=name". git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1552 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleSimulationCraft.lua | 2 +- scripts/ovale_deathknight.lua | 48 ++++++------- scripts/ovale_deathknight_spells.lua | 36 +++++----- scripts/ovale_druid.lua | 72 ++++++++++---------- scripts/ovale_druid_spells.lua | 54 +++++++-------- scripts/ovale_hunter.lua | 48 ++++++------- scripts/ovale_hunter_spells.lua | 18 ++--- scripts/ovale_mage.lua | 48 ++++++------- scripts/ovale_mage_spells.lua | 10 +-- scripts/ovale_monk.lua | 50 +++++++------- scripts/ovale_monk_spells.lua | 8 +-- scripts/ovale_paladin.lua | 48 ++++++------- scripts/ovale_paladin_spells.lua | 32 ++++----- scripts/ovale_priest.lua | 16 ++--- scripts/ovale_priest_spells.lua | 2 +- scripts/ovale_rogue.lua | 48 ++++++------- scripts/ovale_rogue_spells.lua | 4 +- scripts/ovale_shaman.lua | 48 ++++++------- scripts/ovale_shaman_spells.lua | 14 ++-- scripts/ovale_warlock.lua | 48 ++++++------- scripts/ovale_warlock_spells.lua | 4 +- scripts/ovale_warrior.lua | 48 ++++++------- scripts/ovale_warrior_common.lua | 2 +- scripts/ovale_warrior_spells.lua | 42 ++++++------ .../simulationcraft_deathknight_frost_1h_t16h.lua | 2 +- .../simulationcraft_deathknight_frost_2h_t16h.lua | 2 +- .../simulationcraft_deathknight_unholy_t16h.lua | 2 +- scripts/simulationcraft_druid_balance_t16h.lua | 2 +- scripts/simulationcraft_druid_feral_t16h.lua | 2 +- ...mulationcraft_druid_feral_t16h_adv_rotation.lua | 2 +- scripts/simulationcraft_hunter_bm_t16h.lua | 2 +- scripts/simulationcraft_hunter_mm_t16h.lua | 2 +- scripts/simulationcraft_hunter_sv_t16h.lua | 2 +- scripts/simulationcraft_mage_arcane_t16h.lua | 2 +- scripts/simulationcraft_mage_fire_t16h.lua | 2 +- scripts/simulationcraft_mage_frost_t16h.lua | 2 +- .../simulationcraft_monk_windwalker_1h_t16h.lua | 2 +- .../simulationcraft_monk_windwalker_2h_t16h.lua | 2 +- .../simulationcraft_paladin_protection_t16h.lua | 2 +- .../simulationcraft_paladin_retribution_t16h.lua | 2 +- scripts/simulationcraft_priest_shadow_t16h.lua | 2 +- .../simulationcraft_rogue_assassination_t16h.lua | 2 +- scripts/simulationcraft_rogue_combat_t16h.lua | 2 +- scripts/simulationcraft_rogue_subtlety_t16h.lua | 2 +- scripts/simulationcraft_shaman_elemental_t16h.lua | 2 +- .../simulationcraft_shaman_enhancement_t16h.lua | 2 +- .../simulationcraft_warlock_affliction_t16h.lua | 2 +- .../simulationcraft_warlock_demonology_t16h.lua | 2 +- .../simulationcraft_warlock_destruction_t16h.lua | 2 +- scripts/simulationcraft_warrior_arms_t16h.lua | 2 +- scripts/simulationcraft_warrior_fury_1h_t16h.lua | 2 +- scripts/simulationcraft_warrior_fury_2h_t16h.lua | 2 +- .../simulationcraft_warrior_protection_t16h.lua | 2 +- scripts/wiljo_mage.lua | 6 +- 54 files changed, 407 insertions(+), 407 deletions(-) diff --git a/OvaleSimulationCraft.lua b/OvaleSimulationCraft.lua index ef3fc47..f249949 100644 --- a/OvaleSimulationCraft.lua +++ b/OvaleSimulationCraft.lua @@ -218,7 +218,7 @@ do self:Append(script, "") if profile.spec then - self:Append(script, format("AddIcon mastery=%s help=main", profile.spec)) + self:Append(script, format("AddIcon specialization=%s help=main", profile.spec)) else self:Append(script, "AddIcon help=main") end diff --git a/scripts/ovale_deathknight.lua b/scripts/ovale_deathknight.lua index 30fd036..118ef27 100644 --- a/scripts/ovale_deathknight.lua +++ b/scripts/ovale_deathknight.lua @@ -231,13 +231,13 @@ AddFunction BloodCdActions # Blood icons. -AddIcon mastery=blood size=small checkboxon=opt_icons_left +AddIcon specialization=blood size=small checkbox=opt_icons_left { Spell(antimagic_shell) Spell(icebound_fortitude) } -AddIcon mastery=blood size=small checkboxon=opt_icons_left +AddIcon specialization=blood size=small checkbox=opt_icons_left { if TalentPoints(death_pact_talent) { @@ -247,31 +247,31 @@ AddIcon mastery=blood size=small checkboxon=opt_icons_left if TalentPoints(death_siphon_talent) Spell(death_siphon) } -AddIcon mastery=blood help=shortcd +AddIcon specialization=blood help=shortcd { BloodShortCdActions() } -AddIcon mastery=blood help=main +AddIcon specialization=blood help=main { if InCombat(no) BloodPrecombatActions() BloodSingleTargetActions() } -AddIcon mastery=blood help=aoe checkboxon=opt_aoe +AddIcon specialization=blood help=aoe checkbox=opt_aoe { if InCombat(no) BloodPrecombatActions() BloodAoeActions() } -AddIcon mastery=blood help=cd +AddIcon specialization=blood help=cd { Interrupt() UseRacialInterruptActions() BloodCdActions() } -AddIcon mastery=blood size=small checkboxon=opt_icons_right +AddIcon specialization=blood size=small checkbox=opt_icons_right { #pestilence,if=dot.blood_plague.ticking&talent.plague_leech.enabled,line_cd=28 if target.DebuffPresent(blood_plague_debuff) and TalentPoints(plague_leech_talent) Spell(pestilence) @@ -279,7 +279,7 @@ AddIcon mastery=blood size=small checkboxon=opt_icons_right if target.DebuffPresent(blood_plague_debuff) and TalentPoints(unholy_blight_talent) and SpellCooldown(unholy_blight) < 49 Spell(pestilence) } -AddIcon mastery=blood size=small checkboxon=opt_icons_right +AddIcon specialization=blood size=small checkbox=opt_icons_right { UseItemActions() } @@ -535,13 +535,13 @@ AddFunction FrostTwoHandSingleTargetShortCdActions ### Frost icons. -AddIcon mastery=frost size=small checkboxon=opt_icons_left +AddIcon specialization=frost size=small checkbox=opt_icons_left { Spell(antimagic_shell) Spell(icebound_fortitude) } -AddIcon mastery=frost size=small checkboxon=opt_icons_left +AddIcon specialization=frost size=small checkbox=opt_icons_left { if TalentPoints(death_pact_talent) { @@ -551,7 +551,7 @@ AddIcon mastery=frost size=small checkboxon=opt_icons_left if TalentPoints(death_siphon_talent) Spell(death_siphon) } -AddIcon mastery=frost help=shortcd +AddIcon specialization=frost help=shortcd { if InCombat(no) FrostPrecombatShortCdActions() FrostDefaultShortCdActions() @@ -559,7 +559,7 @@ AddIcon mastery=frost help=shortcd if HasWeapon(offhand no) FrostTwoHandSingleTargetShortCdActions() } -AddIcon mastery=frost help=main +AddIcon specialization=frost help=main { if InCombat(no) FrostPrecombatActions() FrostDefaultActions() @@ -567,7 +567,7 @@ AddIcon mastery=frost help=main if HasWeapon(offhand no) FrostTwoHandSingleTargetActions() } -AddIcon mastery=frost help=aoe checkboxon=opt_aoe +AddIcon specialization=frost help=aoe checkbox=opt_aoe { if InCombat(no) FrostPrecombatActions() FrostDefaultActions() @@ -575,7 +575,7 @@ AddIcon mastery=frost help=aoe checkboxon=opt_aoe if HasWeapon(offhand no) FrostTwoHandAoeActions() } -AddIcon mastery=frost help=cd +AddIcon specialization=frost help=cd { if InCombat(no) FrostPrecombatCdActions() Interrupt() @@ -583,7 +583,7 @@ AddIcon mastery=frost help=cd FrostDefaultCdActions() } -AddIcon mastery=frost size=small checkboxon=opt_icons_right +AddIcon specialization=frost size=small checkbox=opt_icons_right { #pestilence,if=dot.blood_plague.ticking&talent.plague_leech.enabled,line_cd=28 if target.DebuffPresent(blood_plague_debuff) and TalentPoints(plague_leech_talent) Spell(pestilence) @@ -591,7 +591,7 @@ AddIcon mastery=frost size=small checkboxon=opt_icons_right if target.DebuffPresent(blood_plague_debuff) and TalentPoints(unholy_blight_talent) and SpellCooldown(unholy_blight) < 49 Spell(pestilence) } -AddIcon mastery=frost size=small checkboxon=opt_icons_right +AddIcon specialization=frost size=small checkbox=opt_icons_right { UseItemActions() } @@ -776,13 +776,13 @@ AddFunction UnholyPrecombatCdActions ### Unholy icons. -AddIcon mastery=unholy size=small checkboxon=opt_icons_left +AddIcon specialization=unholy size=small checkbox=opt_icons_left { Spell(antimagic_shell) Spell(icebound_fortitude) } -AddIcon mastery=unholy size=small checkboxon=opt_icons_left +AddIcon specialization=unholy size=small checkbox=opt_icons_left { if TalentPoints(death_pact_talent) { @@ -792,26 +792,26 @@ AddIcon mastery=unholy size=small checkboxon=opt_icons_left if TalentPoints(death_siphon_talent) Spell(death_siphon) } -AddIcon mastery=unholy help=shortcd +AddIcon specialization=unholy help=shortcd { UnholySingleTargetShortCdActions() } -AddIcon mastery=unholy help=main +AddIcon specialization=unholy help=main { if InCombat(no) UnholyPrecombatActions() UnholyDefaultActions() UnholySingleTargetActions() } -AddIcon mastery=unholy help=aoe checkboxon=opt_aoe +AddIcon specialization=unholy help=aoe checkbox=opt_aoe { if InCombat(no) UnholyPrecombatActions() UnholyDefaultActions() UnholyAoeActions() } -AddIcon mastery=unholy help=cd +AddIcon specialization=unholy help=cd { if InCombat(no) UnholyPrecombatCdActions() Interrupt() @@ -820,7 +820,7 @@ AddIcon mastery=unholy help=cd UnholySingleTargetCdActions() } -AddIcon mastery=unholy size=small checkboxon=opt_icons_right +AddIcon specialization=unholy size=small checkbox=opt_icons_right { #pestilence,if=dot.blood_plague.ticking&talent.plague_leech.enabled,line_cd=28 if target.DebuffPresent(blood_plague_debuff) and TalentPoints(plague_leech_talent) Spell(pestilence) @@ -828,7 +828,7 @@ AddIcon mastery=unholy size=small checkboxon=opt_icons_right if target.DebuffPresent(blood_plague_debuff) and TalentPoints(unholy_blight_talent) and SpellCooldown(unholy_blight) < 49 Spell(pestilence) } -AddIcon mastery=unholy size=small checkboxon=opt_icons_right +AddIcon specialization=unholy size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_deathknight_spells.lua b/scripts/ovale_deathknight_spells.lua index 9c94089..f55e5d1 100644 --- a/scripts/ovale_deathknight_spells.lua +++ b/scripts/ovale_deathknight_spells.lua @@ -9,13 +9,13 @@ do Define(antimagic_shell 48707) SpellInfo(antimagic_shell cd=45) - SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_strength_buff mastery=frost) - SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_strength_buff mastery=unholy) - SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_tank_buff mastery=blood) + SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_strength_buff specialization=frost) + SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_strength_buff specialization=unholy) + SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_tank_buff specialization=blood) Define(army_of_the_dead 42650) SpellInfo(army_of_the_dead blood=1 frost=1 unholy=1 cd=600) - SpellInfo(army_of_the_dead buff_cdr=cooldown_reduction_strength_buff mastery=frost) - SpellInfo(army_of_the_dead buff_cdr=cooldown_reduction_strength_buff mastery=unholy) + SpellInfo(army_of_the_dead buff_cdr=cooldown_reduction_strength_buff specialization=frost) + SpellInfo(army_of_the_dead buff_cdr=cooldown_reduction_strength_buff specialization=unholy) SpellAddBuff(army_of_the_dead army_of_the_dead_buff=1) Define(army_of_the_dead_buff 42650) SpellInfo(army_of_the_dead_buff duration=40) @@ -37,7 +37,7 @@ Define(blood_tap 45529) Define(blood_tap_talent 13) Define(bone_shield 49222) SpellInfo(bone_shield cd=60) - SpellInfo(bone_shield buff_cdr=cooldown_reduction_tank_buff mastery=blood) + SpellInfo(bone_shield buff_cdr=cooldown_reduction_tank_buff specialization=blood) SpellAddBuff(bone_shield bone_shield_buff=1) Define(bone_shield_buff 49222) SpellInfo(bone_shield_buff duration=300) @@ -46,7 +46,7 @@ Define(crimson_scourge_buff 81141) SpellInfo(crimson_scourge_buff duration=15) Define(dancing_rune_weapon 49028) SpellInfo(dancing_rune_weapon cd=90) - SpellInfo(dancing_rune_weapon buff_cdr=cooldown_reduction_tank_buff mastery=blood) + SpellInfo(dancing_rune_weapon buff_cdr=cooldown_reduction_tank_buff specialization=blood) SpellAddBuff(dancing_rune_weapon dancing_rune_weapon_buff=1) Define(dancing_rune_weapon_buff 81256) SpellInfo(dancing_rune_weapon_buff duration=12) @@ -82,7 +82,7 @@ Define(death_strike 49998) Define(ebon_plaguebringer 51160) Define(empower_rune_weapon 47568) SpellInfo(empower_rune_weapon cd=300 runicpower=-25) - SpellInfo(empower_rune_weapon buff_cdr=cooldown_reduction_strength_buff mastery=frost) + SpellInfo(empower_rune_weapon buff_cdr=cooldown_reduction_strength_buff specialization=frost) Define(festering_strike 85948) SpellInfo(festering_strike blood=1 frost=1) Define(frost_fever_debuff 55095) @@ -111,9 +111,9 @@ Define(howling_blast 49184) Define(icebound_fortitude 48792) SpellInfo(icebound_fortitude cd=180) SpellInfo(icebound_fortitude cd=90 glyph=glyph_of_icebound_fortitude) - SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_strength_buff mastery=frost) - SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_strength_buff mastery=unholy) - SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_tank_buff mastery=blood) + SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_strength_buff specialization=frost) + SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_strength_buff specialization=unholy) + SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_tank_buff specialization=blood) SpellAddBuff(icebound_fortitude icebound_fortitude_buff=1) Define(icebound_fortitude_buff 48792) SpellInfo(icebound_fortitude_buff duration=12) @@ -137,15 +137,15 @@ Define(obliterate 49020) Define(outbreak 77575) SpellInfo(outbreak cd=60 glyph=!glyph_of_outbreak) SpellInfo(outbreak runicpower=30 glyph=glyph_of_outbreak) - SpellInfo(outbreak buff_cdr=cooldown_reduction_strength_buff mastery=frost) - SpellInfo(outbreak buff_cdr=cooldown_reduction_strength_buff mastery=unholy) - SpellInfo(outbreak buff_cdr=cooldown_reduction_tank_buff mastery=blood) + SpellInfo(outbreak buff_cdr=cooldown_reduction_strength_buff specialization=frost) + SpellInfo(outbreak buff_cdr=cooldown_reduction_strength_buff specialization=unholy) + SpellInfo(outbreak buff_cdr=cooldown_reduction_tank_buff specialization=blood) SpellAddTargetDebuff(outbreak blood_plague_debuff=1 frost_fever_debuff=1) Define(pestilence 50842) SpellInfo(pestilence blood=1) Define(pillar_of_frost 51271) SpellInfo(pillar_of_frost cd=60 frost=1) - SpellInfo(pillar_of_frost buff_cdr=cooldown_reduction_strength_buff mastery=frost) + SpellInfo(pillar_of_frost buff_cdr=cooldown_reduction_strength_buff specialization=frost) SpellAddBuff(pillar_of_frost pillar_of_frost_buff=1) Define(pillar_of_frost_buff 51271) SpellInfo(pillar_of_frost duration=20) @@ -197,18 +197,18 @@ Define(sudden_doom_buff 81340) SpellInfo(sudden_doom_buff duration=10) Define(summon_gargoyle 49206) SpellInfo(summon_gargoyle cd=180) - SpellInfo(summon_gargoyle buff_cdr=cooldown_reduction_strength_buff mastery=unholy) + SpellInfo(summon_gargoyle buff_cdr=cooldown_reduction_strength_buff specialization=unholy) Define(unholy_blight 115989) SpellInfo(unholy_blight cd=90) Define(unholy_blight_talent 3) Define(unholy_frenzy 49016) SpellInfo(unholy_frenzy cd=180) - SpellInfo(unholy_frenzy buff_cdr=cooldown_reduction_strength_buff mastery=unholy) + SpellInfo(unholy_frenzy buff_cdr=cooldown_reduction_strength_buff specialization=unholy) Define(unholy_presence 48265) Define(vampiric_blood 55233) SpellInfo(vampiric_blood cd=60) SpellInfo(vampiric_blood addcd=-10 itemset=T14_tank itemcount=2) - SpellInfo(vampiric_blood buff_cdr=cooldown_reduction_tank_buff mastery=blood) + SpellInfo(vampiric_blood buff_cdr=cooldown_reduction_tank_buff specialization=blood) SpellAddBuff(vampiric_blood vampiric_blood_buff=1) Define(vampiric_blood_buff 55233) SpellInfo(vampiric_blood_buff duration=10) diff --git a/scripts/ovale_druid.lua b/scripts/ovale_druid.lua index abe7305..14bffd2 100644 --- a/scripts/ovale_druid.lua +++ b/scripts/ovale_druid.lua @@ -20,7 +20,7 @@ AddCheckBox(opt_icons_right "Right icons") ### Elitist Jerks rotation functions. -AddCheckBox(opt_elitist_jerks_balance_rotation "Elitist Jerks Balance Rotation" default mastery=balance) +AddCheckBox(opt_elitist_jerks_balance_rotation "Elitist Jerks Balance Rotation" default specialization=balance) AddFunction BalanceIsNearEclipseState { @@ -276,7 +276,7 @@ AddFunction BalancePrecombatCdActions ### Balance Icons -AddIcon mastery=balance size=small checkboxon=opt_icons_left +AddIcon specialization=balance size=small checkbox=opt_icons_left { Spell(barkskin) Spell(survival_instincts) @@ -286,13 +286,13 @@ AddIcon mastery=balance size=small checkboxon=opt_icons_left Spell(tranquility) } -AddIcon mastery=balance size=small checkboxon=opt_icons_left +AddIcon specialization=balance size=small checkbox=opt_icons_left { #wild_mushroom_detonate,moving=0,if=buff.wild_mushroom.stack>0&buff.solar_eclipse.up if WildMushroomCount() > 0 and BuffPresent(solar_eclipse_buff) Spell(wild_mushroom_detonate) } -AddIcon mastery=balance help=shortcd +AddIcon specialization=balance help=shortcd { if not Stance(druid_moonkin_form) Spell(moonkin_form) @@ -300,34 +300,34 @@ AddIcon mastery=balance help=shortcd BalanceAoeActions() } -AddIcon mastery=balance help=main +AddIcon specialization=balance help=main { if InCombat(no) BalancePrecombatActions() if CheckBoxOn(opt_elitist_jerks_balance_rotation) BalanceElitistJerksMainActions() if CheckBoxOff(opt_elitist_jerks_balance_rotation) BalanceDefaultActions() } -AddIcon mastery=balance help=moving +AddIcon specialization=balance help=moving { if InCombat(no) BalancePrecombatMovingActions() if CheckBoxOn(opt_elitist_jerks_balance_rotation) BalanceElitistJerksMovingActions() if CheckBoxOff(opt_elitist_jerks_balance_rotation) BalanceDefaultMovingActions() } -AddIcon mastery=balance help=cd +AddIcon specialization=balance help=cd { BalanceInterrupt() if CheckBoxOn(opt_elitist_jerks_balance_rotation) BalanceElitistJerksCdActions() if CheckBoxOff(opt_elitist_jerks_balance_rotation) BalanceDefaultCdActions() } -AddIcon mastery=balance size=small checkboxon=opt_icons_right +AddIcon specialization=balance size=small checkbox=opt_icons_right { if TalentPoints(heart_of_the_wild_talent) Spell(heart_of_the_wild_caster) if TalentPoints(natures_vigil_talent) Spell(natures_vigil) } -AddIcon mastery=balance size=small checkboxon=opt_icons_right +AddIcon specialization=balance size=small checkbox=opt_icons_right { UseItemActions() } @@ -341,7 +341,7 @@ AddIcon mastery=balance size=small checkboxon=opt_icons_right # talents=http://us.battle.net/wow/en/tool/talent-calculator#UZ!...2.1 # glyphs=savagery/cat_form -AddCheckBox(opt_weakened_armor_debuff SpellName(weakened_armor_debuff) default mastery=feral) +AddCheckBox(opt_weakened_armor_debuff SpellName(weakened_armor_debuff) default specialization=feral) AddFunction FeralFillerActions { @@ -690,12 +690,12 @@ AddFunction FeralAdvancedCdActions } } -AddListItem(opt_feral_rotation basic "Use basic rotation" default mastery=feral) -AddListItem(opt_feral_rotation advanced "Use advanced rotation" mastery=feral) +AddListItem(opt_feral_rotation basic "Use basic rotation" default specialization=feral) +AddListItem(opt_feral_rotation advanced "Use advanced rotation" specialization=feral) ### Feral Icons -AddIcon mastery=feral size=small checkboxon=opt_icons_left +AddIcon specialization=feral size=small checkbox=opt_icons_left { Spell(barkskin) Spell(survival_instincts) @@ -705,7 +705,7 @@ AddIcon mastery=feral size=small checkboxon=opt_icons_left Spell(tranquility) } -AddIcon mastery=feral size=small checkboxon=opt_icons_left +AddIcon specialization=feral size=small checkbox=opt_icons_left { if TalentPoints(displacer_beast_talent) Spell(displacer_beast) if TalentPoints(wild_charge_talent) @@ -717,7 +717,7 @@ AddIcon mastery=feral size=small checkboxon=opt_icons_left Spell(dash) } -AddIcon mastery=feral help=main +AddIcon specialization=feral help=main { if InCombat(no) FeralPrecombatActions() if not target.InRange(mangle_cat) Texture(ability_druid_catformattack help=NotInMeleeRange) @@ -725,7 +725,7 @@ AddIcon mastery=feral help=main if List(opt_feral_rotation advanced) FeralAdvancedActions() } -AddIcon mastery=feral help=main +AddIcon specialization=feral help=main { if InCombat(no) FeralPrecombatActions() if not target.InRange(mangle_cat) Texture(ability_druid_catformattack help=NotInMeleeRange) @@ -733,25 +733,25 @@ AddIcon mastery=feral help=main if List(opt_feral_rotation advanced) FeralAdvancedPredictiveActions() } -AddIcon mastery=feral help=aoe checkboxon=opt_aoe +AddIcon specialization=feral help=aoe checkbox=opt_aoe { if InCombat(no) FeralPrecombatActions() FeralAoeActions() } -AddIcon mastery=feral help=cd +AddIcon specialization=feral help=cd { if List(opt_feral_rotation basic) FeralBasicCdActions() if List(opt_feral_rotation advanced) FeralAdvancedCdActions() } -AddIcon mastery=feral size=small checkboxon=opt_icons_right +AddIcon specialization=feral size=small checkbox=opt_icons_right { if TalentPoints(heart_of_the_wild_talent) Spell(heart_of_the_wild_melee) if TalentPoints(natures_vigil_talent) Spell(natures_vigil) } -AddIcon mastery=feral size=small checkboxon=opt_icons_right +AddIcon specialization=feral size=small checkbox=opt_icons_right { UseItemActions() } @@ -832,46 +832,46 @@ AddFunction GuardianPrecombatActions ### Guardian icons. -AddIcon mastery=guardian size=small checkboxon=opt_icons_left +AddIcon specialization=guardian size=small checkbox=opt_icons_left { Spell(might_of_ursoc) } -AddIcon mastery=guardian size=small checkboxon=opt_icons_left +AddIcon specialization=guardian size=small checkbox=opt_icons_left { Spell(barkskin) if TalentPoints(force_of_nature_talent) Spell(force_of_nature_tank) Spell(survival_instincts) } -AddIcon mastery=guardian help=shortcd +AddIcon specialization=guardian help=shortcd { GuardianShortCdActions() } -AddIcon mastery=guardian help=main +AddIcon specialization=guardian help=main { if InCombat(no) GuardianPrecombatActions() GuardianMainActions() } -AddIcon mastery=guardian help=aoe checkboxon=aoe +AddIcon specialization=guardian help=aoe checkbox=aoe { GuardianAoeActions() } -AddIcon mastery=guardian help=cd +AddIcon specialization=guardian help=cd { GuardianCdActions() } -AddIcon mastery=guardian size=small checkboxon=opt_icons_right +AddIcon specialization=guardian size=small checkbox=opt_icons_right { #renewal,if=talent.renewal.enabled&incoming_damage_5>0.8*health.max if TalentPoints(renewal_talent) and IncomingDamage(5) > 0.8 * MaxHealth() Spell(renewal) } -AddIcon mastery=guardian size=small checkboxon=opt_icons_right +AddIcon specialization=guardian size=small checkbox=opt_icons_right { UseItemActions() } @@ -951,14 +951,14 @@ AddFunction RestorationPrecombatActions ### Restoration icons. -AddIcon mastery=restoration size=small checkboxon=opt_icons_left +AddIcon specialization=restoration size=small checkbox=opt_icons_left { Spell(barkskin) Spell(might_of_ursoc) Spell(survival_instincts) } -AddIcon mastery=restoration size=small checkboxon=opt_icons_left +AddIcon specialization=restoration size=small checkbox=opt_icons_left { #innervate,if=mana.pct<90 if ManaPercent() < 90 Spell(innervate) @@ -966,35 +966,35 @@ AddIcon mastery=restoration size=small checkboxon=opt_icons_left if TalentPoints(natures_vigil_talent) Spell(natures_vigil) } -AddIcon mastery=restoration help=shortcd +AddIcon specialization=restoration help=shortcd { RestorationShortCdActions() } -AddIcon mastery=restoration help=main +AddIcon specialization=restoration help=main { if InCombat(no) RestorationPrecombatActions() RestorationMainActions() } -AddIcon mastery=restoration help=aoe checkboxon=opt_aoe +AddIcon specialization=restoration help=aoe checkbox=opt_aoe { RestorationAoeActions() } -AddIcon mastery=restoration help=cd +AddIcon specialization=restoration help=cd { RestorationInterrupt() RestorationCdActions() } -AddIcon mastery=restoration size=small checkboxon=opt_icons_right +AddIcon specialization=restoration size=small checkbox=opt_icons_right { Spell(ironbark) Spell(natures_swiftness) } -AddIcon mastery=restoration size=small checkboxon=opt_icons_right +AddIcon specialization=restoration size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_druid_spells.lua b/scripts/ovale_druid_spells.lua index c93f8a1..7b18b2d 100644 --- a/scripts/ovale_druid_spells.lua +++ b/scripts/ovale_druid_spells.lua @@ -11,20 +11,20 @@ Define(astral_storm 106996) SpellInfo(astral_storm arcane=1 channel=10 haste=spell) Define(barkskin 22812) SpellInfo(barkskin cd=60) - SpellInfo(barkskin buff_cdr=cooldown_reduction_agility_buff mastery=feral) - SpellInfo(barkskin buff_cdr=cooldown_reduction_tank_buff mastery=guardian) + SpellInfo(barkskin buff_cdr=cooldown_reduction_agility_buff specialization=feral) + SpellInfo(barkskin buff_cdr=cooldown_reduction_tank_buff specialization=guardian) SpellInfo(barkskin addcd=-15 if_spell=malfurions_gift) Define(bear_form 5487) SpellInfo(bear_form rage=-10) Define(berserk_bear 50334) SpellInfo(berserk_bear cd=180) - SpellInfo(berserk_bear buff_cdr=cooldown_reduction_tank_buff mastery=guardian) + SpellInfo(berserk_bear buff_cdr=cooldown_reduction_tank_buff specialization=guardian) SpellAddBuff(berserk_bear berserk_bear_buff=1) Define(berserk_bear_buff 50334) SpellInfo(berserk_bear_buff duration=10) Define(berserk_cat 106951) SpellInfo(berserk_cat cd=180) - SpellInfo(berserk_cat buff_cdr=cooldown_reduction_agility_buff mastery=feral) + SpellInfo(berserk_cat buff_cdr=cooldown_reduction_agility_buff specialization=feral) SpellAddBuff(berserk_cat berserk_cat_buff=1) Define(berserk_cat_buff 106951) SpellInfo(berserk_cat duration=15) @@ -42,7 +42,7 @@ Define(chosen_of_elune_buff 102560) Define(dash 1850) SpellInfo(dash cd=180) SpellInfo(dash addcd=-60 glyph=glyph_of_dash) - SpellInfo(dash buff_cdr=cooldown_reduction_agility_buff mastery=feral) + SpellInfo(dash buff_cdr=cooldown_reduction_agility_buff specialization=feral) Define(displacer_beast 102280) SpellInfo(displacer_beast cd=30) Define(displacer_beast_talent 2) @@ -76,7 +76,7 @@ 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_melee_buff if_spell=omen_of_clarity_melee) - SpellInfo(ferocious_bite damage=FeralFerociousBiteDamage mastery=feral) + SpellInfo(ferocious_bite damage=FeralFerociousBiteDamage specialization=feral) 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 nature=1) @@ -107,9 +107,9 @@ Define(harmony 77495) Define(harmony_buff 100977) SpellInfo(harmony_buff duration=20) 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=2 mastery=feral talent=dream_of_cenarius_talent) - SpellAddBuff(healing_touch dream_of_cenarius_tank_buff=0 mastery=guardian talent=dream_of_cenarius_talent) + SpellAddBuff(healing_touch dream_of_cenarius_caster_buff=1 specialization=balance talent=dream_of_cenarius_talent) + SpellAddBuff(healing_touch dream_of_cenarius_melee_buff=2 specialization=feral talent=dream_of_cenarius_talent) + SpellAddBuff(healing_touch dream_of_cenarius_tank_buff=0 specialization=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_heal_buff=0 if_spell=omen_of_clarity_heal) @@ -161,7 +161,7 @@ Define(mangle_cat 33876) 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_melee_buff if_spell=omen_of_clarity_melee) - SpellInfo(mangle_cat damage=FeralMangleCatDamage mastery=feral) + SpellInfo(mangle_cat damage=FeralMangleCatDamage specialization=feral) 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) @@ -172,7 +172,7 @@ Define(might_of_ursoc 106922) SpellInfo(might_of_ursoc cd=180) SpellInfo(might_of_ursoc addcd=120 glyph=glyph_of_might_of_ursoc) SpellInfo(might_of_ursoc addcd=-60 itemset=T14_tank itemcount=2) - SpellInfo(might_of_ursoc buff_cdr=cooldown_reduction_tank_buff mastery=guardian) + SpellInfo(might_of_ursoc buff_cdr=cooldown_reduction_tank_buff specialization=guardian) Define(mighty_bash 5211) SpellInfo(mighty_bash cd=50) Define(mighty_bash_talent 15) @@ -182,8 +182,8 @@ Define(moonfire 8921) Define(moonfire_debuff 8921) SpellInfo(moonfire_debuff arcane=1 duration=14 haste=spell tick=2) SpellInfo(moonfire_debuff addduration=2 itemset=T14_caster itemcount=4) - SpellInfo(moonfire_debuff damage=BalanceMoonfireTickDamage mastery=balance) - SpellInfo(moonfire_debuff lastEstimatedDamage=BalanceMoonfireTickLastDamage mastery=balance) + SpellInfo(moonfire_debuff damage=BalanceMoonfireTickDamage specialization=balance) + SpellInfo(moonfire_debuff lastEstimatedDamage=BalanceMoonfireTickLastDamage specialization=balance) Define(moonkin_form 24858) Define(natures_grace_buff 16886) SpellInfo(natures_grace_buff duration=15) @@ -218,19 +218,19 @@ Define(rake 1822) SpellAddTargetDebuff(rake rake_debuff=1) Define(rake_debuff 1822) SpellInfo(rake_debuff duration=15 tick=3) - SpellInfo(rake_debuff damage=FeralRakeTickDamage mastery=feral) - SpellInfo(rake_debuff lastEstimatedDamage=FeralRakeTickLastDamage mastery=feral) + SpellInfo(rake_debuff damage=FeralRakeTickDamage specialization=feral) + SpellInfo(rake_debuff lastEstimatedDamage=FeralRakeTickLastDamage specialization=feral) SpellDamageBuff(rake_debuff dream_of_cenarius_melee_buff=1.3) 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_melee_buff if_spell=omen_of_clarity_melee) - SpellInfo(ravage damage=FeralRavageDamage mastery=feral) + SpellInfo(ravage damage=FeralRavageDamage specialization=feral) 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) + SpellAddBuff(rebirth dream_of_cenarius_tank_buff=0 specialization=guardian talent=dream_of_cenarius_talent) SpellAddBuff(rebirth predatory_swiftness_buff=0 if_spell=predatory_swiftness) Define(regrowth 8936) SpellAddBuff(regrowth harmony_buff=1 if_spell=harmony) @@ -257,8 +257,8 @@ Define(rip_debuff 1079) SpellInfo(rip_debuff duration=16 resetcounter=ripshreds tick=2) SpellInfo(rip_debuff addduration=4 itemset=T14_melee itemcount=4) SpellInfo(rip_debuff base=14.125 bonuscp=40 bonusapcp=0.0484) - SpellInfo(rip_debuff damage=FeralRipTickDamage mastery=feral) - SpellInfo(rip_debuff lastEstimatedDamage=FeralRipTickLastDamage mastery=feral) + SpellInfo(rip_debuff damage=FeralRipTickDamage specialization=feral) + SpellInfo(rip_debuff lastEstimatedDamage=FeralRipTickLastDamage specialization=feral) SpellDamageBuff(rip_debuff dream_of_cenarius_damage_buff=1.3) Define(rune_of_reorigination_buff 139120) SpellInfo(rune_of_reorigination_buff duration=10) @@ -289,7 +289,7 @@ Define(shred 5221) 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_melee_buff if_spell=omen_of_clarity_melee) - SpellInfo(shred damage=FeralShredDamage mastery=feral) + SpellInfo(shred damage=FeralShredDamage specialization=feral) 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) @@ -321,13 +321,13 @@ Define(sunfire 93402) Define(sunfire_debuff 93402) SpellInfo(sunfire_debuff duration=14 haste=spell nature=1 tick=2) SpellInfo(sunfire_debuff addduration=2 itemset=T14_caster itemcount=4) - SpellInfo(sunfire_debuff damage=BalanceSunfireTickDamage mastery=balance) - SpellInfo(sunfire_debuff lastEstimatedDamage=BalanceSunfireTickLastDamage mastery=balance) + SpellInfo(sunfire_debuff damage=BalanceSunfireTickDamage specialization=balance) + SpellInfo(sunfire_debuff lastEstimatedDamage=BalanceSunfireTickLastDamage specialization=balance) Define(survival_instincts 61336) SpellInfo(survival_instincts cd=180) SpellInfo(survival_instincts addcd=-60 glyph=glyph_of_survival_instincts) - SpellInfo(survival_instincts buff_cdr=cooldown_reduction_agility_buff mastery=feral) - SpellInfo(survival_instincts buff_cdr=cooldown_reduction_tank_buff mastery=guardian) + SpellInfo(survival_instincts buff_cdr=cooldown_reduction_agility_buff specialization=feral) + SpellInfo(survival_instincts buff_cdr=cooldown_reduction_tank_buff specialization=guardian) SpellAddBuff(survival_instincts survival_instincts=1) Define(swiftmend 18562) SpellInfo(swiftmend cd=15) @@ -338,7 +338,7 @@ 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_melee_buff if_spell=omen_of_clarity_melee) - SpellInfo(swipe_cat damage=FeralSwipeCatDamage mastery=feral) + SpellInfo(swipe_cat damage=FeralSwipeCatDamage specialization=feral) 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) @@ -351,14 +351,14 @@ 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_melee_buff if_spell=omen_of_clarity_melee) - SpellInfo(thrash_cat damage=FeralThrashCatDamage mastery=feral) + SpellInfo(thrash_cat damage=FeralThrashCatDamage specialization=feral) 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) Define(tigers_fury 5217) SpellInfo(tigers_fury cd=30 energy=-60) - SpellInfo(tigers_fury buff_cdr=cooldown_reduction_agility_buff mastery=feral) + SpellInfo(tigers_fury buff_cdr=cooldown_reduction_agility_buff specialization=feral) SpellAddBuff(tigers_fury tigers_fury_buff=1) Define(tigers_fury_buff 5217) SpellInfo(tigers_fury duration=6) diff --git a/scripts/ovale_hunter.lua b/scripts/ovale_hunter.lua index 7e81f95..8e3055d 100644 --- a/scripts/ovale_hunter.lua +++ b/scripts/ovale_hunter.lua @@ -160,36 +160,36 @@ AddFunction BeastMasteryPrecombatCdActions ### Beast Mastery icons -AddIcon mastery=beast_mastery size=small checkboxon=opt_icons_left +AddIcon specialization=beast_mastery size=small checkbox=opt_icons_left { Spell(misdirection) } -AddIcon mastery=beast_mastery size=small checkboxon=opt_icons_left +AddIcon specialization=beast_mastery size=small checkbox=opt_icons_left { Spell(disengage) } -AddIcon mastery=beast_mastery help=shortcd +AddIcon specialization=beast_mastery help=shortcd { if InCombat(no) BeastMasteryPrecombatShortCdActions() SummonPet() BeastMasteryDefaultShortCdActions() } -AddIcon mastery=beast_mastery help=main +AddIcon specialization=beast_mastery help=main { if InCombat(no) BeastMasteryPrecombatActions() BeastMasteryDefaultActions() } -AddIcon mastery=beast_mastery help=aoe checkboxon=opt_aoe +AddIcon specialization=beast_mastery help=aoe checkbox=opt_aoe { if InCombat(no) BeastMasteryPrecombatActions() BeastMasteryDefaultAoeActions() } -AddIcon mastery=beast_mastery help=cd +AddIcon specialization=beast_mastery help=cd { if InCombat(no) BeastMasteryPrecombatCdActions() Interrupt() @@ -197,12 +197,12 @@ AddIcon mastery=beast_mastery help=cd BeastMasteryDefaultCdActions() } -AddIcon mastery=beast_mastery size=small checkboxon=opt_icons_right +AddIcon specialization=beast_mastery size=small checkbox=opt_icons_right { Spell(explosive_trap) } -AddIcon mastery=beast_mastery size=small checkboxon=opt_icons_right +AddIcon specialization=beast_mastery size=small checkbox=opt_icons_right { UseItemActions() } @@ -363,36 +363,36 @@ AddFunction MarksmanshipPrecombatCdActions ### Marksmanship icons -AddIcon mastery=marksmanship size=small checkboxon=opt_icons_left +AddIcon specialization=marksmanship size=small checkbox=opt_icons_left { Spell(misdirection) } -AddIcon mastery=marksmanship size=small checkboxon=opt_icons_left +AddIcon specialization=marksmanship size=small checkbox=opt_icons_left { Spell(disengage) } -AddIcon mastery=marksmanship help=shortcd +AddIcon specialization=marksmanship help=shortcd { if InCombat(no) MarksmanshipPrecombatShortCdActions() SummonPet() MarksmanshipDefaultShortCdActions() } -AddIcon mastery=marksmanship help=main +AddIcon specialization=marksmanship help=main { if InCombat(no) MarksmanshipPrecombatActions() MarksmanshipDefaultActions() } -AddIcon mastery=marksmanship help=aoe checkboxon=opt_aoe +AddIcon specialization=marksmanship help=aoe checkbox=opt_aoe { if InCombat(no) MarksmanshipPrecombatActions() MarksmanshipDefaultAoeActions() } -AddIcon mastery=marksmanship help=cd +AddIcon specialization=marksmanship help=cd { if InCombat(no) MarksmanshipPrecombatCdActions() Interrupt() @@ -400,12 +400,12 @@ AddIcon mastery=marksmanship help=cd MarksmanshipDefaultCdActions() } -AddIcon mastery=marksmanship size=small checkboxon=opt_icons_right +AddIcon specialization=marksmanship size=small checkbox=opt_icons_right { Spell(explosive_trap) } -AddIcon mastery=marksmanship size=small checkboxon=opt_icons_right +AddIcon specialization=marksmanship size=small checkbox=opt_icons_right { UseItemActions() } @@ -558,36 +558,36 @@ AddFunction SurvivalPrecombatCdActions ### Survival icons -AddIcon mastery=survival size=small checkboxon=opt_icons_left +AddIcon specialization=survival size=small checkbox=opt_icons_left { Spell(misdirection) } -AddIcon mastery=survival size=small checkboxon=opt_icons_left +AddIcon specialization=survival size=small checkbox=opt_icons_left { Spell(disengage) } -AddIcon mastery=survival help=shortcd +AddIcon specialization=survival help=shortcd { if InCombat(no) SurvivalPrecombatShortCdActions() SummonPet() SurvivalDefaultShortCdActions() } -AddIcon mastery=survival help=main +AddIcon specialization=survival help=main { if InCombat(no) SurvivalPrecombatActions() SurvivalDefaultActions() } -AddIcon mastery=survival help=aoe checkboxon=opt_aoe +AddIcon specialization=survival help=aoe checkbox=opt_aoe { if InCombat(no) SurvivalPrecombatActions() SurvivalDefaultAoeActions() } -AddIcon mastery=survival help=cd +AddIcon specialization=survival help=cd { if InCombat(no) SurvivalPrecombatCdActions() Interrupt() @@ -595,13 +595,13 @@ AddIcon mastery=survival help=cd SurvivalDefaultCdActions() } -AddIcon mastery=survival size=small checkboxon=opt_icons_right +AddIcon specialization=survival size=small checkbox=opt_icons_right { Spell(explosive_trap) Spell(ice_trap) } -AddIcon mastery=survival size=small checkboxon=opt_icons_right +AddIcon specialization=survival size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_hunter_spells.lua b/scripts/ovale_hunter_spells.lua index 088a763..c8c5851 100644 --- a/scripts/ovale_hunter_spells.lua +++ b/scripts/ovale_hunter_spells.lua @@ -9,7 +9,7 @@ do Define(a_murder_of_crows 131894) SpellInfo(a_murder_of_crows cd=120 focus=60) - SpellInfo(a_murder_of_crows buff_focus_half=beast_within_buff mastery=beast_mastery) + SpellInfo(a_murder_of_crows buff_focus_half=beast_within_buff specialization=beast_mastery) SpellAddTargetDebuff(a_murder_of_crows a_murder_of_crows_debuff=1) Define(a_murder_of_crows_debuff 131894) SpellInfo(a_murder_of_crows duration=30) @@ -19,7 +19,7 @@ Define(aimed_shot 19434) SpellAddBuff(aimed_shot master_marksman_fire_buff=0) Define(arcane_shot 3044) SpellInfo(arcane_shot focus=30) - SpellInfo(arcane_shot buff_focus_half=beast_within_buff mastery=beast_mastery) + SpellInfo(arcane_shot buff_focus_half=beast_within_buff specialization=beast_mastery) SpellInfo(arcane_shot buff_focus=thrill_of_the_hunt_buff buff_focus_amount=-20 talent=thrill_of_the_hunt_talent) SpellAddBuff(arcane_shot thrill_of_the_hunt_buff=-1) SpellAddTargetDebuff(arcane_shot hunters_mark_debuff=1) @@ -30,7 +30,7 @@ Define(aspect_of_the_iron_hawk 109260) Define(aspect_of_the_iron_hawk_talent 8) Define(barrage 120360) SpellInfo(barrage cd=30 focus=30) - SpellInfo(barrage buff_focus_half=beast_within_buff mastery=beast_mastery) + SpellInfo(barrage buff_focus_half=beast_within_buff specialization=beast_mastery) Define(barrage_talent 18) Define(beast_within_buff 34471) SpellInfo(beast_within_buff duration=10) @@ -82,7 +82,7 @@ Define(focus_fire 82692) SpellAddBuff(focus_fire frenzy_buff=0) Define(glaive_toss 117050) SpellInfo(glaive_toss cd=15 focus=15) - SpellInfo(glaive_toss buff_focus_half=beast_within_buff mastery=beast_mastery) + SpellInfo(glaive_toss buff_focus_half=beast_within_buff specialization=beast_mastery) Define(glaive_toss_talent 16) Define(hunters_mark 1130) Define(hunters_mark_debuff 1130) @@ -113,8 +113,8 @@ Define(misdirection 34477) Define(multi_shot 2643) SpellInfo(multi_shot focus=40) SpellInfo(multi_shot buff_focus=thrill_of_the_hunt_buff buff_focus_amount=-20 talent=thrill_of_the_hunt_talent) - SpellInfo(multi_shot buff_focus_half=beast_within_buff mastery=beast_mastery) - SpellInfo(multi_shot buff_focus=bombardment_buff buff_focus_amount=-20 mastery=marksmanship) + SpellInfo(multi_shot buff_focus_half=beast_within_buff specialization=beast_mastery) + SpellInfo(multi_shot buff_focus=bombardment_buff buff_focus_amount=-20 specialization=marksmanship) SpellAddBuff(multi_shot thrill_of_the_hunt_buff=-1) SpellAddTargetDebuff(multi_shot serpent_sting_debuff=1 if_spell=serpent_spread) Define(pet_beast_cleave_buff 118455) @@ -123,7 +123,7 @@ Define(frenzy_buff 19615) SpellInfo(frenzy_buff duration=30) Define(powershot 109259) SpellInfo(powershot cd=60 focus=15) - SpellInfo(powershot buff_focus_half=beast_within_buff mastery=beast_mastery) + SpellInfo(powershot buff_focus_half=beast_within_buff specialization=beast_mastery) Define(powershot_talent 17) Define(pre_steady_focus_buff 53224) Define(rapid_fire 3045) @@ -134,11 +134,11 @@ Define(rapid_fire_buff 3045) SpellInfo(rapid_fire_buff duration=15) Define(revive_pet 982) SpellInfo(revive_pet focus=35) - SpellInfo(revive_pet buff_focus_half=beast_within_buff mastery=beast_mastery) + SpellInfo(revive_pet buff_focus_half=beast_within_buff specialization=beast_mastery) Define(serpent_spread 87935) Define(serpent_sting 1978) SpellInfo(serpent_sting focus=15) - SpellInfo(serpent_sting buff_focus_half=beast_within_buff mastery=beast_mastery) + SpellInfo(serpent_sting buff_focus_half=beast_within_buff specialization=beast_mastery) SpellAddTargetDebuff(serpent_sting serpent_sting_debuff=1) Define(serpent_sting_debuff 118253) SpellInfo(serpent_sting_debuff duration=15 tick=3) diff --git a/scripts/ovale_mage.lua b/scripts/ovale_mage.lua index d9bf6b3..ab1a58c 100644 --- a/scripts/ovale_mage.lua +++ b/scripts/ovale_mage.lua @@ -185,48 +185,48 @@ AddFunction ArcanePrecombatCdActions ### Arcane icons. -AddIcon mastery=arcane size=small checkboxon=opt_icons_left +AddIcon specialization=arcane size=small checkbox=opt_icons_left { if TalentPoints(cold_snap_talent) and HealthPercent() < 30 Spell(cold_snap) Spell(blink) } -AddIcon mastery=arcane help=moving size=small checkboxon=opt_icons_left +AddIcon specialization=arcane help=moving size=small checkbox=opt_icons_left { ArcaneSingleTargetMovingActions() } -AddIcon mastery=arcane help=shortcd +AddIcon specialization=arcane help=shortcd { if InCombat(no) ArcanePrecombatShortCdActions() ArcaneDefaultShortCdActions() } -AddIcon mastery=arcane help=main +AddIcon specialization=arcane help=main { if InCombat(no) ArcanePrecombatActions() ArcaneDefaultActions() ArcaneSingleTargetActions() } -AddIcon mastery=arcane help=aoe checkboxon=opt_aoe +AddIcon specialization=arcane help=aoe checkbox=opt_aoe { if InCombat(no) ArcanePrecombatActions() ArcaneDefaultActions() ArcaneAoeActions() } -AddIcon mastery=arcane help=cd +AddIcon specialization=arcane help=cd { ArcaneDefaultCdActions() } -AddIcon mastery=arcane size=small checkboxon=opt_icons_right +AddIcon specialization=arcane size=small checkbox=opt_icons_right { if BuffExpires(burst_haste any=1) and DebuffExpires(burst_haste_debuff) Spell(time_warp) } -AddIcon mastery=arcane size=small checkboxon=opt_icons_right +AddIcon specialization=arcane size=small checkbox=opt_icons_right { UseItemActions() } @@ -378,46 +378,46 @@ AddFunction FirePrecombatCdActions ### Fire icons. -AddIcon mastery=fire size=small checkboxon=opt_icons_left +AddIcon specialization=fire size=small checkbox=opt_icons_left { if TalentPoints(cold_snap_talent) and HealthPercent() < 30 Spell(cold_snap) Spell(blink) } -AddIcon mastery=fire size=small checkboxon=opt_icons_left +AddIcon specialization=fire size=small checkbox=opt_icons_left { Spell(combustion) } -AddIcon mastery=fire help=shortcd +AddIcon specialization=fire help=shortcd { if InCombat(no) FirePrecombatShortCdActions() FireDefaultShortCdActions() } -AddIcon mastery=fire help=main +AddIcon specialization=fire help=main { if InCombat(no) FirePrecombatActions() FireDefaultActions() } -AddIcon mastery=fire help=aoe checkboxon=opt_aoe +AddIcon specialization=fire help=aoe checkbox=opt_aoe { if InCombat(no) FirePrecombatActions() FireDefaultAoeActions() } -AddIcon mastery=fire help=cd +AddIcon specialization=fire help=cd { FireDefaultCdActions() } -AddIcon mastery=fire size=small checkboxon=opt_icons_right +AddIcon specialization=fire size=small checkbox=opt_icons_right { if BuffExpires(burst_haste any=1) and DebuffExpires(burst_haste_debuff) Spell(time_warp) } -AddIcon mastery=fire size=small checkboxon=opt_icons_right +AddIcon specialization=fire size=small checkbox=opt_icons_right { UseItemActions() } @@ -571,46 +571,46 @@ AddFunction FrostAoeActions ### Frost icons. -AddIcon mastery=frost size=small checkboxon=opt_icons_left +AddIcon specialization=frost size=small checkbox=opt_icons_left { if TalentPoints(cold_snap_talent) and HealthPercent() < 30 Spell(cold_snap) Spell(blink) } -AddIcon mastery=frost size=small checkboxon=opt_icons_left +AddIcon specialization=frost size=small checkbox=opt_icons_left { if pet.Present() Spell(water_elemental_freeze) } -AddIcon mastery=frost help=shortcd +AddIcon specialization=frost help=shortcd { if InCombat(no) FrostPrecombatShortCdActions() FrostDefaultShortCdActions() } -AddIcon mastery=frost help=main +AddIcon specialization=frost help=main { if InCombat(no) FrostPrecombatActions() FrostDefaultActions() } -AddIcon mastery=frost help=aoe checkboxon=opt_aoe +AddIcon specialization=frost help=aoe checkbox=opt_aoe { if InCombat(no) FrostPrecombatActions() FrostAoeActions() } -AddIcon mastery=frost help=cd +AddIcon specialization=frost help=cd { FrostDefaultCdActions() } -AddIcon mastery=frost size=small checkboxon=opt_icons_right +AddIcon specialization=frost size=small checkbox=opt_icons_right { if BuffExpires(burst_haste any=1) and DebuffExpires(burst_haste_debuff) Spell(time_warp) } -AddIcon mastery=frost size=small checkboxon=opt_icons_right +AddIcon specialization=frost size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_mage_spells.lua b/scripts/ovale_mage_spells.lua index 6369935..ca54ae7 100644 --- a/scripts/ovale_mage_spells.lua +++ b/scripts/ovale_mage_spells.lua @@ -17,7 +17,7 @@ Define(arcane_barrage 44425) SpellAddDebuff(arcane_barrage arcane_charge_debuff=0 if_spell=arcane_charge) Define(arcane_blast 30451) SpellAddDebuff(arcane_blast arcane_charge_debuff=1 if_spell=arcane_charge) - SpellAddBuff(arcane_blast profound_magic_buff=0 itemset=T16_caster itemcount=2 mastery=arcane) + SpellAddBuff(arcane_blast profound_magic_buff=0 itemset=T16_caster itemcount=2 specialization=arcane) Define(arcane_brilliance 1459) Define(arcane_charge 114664) Define(arcane_charge_debuff 36032) @@ -91,10 +91,10 @@ Define(frost_bomb_debuff 112948) SpellInfo(frost_bomb_debuff duration=4 haste=spell tick=4) Define(frost_bomb_talent 15) Define(frostbolt 116) - SpellAddBuff(frostbolt frozen_thoughts_buff=0 itemset=T16_caster itemcount=2 mastery=frost) + SpellAddBuff(frostbolt frozen_thoughts_buff=0 itemset=T16_caster itemcount=2 specialization=frost) Define(frostfire_bolt 44614) - SpellAddBuff(frostfire_bolt brain_freeze_buff=0 mastery=frost) - SpellAddBuff(frostfire_bolt frozen_thoughts_buff=0 itemset=T16_caster itemcount=2 mastery=frost) + SpellAddBuff(frostfire_bolt brain_freeze_buff=0 specialization=frost) + SpellAddBuff(frostfire_bolt frozen_thoughts_buff=0 itemset=T16_caster itemcount=2 specialization=frost) SpellDamageDebuff(frostfire_bolt pyromaniac_debuff=1.1) Define(frozen_orb 84714) SpellInfo(frozen_orb cd=60) @@ -117,7 +117,7 @@ Define(ice_floes_buff 108839) Define(ice_floes_talent 3) Define(ice_lance 30455) SpellAddBuff(ice_lance fingers_of_frost_buff=-1) - SpellAddBuff(ice_lance frozen_thoughts_buff=0 itemset=T16_caster itemcount=2 mastery=frost) + SpellAddBuff(ice_lance frozen_thoughts_buff=0 itemset=T16_caster itemcount=2 specialization=frost) Define(icy_veins 12472) SpellInfo(icy_veins cd=180 duration=20) SpellInfo(icy_veins addcd=-90 itemset=T14 itemcount=4) diff --git a/scripts/ovale_monk.lua b/scripts/ovale_monk.lua index b7ddce1..fc4eef5 100644 --- a/scripts/ovale_monk.lua +++ b/scripts/ovale_monk.lua @@ -151,25 +151,25 @@ AddFunction BrewmasterPrecombatActions ### Brewmaster icons. -AddIcon mastery=brewmaster size=small checkboxon=opt_icons_left +AddIcon specialization=brewmaster size=small checkbox=opt_icons_left { if TalentPoints(dampen_harm_talent) Spell(dampen_harm) if TalentPoints(diffuse_magic_talent) Spell(diffuse_magic) } -AddIcon mastery=brewmaster size=small checkboxon=opt_icons_left +AddIcon specialization=brewmaster size=small checkbox=opt_icons_left { Spell(fortifying_brew) Spell(symbiosis_survival_instincts) UseRacialSurvivalActions() } -AddIcon mastery=brewmaster help=cd +AddIcon specialization=brewmaster help=cd { BrewmasterShortCdActions() } -AddIcon mastery=brewmaster help=main +AddIcon specialization=brewmaster help=main { if InCombat(no) BrewmasterPrecombatActions() BrewmasterDefaultActions() @@ -177,7 +177,7 @@ AddIcon mastery=brewmaster help=main BrewmasterFillerActions() } -AddIcon mastery=brewmaster help=aoe checkboxon=opt_aoe +AddIcon specialization=brewmaster help=aoe checkbox=opt_aoe { if InCombat(no) BrewmasterPrecombatActions() BrewmasterDefaultActions() @@ -185,7 +185,7 @@ AddIcon mastery=brewmaster help=aoe checkboxon=opt_aoe BrewmasterFillerActions() } -AddIcon mastery=brewmaster help=cd +AddIcon specialization=brewmaster help=cd { if IsFeared() or IsRooted() or IsStunned() Spell(nimble_brew) if target.Health() < Health() and BuffPresent(death_note_buff) Spell(touch_of_death) @@ -194,12 +194,12 @@ AddIcon mastery=brewmaster help=cd BrewmasterCdActions() } -AddIcon mastery=brewmaster size=small checkboxon=opt_icons_right +AddIcon specialization=brewmaster size=small checkbox=opt_icons_right { if TotemExpires(statue) or BuffExpires(sanctuary_of_the_ox_buff) Spell(summon_black_ox_statue) } -AddIcon mastery=brewmaster size=small checkboxon=opt_icons_right +AddIcon specialization=brewmaster size=small checkbox=opt_icons_right { UseItemActions() } @@ -208,7 +208,7 @@ AddIcon mastery=brewmaster size=small checkboxon=opt_icons_right ### Mistweaver ### -AddCheckBox(opt_mistweaver_pool_chi "Pool Chi >= 2" mastery=mistweaver) +AddCheckBox(opt_mistweaver_pool_chi "Pool Chi >= 2" specialization=mistweaver) AddFunction MistweaverChiPool { if CheckBoxOn(opt_mistweaver_pool_chi) 2 @@ -286,18 +286,18 @@ AddFunction MistweaverPrecombatActions ### Mistweaver icons. -AddIcon mastery=mistweaver size=small checkboxon=opt_icons_right +AddIcon specialization=mistweaver size=small checkbox=opt_icons_right { if TotemExpires(statue) Spell(summon_jade_serpent_statue) } -AddIcon mastery=mistweaver size=small checkboxon=opt_icons_left +AddIcon specialization=mistweaver size=small checkbox=opt_icons_left { if BuffCountOnAny(renewing_mist_buff) > 5 Spell(thunder_focus_tea) Spell(revival) } -AddIcon mastery=mistweaver help=shortcd +AddIcon specialization=mistweaver help=shortcd { unless Stance(monk_stance_of_the_wise_serpent) Spell(stance_of_the_wise_serpent) @@ -311,19 +311,19 @@ AddIcon mastery=mistweaver help=shortcd if TalentPoints(zen_sphere_talent) and BuffCountOnAny(zen_sphere_buff) < 1 Spell(zen_sphere) } -AddIcon mastery=mistweaver help=main +AddIcon specialization=mistweaver help=main { if InCombat(no) MistweaverPrecombatActions() MistweaverSingleTargetActions() } -AddIcon mastery=mistweaver help=aoe checkboxon=opt_aoe +AddIcon specialization=mistweaver help=aoe checkbox=opt_aoe { if InCombat(no) MistweaverPrecombatActions() MistweaverAoeActions() } -AddIcon mastery=mistweaver help=cd +AddIcon specialization=mistweaver help=cd { if IsFeared() or IsRooted() or IsStunned() Spell(nimble_brew) if target.Health() < Health() and BuffPresent(death_note) Spell(touch_of_death) @@ -335,7 +335,7 @@ AddIcon mastery=mistweaver help=cd MistweaverDefaultCdActions() } -AddIcon mastery=mistweaver help=mana size=small checkboxon=opt_icons_left +AddIcon specialization=mistweaver help=mana size=small checkbox=opt_icons_left { if ManaPercent() < 100 { @@ -343,7 +343,7 @@ AddIcon mastery=mistweaver help=mana size=small checkboxon=opt_icons_left } } -AddIcon mastery=mistweaver size=small checkboxon=opt_icons_right +AddIcon specialization=mistweaver size=small checkbox=opt_icons_right { UseItemActions() } @@ -470,40 +470,40 @@ AddFunction WindwalkerPrecombatCdActions ### Windwalker icons. -AddIcon mastery=windwalker size=small checkboxon=opt_icons_left +AddIcon specialization=windwalker size=small checkbox=opt_icons_left { if TalentPoints(dampen_harm_talent) Spell(dampen_harm) if TalentPoints(diffuse_magic_talent) Spell(diffuse_magic) } -AddIcon mastery=windwalker size=small checkboxon=opt_icons_left +AddIcon specialization=windwalker size=small checkbox=opt_icons_left { if TalentPoints(chi_burst_talent) Spell(chi_burst) if TalentPoints(chi_wave_talent) Spell(chi_wave) if TalentPoints(zen_sphere_talent) and BuffExpires(zen_sphere_buff) Spell(zen_sphere) } -AddIcon mastery=windwalker help=shortcd +AddIcon specialization=windwalker help=shortcd { WindwalkerDefaultShortCdActions() WindwalkerSingleTargetShortCdActions() } -AddIcon mastery=windwalker help=main +AddIcon specialization=windwalker help=main { if InCombat(no) WindwalkerPrecombatActions() WindwalkerDefaultActions() WindwalkerSingleTargetActions() } -AddIcon mastery=windwalker help=aoe checkboxon=opt_aoe +AddIcon specialization=windwalker help=aoe checkbox=opt_aoe { if InCombat(no) WindwalkerPrecombatActions() WindwalkerDefaultActions() WindwalkerAoeActions() } -AddIcon mastery=windwalker help=cd +AddIcon specialization=windwalker help=cd { if InCombat(no) WindwalkerPrecombatCdActions() @@ -515,12 +515,12 @@ AddIcon mastery=windwalker help=cd WindwalkerDefaultCdActions() } -AddIcon mastery=windwalker size=small checkboxon=opt_icons_right +AddIcon specialization=windwalker size=small checkbox=opt_icons_right { Spell(zen_meditation) } -AddIcon mastery=windwalker size=small checkboxon=opt_icons_right +AddIcon specialization=windwalker size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_monk_spells.lua b/scripts/ovale_monk_spells.lua index fa4a600..6364ab9 100644 --- a/scripts/ovale_monk_spells.lua +++ b/scripts/ovale_monk_spells.lua @@ -71,8 +71,8 @@ Define(focus_of_xuen_buff 145024) SpellInfo(focus_of_xuen_buff duration=10) Define(fortifying_brew 115203) SpellInfo(fortifying_brew cd=180) - SpellInfo(fortifying_brew buff_cdr=cooldown_reduction_agility_buff mastery=windwalker) - SpellInfo(fortifying_brew buff_cdr=cooldown_reduction_tank_buff mastery=brewmaster) + SpellInfo(fortifying_brew buff_cdr=cooldown_reduction_agility_buff specialization=windwalker) + SpellInfo(fortifying_brew buff_cdr=cooldown_reduction_tank_buff specialization=brewmaster) #Define(fortifying_brew_glyphed 120954) Define(glyph_of_guard 123401) Define(glyph_of_mana_tea 123763) @@ -208,8 +208,8 @@ Define(vital_mists_buff 118674) SpellInfo(vital_mists_buff duration=30) Define(zen_meditation 115176) SpellInfo(zen_meditation cd=180) - SpellInfo(zen_meditation buff_cdr=cooldown_reduction_agility_buff mastery=windwalker) - SpellInfo(zen_meditation buff_cdr=cooldown_reduction_tank_buff mastery=brewmaster) + SpellInfo(zen_meditation buff_cdr=cooldown_reduction_agility_buff specialization=windwalker) + SpellInfo(zen_meditation buff_cdr=cooldown_reduction_tank_buff specialization=brewmaster) Define(zen_sphere 124081) SpellInfo(zen_sphere cd=10) SpellAddTargetBuff(zen_sphere zen_sphere_buff=1) diff --git a/scripts/ovale_paladin.lua b/scripts/ovale_paladin.lua index 4735b82..1cc8b30 100644 --- a/scripts/ovale_paladin.lua +++ b/scripts/ovale_paladin.lua @@ -65,14 +65,14 @@ AddFunction HolyPrecombatActions ### Holy Icons -AddIcon mastery=holy size=small checkboxon=opt_icons_left +AddIcon specialization=holy size=small checkbox=opt_icons_left { Spell(divine_protection) Spell(devotion_aura) UseRacialSurvivalActions() } -AddIcon mastery=holy help=mana size=small checkboxon=opt_icons_left +AddIcon specialization=holy help=mana size=small checkbox=opt_icons_left { if ManaPercent() <98 Spell(arcane_torrent_mana) if ManaPercent() <88 Spell(divine_plea) @@ -80,27 +80,27 @@ AddIcon mastery=holy help=mana size=small checkboxon=opt_icons_left if target.IsFriend(no) and not target.InRange(crusader_strike) Texture(ability_druid_dash help=NotInMeleeRange) } -AddIcon mastery=holy help=shortcd +AddIcon specialization=holy help=shortcd { if TalentPoints(holy_prism_talent) Spell(holy_prism) if TalentPoints(lights_hammer_talent) Spell(lights_hammer) if TalentPoints(execution_sentence_talent) Spell(execution_sentence) } -AddIcon mastery=holy help=main +AddIcon specialization=holy help=main { HolyPrecombatActions() HolySingleTargetActions() } -AddIcon mastery=holy help=aoe checkboxon=opt_aoe +AddIcon specialization=holy help=aoe checkbox=opt_aoe { HolyPrecombatActions() if TalentPoints(selfless_healer_talent) HolySelflessHealerAoeActions() if not TalentPoints(selfless_healer_talent) HolyAoeActions() } -AddIcon mastery=holy help=cd +AddIcon specialization=holy help=cd { Interrupt() if IsRooted() Spell(hand_of_freedom) @@ -110,12 +110,12 @@ AddIcon mastery=holy help=cd Spell(guardian_of_ancient_kings_heal) } -AddIcon mastery=holy size=small checkboxon=opt_icons_right +AddIcon specialization=holy size=small checkbox=opt_icons_right { if BuffPresent(righteous_fury) Texture(spell_holy_sealoffury help=RighteousFuryIsActive) } -AddIcon mastery=holy size=small checkboxon=opt_icons_right +AddIcon specialization=holy size=small checkbox=opt_icons_right { UseItemActions() } @@ -217,7 +217,7 @@ AddFunction ProtectionPrecombatActions ### Protection Icons -AddIcon mastery=protection size=small checkboxon=opt_icons_left +AddIcon specialization=protection size=small checkbox=opt_icons_left { Spell(divine_protection) Spell(ardent_defender) @@ -226,7 +226,7 @@ AddIcon mastery=protection size=small checkboxon=opt_icons_left UseRacialSurvivalActions() } -AddIcon mastery=protection size=small checkboxon=opt_icons_left +AddIcon specialization=protection size=small checkbox=opt_icons_left { if DebuffExpires(forbearance_debuff) { @@ -236,19 +236,19 @@ AddIcon mastery=protection size=small checkboxon=opt_icons_left } } -AddIcon mastery=protection help=shortcd +AddIcon specialization=protection help=shortcd { if BuffExpires(righteous_fury) Spell(righteous_fury) ProtectionDefaultShortCdActions() } -AddIcon mastery=protection help=main +AddIcon specialization=protection help=main { if InCombat(no) ProtectionPrecombatActions() ProtectionDefaultActions() } -AddIcon mastery=protection help=aoe checkboxon=opt_aoe +AddIcon specialization=protection help=aoe checkbox=opt_aoe { if InCombat(no) ProtectionPrecombatActions() @@ -262,19 +262,19 @@ AddIcon mastery=protection help=aoe checkboxon=opt_aoe Spell(holy_wrath) } -AddIcon mastery=protection help=cd +AddIcon specialization=protection help=cd { Interrupt() if IsRooted() Spell(hand_of_freedom) ProtectionDefaultCdActions() } -AddIcon mastery=protection size=small checkboxon=opt_icons_right +AddIcon specialization=protection size=small checkbox=opt_icons_right { if BuffPresent(righteous_fury) Texture(spell_holy_sealoffury help=RighteousFuryIsActive) } -AddIcon mastery=protection size=small checkboxon=opt_icons_right +AddIcon specialization=protection size=small checkbox=opt_icons_right { UseItemActions() } @@ -422,7 +422,7 @@ AddFunction RetributionPrecombatCdActions ### Retribution Icons -AddIcon mastery=retribution size=small checkboxon=opt_icons_left +AddIcon specialization=retribution size=small checkbox=opt_icons_left { if IsRooted() { @@ -431,44 +431,44 @@ AddIcon mastery=retribution size=small checkboxon=opt_icons_left } } -AddIcon mastery=retribution size=small checkboxon=opt_icons_left +AddIcon specialization=retribution size=small checkbox=opt_icons_left { Spell(lay_on_hands) Spell(hand_of_protection) if DebuffExpires(forbearance_debuff) Spell(divine_shield) } -AddIcon mastery=retribution help=shortcd +AddIcon specialization=retribution help=shortcd { RetributionDefaultShortCdActions() } -AddIcon mastery=retribution help=main +AddIcon specialization=retribution help=main { if InCombat(no) RetributionPrecombatActions() RetributionDefaultActions() } -AddIcon mastery=retribution help=aoe checkboxon=opt_aoe +AddIcon specialization=retribution help=aoe checkbox=opt_aoe { if InCombat(no) RetributionPrecombatActions() RetributionDefaultAoeActions() } -AddIcon mastery=retribution help=cd +AddIcon specialization=retribution help=cd { if InCombat(no) RetributionPrecombatCdActions() RetributionDefaultCdActions() } -AddIcon mastery=retribution size=small checkboxon=opt_icons_right +AddIcon specialization=retribution size=small checkbox=opt_icons_right { #seal_of_righteousness,if=active_enemies>=4 if Enemies() >= 4 and not Stance(paladin_seal_of_righteousness) Spell(seal_of_righteousness) if BuffPresent(righteous_fury) Texture(spell_holy_sealoffury help=RighteousFuryIsActive) } -AddIcon mastery=retribution size=small checkboxon=opt_icons_right +AddIcon specialization=retribution size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_paladin_spells.lua b/scripts/ovale_paladin_spells.lua index 7173a32..466a86b 100644 --- a/scripts/ovale_paladin_spells.lua +++ b/scripts/ovale_paladin_spells.lua @@ -20,8 +20,8 @@ Define(avengers_shield 31935) Define(avenging_wrath 31884) SpellInfo(avenging_wrath cd=180) SpellInfo(avenging_wrath addcd=-65 itemset=T14_melee itemcount=4) - SpellInfo(avenging_wrath buff_cdr=cooldown_reduction_strength_buff mastery=retribution) - SpellInfo(avenging_wrath buff_cdr=cooldown_reduction_tank_buff mastery=protection) + SpellInfo(avenging_wrath buff_cdr=cooldown_reduction_strength_buff specialization=retribution) + SpellInfo(avenging_wrath buff_cdr=cooldown_reduction_tank_buff specialization=protection) SpellAddBuff(avenging_wrath avenging_wrath_buff=1) Define(avenging_wrath_buff 31884) SpellInfo(avenging_wrath_buff duration=20) @@ -49,7 +49,7 @@ Define(consecration_glyphed 116467) Define(crusader_strike 35395) SpellInfo(crusader_strike holy=-1 cd=4.5) SpellInfo(crusader_strike cd_haste=melee if_spell=sanctity_of_battle) - SpellAddTargetDebuff(crusader_strike weakened_blows=1 mastery=protection) + SpellAddTargetDebuff(crusader_strike weakened_blows=1 specialization=protection) Define(daybreak 88821) Define(daybreak_buff 88819) SpellInfo(daybreak_buff duration=10 maxstacks=2) @@ -67,16 +67,16 @@ Define(divine_plea 54428) Define(divine_protection 498) SpellInfo(divine_protection cd=60) SpellInfo(divine_protection cd=30 talent=unbreakable_spirit_talent) - SpellInfo(divine_protection buff_cdr=cooldown_reduction_strength_buff mastery=retribution) - SpellInfo(divine_protection buff_cdr=cooldown_reduction_tank_buff mastery=protection) + SpellInfo(divine_protection buff_cdr=cooldown_reduction_strength_buff specialization=retribution) + SpellInfo(divine_protection buff_cdr=cooldown_reduction_tank_buff specialization=protection) Define(divine_purpose_buff 90174) SpellInfo(divine_purpose_buff duration=8) Define(divine_purpose_talent 15) Define(divine_shield 642) SpellInfo(divine_shield cd=300) SpellInfo(divine_shield cd=150 talent=unbreakable_spirit_talent) - SpellInfo(divine_shield buff_cdr=cooldown_reduction_strength_buff mastery=retribution) - SpellInfo(divine_shield buff_cdr=cooldown_reduction_tank_buff mastery=protection) + SpellInfo(divine_shield buff_cdr=cooldown_reduction_strength_buff specialization=retribution) + SpellInfo(divine_shield buff_cdr=cooldown_reduction_tank_buff specialization=protection) SpellAddDebuff(divine_shield forbearance_debuff=1) Define(divine_storm 53385) SpellInfo(divine_storm holy=3) @@ -100,10 +100,10 @@ Define(execution_sentence 114157) Define(execution_sentence_talent 18) Define(exorcism 879) SpellInfo(exorcism holy=-1 cd=15) - SpellInfo(exorcism cd_haste=melee if_spell=sanctity_of_battle mastery=retribution) + SpellInfo(exorcism cd_haste=melee if_spell=sanctity_of_battle specialization=retribution) Define(exorcism_glyphed 122032) SpellInfo(exorcism_glyphed holy=-1 cd=15) - SpellInfo(exorcism_glyphed cd_haste=melee if_spell=sanctity_of_battle mastery=retribution) + SpellInfo(exorcism_glyphed cd_haste=melee if_spell=sanctity_of_battle specialization=retribution) Define(fist_of_justice 105593) SpellInfo(fist_of_justice cd=30) Define(fist_of_justice_talent 4) @@ -133,14 +133,14 @@ Define(hammer_of_the_righteous 53595) Define(hammer_of_wrath 24275) SpellInfo(hammer_of_wrath cd=6) SpellInfo(hammer_of_wrath cd_haste=melee if_spell=sanctity_of_battle) - SpellInfo(hammer_of_wrath holy=-1 mastery=retribution) + SpellInfo(hammer_of_wrath holy=-1 specialization=retribution) Define(hand_of_freedom 1044) SpellInfo(hand_of_freedom cd=25) - SpellInfo(hand_of_freedom buff_cdr=cooldown_reduction_strength_buff mastery=retribution) + SpellInfo(hand_of_freedom buff_cdr=cooldown_reduction_strength_buff specialization=retribution) Define(hand_of_protection 1022) SpellInfo(hand_of_protection cd=300) - SpellInfo(hand_of_protection buff_cdr=cooldown_reduction_strength_buff mastery=retribution) - SpellInfo(hand_of_protection buff_cdr=cooldown_reduction_tank_buff mastery=protection) + SpellInfo(hand_of_protection buff_cdr=cooldown_reduction_strength_buff specialization=retribution) + SpellInfo(hand_of_protection buff_cdr=cooldown_reduction_tank_buff specialization=protection) SpellAddTargetDebuff(hand_of_protection forbearance_debuff=1) Define(holy_avenger 105809) SpellInfo(holy_avenger cd=120) @@ -153,7 +153,7 @@ Define(holy_prism_talent 16) Define(holy_radiance 82327) SpellInfo(holy_radiance holy=-1) SpellAddBuff(holy_radiance daybreak_buff=1 if_spell=daybreak) - SpellAddBuff(holy_radiance selfless_healer_buff=0 mastery=holy talent=selfless_healer_talent) + SpellAddBuff(holy_radiance selfless_healer_buff=0 specialization=holy talent=selfless_healer_talent) Define(holy_shock 20473) SpellInfo(holy_shock cd=6 holy=-1) SpellInfo(holy_shock cd=5 itemset=T14_heal itemcount=4) @@ -172,11 +172,11 @@ Define(inquisition_buff 84963) Define(judgment 20271) SpellInfo(judgment cd=6) SpellInfo(judgment cd_haste=melee if_spell=sanctity_of_battle) - SpellInfo(judgment holy=-1 mastery=holy talent=selfless_healer_talent) + SpellInfo(judgment holy=-1 specialization=holy talent=selfless_healer_talent) SpellInfo(judgment holy=-1 if_spell=judgments_of_the_bold) SpellInfo(judgment holy=-1 if_spell=judgments_of_the_wise) SpellInfo(judgment holy=-1 buff_holy=avenging_wrath_buff if_spell=judgments_of_the_wise talent=sanctified_wrath_talent) - SpellAddBuff(judgment selfless_healer_buff=1 mastery=holy talent=selfless_healer_talent) + SpellAddBuff(judgment selfless_healer_buff=1 specialization=holy talent=selfless_healer_talent) Define(judgments_of_the_bold 111529) Define(judgments_of_the_wise 105424) Define(lay_on_hands 633) diff --git a/scripts/ovale_priest.lua b/scripts/ovale_priest.lua index b13cbbe..02f552c 100644 --- a/scripts/ovale_priest.lua +++ b/scripts/ovale_priest.lua @@ -169,36 +169,36 @@ AddFunction ShadowPrecombatCdActions ### Shadow icons -AddIcon mastery=shadow size=small checkboxon=opt_icons_left +AddIcon specialization=shadow size=small checkbox=opt_icons_left { if TalentPoints(desperate_prayer_talent) Spell(desperate_prayer) Spell(dispersion) } -AddIcon mastery=shadow size=small checkboxon=opt_icons_left +AddIcon specialization=shadow size=small checkbox=opt_icons_left { Spell(vampiric_embrace) Spell(hymn_of_hope) } -AddIcon mastery=shadow help=shortcd +AddIcon specialization=shadow help=shortcd { ShadowDefaultShortCdActions() } -AddIcon mastery=shadow help=main +AddIcon specialization=shadow help=main { if InCombat(no) ShadowPrecombatActions() ShadowDefaultActions() } -AddIcon mastery=shadow help=moving +AddIcon specialization=shadow help=moving { if InCombat(no) ShadowPrecombatActions() ShadowDefaultMovingActions() } -AddIcon mastery=shadow help=cd +AddIcon specialization=shadow help=cd { if InCombat(no) ShadowPrecombatCdActions() Interrupt() @@ -206,12 +206,12 @@ AddIcon mastery=shadow help=cd ShadowDefaultCdActions() } -AddIcon mastery=shadow size=small checkboxon=opt_icons_right +AddIcon specialization=shadow size=small checkbox=opt_icons_right { Spell(mass_dispel) } -AddIcon mastery=shadow size=small checkboxon=opt_icons_right +AddIcon specialization=shadow size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_priest_spells.lua b/scripts/ovale_priest_spells.lua index 5327ff3..2e8fbc3 100644 --- a/scripts/ovale_priest_spells.lua +++ b/scripts/ovale_priest_spells.lua @@ -47,7 +47,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=-1 mastery=shadow talent=from_darkness_comes_light_talent) + SpellAddBuff(mind_spike surge_of_darkness_buff=-1 specialization=shadow talent=from_darkness_comes_light_talent) Define(mindbender 123040) SpellInfo(mindbender cd=60) Define(mindbender_talent 8) diff --git a/scripts/ovale_rogue.lua b/scripts/ovale_rogue.lua index ff9c759..8b907b7 100644 --- a/scripts/ovale_rogue.lua +++ b/scripts/ovale_rogue.lua @@ -139,47 +139,47 @@ AddFunction AssassinationPrecombatCdActions } ### Assassination icons. -AddIcon mastery=assassination size=small checkboxon=opt_icons_left +AddIcon specialization=assassination size=small checkbox=opt_icons_left { Spell(tricks_of_the_trade) } -AddIcon mastery=assassination size=small checkboxon=opt_icons_left +AddIcon specialization=assassination size=small checkbox=opt_icons_left { Spell(redirect) } -AddIcon mastery=assassination help=shortcd +AddIcon specialization=assassination help=shortcd { if InCombat(no) AssassinationPrecombatShortCdActions() AssassinationDefaultShortCdActions() } -AddIcon mastery=assassination help=main +AddIcon specialization=assassination help=main { if InCombat(no) AssassinationPrecombatActions() AssassinationDefaultActions() } -AddIcon mastery=assassination help=aoe checkboxon=opt_aoe +AddIcon specialization=assassination help=aoe checkbox=opt_aoe { if InCombat(no) AssassinationPrecombatActions() AssassinationDefaultAoeActions() } -AddIcon mastery=assassination help=cd +AddIcon specialization=assassination help=cd { if InCombat(no) AssassinationPrecombatCdActions() AssassinationDefaultCdActions() } -AddIcon mastery=assassination size=small checkboxon=opt_icons_right +AddIcon specialization=assassination size=small checkbox=opt_icons_right { Spell(feint) UseRacialSurvivalActions() } -AddIcon mastery=assassination size=small checkboxon=opt_icons_right +AddIcon specialization=assassination size=small checkbox=opt_icons_right { Spell(cloak_of_shadows) } @@ -341,48 +341,48 @@ AddFunction CombatPrecombatCdActions } ### Combat icons. -AddIcon mastery=combat size=small checkboxon=opt_icons_left +AddIcon specialization=combat size=small checkbox=opt_icons_left { Spell(tricks_of_the_trade) } -AddIcon mastery=combat size=small checkboxon=opt_icons_left +AddIcon specialization=combat size=small checkbox=opt_icons_left { if BuffPresent(blade_flurry_buff) Texture(ability_warrior_punishingblow help=BladeFlurryIsActive) Spell(redirect) } -AddIcon mastery=combat help=shortcd +AddIcon specialization=combat help=shortcd { if InCombat(no) CombatPrecombatShortCdActions() CombatDefaultShortCdActions() } -AddIcon mastery=combat help=main +AddIcon specialization=combat help=main { if InCombat(no) CombatPrecombatActions() CombatDefaultActions() } -AddIcon mastery=combat help=aoe checkboxon=opt_aoe +AddIcon specialization=combat help=aoe checkbox=opt_aoe { if InCombat(no) CombatPrecombatActions() CombatDefaultAoeActions() } -AddIcon mastery=combat help=cd +AddIcon specialization=combat help=cd { if InCombat(no) CombatPrecombatCdActions() CombatDefaultCdActions() } -AddIcon mastery=combat size=small checkboxon=opt_icons_right +AddIcon specialization=combat size=small checkbox=opt_icons_right { Spell(feint) UseRacialSurvivalActions() } -AddIcon mastery=combat size=small checkboxon=opt_icons_right +AddIcon specialization=combat size=small checkbox=opt_icons_right { Spell(cloak_of_shadows) } @@ -553,47 +553,47 @@ AddFunction SubtletyDefaultCdActions } ### Subtlety icons. -AddIcon mastery=subtlety size=small checkboxon=opt_icons_left +AddIcon specialization=subtlety size=small checkbox=opt_icons_left { Spell(tricks_of_the_trade) } -AddIcon mastery=subtlety size=small checkboxon=opt_icons_left +AddIcon specialization=subtlety size=small checkbox=opt_icons_left { Spell(redirect) } -AddIcon mastery=subtlety help=shortcd +AddIcon specialization=subtlety help=shortcd { if InCombat(no) SubtletyPrecombatShortCdActions() SubtletyDefaultShortCdActions() } -AddIcon mastery=subtlety help=main +AddIcon specialization=subtlety help=main { if InCombat(no) SubtletyPrecombatActions() SubtletyDefaultActions() } -AddIcon mastery=subtlety help=aoe checkboxon=opt_aoe +AddIcon specialization=subtlety help=aoe checkbox=opt_aoe { if InCombat(no) SubtletyPrecombatActions() SubtletyDefaultAoeActions() } -AddIcon mastery=subtlety help=cd +AddIcon specialization=subtlety help=cd { if InCombat(no) SubtletyPrecombatCdActions() SubtletyDefaultCdActions() } -AddIcon mastery=subtlety size=small checkboxon=opt_icons_right +AddIcon specialization=subtlety size=small checkbox=opt_icons_right { Spell(feint) UseRacialSurvivalActions() } -AddIcon mastery=subtlety size=small checkboxon=opt_icons_right +AddIcon specialization=subtlety size=small checkbox=opt_icons_right { Spell(cloak_of_shadows) } diff --git a/scripts/ovale_rogue_spells.lua b/scripts/ovale_rogue_spells.lua index d8c284f..3e880ee 100644 --- a/scripts/ovale_rogue_spells.lua +++ b/scripts/ovale_rogue_spells.lua @@ -225,8 +225,8 @@ Define(tricks_of_the_trade 57934) SpellInfo(tricks_of_the_trade buff_energy_less75=stealth_buff if_spell=shadow_focus) Define(vanish 1856) SpellInfo(vanish cd=120) - SpellInfo(vanish buff_cdr=cooldown_reduction_agility_buff mastery=assassination) - SpellInfo(vanish buff_cdr=cooldown_reduction_agility_buff mastery=subtlety) + SpellInfo(vanish buff_cdr=cooldown_reduction_agility_buff specialization=assassination) + SpellInfo(vanish buff_cdr=cooldown_reduction_agility_buff specialization=subtlety) SpellAddBuff(vanish vanish_buff=1) Define(vanish_buff 11327) SpellInfo(vanish_buff duration=3) diff --git a/scripts/ovale_shaman.lua b/scripts/ovale_shaman.lua index 298a87d..caea3eb 100644 --- a/scripts/ovale_shaman.lua +++ b/scripts/ovale_shaman.lua @@ -139,7 +139,7 @@ AddFunction ElementalPrecombatCdActions ### Elemental icons. -AddIcon mastery=elemental size=small checkboxon=opt_icons_left +AddIcon specialization=elemental size=small checkbox=opt_icons_left { if TalentPoints(stone_bulwark_totem_talent) Spell(stone_bulwark_totem) if TalentPoints(astral_shift_talent) Spell(astral_shift) @@ -147,7 +147,7 @@ AddIcon mastery=elemental size=small checkboxon=opt_icons_left Spell(earthbind_totem) } -AddIcon mastery=elemental size=small checkboxon=opt_icons_left +AddIcon specialization=elemental size=small checkbox=opt_icons_left { if IsFeared() Spell(tremor_totem) #if IsStunned() Spell(windwalk_totem) @@ -160,7 +160,7 @@ AddIcon mastery=elemental size=small checkboxon=opt_icons_left if TalentPoints(ancestral_guidance_talent) Spell(ancestral_guidance) } -AddIcon mastery=elemental help=main +AddIcon specialization=elemental help=main { ElementalPrecombatActions() ElementalDefaultActions() @@ -169,27 +169,27 @@ AddIcon mastery=elemental help=main Spell(lightning_bolt) } -AddIcon mastery=elemental help=main +AddIcon specialization=elemental help=main { ElementalPrecombatActions() ElementalDefaultActions() ElementalSingleActions() } -AddIcon mastery=elemental help=aoe checkboxon=aoe +AddIcon specialization=elemental help=aoe checkbox=aoe { ElementalPrecombatActions() ElementalDefaultActions() ElementalAoeActions() } -AddIcon mastery=elemental help=cd +AddIcon specialization=elemental help=cd { ElementalDefaultCdActions() ElementalSingleCdActions() } -AddIcon mastery=elemental size=small checkboxon=opt_icons_right +AddIcon specialization=elemental size=small checkbox=opt_icons_right { #bloodlust,if=target.health.pct<25|time>5 if target.HealthPercent() < 25 or TimeInCombat() > 5 Bloodlust() @@ -197,7 +197,7 @@ AddIcon mastery=elemental size=small checkboxon=opt_icons_right if not TotemPresent(air totem=stormlash_totem) and not BuffPresent(stormlash_buff) and { BuffPresent(burst_haste any=1) or TimeInCombat() >= 60 } Spell(stormlash_totem) } -AddIcon mastery=elemental size=small checkboxon=opt_icons_right +AddIcon specialization=elemental size=small checkbox=opt_icons_right { UseItemActions() } @@ -380,7 +380,7 @@ AddFunction EnhancementPrecombatCdActions ### Enhancement icons. -AddIcon mastery=enhancement size=small checkboxon=opt_icons_left +AddIcon specialization=enhancement size=small checkbox=opt_icons_left { if TalentPoints(stone_bulwark_totem_talent) Spell(stone_bulwark_totem) if TalentPoints(astral_shift_talent) Spell(astral_shift) @@ -388,7 +388,7 @@ AddIcon mastery=enhancement size=small checkboxon=opt_icons_left Spell(earthbind_totem) } -AddIcon mastery=enhancement size=small checkboxon=opt_icons_left +AddIcon specialization=enhancement size=small checkbox=opt_icons_left { if IsFeared() Spell(tremor_totem) #if IsStunned() Spell(windwalk_totem) @@ -401,34 +401,34 @@ AddIcon mastery=enhancement size=small checkboxon=opt_icons_left if TalentPoints(ancestral_guidance_talent) Spell(ancestral_guidance) } -AddIcon mastery=enhancement help=main +AddIcon specialization=enhancement help=main { EnhancementPrecombatActions() EnhancementDefaultActions() EnhancementSingleActions() } -AddIcon mastery=enhancement help=main +AddIcon specialization=enhancement help=main { EnhancementPrecombatActions() EnhancementDefaultActions() EnhancementSingleActions() } -AddIcon mastery=enhancement help=aoe checkboxon=aoe +AddIcon specialization=enhancement help=aoe checkbox=aoe { EnhancementPrecombatActions() EnhancementDefaultActions() EnhancementAoeActions() } -AddIcon mastery=enhancement help=cd +AddIcon specialization=enhancement help=cd { EnhancementDefaultCdActions() EnhancementSingleCdActions() } -AddIcon mastery=enhancement size=small checkboxon=opt_icons_right +AddIcon specialization=enhancement size=small checkbox=opt_icons_right { #bloodlust,if=target.health.pct<25|time>5 if target.HealthPercent() < 25 or TimeInCombat() > 5 Spell(bloodlust) @@ -436,7 +436,7 @@ AddIcon mastery=enhancement size=small checkboxon=opt_icons_right if not TotemPresent(air totem=stormlash_totem) and not BuffPresent(stormlash_buff) and { BuffPresent(burst_haste any=1) or TimeInCombat() >= 60 } Spell(stormlash_totem) } -AddIcon mastery=enhancement size=small checkboxon=opt_icons_right +AddIcon specialization=enhancement size=small checkbox=opt_icons_right { UseItemActions() } @@ -490,7 +490,7 @@ AddFunction RestorationShortCdActions ### Restoration icons. -AddIcon mastery=restoration size=small checkboxon=opt_icons_left +AddIcon specialization=restoration size=small checkbox=opt_icons_left { if TalentPoints(stone_bulwark_totem_talent) Spell(stone_bulwark_totem) if TalentPoints(astral_shift_talent) Spell(astral_shift) @@ -498,7 +498,7 @@ AddIcon mastery=restoration size=small checkboxon=opt_icons_left Spell(earthbind_totem) } -AddIcon mastery=restoration size=small checkboxon=opt_icons_left +AddIcon specialization=restoration size=small checkbox=opt_icons_left { if IsFeared() Spell(tremor_totem) #if IsStunned() Spell(windwalk_totem) @@ -512,22 +512,22 @@ AddIcon mastery=restoration size=small checkboxon=opt_icons_left Spell(spirit_link_totem) } -AddIcon mastery=restoration help=shortcd +AddIcon specialization=restoration help=shortcd { RestorationShortCdActions() } -AddIcon mastery=restoration help=main +AddIcon specialization=restoration help=main { RestorationMainActions() } -AddIcon mastery=restoration help=aoe checkboxon=aoe +AddIcon specialization=restoration help=aoe checkbox=aoe { RestorationAoeActions() } -AddIcon mastery=restoration help=cd +AddIcon specialization=restoration help=cd { Interrupt() if Speed(more 0) Spell(spiritwalkers_grace) @@ -536,13 +536,13 @@ AddIcon mastery=restoration help=cd Spell(earth_elemental_totem) } -AddIcon mastery=restoration size=small checkboxon=opt_icons_right +AddIcon specialization=restoration size=small checkbox=opt_icons_right { if BuffExpires(stormlash_totem_buff any=1) and {BuffPresent(burst_haste any=1) or TimeInCombat() >60} Spell(stormlash_totem) if BuffExpires(burst_haste any=1) Bloodlust() } -AddIcon mastery=restoration size=small checkboxon=opt_icons_right +AddIcon specialization=restoration size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_shaman_spells.lua b/scripts/ovale_shaman_spells.lua index 6db15ff..82ed0eb 100644 --- a/scripts/ovale_shaman_spells.lua +++ b/scripts/ovale_shaman_spells.lua @@ -44,18 +44,18 @@ Define(chain_heal 1064) SpellAddBuff(chain_heal ancestral_swiftness_buff=0 if_talent=ancestral_swiftness_talent) Define(chain_lightning 421) SpellInfo(chain_lightning cd=3) - SpellInfo(chain_lightning cd=0 mastery=elemental) + SpellInfo(chain_lightning cd=0 specialization=elemental) SpellAddBuff(chain_lightning ancestral_swiftness_buff=0 if_talent=ancestral_swiftness_talent) Define(earth_elemental_totem 2062) SpellInfo(earth_elemental_totem cd=300) - SpellInfo(earth_elemental_totem buff_cdr=cooldown_reduction_agility_buff mastery=enhancement) + SpellInfo(earth_elemental_totem buff_cdr=cooldown_reduction_agility_buff specialization=enhancement) Define(earth_shield 974) SpellAddTargetBuff(earth_shield earth_shield_buff=1) Define(earth_shield_buff 974) SpellInfo(earth_shield_buff duration=600) Define(earth_shock 8042) SpellInfo(earth_shock cd=6 sharedcd=shock) - SpellInfo(earth_shock addcd=-1 mastery=elemental) + SpellInfo(earth_shock addcd=-1 specialization=elemental) Define(earthbind_totem 2484) SpellInfo(earthbind_totem cd=30) Define(earthgrab_totem 51485) @@ -79,12 +79,12 @@ Define(feral_spirit 51533) Define(fire_elemental_totem 2894) SpellInfo(fire_elemental_totem cd=300) SpellInfo(fire_elemental_totem cd=150 glyph=glyph_of_fire_elemental_totem) - SpellInfo(fire_elemental_totem buff_cdr=cooldown_reduction_agility_buff mastery=enhancement) + SpellInfo(fire_elemental_totem buff_cdr=cooldown_reduction_agility_buff specialization=enhancement) Define(fire_nova 1535) SpellInfo(fire_nova cd=4) Define(flame_shock 8050) SpellInfo(flame_shock cd=6 sharedcd=shock) - SpellInfo(flame_shock addcd=-1 mastery=elemental) + SpellInfo(flame_shock addcd=-1 specialization=elemental) SpellAddBuff(flame_shock unleash_flame_buff=0 if_spell=unleash_elements) SpellAddTargetDebuff(flame_shock flame_shock_debuff=1) Define(flame_shock_debuff 8050) @@ -145,7 +145,7 @@ Define(riptide_buff 61295) Define(searing_totem 3599) Define(shamanistic_rage 30823) SpellInfo(shamanistic_rage cd=60) - SpellInfo(shamanistic_rage buff_cdr=cooldown_reduction_agility_buff mastery=enhancement) + SpellInfo(shamanistic_rage buff_cdr=cooldown_reduction_agility_buff specialization=enhancement) Define(spirit_link_totem 98008) SpellInfo(spirit_link_totem cd=180) Define(spirit_walk 58875) @@ -153,7 +153,7 @@ Define(spirit_walk 58875) SpellInfo(spirit_walk addcd=-15 glyph=glyph_of_spirit_walk) Define(spiritwalkers_grace 79206) SpellInfo(spiritwalkers_grace cd=120) - SpellInfo(spiritwalkers_grace buff_cdr=cooldown_reduction_agility_buff mastery=enhancement) + SpellInfo(spiritwalkers_grace buff_cdr=cooldown_reduction_agility_buff specialization=enhancement) Define(stone_bulwark_totem 108270) SpellInfo(stone_bulwark_totem cd=10) Define(stone_bulwark_totem_talent 2) diff --git a/scripts/ovale_warlock.lua b/scripts/ovale_warlock.lua index 34408f6..2951f02 100644 --- a/scripts/ovale_warlock.lua +++ b/scripts/ovale_warlock.lua @@ -143,39 +143,39 @@ AddFunction AfflictionPrecombatCdActions ### Affliction icons. -AddIcon mastery=affliction size=small checkboxon=opt_icons_left +AddIcon specialization=affliction size=small checkbox=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 +AddIcon specialization=affliction size=small checkbox=opt_icons_left { if TalentPoints(sacrificial_pact_talent) Spell(sacrificial_pact) if TalentPoints(dark_bargain_talent) Spell(dark_bargain) } -AddIcon mastery=affliction help=shortcd +AddIcon specialization=affliction help=shortcd { if InCombat(no) AfflictionPrecombatShortCdActions() AfflictionDefaultShortCdActions() } -AddIcon mastery=affliction help=main +AddIcon specialization=affliction help=main { if InCombat(no) AfflictionPrecombatActions() AfflictionDefaultActions() AfflictionSingleTargetActions() } -AddIcon mastery=affliction help=aoe checkboxon=opt_aoe +AddIcon specialization=affliction help=aoe checkbox=opt_aoe { if InCombat(no) AfflictionPrecombatActions() AfflictionDefaultActions() AfflictionAoeActions() } -AddIcon mastery=affliction help=cd +AddIcon specialization=affliction help=cd { if InCombat(no) AfflictionPrecombatCdActions() AfflictionDefaultCdActions() @@ -183,31 +183,31 @@ AddIcon mastery=affliction help=cd if Enemies() <= 6 AfflictionSingleTargetCdActions() } -AddIcon mastery=affliction size=small checkboxon=opt_icons_right +AddIcon specialization=affliction size=small checkbox=opt_icons_right { Spell(demonic_circle_teleport) } -AddIcon mastery=affliction size=small checkboxon=opt_icons_right +AddIcon specialization=affliction size=small checkbox=opt_icons_right { UseItemActions() } ### Demonology icons. -AddIcon mastery=demonology size=small checkboxon=opt_icons_left +AddIcon specialization=demonology size=small checkbox=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 +AddIcon specialization=demonology size=small checkbox=opt_icons_left { if TalentPoints(sacrificial_pact_talent) Spell(sacrificial_pact) if TalentPoints(dark_bargain_talent) Spell(dark_bargain) } -AddIcon mastery=demonology help=offgcd +AddIcon specialization=demonology help=offgcd { if not InCombat() { @@ -219,7 +219,7 @@ AddIcon mastery=demonology help=offgcd if {BuffPresent(dark_soul_knowledge) and DemonicFury() /32 >BuffRemains(dark_soul_knowledge) } or target.DebuffRemains(corruption_debuff) <5 or not target.DebuffPresent(doom) or DemonicFury() >=950 or DemonicFury() /32 >target.DeadIn() unless Stance(1) Spell(metamorphosis) } -AddIcon mastery=demonology help=main +AddIcon specialization=demonology help=main { if not InCombat() { @@ -243,7 +243,7 @@ AddIcon mastery=demonology help=main Spell(life_tap) } -AddIcon mastery=demonology help=aoe checkboxon=opt_aoe +AddIcon specialization=demonology help=aoe checkbox=opt_aoe { if BuffPresent(metamorphosis) and target.DebuffRemains(corruption_debuff) >10 and DemonicFury() <=650 and BuffExpires(dark_soul_knowledge) and not target.DebuffPresent(immolation_aura) if Stance(1) cancel.Texture(Spell_shadow_demonform) if BuffPresent(metamorphosis) Spell(immolation_aura) @@ -257,7 +257,7 @@ AddIcon mastery=demonology help=aoe checkboxon=opt_aoe Spell(life_tap) } -AddIcon mastery=demonology help=cd +AddIcon specialization=demonology help=cd { UseItemActions() Spell(blood_fury) @@ -265,12 +265,12 @@ AddIcon mastery=demonology help=cd Spell(summon_doomguard) } -AddIcon mastery=demonology size=small checkboxon=opt_icons_right +AddIcon specialization=demonology size=small checkbox=opt_icons_right { Spell(demonic_circle_teleport) } -AddIcon mastery=demonology size=small checkboxon=opt_icons_right +AddIcon specialization=demonology size=small checkbox=opt_icons_right { UseItemActions() } @@ -391,33 +391,33 @@ AddFunction DestructionPrecombatCdActions ### Destruction icons. -AddIcon mastery=destruction size=small checkboxon=opt_icons_left +AddIcon specialization=destruction size=small checkbox=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 +AddIcon specialization=destruction size=small checkbox=opt_icons_left { if TalentPoints(sacrificial_pact_talent) Spell(sacrificial_pact) if TalentPoints(dark_bargain_talent) Spell(dark_bargain) } -AddIcon mastery=destruction help=shortcd +AddIcon specialization=destruction help=shortcd { if InCombat(no) DestructionPrecombatShortCdActions() DestructionDefaultShortCdActions() DestructionSingleTargetShortCdActions() } -AddIcon mastery=destruction help=main +AddIcon specialization=destruction help=main { if InCombat(no) DestructionPrecombatActions() DestructionDefaultActions() DestructionSingleTargetActions() } -AddIcon mastery=destruction help=aoe checkboxon=opt_aoe +AddIcon specialization=destruction help=aoe checkbox=opt_aoe { if InCombat(no) DestructionPrecombatActions() DestructionDefaultActions() @@ -428,7 +428,7 @@ AddIcon mastery=destruction help=aoe checkboxon=opt_aoe DestructionAoeActions() } -AddIcon mastery=destruction help=cd +AddIcon specialization=destruction help=cd { if InCombat(no) DestructionPrecombatCdActions() DestructionDefaultCdActions() @@ -436,12 +436,12 @@ AddIcon mastery=destruction help=cd if Enemies() <= 3 DestructionSingleTargetCdActions() } -AddIcon mastery=destruction size=small checkboxon=opt_icons_right +AddIcon specialization=destruction size=small checkbox=opt_icons_right { Spell(demonic_circle_teleport) } -AddIcon mastery=destruction size=small checkboxon=opt_icons_right +AddIcon specialization=destruction size=small checkbox=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_warlock_spells.lua b/scripts/ovale_warlock_spells.lua index 793f7f3..ef4b260 100644 --- a/scripts/ovale_warlock_spells.lua +++ b/scripts/ovale_warlock_spells.lua @@ -12,8 +12,8 @@ Define(agony 980) Define(agony_debuff 980) SpellInfo(agony_debuff duration=24 haste=spell maxstacks=10 tick=2) SpellInfo(agony_debuff addduration=12 glyph=glyph_of_everlasting_affliction) - SpellInfo(agony_debuff damage=AfflictionAgonyTickDamage mastery=affliction) - SpellInfo(agony_debuff lastEstimatedDamage=AfflictionAgonyTickLastDamage mastery=affliction) + SpellInfo(agony_debuff damage=AfflictionAgonyTickDamage specialization=affliction) + SpellInfo(agony_debuff lastEstimatedDamage=AfflictionAgonyTickLastDamage specialization=affliction) Define(aftermath 109784) Define(archimondes_darkness_talent 16) Define(backdraft 117896) diff --git a/scripts/ovale_warrior.lua b/scripts/ovale_warrior.lua index af40dcc..d0dc340 100644 --- a/scripts/ovale_warrior.lua +++ b/scripts/ovale_warrior.lua @@ -162,41 +162,41 @@ AddFunction ArmsPrecombatCdActions ### Arms icons. -AddIcon mastery=arms size=small checkboxon=opt_icons_left +AddIcon specialization=arms size=small checkbox=opt_icons_left { Spell(vigilance) Spell(demoralizing_banner) Spell(rallying_cry) } -AddIcon mastery=arms size=small checkboxon=opt_icons_left +AddIcon specialization=arms size=small checkbox=opt_icons_left { if TalentPoints(impending_victory_talent) and HealthPercent() < 80 Spell(impending_victory usable=1) if not TalentPoints(impending_victory_talent) and HealthPercent() < 80 Spell(victory_rush usable=1) if TalentPoints(enraged_regeneration_talent) Spell(enraged_regeneration) } -AddIcon mastery=arms help=shortcd +AddIcon specialization=arms help=shortcd { ArmsDefaultShortCdActions() ArmsSingleTargetShortCdActions() } -AddIcon mastery=arms help=main +AddIcon specialization=arms help=main { if InCombat(no) ArmsPrecombatActions() ArmsDefaultActions() ArmsSingleTargetActions() } -AddIcon mastery=arms help=aoe checkboxon=opt_aoe +AddIcon specialization=arms help=aoe checkbox=opt_aoe { if InCombat(no) ArmsPrecombatActions() ArmsDefaultActions() ArmsAoeActions() } -AddIcon mastery=arms help=cd +AddIcon specialization=arms help=cd { Interrupt() UseRacialInterruptActions() @@ -205,13 +205,13 @@ AddIcon mastery=arms help=cd ArmsDefaultCdActions() } -AddIcon mastery=arms size=small checkboxon=opt_icons_right +AddIcon specialization=arms size=small checkbox=opt_icons_right { Spell(die_by_the_sword) Spell(shield_wall) } -AddIcon mastery=arms size=small checkboxon=opt_icons_right +AddIcon specialization=arms size=small checkbox=opt_icons_right { #shattering_throw,if=cooldown.colossus_smash.remains>5 if target.DebuffExpires(shattering_throw_debuff) and SpellCooldown(colossus_smash) > 5 Spell(shattering_throw) @@ -551,34 +551,34 @@ AddFunction FuryTwoHandSingleTargetShortCdActions ### Fury icons. -AddIcon mastery=fury size=small checkboxon=opt_icons_left +AddIcon specialization=fury size=small checkbox=opt_icons_left { Spell(vigilance) Spell(demoralizing_banner) Spell(rallying_cry) } -AddIcon mastery=fury size=small checkboxon=opt_icons_left +AddIcon specialization=fury size=small checkbox=opt_icons_left { if TalentPoints(impending_victory_talent) and HealthPercent() < 80 Spell(impending_victory usable=1) if not TalentPoints(impending_victory_talent) and HealthPercent() < 80 Spell(victory_rush usable=1) if TalentPoints(enraged_regeneration_talent) Spell(enraged_regeneration) } -AddIcon mastery=fury help=shortcd +AddIcon specialization=fury help=shortcd { if HasWeapon(main type=1h) FuryOneHandSingleTargetShortCdActions() if HasWeapon(main type=2h) FuryTwoHandSingleTargetShortCdActions() } -AddIcon mastery=fury help=main +AddIcon specialization=fury help=main { if InCombat(no) FuryPrecombatActions() if HasWeapon(main type=1h) FuryOneHandSingleTargetActions() if HasWeapon(main type=2h) FuryTwoHandSingleTargetActions() } -AddIcon mastery=fury help=aoe checkboxon=opt_aoe +AddIcon specialization=fury help=aoe checkbox=opt_aoe { if InCombat(no) FuryPrecombatActions() #run_action_list,name=two_targets,if=active_enemies=2 @@ -589,7 +589,7 @@ AddIcon mastery=fury help=aoe checkboxon=opt_aoe if Enemies() > 3 FuryAoeActions() } -AddIcon mastery=fury help=cd +AddIcon specialization=fury help=cd { Interrupt() UseRacialInterruptActions() @@ -598,13 +598,13 @@ AddIcon mastery=fury help=cd FuryDefaultCdActions() } -AddIcon mastery=fury size=small checkboxon=opt_icons_right +AddIcon specialization=fury size=small checkbox=opt_icons_right { Spell(die_by_the_sword) Spell(shield_wall) } -AddIcon mastery=fury size=small checkboxon=opt_icons_right +AddIcon specialization=fury size=small checkbox=opt_icons_right { #shattering_throw,if=cooldown.colossus_smash.remains>5 if target.DebuffExpires(shattering_throw_debuff) and SpellCooldown(colossus_smash) > 5 Spell(shattering_throw) @@ -718,52 +718,52 @@ AddFunction ProtectionPrecombatActions ### Protection icons. -AddIcon mastery=protection size=small checkboxon=opt_icons_left +AddIcon specialization=protection size=small checkbox=opt_icons_left { Spell(vigilance) Spell(demoralizing_banner) Spell(rallying_cry) } -AddIcon mastery=protection size=small checkboxon=opt_icons_left +AddIcon specialization=protection size=small checkbox=opt_icons_left { if TalentPoints(impending_victory_talent) and HealthPercent() < 80 Spell(impending_victory usable=1) if not TalentPoints(impending_victory_talent) and HealthPercent() < 80 Spell(victory_rush usable=1) if TalentPoints(enraged_regeneration_talent) Spell(enraged_regeneration) } -AddIcon mastery=protection help=shortcd +AddIcon specialization=protection help=shortcd { ProtectionDefaultShortCdActions() } -AddIcon mastery=protection help=main +AddIcon specialization=protection help=main { if InCombat(no) ProtectionPrecombatActions() ProtectionDefaultActions() ProtectionNormalRotationActions() } -AddIcon mastery=protection help=aoe checkboxon=opt_aoe +AddIcon specialization=protection help=aoe checkbox=opt_aoe { if InCombat(no) ProtectionPrecombatActions() ProtectionAoeActions() } -AddIcon mastery=protection help=cd +AddIcon specialization=protection help=cd { Interrupt() UseRacialInterruptActions() ProtectionDefaultCdActions() } -AddIcon mastery=protection size=small checkboxon=opt_icons_right +AddIcon specialization=protection size=small checkbox=opt_icons_right { Spell(die_by_the_sword) Spell(shield_wall) } -AddIcon mastery=protection size=small checkboxon=opt_icons_right +AddIcon specialization=protection size=small checkbox=opt_icons_right { #shattering_throw if target.DebuffExpires(shattering_throw_debuff) Spell(shattering_throw) diff --git a/scripts/ovale_warrior_common.lua b/scripts/ovale_warrior_common.lua index 31bfb31..ed34a75 100644 --- a/scripts/ovale_warrior_common.lua +++ b/scripts/ovale_warrior_common.lua @@ -23,7 +23,7 @@ AddFunction Interrupt } } -AddCheckBox(opt_heroic_leap_dps SpellName(heroic_leap) mastery=!protection) +AddCheckBox(opt_heroic_leap_dps SpellName(heroic_leap) specialization=!protection) AddFunction HeroicLeap { if CheckBoxOn(opt_heroic_leap_dps) Spell(heroic_leap) diff --git a/scripts/ovale_warrior_spells.lua b/scripts/ovale_warrior_spells.lua index 5095fc4..9bc5dae 100644 --- a/scripts/ovale_warrior_spells.lua +++ b/scripts/ovale_warrior_spells.lua @@ -9,8 +9,8 @@ do Define(avatar 107574) SpellInfo(avatar cd=180) - SpellInfo(avatar buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(avatar buff_cdr=cooldown_reduction_strength_buff mastery=fury) + SpellInfo(avatar buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(avatar buff_cdr=cooldown_reduction_strength_buff specialization=fury) Define(avatar_talent 16) Define(bastion_of_defense 84608) Define(battle_shout 6673) @@ -24,14 +24,14 @@ Define(berserker_stance 2458) SpellInfo(berserker_stance cd=1.5) Define(bladestorm 46924) SpellInfo(bladestorm cd=60) - SpellInfo(bladestorm buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(bladestorm buff_cdr=cooldown_reduction_strength_buff mastery=fury) + SpellInfo(bladestorm buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(bladestorm buff_cdr=cooldown_reduction_strength_buff specialization=fury) Define(bladestorm_talent 10) Define(blood_and_thunder 84615) Define(bloodbath 12292) SpellInfo(bloodbath cd=60) - SpellInfo(bloodbath buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(bloodbath buff_cdr=cooldown_reduction_strength_buff mastery=fury) + SpellInfo(bloodbath buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(bloodbath buff_cdr=cooldown_reduction_strength_buff specialization=fury) SpellAddBuff(bloodbath bloodbath_buff=1) Define(bloodbath_buff 12292) SpellInfo(bloodbath_buff duration=12) @@ -86,8 +86,8 @@ Define(disrupting_shout 102060) Define(disrupting_shout_talent 9) Define(dragon_roar 118000) SpellInfo(dragon_roar cd=60) - SpellInfo(dragon_roar buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(dragon_roar buff_cdr=cooldown_reduction_strength_buff mastery=fury) + SpellInfo(dragon_roar buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(dragon_roar buff_cdr=cooldown_reduction_strength_buff specialization=fury) Define(dragon_roar_talent 12) Define(enrage_buff 12880) SpellInfo(enrage_buff duration=6) @@ -115,9 +115,9 @@ Define(glyph_of_spell_reflection 63328) Define(heroic_leap 6544) SpellInfo(heroic_leap cd=45) SpellInfo(heroic_leap addcd=-15 glyph=glyph_of_death_from_above) - SpellInfo(heroic_leap buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(heroic_leap buff_cdr=cooldown_reduction_strength_buff mastery=fury) - SpellInfo(heroic_leap buff_cdr=cooldown_reduction_tank_buff mastery=protection) + SpellInfo(heroic_leap buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(heroic_leap buff_cdr=cooldown_reduction_strength_buff specialization=fury) + SpellInfo(heroic_leap buff_cdr=cooldown_reduction_tank_buff specialization=protection) Define(heroic_strike 78) SpellInfo(heroic_strike rage=30 cd=1.5) SpellInfo(heroic_strike buff_rage_none=cleave_heroic_strike_no_rage_buff) @@ -163,9 +163,9 @@ Define(rallying_cry 97462) SpellInfo(rallying_cry cd=180) Define(recklessness 1719) SpellInfo(recklessness cd=180) - SpellInfo(recklessness buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(recklessness buff_cdr=cooldown_reduction_strength_buff mastery=fury) - SpellInfo(recklessness buff_cdr=cooldown_reduction_tank_buff mastery=protection) + SpellInfo(recklessness buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(recklessness buff_cdr=cooldown_reduction_strength_buff specialization=fury) + SpellInfo(recklessness buff_cdr=cooldown_reduction_tank_buff specialization=protection) SpellAddBuff(recklessness recklessness_buff=1) Define(recklessness_buff 1719) SpellInfo(recklessness_buff duration=12) @@ -199,13 +199,13 @@ Define(shield_wall 871) SpellAddBuff(shield_wall shield_wall_buff=1) Define(shield_wall_buff 871) SpellInfo(shield_wall duration=12) - SpellInfo(shield_wall buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(shield_wall buff_cdr=cooldown_reduction_strength_buff mastery=fury) - SpellInfo(shield_wall buff_cdr=cooldown_reduction_tank_buff mastery=protection) + SpellInfo(shield_wall buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(shield_wall buff_cdr=cooldown_reduction_strength_buff specialization=fury) + SpellInfo(shield_wall buff_cdr=cooldown_reduction_tank_buff specialization=protection) Define(shockwave 46968) SpellInfo(shockwave cd=40) - SpellInfo(shockwave buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(shockwave buff_cdr=cooldown_reduction_strength_buff mastery=fury) + SpellInfo(shockwave buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(shockwave buff_cdr=cooldown_reduction_strength_buff specialization=fury) Define(shockwave_talent 11) Define(skull_banner 114207) SpellInfo(skull_banner cd=180) @@ -219,8 +219,8 @@ Define(spell_reflection 23920) SpellInfo(spell_reflection addcd=-5 glyph=glyph_of_spell_reflection) Define(storm_bolt 107570) SpellInfo(storm_bolt cd=30) - SpellInfo(storm_bolt buff_cdr=cooldown_reduction_strength_buff mastery=arms) - SpellInfo(storm_bolt buff_cdr=cooldown_reduction_strength_buff mastery=fury) + SpellInfo(storm_bolt buff_cdr=cooldown_reduction_strength_buff specialization=arms) + SpellInfo(storm_bolt buff_cdr=cooldown_reduction_strength_buff specialization=fury) Define(storm_bolt_talent 18) Define(sudden_death 29725) Define(sudden_execute_buff 139958) diff --git a/scripts/simulationcraft_deathknight_frost_1h_t16h.lua b/scripts/simulationcraft_deathknight_frost_1h_t16h.lua index d343585..cc6dbfc 100644 --- a/scripts/simulationcraft_deathknight_frost_1h_t16h.lua +++ b/scripts/simulationcraft_deathknight_frost_1h_t16h.lua @@ -134,7 +134,7 @@ AddFunction FrostPrecombatActions Spell(raise_dead) } -AddIcon mastery=frost help=main +AddIcon specialization=frost help=main { if InCombat(no) FrostPrecombatActions() FrostDefaultActions() diff --git a/scripts/simulationcraft_deathknight_frost_2h_t16h.lua b/scripts/simulationcraft_deathknight_frost_2h_t16h.lua index b4d4061..94b5b68 100644 --- a/scripts/simulationcraft_deathknight_frost_2h_t16h.lua +++ b/scripts/simulationcraft_deathknight_frost_2h_t16h.lua @@ -144,7 +144,7 @@ AddFunction FrostPrecombatActions Spell(raise_dead) } -AddIcon mastery=frost help=main +AddIcon specialization=frost help=main { if InCombat(no) FrostPrecombatActions() FrostDefaultActions() diff --git a/scripts/simulationcraft_deathknight_unholy_t16h.lua b/scripts/simulationcraft_deathknight_unholy_t16h.lua index e050591..2fa6b0a 100644 --- a/scripts/simulationcraft_deathknight_unholy_t16h.lua +++ b/scripts/simulationcraft_deathknight_unholy_t16h.lua @@ -155,7 +155,7 @@ AddFunction UnholyPrecombatActions Spell(raise_dead) } -AddIcon mastery=unholy help=main +AddIcon specialization=unholy help=main { if InCombat(no) UnholyPrecombatActions() UnholyDefaultActions() diff --git a/scripts/simulationcraft_druid_balance_t16h.lua b/scripts/simulationcraft_druid_balance_t16h.lua index e44ce32..3813a22 100644 --- a/scripts/simulationcraft_druid_balance_t16h.lua +++ b/scripts/simulationcraft_druid_balance_t16h.lua @@ -81,7 +81,7 @@ AddFunction BalanceDefaultActions if Speed() > 0 Spell(sunfire) } -AddIcon mastery=balance help=main +AddIcon specialization=balance help=main { BalanceDefaultActions() } diff --git a/scripts/simulationcraft_druid_feral_t16h.lua b/scripts/simulationcraft_druid_feral_t16h.lua index 49b7f6d..c8c6fe5 100644 --- a/scripts/simulationcraft_druid_feral_t16h.lua +++ b/scripts/simulationcraft_druid_feral_t16h.lua @@ -251,7 +251,7 @@ AddFunction FeralAdvancedActions } } -AddIcon mastery=feral help=main +AddIcon specialization=feral help=main { if InCombat(no) FeralPrecombatActions() FeralDefaultActions() diff --git a/scripts/simulationcraft_druid_feral_t16h_adv_rotation.lua b/scripts/simulationcraft_druid_feral_t16h_adv_rotation.lua index 32a9de5..8668f97 100644 --- a/scripts/simulationcraft_druid_feral_t16h_adv_rotation.lua +++ b/scripts/simulationcraft_druid_feral_t16h_adv_rotation.lua @@ -251,7 +251,7 @@ AddFunction FeralAdvancedActions } } -AddIcon mastery=feral help=main +AddIcon specialization=feral help=main { if InCombat(no) FeralPrecombatActions() FeralDefaultActions() diff --git a/scripts/simulationcraft_hunter_bm_t16h.lua b/scripts/simulationcraft_hunter_bm_t16h.lua index 7ff6c90..0d26b99 100644 --- a/scripts/simulationcraft_hunter_bm_t16h.lua +++ b/scripts/simulationcraft_hunter_bm_t16h.lua @@ -83,7 +83,7 @@ AddFunction BeastMasteryPrecombatActions UsePotionAgility() } -AddIcon mastery=beast_mastery help=main +AddIcon specialization=beast_mastery help=main { if InCombat(no) BeastMasteryPrecombatActions() BeastMasteryDefaultActions() diff --git a/scripts/simulationcraft_hunter_mm_t16h.lua b/scripts/simulationcraft_hunter_mm_t16h.lua index 915f488..3c6fb15 100644 --- a/scripts/simulationcraft_hunter_mm_t16h.lua +++ b/scripts/simulationcraft_hunter_mm_t16h.lua @@ -97,7 +97,7 @@ AddFunction MarksmanshipPrecombatActions UsePotionAgility() } -AddIcon mastery=marksmanship help=main +AddIcon specialization=marksmanship help=main { if InCombat(no) MarksmanshipPrecombatActions() MarksmanshipDefaultActions() diff --git a/scripts/simulationcraft_hunter_sv_t16h.lua b/scripts/simulationcraft_hunter_sv_t16h.lua index 4083696..d06e02e 100644 --- a/scripts/simulationcraft_hunter_sv_t16h.lua +++ b/scripts/simulationcraft_hunter_sv_t16h.lua @@ -81,7 +81,7 @@ AddFunction SurvivalPrecombatActions UsePotionAgility() } -AddIcon mastery=survival help=main +AddIcon specialization=survival help=main { if InCombat(no) SurvivalPrecombatActions() SurvivalDefaultActions() diff --git a/scripts/simulationcraft_mage_arcane_t16h.lua b/scripts/simulationcraft_mage_arcane_t16h.lua index 71973fc..c4526af 100644 --- a/scripts/simulationcraft_mage_arcane_t16h.lua +++ b/scripts/simulationcraft_mage_arcane_t16h.lua @@ -107,7 +107,7 @@ AddFunction ArcanePrecombatActions Spell(mirror_image) } -AddIcon mastery=arcane help=main +AddIcon specialization=arcane help=main { if InCombat(no) ArcanePrecombatActions() ArcaneDefaultActions() diff --git a/scripts/simulationcraft_mage_fire_t16h.lua b/scripts/simulationcraft_mage_fire_t16h.lua index 521f7b9..e797d3c 100644 --- a/scripts/simulationcraft_mage_fire_t16h.lua +++ b/scripts/simulationcraft_mage_fire_t16h.lua @@ -86,7 +86,7 @@ AddFunction FirePrecombatActions Spell(mirror_image) } -AddIcon mastery=fire help=main +AddIcon specialization=fire help=main { if InCombat(no) FirePrecombatActions() FireDefaultActions() diff --git a/scripts/simulationcraft_mage_frost_t16h.lua b/scripts/simulationcraft_mage_frost_t16h.lua index 23c7cc0..4711425 100644 --- a/scripts/simulationcraft_mage_frost_t16h.lua +++ b/scripts/simulationcraft_mage_frost_t16h.lua @@ -86,7 +86,7 @@ AddFunction FrostPrecombatActions Spell(mirror_image) } -AddIcon mastery=frost help=main +AddIcon specialization=frost help=main { if InCombat(no) FrostPrecombatActions() FrostDefaultActions() diff --git a/scripts/simulationcraft_monk_windwalker_1h_t16h.lua b/scripts/simulationcraft_monk_windwalker_1h_t16h.lua index a02efb0..b3af658 100644 --- a/scripts/simulationcraft_monk_windwalker_1h_t16h.lua +++ b/scripts/simulationcraft_monk_windwalker_1h_t16h.lua @@ -96,7 +96,7 @@ AddFunction WindwalkerPrecombatActions UsePotionAgility() } -AddIcon mastery=windwalker help=main +AddIcon specialization=windwalker help=main { if InCombat(no) WindwalkerPrecombatActions() WindwalkerDefaultActions() diff --git a/scripts/simulationcraft_monk_windwalker_2h_t16h.lua b/scripts/simulationcraft_monk_windwalker_2h_t16h.lua index 9b0d78c..9a9cf42 100644 --- a/scripts/simulationcraft_monk_windwalker_2h_t16h.lua +++ b/scripts/simulationcraft_monk_windwalker_2h_t16h.lua @@ -96,7 +96,7 @@ AddFunction WindwalkerPrecombatActions UsePotionAgility() } -AddIcon mastery=windwalker help=main +AddIcon specialization=windwalker help=main { if InCombat(no) WindwalkerPrecombatActions() WindwalkerDefaultActions() diff --git a/scripts/simulationcraft_paladin_protection_t16h.lua b/scripts/simulationcraft_paladin_protection_t16h.lua index bcdc942..ad6d57e 100644 --- a/scripts/simulationcraft_paladin_protection_t16h.lua +++ b/scripts/simulationcraft_paladin_protection_t16h.lua @@ -85,7 +85,7 @@ AddFunction ProtectionPrecombatActions #snapshot_stats } -AddIcon mastery=protection help=main +AddIcon specialization=protection help=main { if InCombat(no) ProtectionPrecombatActions() ProtectionDefaultActions() diff --git a/scripts/simulationcraft_paladin_retribution_t16h.lua b/scripts/simulationcraft_paladin_retribution_t16h.lua index 205c76e..73b5223 100644 --- a/scripts/simulationcraft_paladin_retribution_t16h.lua +++ b/scripts/simulationcraft_paladin_retribution_t16h.lua @@ -104,7 +104,7 @@ AddFunction RetributionPrecombatActions UsePotionStrength() } -AddIcon mastery=retribution help=main +AddIcon specialization=retribution help=main { if InCombat(no) RetributionPrecombatActions() RetributionDefaultActions() diff --git a/scripts/simulationcraft_priest_shadow_t16h.lua b/scripts/simulationcraft_priest_shadow_t16h.lua index b066cad..7fa29c7 100644 --- a/scripts/simulationcraft_priest_shadow_t16h.lua +++ b/scripts/simulationcraft_priest_shadow_t16h.lua @@ -105,7 +105,7 @@ AddFunction ShadowPrecombatActions UsePotionIntellect() } -AddIcon mastery=shadow help=main +AddIcon specialization=shadow help=main { if InCombat(no) ShadowPrecombatActions() ShadowDefaultActions() diff --git a/scripts/simulationcraft_rogue_assassination_t16h.lua b/scripts/simulationcraft_rogue_assassination_t16h.lua index 215a517..735c3c9 100644 --- a/scripts/simulationcraft_rogue_assassination_t16h.lua +++ b/scripts/simulationcraft_rogue_assassination_t16h.lua @@ -80,7 +80,7 @@ AddFunction AssassinationPrecombatActions if TalentPoints(marked_for_death_talent) Spell(slice_and_dice) } -AddIcon mastery=assassination help=main +AddIcon specialization=assassination help=main { if InCombat(no) AssassinationPrecombatActions() AssassinationDefaultActions() diff --git a/scripts/simulationcraft_rogue_combat_t16h.lua b/scripts/simulationcraft_rogue_combat_t16h.lua index 62acba8..1993916 100644 --- a/scripts/simulationcraft_rogue_combat_t16h.lua +++ b/scripts/simulationcraft_rogue_combat_t16h.lua @@ -91,7 +91,7 @@ AddFunction CombatPrecombatActions if TalentPoints(marked_for_death_talent) Spell(slice_and_dice) } -AddIcon mastery=combat help=main +AddIcon specialization=combat help=main { if InCombat(no) CombatPrecombatActions() CombatDefaultActions() diff --git a/scripts/simulationcraft_rogue_subtlety_t16h.lua b/scripts/simulationcraft_rogue_subtlety_t16h.lua index 355ab5d..4ee953c 100644 --- a/scripts/simulationcraft_rogue_subtlety_t16h.lua +++ b/scripts/simulationcraft_rogue_subtlety_t16h.lua @@ -106,7 +106,7 @@ AddFunction SubtletyDefaultActions SubtletyPoolActions() } -AddIcon mastery=subtlety help=main +AddIcon specialization=subtlety help=main { if InCombat(no) SubtletyPrecombatActions() SubtletyDefaultActions() diff --git a/scripts/simulationcraft_shaman_elemental_t16h.lua b/scripts/simulationcraft_shaman_elemental_t16h.lua index 56ddd3c..e542e8e 100644 --- a/scripts/simulationcraft_shaman_elemental_t16h.lua +++ b/scripts/simulationcraft_shaman_elemental_t16h.lua @@ -109,7 +109,7 @@ AddFunction ElementalPrecombatActions UsePotionIntellect() } -AddIcon mastery=elemental help=main +AddIcon specialization=elemental help=main { if InCombat(no) ElementalPrecombatActions() ElementalDefaultActions() diff --git a/scripts/simulationcraft_shaman_enhancement_t16h.lua b/scripts/simulationcraft_shaman_enhancement_t16h.lua index 41a51ae..5c846f0 100644 --- a/scripts/simulationcraft_shaman_enhancement_t16h.lua +++ b/scripts/simulationcraft_shaman_enhancement_t16h.lua @@ -152,7 +152,7 @@ AddFunction EnhancementPrecombatActions UsePotionAgility() } -AddIcon mastery=enhancement help=main +AddIcon specialization=enhancement help=main { if InCombat(no) EnhancementPrecombatActions() EnhancementDefaultActions() diff --git a/scripts/simulationcraft_warlock_affliction_t16h.lua b/scripts/simulationcraft_warlock_affliction_t16h.lua index 9d0ffc1..6e5c5fe 100644 --- a/scripts/simulationcraft_warlock_affliction_t16h.lua +++ b/scripts/simulationcraft_warlock_affliction_t16h.lua @@ -104,7 +104,7 @@ AddFunction AfflictionPrecombatActions UsePotionIntellect() } -AddIcon mastery=affliction help=main +AddIcon specialization=affliction help=main { if InCombat(no) AfflictionPrecombatActions() AfflictionDefaultActions() diff --git a/scripts/simulationcraft_warlock_demonology_t16h.lua b/scripts/simulationcraft_warlock_demonology_t16h.lua index 16d47fe..4def556 100644 --- a/scripts/simulationcraft_warlock_demonology_t16h.lua +++ b/scripts/simulationcraft_warlock_demonology_t16h.lua @@ -107,7 +107,7 @@ AddFunction DemonologyPrecombatActions UsePotionIntellect() } -AddIcon mastery=demonology help=main +AddIcon specialization=demonology help=main { if InCombat(no) DemonologyPrecombatActions() DemonologyDefaultActions() diff --git a/scripts/simulationcraft_warlock_destruction_t16h.lua b/scripts/simulationcraft_warlock_destruction_t16h.lua index 8102463..3565f31 100644 --- a/scripts/simulationcraft_warlock_destruction_t16h.lua +++ b/scripts/simulationcraft_warlock_destruction_t16h.lua @@ -91,7 +91,7 @@ AddFunction DestructionPrecombatActions UsePotionIntellect() } -AddIcon mastery=destruction help=main +AddIcon specialization=destruction help=main { if InCombat(no) DestructionPrecombatActions() DestructionDefaultActions() diff --git a/scripts/simulationcraft_warrior_arms_t16h.lua b/scripts/simulationcraft_warrior_arms_t16h.lua index 39c6f2d..c868caa 100644 --- a/scripts/simulationcraft_warrior_arms_t16h.lua +++ b/scripts/simulationcraft_warrior_arms_t16h.lua @@ -118,7 +118,7 @@ AddFunction ArmsPrecombatActions UsePotionStrength() } -AddIcon mastery=arms help=main +AddIcon specialization=arms help=main { if InCombat(no) ArmsPrecombatActions() ArmsDefaultActions() diff --git a/scripts/simulationcraft_warrior_fury_1h_t16h.lua b/scripts/simulationcraft_warrior_fury_1h_t16h.lua index 0f5b343..0f68000 100644 --- a/scripts/simulationcraft_warrior_fury_1h_t16h.lua +++ b/scripts/simulationcraft_warrior_fury_1h_t16h.lua @@ -216,7 +216,7 @@ AddFunction FuryAoeActions Spell(battle_shout) } -AddIcon mastery=fury help=main +AddIcon specialization=fury help=main { if InCombat(no) FuryPrecombatActions() FuryDefaultActions() diff --git a/scripts/simulationcraft_warrior_fury_2h_t16h.lua b/scripts/simulationcraft_warrior_fury_2h_t16h.lua index f323d87..031eed8 100644 --- a/scripts/simulationcraft_warrior_fury_2h_t16h.lua +++ b/scripts/simulationcraft_warrior_fury_2h_t16h.lua @@ -218,7 +218,7 @@ AddFunction FuryAoeActions Spell(battle_shout) } -AddIcon mastery=fury help=main +AddIcon specialization=fury help=main { if InCombat(no) FuryPrecombatActions() FuryDefaultActions() diff --git a/scripts/simulationcraft_warrior_protection_t16h.lua b/scripts/simulationcraft_warrior_protection_t16h.lua index 5cd8c17..a2d0ecc 100644 --- a/scripts/simulationcraft_warrior_protection_t16h.lua +++ b/scripts/simulationcraft_warrior_protection_t16h.lua @@ -100,7 +100,7 @@ AddFunction ProtectionPrecombatActions Spell(mountains_potion) } -AddIcon mastery=protection help=main +AddIcon specialization=protection help=main { if InCombat(no) ProtectionPrecombatActions() ProtectionDefaultActions() diff --git a/scripts/wiljo_mage.lua b/scripts/wiljo_mage.lua index 3eae5f2..9cda667 100644 --- a/scripts/wiljo_mage.lua +++ b/scripts/wiljo_mage.lua @@ -127,7 +127,7 @@ AddFunction Interrupt UseRacialInterrupt() } -AddIcon mastery=frost help=offgcd +AddIcon specialization=frost help=offgcd { #/counterspell,if=target.debuff.casting.react if not target.IsFriend() and target.IsInterruptible() Interrupt() @@ -151,7 +151,7 @@ AddIcon mastery=frost help=offgcd if ManaPercent(less 84) and BuffExpires(alter_time_buff) UseManaGem() } -AddIcon mastery=frost help=main +AddIcon specialization=frost help=main { if not InCombat() { @@ -202,7 +202,7 @@ AddIcon mastery=frost help=main Spell(frostbolt) } -AddIcon mastery=frost help=cd +AddIcon specialization=frost help=cd { #/evocation,if=mana.pct<20&buff.alter_time.down if ManaPercent(less 20) and BuffExpires(alter_time_buff) Spell(evocation) -- 1.7.9.5