From cb8cff32ba38d07b94fabc57081ae0a3812a685b Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Tue, 5 Jan 2010 21:04:55 +0000 Subject: [PATCH] added conflagrate glyph support git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@191 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.toc | 2 +- defaut/Demoniste.lua | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Ovale.toc b/Ovale.toc index 5f23098..d4ef706 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.3.12 +## Version: 3.3.13 ## OptionalDeps: Ace3, ButtonFacade, Recount, LibBabble-CreatureType-3.0 ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index 8859f8b..f189771 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -28,6 +28,7 @@ Define(INCINERATE 29722) Define(DECIMATION 63167) Define(CHAOSBOLT 50796) Define(MOLTENCORE 47383) +Define(GLYPHOFCONFLAGRATE 56235) AddListItem(curse elements SpellName(CURSEELEMENTS)) AddListItem(curse agony SpellName(CURSEAGONY)) @@ -47,6 +48,8 @@ SpellAddTargetDebuff(IMMOLATE IMMOLATE=15) SpellAddBuff(SHADOWBOLT SHADOWEMBRACE=12) SpellAddBuff(INCINERATE MOLTENCORE=-1) SpellAddBuff(IMMOLATE MOLTENCORE=-1) +SpellAddTargetDebuff(CONFLAGRATE IMMOLATE=0) +SpellAddTargetDebuff(CONFLAGRATE glyph=GLYPHOFCONFLAGRATE) ScoreSpells(CURSEELEMENTS SHADOWBOLT HAUNT UNSTABLEAFFLICTION IMMOLATE CONFLAGRATE CURSEDOOM CURSETONGUES CURSEWEAKNESS CURSEAGONY CORRUPTION SOULFIRE DRAINSOUL INCINERATE SHADOWBOLT) @@ -57,8 +60,12 @@ if List(curse elements) and TargetDebuffExpires(CURSEELEMENTS 2) and TargetDeadI 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) 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 TalentPoints(TALENTBACKDRAFT more 0) and TargetDebuffPresent(IMMOLATE mine=1) +{ + if TargetDebuffExpires(IMMOLATE 3 mine=1) or Glyph(GLYPHOFCONFLAGRATE) + Spell(CONFLAGRATE) +} + if TargetDebuffExpires(IMMOLATE 1.5 mine=1 haste=spell) and TargetDebuffExpires(UNSTABLEAFFLICTION 0 mine=1) and {TargetLifePercent(more 25) or TalentPoints(TALENTDECIMATION more 0)} and TargetDeadIn(more 8) Spell(IMMOLATE) -- 1.7.9.5