Quantcast

Use of Pyroblast!

Sidoine De Wispelaere [07-10-11 - 12:11]
Use of Pyroblast!

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@418 d5049fe3-3747-40f7-a4b5-f36d6801af5f
Filename
Ovale.toc
defaut/Mage.lua
diff --git a/Ovale.toc b/Ovale.toc
index c968c96..89200bb 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.2.1
+## Version: 4.2.2
 ## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0, LibRangeCheck-2.0
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index d384463..6a79e39 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -51,6 +51,9 @@ Define(MOLTENARMOR 30482)
 Define(PYROBLAST 11366) #fire dot
     SpellAddTargetDebuff(PYROBLAST PYROBLAST=12)
     SpellAddBuff(PYROBLAST HOTSTREAK=0)
+Define(PYROBLASTBANG 92315)
+	SpellAddTargetDebuff(PYROBLASTBANG PYROBLASTBANG=12)
+	SpellAddBuff(PYROBLASTBANG HOTSTREAK=0)
 Define(SCORCH 2948) #fire 1.5 (cast while moving with firestarter talent)
 Define(SPELLSTEAL 30449)
 Define(SUMMONWATERELEMENTAL 31687) #frost pet
@@ -156,7 +159,8 @@ AddIcon help=main mastery=2
 	#/scorch,debuff=1
     if TalentPoints(CRITICALMASSTALENT more 0) and TargetDebuffExpires(magicalcrittaken 0) Spell(SCORCH)
 	#/combustion,if=dot.living_bomb.ticking&dot.ignite.ticking&dot.pyroblast.ticking
-    if TargetDebuffPresent(LIVINGBOMB mine=1) and TargetDebuffPresent(IGNITE mine=1) and TargetDebuffPresent(PYROBLAST mine=1)
+    if TargetDebuffPresent(LIVINGBOMB mine=1) and TargetDebuffPresent(IGNITE mine=1) and
+		{TargetDebuffPresent(PYROBLAST mine=1) or TargetDebuffPresent(PYROBLASTBANG mine=1)}
         Spell(COMBUSTION)
 	#/living_bomb,if=!ticking
     if TargetDebuffExpires(LIVINGBOMB 0 mine=1) and TargetDeadIn(more 12) Spell(LIVINGBOMB)