From 6642be4e496480d3fb1383a771dab1af7e58e8e0 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sun, 1 Jun 2014 05:30:40 +0000 Subject: [PATCH] Paladin: Mastery > stats when giving out raid buffs. This fixes ticket 374 by @Draugrs, who noted the error. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1507 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- scripts/ovale_paladin.lua | 14 ++++---------- scripts/ovale_paladin_spells.lua | 8 ++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/ovale_paladin.lua b/scripts/ovale_paladin.lua index f7d3b36..568e62b 100644 --- a/scripts/ovale_paladin.lua +++ b/scripts/ovale_paladin.lua @@ -60,8 +60,7 @@ AddFunction HolySelflessHealerAoeActions() AddFunction HolyPrecombatActions { - if not BuffPresent(str_agi_int any=1) Spell(blessing_of_kings) - if not BuffPresent(mastery any=1) and not BuffPresent(str_agi_int) Spell(blessing_of_might) + RaidBuffActions() if not Stance(paladin_seal_of_insight) Spell(seal_of_insight) } @@ -208,9 +207,8 @@ AddFunction ProtectionPrecombatActions #flask,type=earth #food,type=chun_tian_spring_rolls #blessing_of_kings,if=(!aura.str_agi_int.up)&(aura.mastery.up) - if not BuffPresent(str_agi_int any=1) Spell(blessing_of_kings) #blessing_of_might,if=!aura.mastery.up - if not BuffPresent(mastery any=1) and not BuffPresent(str_agi_int) Spell(blessing_of_might) + RaidBuffActions() #seal_of_insight if not Stance(paladin_seal_of_insight) Spell(seal_of_insight) #sacred_shield,if=talent.sacred_shield.enabled @@ -411,11 +409,7 @@ AddFunction RetributionPrecombatActions #food,type=black_pepper_ribs_and_shrimp #blessing_of_kings,if=!aura.str_agi_int.up #blessing_of_might,if=!aura.mastery.up - if not BuffPresent(str_agi_int any=1) - { - Spell(blessing_of_kings) - if not BuffPresent(mastery any=1) Spell(blessing_of_might) - } + RaidBuffActions() #seal_of_truth,if=active_enemies<4 if not Stance(paladin_seal_of_truth) Spell(seal_of_truth) #snapshot_stats @@ -452,7 +446,7 @@ AddIcon mastery=retribution help=shortcd AddIcon mastery=retribution help=main { - RetributionPrecombatActions() + if InCombat(no) RetributionPrecombatActions() RetributionDefaultActions() } diff --git a/scripts/ovale_paladin_spells.lua b/scripts/ovale_paladin_spells.lua index ee5098f..99b8d21 100644 --- a/scripts/ovale_paladin_spells.lua +++ b/scripts/ovale_paladin_spells.lua @@ -248,6 +248,14 @@ AddFunction Interrupt } } } + +AddFunction RaidBuffActions +{ + #blessing_of_kings,if=(!aura.str_agi_int.up)&(aura.mastery.up) + if BuffExpires(str_agi_int any=1) and BuffPresent(mastery any=1) and BuffExpires(mastery) Spell(blessing_of_kings) + #blessing_of_might,if=!aura.mastery.up + if BuffExpires(mastery any=1) Spell(blessing_of_might) +} ]] OvaleScripts:RegisterScript("PALADIN", name, desc, code, "include") -- 1.7.9.5