From dfbcc73a775be91be5aa5cfa58a51797faa95209 Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Sun, 5 Dec 2010 15:10:40 +0000 Subject: [PATCH] added some >80 abilities git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@337 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.lua | 3 ++- defaut/Chaman.lua | 6 +++++- defaut/Chasseur.lua | 9 +++++---- defaut/Chevalier.lua | 8 ++++++-- defaut/Demoniste.lua | 2 ++ defaut/Druide.lua | 5 ++++- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Ovale.lua b/Ovale.lua index 48222c0..aa1d0cc 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -113,7 +113,8 @@ Ovale.buffSpellList = { 21562, -- Fortitude TODO: vérifier 469, -- Commanding Shout - 6307 -- Blood Pact + 6307, -- Blood Pact + 90364 -- Qiraji Fortitude }, lowerarmor= { diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua index 6c614c7..becb5ce 100644 --- a/defaut/Chaman.lua +++ b/defaut/Chaman.lua @@ -41,6 +41,7 @@ Define(WINDFURYWEAPON 8232) #Buff Define(MAELSTROMWEAPON 53817) +Define(UNLEASHWIND 73681) #Fire Define(FIREELEMENTALTOTEM 2894) @@ -84,6 +85,7 @@ AddIcon help=main mastery=1 if ManaPercent(less 90) Spell(THUNDERSTORM) } if CheckBoxOn(aoe) Spell(CHAINLIGHTNING) + Spell(UNLEASHELEMENTS) if TargetDebuffExpires(FLAMESHOCK 0 mine=1) Spell(FLAMESHOCK) unless TargetDebuffExpires(FLAMESHOCK 1.6 haste=spell mine=1) Spell(LAVABURST) @@ -101,17 +103,19 @@ AddIcon help=main mastery=2 if WeaponEnchantExpires(mainhand 400) Spell(WINDFURYWEAPON) if WeaponEnchantExpires(offhand 400) Spell(FLAMETHONGWEAPON) } - + if CheckBoxOn(aoe) { if TotemExpires(fire) Spell(MAGMATOTEM) if BuffExpires(LIGHTNINGSHIELD) Spell(LIGHTNINGSHIELD) if BuffPresent(MAELSTROMWEAPON stacks=5) Spell(CHAINLIGHTNING) if TotemPresent(fire) Spell(FIRENOVA) + Spell(UNLEASHELEMENTS) } if CheckBoxOff(aoe) { + Spell(UNLEASHELEMENTS) if TotemExpires(fire) Spell(SEARINGTOTEM) if BuffExpires(LIGHTNINGSHIELD) Spell(LIGHTNINGSHIELD) if BuffPresent(MAELSTROMWEAPON stacks=5) Spell(LIGHTNINGBOLT) diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index 03de69d..671bf64 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -59,12 +59,13 @@ ScoreSpells(FOCUSFIRE KILLCOMMAND ARCANESHOT KILLSHOT STEADYSHOT SERPENTSTING AddIcon help=main mastery=1 { if TargetLifePercent(less 20) Spell(KILLSHOT) - if Mana(less 40) {Spell(FERVOR) Spell(STEADYSHOT)} + if Mana(less 40) {Spell(FERVOR) Spell(COBRASHOT) Spell(STEADYSHOT)} if TargetBuffPresent(FRENZYEFFECT stacks=5 target=pet) Spell(FOCUSFIRE) if CheckBoxOn(multi) Spell(MULTISHOT) if TargetDebuffExpires(SERPENTSTING 0 mine=1) and TargetDeadIn(more 8) Spell(SERPENTSTING) if TargetInRange(GROWL) Spell(KILLCOMMAND) Spell(ARCANESHOT) + Spell(COBRASHOT) Spell(STEADYSHOT) } @@ -84,16 +85,16 @@ AddIcon help=main mastery=2 AddIcon help=main mastery=3 { if TargetLifePercent(less 20) Spell(KILLSHOT) - if Mana(less 35) and BuffExpires(LOCKANDLOAD) Spell(STEADYSHOT) + if Mana(less 35) and BuffExpires(LOCKANDLOAD) {Spell(COBRASHOT) Spell(STEADYSHOT)} if Mana(more 35) and TargetDebuffExpires(BLACKARROW 0 mine=1) Spell(BLACKARROW) if Mana(more 25) and TargetDebuffExpires(SERPENTSTING 0 mine=1) and TargetDeadIn(more 8) Spell(SERPENTSTING) if TargetDebuffExpires(EXPLOSIVESHOT 0 mine=1) Spell(EXPLOSIVESHOT) if BuffPresent(LOCKANDLOAD) Spell (KILLCOMMAND) if BuffPresent(LOCKANDLOAD) Spell (EXPLOSIVESHOT) - unless 1.5s before Spell(BLACKARROW) Spell(STEADYSHOT) + unless 1.5s before Spell(BLACKARROW) {Spell(COBRASHOT) Spell(STEADYSHOT)} if CheckBoxOn(multi) Spell(MULTISHOT) if Mana(more 57) Spell(ARCANESHOT) - unless 1.5s before Spell(EXPLOSIVESHOT) Spell(STEADYSHOT) + unless 1.5s before Spell(EXPLOSIVESHOT) {Spell(COBRASHOT) Spell(STEADYSHOT)} } diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua index dd69e63..ae75e84 100644 --- a/defaut/Chevalier.lua +++ b/defaut/Chevalier.lua @@ -95,6 +95,7 @@ AddIcon help=main mastery=1 if BuffExpires(strengthagility 2) and CheckBoxOn(horn) Spell(HORNOFWINTER) if TargetDebuffExpires(lowerphysicaldamage) and CheckBoxOn(scarlet) and TargetClassification(worldboss) if Runes(blood 1) or BuffPresent(BLOODSWARM) Spell(BLOODBOIL) + if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and TargetDebuffExpires(FROSTFEVER 0 mine=1) Spell(OUTBREAK) Spell(RUNESTRIKE usable=1) if Runes(unholy 1 frost 1) and {BuffExpires(BLOODSHIELD) or TargetTargetIsPlayer(no)} Spell(DEATHSTRIKE) @@ -108,10 +109,10 @@ AddIcon help=main mastery=1 AddIcon help=aoe mastery=1 { if BuffExpires(strengthagility 2) and CheckBoxOn(horn) Spell(HORNOFWINTER) - Spell(RUNESTRIKE usable=1) if Runes(unholy 1) Spell(DEATHANDECAY usable=1) + if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and TargetDebuffExpires(FROSTFEVER 0 mine=1) Spell(OUTBREAK) if TargetDebuffExpires(FROSTFEVER 0 mine=1) and Runes(frost 1) Spell(ICYTOUCH) if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and Runes(unholy 1) Spell(PLAGUESTRIKE) @@ -122,10 +123,11 @@ AddIcon help=aoe mastery=1 if Runes(blood 1) unless OtherDebuffPresent(BLOODPLAGUE) and OtherDebuffPresent(FROSTFEVER) Spell(PESTILENCE usable=1) + Spell(RUNESTRIKE usable=1) if Runes(unholy 1 frost 1) Spell(DEATHSTRIKE) if Runes(blood 1) Spell(HEARTSTRIKE) } - + Spell(RUNESTRIKE usable=1) if Mana(more 39) Spell(DEATHCOIL usable=1) } @@ -133,6 +135,7 @@ AddIcon help=main mastery=2 { if BuffExpires(strengthagility 2) and CheckBoxOn(horn) Spell(HORNOFWINTER) + if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and TargetDebuffExpires(FROSTFEVER 0 mine=1) Spell(OUTBREAK) if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and Runes(unholy 1) Spell(PLAGUESTRIKE) if TargetDebuffExpires(FROSTFEVER 0 mine=1) and Runes(frost 1) { @@ -181,6 +184,7 @@ AddIcon help=main mastery=3 if Runes(unholy 1) Spell(SCOURGESTRIKE) if Runes(blood 1 frost 1 nodeath=1) Spell(FESTERINGSTRIKE) } + if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and TargetDebuffExpires(FROSTFEVER 0 mine=1) Spell(OUTBREAK) if TargetDebuffExpires(FROSTFEVER 0 mine=1) and Runes(frost 1) Spell(ICYTOUCH) if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and Runes(unholy 1) Spell(PLAGUESTRIKE) diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index cd4c3e5..1957c23 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -105,6 +105,7 @@ AddIcon help=main mastery=1 AddIcon help=cd mastery=1 { if BuffPresent(heroism) Spell(SUMMONFELGUARD) + Spell(DEMONSOUL) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } @@ -137,6 +138,7 @@ AddIcon help=main mastery=2 AddIcon help=cd mastery=2 { Spell(METAMORPHOSIS) + Spell(DEMONSOUL) if BuffPresent(METAMORPHOSIS) Spell(SUMMONINFERNAL) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) diff --git a/defaut/Druide.lua b/defaut/Druide.lua index de3fadd..882184f 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -56,7 +56,7 @@ Define(SURVIVALINSTINCTS 61336) #cat+bear surv cd Define(SWIPEBEAR 779) #bear aoe SpellInfo(SWIPEBEAR cd=6) Define(SWIPECAT 62078) #cat aoe -Define(TRASH 77758) #bear aoe bleed +Define(THRASH 77758) #bear aoe bleed Define(TIGERSFURY 5217) #cat buff SpellInfo(TIGERSFURY cd=30) Define(WRATH 5176) #moonkin @@ -167,7 +167,10 @@ AddIcon help=main mastery=2 if Mana(more 50) Spell(MAUL) if CheckBoxOn(multi) + { + Spell(THRASH) Spell(SWIPEBEAR) + } Spell(MANGLEBEAR) Spell(LACERATE) } -- 1.7.9.5