From f9baeade7d2607b7848bcb474119ba1fb283f0fb Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Sat, 16 Oct 2010 17:28:24 +0000 Subject: [PATCH] arcane mage: new script various buff and debuffs git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@284 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Condition.lua | 2 +- Ovale.toc | 2 +- defaut/Druide.lua | 4 ++-- defaut/Mage.lua | 26 ++++++++++++++++++++------ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Condition.lua b/Condition.lua index 13e1e82..c48c01e 100644 --- a/Condition.lua +++ b/Condition.lua @@ -94,7 +94,7 @@ local buffSpellList = meleeslow= { 45477, --Icy Touch - 58179, --Infected Wounds + 58179, --Infected Wounds rank 1 58180, --Infected Wounds rank 2 68055, --Judgments of the just 6343, --Thunderclap diff --git a/Ovale.toc b/Ovale.toc index c650af3..a4c3193 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.4 +## Version: 4.0.5 ## OptionalDeps: Ace3, ButtonFacade, Recount, LibBabble-CreatureType-3.0 ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/defaut/Druide.lua b/defaut/Druide.lua index 0d86dbb..9ada052 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -149,7 +149,7 @@ AddIcon help=main mastery=2 if TargetDebuffPresent(LACERATE stacks=3) Spell(PULVERIZE) - if CheckBoxOn(lucioles) and TargetDebuffExpires(lowerarmor 2) + if CheckBoxOn(lucioles) and TargetDebuffExpires(lowerarmor 2) and TargetDebuffExpires(FAERIEFIREDEBUFF stacks=3) Spell(FAERIEFERAL) if CheckBoxOn(demo) and TargetDebuffExpires(lowerphysicaldamage 2) @@ -168,7 +168,7 @@ AddIcon help=main mastery=2 if ComboPoints(more 0) and BuffExpires(SAVAGEROAR 2) Spell(SAVAGEROAR priority=4) - if CheckBoxOn(lucioles) and TargetDebuffExpires(lowerarmor 2) and TargetDeadIn(more 15) + if CheckBoxOn(lucioles) and TargetDebuffExpires(lowerarmor 2) and TargetDebuffExpires(FAERIEFIREDEBUFF stacks=3) and TargetDeadIn(more 15) Spell(FAERIEFERAL) #De-synchronize Roar and Rip diff --git a/defaut/Mage.lua b/defaut/Mage.lua index 73966ce..3a6690d 100644 --- a/defaut/Mage.lua +++ b/defaut/Mage.lua @@ -2,16 +2,19 @@ Ovale.defaut["MAGE"]= [[ #Spells Define(ARCANEBARRAGE 44425) #arcane instant + SpellAddDebuff(ARCANEBARRAGE ARCANEBLASTDEBUFF=0) Define(ARCANEBLAST 30451) #arcane stacks*4 cost increased - SpellAddDebuff(ARCANEBLAST ARCANEBLAST=10) + SpellAddDebuff(ARCANEBLAST ARCANEBLASTDEBUFF=10) Define(ARCANEMISSILES 5143) #arcane channel - SpellAddDebuff(ARCANEMISSILES ARCANEBLAST=0) + SpellAddDebuff(ARCANEMISSILES ARCANEBLASTDEBUFF=0) Define(ARCANEPOWER 12042) #arcane cd SpellInfo(ARCANEPOWER cd=84) Define(COLDSNAP 11958) #frost reset cd Define(COMBUSTION 11129) #fire cd consume dot SpellInfo(COMBUSTION cd=180) Define(DEEPFREEZE 44572) #frost instant +Define(EVOCATION 12051) + SpellInfo(EVOCATION cd=240) Define(FIREBLAST 2136) #fire instant Define(FIREBALL 133) #fire 2.5 Define(FROSTBOLT 116) #frost @@ -38,6 +41,7 @@ Define(SUMMONWATERELEMENTAL 31687) #frost pet Define(BRAINFREEZE 57761) #frost (instant fireball/frostfire bolt) Define(FINGERSOFFROST 83074) #frost boost ice lance/deep freeze Define(HOTSTREAK 48108) #fire instant pyroblast +Define(ARCANEBLASTDEBUFF 36032) #Talent Define(FIRESTARTERTALENT 11431) @@ -47,12 +51,22 @@ ScoreSpells(SCORCH PYROBLAST LIVINGBOMB FROSTFIREBOLT FIREBALL SUMMONWATERELEMEN AddIcon help=main mastery=1 { - unless InCombat() if BuffExpires(MAGEARMOR 400) and BuffExpires(MOLTENARMOR 400) and BuffExpires(ICEARMOR 400) Spell(MOLTENARMOR) + unless InCombat() if BuffExpires(MAGEARMOR 400) and BuffExpires(MOLTENARMOR 400) and BuffExpires(ICEARMOR 400) Spell(MAGEARMOR) if Speed(more 0) Spell(ARCANEBARRAGE) - if DebuffPresent(ARCANEBLAST stacks=4) - Spell(ARCANEMISSILES) - Spell(ARCANEBLAST) + unless 15s before Spell(EVOCATION) + { + #Mana conserve + if DebuffPresent(ARCANEBLASTDEBUFF stacks=4) {Spell(ARCANEMISSILES usable=1) Spell(ARCANEBARRAGE)} + if ManaPercent(less 90) and DebuffPresent(ARCANEBLASTDEBUFF stacks=3) {Spell(ARCANEMISSILES usable=1) Spell(ARCANEBARRAGE)} + if ManaPercent(less 85) and DebuffPresent(ARCANEBLASTDEBUFF stacks=2) {Spell(ARCANEMISSILES usable=1) Spell(ARCANEBARRAGE)} + Spell(ARCANEBLAST) + } + if 15s before Spell(EVOCATION) + { + Spell(ARCANEBLAST) + if ManaPercent(less 40) Spell(EVOCATION) + } } AddIcon help=main mastery=2 -- 1.7.9.5