From d086955fdd801745971d63b3c488ecdff82e376b Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Sat, 21 Nov 2009 15:49:41 +0000 Subject: [PATCH] - buggy message - added TargetDeadIn git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@136 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.toc | 2 +- OvaleFrame.lua | 2 +- defaut/Chasseur.lua | 6 +++--- defaut/Demoniste.lua | 12 ++++++------ defaut/Druide.lua | 8 ++++---- defaut/Mage.lua | 4 ++-- defaut/Pretre.lua | 6 +++--- defaut/Voleur.lua | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Ovale.toc b/Ovale.toc index 0ec034b..8308cec 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: 3.2.17 +## Version: 3.2.18 ## OptionalDeps: Ace3, ButtonFacade, Recount ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/OvaleFrame.lua b/OvaleFrame.lua index 7fbebaf..0399cd2 100644 --- a/OvaleFrame.lua +++ b/OvaleFrame.lua @@ -135,7 +135,7 @@ do end end end - print("sort "..spellName.." incorrect") +-- print("sort "..spellName.." incorrect") return 0 end diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index 51887da..ec808c1 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -22,16 +22,16 @@ ScoreSpells(HUNTERSMARK BLACKARROW SERPENTSTING CHIMERASHOT AIMEDSHOT MULTISHOT AddIcon help=main { - if TargetDebuffExpires(HUNTERSMARK 0) Spell(HUNTERSMARK) + if TargetDebuffExpires(HUNTERSMARK 0) and TargetDeadIn(more 8) Spell(HUNTERSMARK) if TargetDebuffExpires(BLACKARROW 0 mine=1) Spell(BLACKARROW) - if TargetDebuffExpires(SERPENTSTING 0 mine=1) Spell(SERPENTSTING) + if TargetDebuffExpires(SERPENTSTING 0 mine=1) and TargetDeadIn(more 8) Spell(SERPENTSTING) if TargetDebuffExpires(EXPLOSIVESHOT 0 mine=1) Spell(EXPLOSIVESHOT) if TargetDebuffPresent(SERPENTSTING) Spell(CHIMERASHOT) Spell(AIMEDSHOT) if CheckBoxOn(multi) Spell(MULTISHOT) unless TalentPoints(TALENTEXPLOSIVESHOT more 0) Spell(ARCANESHOT) if TargetLifePercent(less 20) Spell(KILLSHOT) - if TargetDebuffExpires(HUNTERSMARK 2) Spell(HUNTERSMARK) + if TargetDebuffExpires(HUNTERSMARK 2) Spell(HUNTERSMARK nored=1) unless TargetDebuffPresent(EXPLOSIVESHOT mine=1) and {2s before Spell(EXPLOSIVESHOT)} Spell(STEADYSHOT) } diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index 03b8b5d..8b0eb10 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -44,20 +44,20 @@ ScoreSpells(CURSEELEMENTS SHADOWBOLT HAUNT UNSTABLEAFFLICTION IMMOLATE CONFLAGRA AddIcon help=main { -if List(curse elements) and TargetDebuffExpires(CURSEELEMENTS 2) Spell(CURSEELEMENTS) +if List(curse elements) and TargetDebuffExpires(CURSEELEMENTS 2) and TargetDeadIn(more 8) Spell(CURSEELEMENTS) if TalentPoints(TALENTSHADOWEMBRACE more 0) and TargetDebuffExpires(SHADOWEMBRACE 0) Spell(SHADOWBOLT) if TargetDebuffExpires(HAUNT 1.5 mine=1) Spell(HAUNT) -if TargetDebuffExpires(UNSTABLEAFFLICTION 1.5 mine=1 haste=spell) Spell(UNSTABLEAFFLICTION) +if TargetDebuffExpires(UNSTABLEAFFLICTION 1.5 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(UNSTABLEAFFLICTION) if TalentPoints(TALENTBACKDRAFT more 0) and TargetDebuffExpires(IMMOLATE 3 mine=1) and TargetDebuffPresent(IMMOLATE mine=1) Spell(CONFLAGRATE) if TargetDebuffExpires(IMMOLATE 1.5 mine=1 haste=spell) and - {TargetLifePercent(more 25) or TalentPoints(TALENTDECIMATION more 0)} + {TargetLifePercent(more 25) or TalentPoints(TALENTDECIMATION more 0)} and TargetDeadIn(more 8) Spell(IMMOLATE) -if List(curse doom) and TargetDebuffExpires(CURSEDOOM 0 mine=1) Spell(CURSEDOOM) +if List(curse doom) and TargetDebuffExpires(CURSEDOOM 0 mine=1) and TargetDeadIn(more 60) Spell(CURSEDOOM) if List(curse tongues) and TargetDebuffExpires(CURSETONGUES 2) Spell(CURSETONGUES) if List(curse weakness) and TargetDebuffExpires(CURSEWEAKNESS 2) Spell(CURSEWEAKNESS) -if List(curse agony) and TargetDebuffExpires(CURSEAGONY 0 mine=1) Spell(CURSEAGONY) -if TargetDebuffExpires(CORRUPTION 0 mine=1) Spell(CORRUPTION) +if List(curse agony) and TargetDebuffExpires(CURSEAGONY 0 mine=1) and TargetDeadIn(more 10) Spell(CURSEAGONY) +if TargetDebuffExpires(CORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) if BuffPresent(DECIMATION) Spell(SOULFIRE) diff --git a/defaut/Druide.lua b/defaut/Druide.lua index f5193b9..ab35604 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -61,7 +61,7 @@ AddIcon help=main { if ComboPoints(more 0) and BuffExpires(SAVAGEROAR 2) Spell(SAVAGEROAR) - if CheckBoxOn(lucioles) and TargetDebuffExpires(FAERIEFERAL 2) + if CheckBoxOn(lucioles) and TargetDebuffExpires(FAERIEFERAL 2) and TargetDeadIn(more 15) Spell(FAERIEFERAL) if ComboPoints(more 4) and Mana(more 70) @@ -91,12 +91,12 @@ AddIcon help=main unless Stance(1) or Stance(3) { - if CheckBoxOn(lucioles) and TargetDebuffExpires(FAERIEFIRE 2) + if CheckBoxOn(lucioles) and TargetDebuffExpires(FAERIEFIRE 2) and TargetDeadIn(more 15) Spell(FAERIEFIRE) - if TargetDebuffExpires(INSECTSWARM 0 mine=1) + if TargetDebuffExpires(INSECTSWARM 0 mine=1) and TargetDeadIn(more 6) Spell(INSECTSWARM) - if TargetDebuffExpires(MOONFIRE 0 mine=1) + if TargetDebuffExpires(MOONFIRE 0 mine=1) and TargetDeadIn(more 6) Spell(MOONFIRE) if BuffPresent(ECLIPSEWRATH) diff --git a/defaut/Mage.lua b/defaut/Mage.lua index 4fbf833..d185f75 100644 --- a/defaut/Mage.lua +++ b/defaut/Mage.lua @@ -37,9 +37,9 @@ AddIcon help=main if TalentPoints(TALENTLIVINGBOMB more 0) { #Fire spec - if TargetDebuffExpires(IMPROVEDSCORCH 6 stacks=5) and CheckBoxOn(scorch) Spell(SCORCH) + if TargetDebuffExpires(IMPROVEDSCORCH 6 stacks=5) and CheckBoxOn(scorch) and TargetDeadIn(more 15) Spell(SCORCH) if BuffPresent(HOTSTREAK) Spell(PYROBLAST) - if TargetDebuffExpires(LIVINGBOMB 0 mine=1) Spell(LIVINGBOMB) + if TargetDebuffExpires(LIVINGBOMB 0 mine=1) and TargetDeadIn(more 12) Spell(LIVINGBOMB) if TalentPoints(TALENTPIERCINGICE more 0) Spell(FROSTFIREBOLT) if TalentPoints(TALENTPIERCINGICE less 1) diff --git a/defaut/Pretre.lua b/defaut/Pretre.lua index 8fa53b8..5b7b733 100644 --- a/defaut/Pretre.lua +++ b/defaut/Pretre.lua @@ -49,20 +49,20 @@ if BuffPresent(Focus) # Check if Shadow Weave is stacked 5 times # before suggesting Shadow Word: Pain -if BuffPresent(SW stacks=5) and TargetDebuffExpires(SWP 0 mine=1) +if BuffPresent(SW stacks=5) and TargetDebuffExpires(SWP 0 mine=1) and TargetDeadIn(more 6) { Spell(SWP) } #Refresh VT -if TargetDebuffExpires(VT 1.4 mine=1 haste=spell) +if TargetDebuffExpires(VT 1.4 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(VT) #cast MB if up Spell(MB) #Refresh devouring plague -if TargetDebuffExpires(DP 0 mine=1) +if TargetDebuffExpires(DP 0 mine=1) and TargetDeadIn(more 8) Spell(DP) if OtherDebuffExpires(SWP) diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua index a198e43..172a6b0 100644 --- a/defaut/Voleur.lua +++ b/defaut/Voleur.lua @@ -43,7 +43,7 @@ AddIcon help=main Spell(SLICEANDDICE) } - if TargetDebuffExpires(RUPTURE 0) + if TargetDebuffExpires(RUPTURE 0) and TargetDeadIn(more 6) Spell(RUPTURE) if TalentPoints(TALENTVILEPOISONS more 0) -- 1.7.9.5