From 92929a250e999823b24f9fb531252fbc0df03d26 Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Mon, 7 Mar 2011 19:47:28 +0000 Subject: [PATCH] bm hunter fix for kill command various minor fixes for warlock bug fix for arm warrior git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@372 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.toc | 2 +- OvaleSwing.lua | 2 +- defaut/Chasseur.lua | 2 +- defaut/Demoniste.lua | 8 +++++--- defaut/Guerrier.lua | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Ovale.toc b/Ovale.toc index 7577d92..5d53228 100644 --- a/Ovale.toc +++ b/Ovale.toc @@ -3,7 +3,7 @@ ## Notes: Show the icon of the next spell to cast ## Notes-frFR: Affiche l'icône du prochain sort à lancer ## Author: Sidoine -## Version: 4.0.27 +## Version: 4.0.28 ## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0, LibRangeCheck-2.0 ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/OvaleSwing.lua b/OvaleSwing.lua index 4551779..c372d67 100644 --- a/OvaleSwing.lua +++ b/OvaleSwing.lua @@ -33,11 +33,11 @@ local math_abs = math.abs local GetTime = GetTime OvaleSwing = LibStub("AceAddon-3.0"):NewAddon("OvaleSwing", "AceEvent-3.0") -OvaleSwing.ohNext = false local BOOKTYPE_SPELL = BOOKTYPE_SPELL function OvaleSwing:OnEnable() + self.ohNext = false -- fired when autoattack is enabled/disabled. self:RegisterEvent("PLAYER_ENTER_COMBAT") self:RegisterEvent("PLAYER_LEAVE_COMBAT") diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index 8ff77d5..e78f512 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -75,7 +75,7 @@ AddIcon help=main mastery=1 #/kill_shot if TargetLifePercent(less 20) Spell(KILLSHOT) #/kill_command - if TargetInRange(GROWL) Spell(KILLCOMMAND) + if TargetInRange(GROWL) and Mana(more 39) Spell(KILLCOMMAND) #/fervor,if=focus<=20 if Mana(less 20) Spell(FERVOR) #/arcane_shot,if=focus>=90|buff.beast_within.up diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index db7c305..4b1d27c 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -22,6 +22,7 @@ Define(DEMONICEMPOWERMENT 47193) Define(DEMONSOUL 77801) Define(DRAINLIFE 689) SpellInfo(DRAINLIFE canStopChannelling=3) + SpellAddBuff(DRAINLIFE SOULBURN=0) Define(DRAINSOUL 1120) SpellInfo(DRAINSOUL canStopChannelling=5) Define(FELARMOR 28176) @@ -50,6 +51,7 @@ Define(SHADOWBURN 17877) Define(SHADOWFLAME 47897) Define(SOULFIRE 6353) SpellAddBuff(SOULFIRE IMPROVEDSOULFIREBUFF=15) + SpellAddBuff(SOULFIRE SOULBURN=0) Define(SOULBURN 74434) SpellInfo(SOULBURN cd=45) SpellAddBuff(SOULBURN SOULBURN=15) @@ -112,7 +114,7 @@ AddIcon help=main mastery=1 if TargetDeadIn(more 10) Spell(BANEOFAGONY) } #/haunt - if TargetDebuffExpires(HAUNT 1.5 mine=1 haste=spell) Spell(HAUNT) + Spell(HAUNT) #/fel_flame,if=buff.tier11_4pc_caster.react&dot.unstable_affliction.remains<8 if ArmorSetParts(T11 more 3) and TargetDebuffExpires(UNSTABLEAFFLICTION 8) Spell(FELFLAME) #/shadowflame @@ -165,8 +167,8 @@ AddIcon help=main mastery=1 AddIcon help=cd mastery=1 { #/summon_infernal - Spell(SUMMONINFERNAL) Spell(DEMONSOUL) + Spell(SUMMONINFERNAL) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } @@ -271,8 +273,8 @@ AddIcon help=main mastery=3 AddIcon help=cd mastery=3 { - if BuffPresent(heroism) Spell(SUMMONFELGUARD) Spell(DEMONSOUL) + if BuffPresent(heroism) Spell(SUMMONFELGUARD) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua index eae3636..3c15950 100644 --- a/defaut/Guerrier.lua +++ b/defaut/Guerrier.lua @@ -140,7 +140,7 @@ AddIcon help=main mastery=1 #/execute if TargetLifePercent(less 20) Spell(EXECUTE) #/slam,if=(cooldown.mortal_strike.remains>=1.5&(rage>=35|swing.mh.remains<1.1|buff.deadly_calm.up|buff.colossus_smash.up))|(cooldown.mortal_strike.remains>=1.2&buff.colossus_smash.remains>0.5&rage>=35) - if {{spell(MORTALSTRIKE)>1.5} and {Mana(more 34) or BuffPresent(DEADLYCALM) or BuffPresent(COLOSSUSSMASH)} or {spell(MORTALSTRIKE)>1.2 and BuffPresent(COLOSSUSSMASH 0.5) and Mana(more 34)} + if {{spell(MORTALSTRIKE)>1.5} and {Mana(more 34) or NextSwing(main 1.1) or BuffPresent(DEADLYCALM) or BuffPresent(COLOSSUSSMASH)}} or {spell(MORTALSTRIKE)>1.2 and BuffPresent(COLOSSUSSMASH 0.5) and Mana(more 34)} Spell(SLAM) #/battle_shout,if=rage<20 if Mana(less 20) Spell(BATTLESHOUT priority=2) @@ -162,7 +162,7 @@ AddIcon help=cd mastery=1 #/stance,choose=berserker,if=cooldown.recklessness.remains=0&rage<=50&((target.health_pct>20&target.time_to_die>320)|target.health_pct<=20) if Stance(1) and Spell(RECKLESSNESS) and Mana(less 50) Spell(BERSERKERSTANCE) #/recklessness,if=((target.health_pct>20&target.time_to_die>320)|target.health_pct<=20) - Spell(RECKLESSNESS) + if Stance(3) Spell(RECKLESSNESS) } Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) -- 1.7.9.5