From e47f1c39c4425d17a19532d14be5d6bb3f47216b Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Mon, 24 Sep 2012 18:43:33 +0000 Subject: [PATCH] Fix some raid buff checks so that they may be cast by anyone. The affected buffs/debuffs are: mastery str_agi_int stamina spell_power_multiplier weakened_blows Rename the buff aliases for burst_haste: bloodlust -> bloodlust_aura heroism -> heroism_aura This should allow shaman scripts for both Alliance and Horde to define the spell names with the same names granting buffs of the same name. When checking for the burst_haste buff, use one of the following buff class names: burst_haste bloodlust_aura heroism_aura git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@554 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleData.lua | 4 ++-- defaut/Chaman.lua | 12 ++++++------ defaut/Demoniste.lua | 6 +++--- defaut/Druide.lua | 6 +++--- defaut/Guerrier.lua | 2 +- defaut/Paladin.lua | 4 ++-- defaut/Pretre.lua | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/OvaleData.lua b/OvaleData.lua index 165576d..e94389f 100644 --- a/OvaleData.lua +++ b/OvaleData.lua @@ -226,8 +226,8 @@ OvaleData.buffSpellList = 1130, -- Hunter's Mark }, } -OvaleData.buffSpellList.bloodlust = OvaleData.buffSpellList.burst_haste -OvaleData.buffSpellList.heroism = OvaleData.buffSpellList.burst_haste +OvaleData.buffSpellList.bloodlust_aura = OvaleData.buffSpellList.burst_haste +OvaleData.buffSpellList.heroism_aura = OvaleData.buffSpellList.burst_haste -- -- diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua index 0c3f577..f082b2b 100644 --- a/defaut/Chaman.lua +++ b/defaut/Chaman.lua @@ -86,7 +86,7 @@ AddIcon mastery=1 help=main { if TalentPoints(unleashed_fury_talent) and not BuffPresent(ascendance) Spell(unleash_elements) - if not BuffPresent(ascendance) and {not target.DebuffPresent(flame_shock) or TicksRemain(flame_shock) <2 or {{BuffPresent(bloodlust) or BuffPresent(elemental_mastery) } and TicksRemain(flame_shock) <3 } } Spell(flame_shock) + if not BuffPresent(ascendance) and {not target.DebuffPresent(flame_shock) or TicksRemain(flame_shock) <2 or {{BuffPresent(bloodlust_aura any=1) or BuffPresent(elemental_mastery) } and TicksRemain(flame_shock) <3 } } Spell(flame_shock) if target.DebuffRemains(flame_shock) >CastTime(lava_burst) and {BuffPresent(ascendance) or SpellCooldown(lava_burst) } Spell(lava_burst) if TalentPoints(elemental_blast_talent) and not BuffPresent(ascendance) Spell(elemental_blast) if BuffPresent(lightning_shield) ==0 Spell(earth_shock) @@ -131,10 +131,10 @@ AddIcon mastery=1 help=cd { if {{SpellCooldown(ascendance) >10 or Level() <87 } and SpellCooldown(fire_elemental_totem) >10 } or BuffPresent(ascendance) or BuffPresent(bloodlust) or TotemPresent(fire) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } - if BuffPresent(bloodlust) or BuffPresent(ascendance) or {{SpellCooldown(ascendance) >10 or Level() <87 } and SpellCooldown(fire_elemental_totem) >10 } Spell(blood_fury) - if TalentPoints(elemental_mastery_talent) and TimeInCombat() >15 and {{not BuffPresent(bloodlust) and TimeInCombat() <120 } or {not BuffPresent(berserking) and not BuffPresent(bloodlust) and BuffPresent(ascendance) } or {TimeInCombat() >=200 and {SpellCooldown(ascendance) >30 or Level() <87 } } } Spell(elemental_mastery) + if BuffPresent(bloodlust_aura any=1) or BuffPresent(ascendance) or {{SpellCooldown(ascendance) >10 or Level() <87 } and SpellCooldown(fire_elemental_totem) >10 } Spell(blood_fury) + if TalentPoints(elemental_mastery_talent) and TimeInCombat() >15 and {{not BuffPresent(bloodlust_aura any=1) and TimeInCombat() <120 } or {not BuffPresent(berserking) and not BuffPresent(bloodlust_aura any=1) and BuffPresent(ascendance) } or {TimeInCombat() >=200 and {SpellCooldown(ascendance) >30 or Level() <87 } } } Spell(elemental_mastery) if not TotemPresent(fire) Spell(fire_elemental_totem) - if target.DebuffRemains(flame_shock) >0 and {target.DeadIn() <20 or BuffPresent(bloodlust) or TimeInCombat() >=180 } Spell(ascendance) + if target.DebuffRemains(flame_shock) >0 and {target.DeadIn() <20 or BuffPresent(bloodlust_aura any=1) or TimeInCombat() >=180 } Spell(ascendance) if not and SpellCooldown(fire_elemental_totem) >=50 Spell(earth_elemental_totem) Spell(spiritwalkers_grace) } @@ -203,7 +203,7 @@ AddIcon mastery=2 help=cd { Spell(blood_fury) if TalentPoints(elemental_mastery_talent) Spell(elemental_mastery) - if not TotemPresent(fire) and {BuffPresent(bloodlust) or BuffPresent(elemental_mastery) or target.DeadIn() <=0 +10 or {TalentPoints(elemental_mastery_talent) and {SpellCooldown(elemental_mastery) ==0 or SpellCooldown(elemental_mastery) >80 } or TimeInCombat() >=60 } } Spell(fire_elemental_totem) + if not TotemPresent(fire) and {BuffPresent(bloodlust_aura any=1) or BuffPresent(elemental_mastery) or target.DeadIn() <=0 +10 or {TalentPoints(elemental_mastery_talent) and {SpellCooldown(elemental_mastery) ==0 or SpellCooldown(elemental_mastery) >80 } or TimeInCombat() >=60 } } Spell(fire_elemental_totem) if SpellCooldown(strike) >=3 Spell(ascendance) Spell(feral_spirit) if not and SpellCooldown(fire_elemental_totem) >=50 Spell(earth_elemental_totem) @@ -213,7 +213,7 @@ AddIcon mastery=2 help=cd { Spell(blood_fury) if SpellCooldown(strike) >=3 Spell(ascendance) - if not TotemPresent(fire) and {BuffPresent(bloodlust) or BuffPresent(elemental_mastery) or target.DeadIn() <=0 +10 or {TalentPoints(elemental_mastery_talent) and {SpellCooldown(elemental_mastery) ==0 or SpellCooldown(elemental_mastery) >80 } or TimeInCombat() >=60 } } Spell(fire_elemental_totem) + if not TotemPresent(fire) and {BuffPresent(bloodlust_aura any=1) or BuffPresent(elemental_mastery) or target.DeadIn() <=0 +10 or {TalentPoints(elemental_mastery_talent) and {SpellCooldown(elemental_mastery) ==0 or SpellCooldown(elemental_mastery) >80 } or TimeInCombat() >=60 } } Spell(fire_elemental_totem) Spell(feral_spirit) } } diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index 6e1c4e2..e97d18b 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -120,7 +120,7 @@ AddIcon mastery=1 help=main { if not InCombat() { - if not BuffPresent(spell_power_multiplier) Spell(dark_intent) + if not BuffPresent(spell_power_multiplier any=1) Spell(dark_intent) unless pet.CreatureFamily(Felhunter) Spell(summon_felhunter) } if target.DebuffExpires(magic_vulnerability any=1) Spell(curse_of_the_elements) @@ -182,7 +182,7 @@ AddIcon mastery=2 help=main { if not InCombat() { - if not BuffPresent(spell_power_multiplier) Spell(dark_intent) + if not BuffPresent(spell_power_multiplier any=1) Spell(dark_intent) unless pet.CreatureFamily(Felguard) Spell(summon_felguard) } if target.DebuffExpires(magic_vulnerability any=1) Spell(curse_of_the_elements) @@ -249,7 +249,7 @@ AddIcon mastery=3 help=main { if not InCombat() { - if not BuffPresent(spell_power_multiplier) Spell(dark_intent) + if not BuffPresent(spell_power_multiplier any=1) Spell(dark_intent) unless pet.CreatureFamily(Felhunter) Spell(summon_felhunter) } if target.DebuffExpires(magic_vulnerability any=1) Spell(curse_of_the_elements) diff --git a/defaut/Druide.lua b/defaut/Druide.lua index f12927c..067871c 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -95,7 +95,7 @@ AddIcon mastery=1 help=main { if not InCombat() { - if not BuffPresent(str_agi_int) Spell(mark_of_the_wild) + if not BuffPresent(str_agi_int any=1) Spell(mark_of_the_wild) if not BuffPresent(dream_of_cenarius_damage) and TalentPoints(dream_of_cenarius_talent) Spell(healing_touch) unless Stance(5) Spell(moonkin_form) } @@ -139,7 +139,7 @@ AddIcon mastery=2 help=main { if not InCombat() { - if not BuffPresent(str_agi_int) Spell(mark_of_the_wild) + if not BuffPresent(str_agi_int any=1) Spell(mark_of_the_wild) if not BuffPresent(dream_of_cenarius_damage) and TalentPoints(dream_of_cenarius_talent) Spell(healing_touch) unless Stance(3) Spell(cat_form) Spell(savage_roar) @@ -149,7 +149,7 @@ AddIcon mastery=2 help=main if target.IsInterruptible() Spell(skull_bash_cat) if BuffPresent(predatory_swiftness) and BuffRemains(predatory_swiftness) <=1 and TalentPoints(dream_of_cenarius_talent) and {BuffExpires(dream_of_cenarius_damage) or {BuffStacks(dream_of_cenarius_damage) ==1 and not BuffPresent(omen_of_clarity) } } Spell(healing_touch) if PreviousSpell(natures_swiftness) Spell(healing_touch) - if target.DebuffStacks(weakened_armor) <3 Spell(faerie_fire) + if target.DebuffStacks(weakened_armor any=1) <3 Spell(faerie_fire) if BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and {{{ComboPoints() >=5 and target.DebuffRemains(rip) >SpellCooldown(healing_touch) and target.HealthPercent() <=25 } } } Spell(healing_touch) if ComboPoints() >=5 and target.DebuffPresent(rip) and target.HealthPercent() <=25 Spell(ferocious_bite) if ComboPoints() >=1 and target.DebuffPresent(rip) and target.DebuffRemains(rip) <=2 and target.HealthPercent() <=25 Spell(ferocious_bite) diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua index 3fd9aac..c7ef7a4 100644 --- a/defaut/Guerrier.lua +++ b/defaut/Guerrier.lua @@ -181,7 +181,7 @@ AddIcon mastery=3 help=main } if Rage() <85 Spell(shield_slam) if Rage() <90 Spell(revenge) - if BuffExpires(weakened_blows) Spell(thunder_clap) + if BuffExpires(weakened_blows any=1) Spell(thunder_clap) if Rage() <70 Spell(battle_shout) Spell(devastate) } diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua index d510da3..b83381c 100644 --- a/defaut/Paladin.lua +++ b/defaut/Paladin.lua @@ -43,8 +43,8 @@ AddIcon mastery=3 help=main { if not InCombat() { - if not BuffPresent(str_agi_int) Spell(blessing_of_kings) - if not BuffPresent(mastery) and not BuffPresent(str_agi_int) Spell(blessing_of_might) + if not BuffPresent(str_agi_int any=1) Spell(blessing_of_kings) + if not BuffPresent(mastery any=1) and not BuffPresent(str_agi_int any=1) Spell(blessing_of_might) unless Stance(1) Spell(seal_of_truth) } if ManaPercent() >=90 or Stance(0) unless Stance(1) Spell(seal_of_truth) diff --git a/defaut/Pretre.lua b/defaut/Pretre.lua index 0deb96f..ce9f07d 100644 --- a/defaut/Pretre.lua +++ b/defaut/Pretre.lua @@ -48,7 +48,7 @@ AddIcon mastery=3 help=main { if not InCombat() { - if not BuffPresent(stamina) Spell(power_word_fortitude) + if not BuffPresent(stamina any=1) Spell(power_word_fortitude) if BuffExpires(inner_fire) and BuffExpires(inner_will) Spell(inner_fire) if BuffExpires(shadowform) Spell(shadowform) } -- 1.7.9.5