From 396528aa0e5a2715ba1d8e9cbd41f8b80e7f17d9 Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Thu, 17 Mar 2011 22:48:37 +0000 Subject: [PATCH] mm hunter: fixes balance druid: some minor changes git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@381 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.toc | 2 +- defaut/Chasseur.lua | 4 ++-- defaut/Chevalier.lua | 4 ++-- defaut/Druide.lua | 37 +++++++++++++++++++++++++++++-------- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Ovale.toc b/Ovale.toc index fe172c9..cd99b19 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.31 +## Version: 4.0.32 ## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0, LibRangeCheck-2.0 ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index 4c57261..4cae069 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -129,10 +129,10 @@ AddIcon help=main mastery=2 if Glyph(GLYPHOFARCANESHOT) { #/aimed_shot,if=target.health_pct>80|buff.rapid_fire.up|buff.bloodlust.up - if #TargetLifePercent(more 80) or + if TargetLifePercent(more 80) or BuffPresent(RAPIDFIRE) or BuffPresent(heroism) if Mana(more 49) Spell(AIMEDSHOT) #/arcane_shot,if=(focus>=66|cooldown.chimera_shot.remains>=5)&(target.health_pct<80&!buff.rapid_fire.up&!buff.bloodlust.up) - if {Mana(more 65) or spell(CHIMERASHOT)>5} and {#TargetLifePercent(less 80) and + if {Mana(more 65) or spell(CHIMERASHOT)>5} and {TargetLifePercent(less 80) and BuffExpires(RAPIDFIRE) and BuffExpires(heroism)} if Mana(more 24) Spell(ARCANESHOT) } diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua index 43e73d0..bddb783 100644 --- a/defaut/Chevalier.lua +++ b/defaut/Chevalier.lua @@ -204,8 +204,8 @@ AddIcon help=aoe mastery=2 AddIcon help=cd mastery=2 { - #/raise_dead,time>=5 - unless TotemPresent(ghoul) if TimeInCombat(more 5) Spell(RAISEDEAD priority=2) + #/raise_dead,time>=15 + unless TotemPresent(ghoul) if TimeInCombat(more 15) Spell(RAISEDEAD priority=2) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } diff --git a/defaut/Druide.lua b/defaut/Druide.lua index bc43742..eb16fbb 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -105,18 +105,32 @@ AddIcon help=main mastery=1 Spell(MOONFIRE) } - #/insect_swarm,if=!ticking - if TargetDebuffExpires(INSECTSWARM 0 mine=1) and TargetDeadIn(more 6) - Spell(INSECTSWARM nored=1) + #/insect_swarm,if=ticks_remain<2|(dot.insect_swarm.remains<4&buff.solar_eclipse.up&eclipse<15)"; + if TargetDebuffExpires(INSECTSWARM 2 mine=1) or {TargetDebuffExpires(INSECTSWARM 4 mine=1) and + BuffPresent(ECLIPSESOLAR) and Eclipse(less 15)} + Spell(INSECTSWARM nored=1) + + if BuffPresent(ASTRALALIGNMENT) + { + #/starsurge,if=buff.t11_4pc_caster.up + Spell(STARSURGE) + #/starfire,if=buff.t11_4pc_caster.up&buff.lunar_eclipse.up + if BuffPresent(ECLIPSELUNAR) Spell(STARFIRE) + #/wrath,if=buff.t11_4pc_caster.up + Spell(WRATH) + } - if TargetDebuffExpires(MOONFIRE 1 mine=1) and TargetDebuffExpires(SUNFIRE 1 mine=1) and TargetDeadIn(more 6) - and BuffExpires(ASTRALALIGNMENT) + #action_list_str += "/wild_mushroom_detonate,moving=1,if=buff.wild_mushroom.stack=3"; + #action_list_str += "/wild_mushroom_detonate,moving=0,if=buff.wild_mushroom.stack>0&buff.solar_eclipse.up"; + + if TargetDeadIn(more 6) and BuffExpires(ASTRALALIGNMENT) { - #/sunfire,if=!ticking&buff.t11_4pc_caster.down&!dot.moonfire.remains>0 - if BuffPresent(ECLIPSESOLAR) + #/sunfire,if=(!ticking|ticks_remain<2)&buff.t11_4pc_caster.down&!dot.moonfire.remains>0 + if BuffPresent(ECLIPSESOLAR) and TargetDebuffExpires(MOONFIRE 0 mine=1) and TargetDebuffExpires(SUNFIRE 2 mine=1) Spell(SUNFIRE nored=1) #/moonfire,if=!ticking&buff.t11_4pc_caster.down&!dot.sunfire.remains>0 - Spell(MOONFIRE nored=1) + if TargetDebuffExpires(MOONFIRE 2 mine=1) and TargetDebuffExpires(SUNFIRE 0 mine=1) + Spell(MOONFIRE nored=1) } #/starsurge,if=!((eclipse<=-87&eclipse_dir=-1)|(eclipse>=80&eclipse_dir=1)) @@ -125,6 +139,13 @@ AddIcon help=main mastery=1 #/innervate,if=mana_pct<50 if ManaPercent(less 50) Spell(INNERVATE) + + #The following lines should not be useful for Ovale + #/starfire,if=eclipse_dir=1&eclipse<80 + #/starfire,prev=wrath,if=eclipse_dir=-1&eclipse<-87 + #/wrath,if=eclipse_dir=-1&eclipse>=-87"; + #/wrath,prev=starfire,if=eclipse_dir=1&eclipse>=80"; + #/starfire,if=eclipse_dir=1 if BuffPresent(ECLIPSELUNAR) or Eclipse(equal -100) Spell(STARFIRE) #/wrath,if=eclipse_dir=-1 -- 1.7.9.5