- added an ItemCount(itemid more/less N) function
Sidoine De Wispelaere [09-20-09 - 11:16]
- added an ItemCount(itemid more/less N) function
- fixed Warlock default script (added Decimation, Incinerate, and Demonic Empowerment)
git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@97 d5049fe3-3747-40f7-a4b5-f36d6801af5f
diff --git a/Condition.lua b/Condition.lua
index 6a88c17..2266cf0 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -334,6 +334,9 @@ Ovale.conditions=
local _,_,_,_,_,_,_,_,itemLoc = GetItemInfo(id)
return testbool(itemLoc=="INVTYPE_SHIELD", condition[1])
end,
+ ItemCount = function(condition)
+ return compare(GetItemCount(condition[1]), condition[2], condition[3])
+ end,
IsFeared = function(condition)
buildFearSpellList()
return testbool(not HasFullControl() and isDebuffInList(fearSpellList), condition[1])
diff --git a/Ovale.toc b/Ovale.toc
index 3032f27..f2a4390 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.1
+## Version: 3.2.2
## OptionalDeps: Ace3, ButtonFacade
## SavedVariables: OvaleDB
## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index 049cd10..863a156 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -21,6 +21,11 @@ Define(DRAINSOUL 47855)
Define(SHADOWEMBRACE 32391)
Define(TALENTSHADOWEMBRACE 1763)
Define(METAMORPHOSIS 47241)
+Define(TALENTDECIMATION 2261)
+Define(SOULSHARD 6265)
+Define(DEMONICEMPOWERMENT 47193)
+Define(INCINERATE 29722)
+Define(DECIMATION 63167)
AddListItem(curse elements SpellName(CURSEELEMENTS))
AddListItem(curse agony SpellName(CURSEAGONY))
@@ -37,7 +42,9 @@ if TargetDebuffExpires(HAUNT 1.5 mine=1) Spell(HAUNT doNotRepeat=1)
if TargetDebuffExpires(UNSTABLEAFFLICTION 1.5 mine=1 haste=spell) Spell(UNSTABLEAFFLICTION doNotRepeat=1)
if TalentPoints(TALENTBACKDRAFT more 0) and TargetDebuffExpires(IMMOLATE 3 mine=1)
and TargetDebuffPresent(IMMOLATE mine=1) Spell(CONFLAGRATE doNotRepeat=1)
-if TargetDebuffExpires(IMMOLATE 1.5 mine=1 haste=spell) and TargetLifePercent(more 25) Spell(IMMOLATE doNotRepeat=1)
+if TargetDebuffExpires(IMMOLATE 1.5 mine=1 haste=spell) and
+ {TargetLifePercent(more 25) or TalentPoints(TALENTDECIMATION more 0)}
+ Spell(IMMOLATE doNotRepeat=1)
if List(curse recklessness) and TargetDebuffExpires(CURSERECKLESSNESS 2) Spell(CURSERECKLESSNESS)
if List(curse doom) and TargetDebuffExpires(CURSEDOOM 0 mine=1) Spell(CURSEDOOM)
if List(curse tongues) and TargetDebuffExpires(CURSETONGUES 2) Spell(CURSETONGUES)
@@ -45,15 +52,18 @@ if List(curse weakness) and TargetDebuffExpires(CURSEWEAKNESS 2) Spell(CURSEWEAK
if List(curse agony) and TargetDebuffExpires(CURSEAGONY 0 mine=1) Spell(CURSEAGONY)
if TargetDebuffExpires(CORRUPTION 0 mine=1) Spell(CORRUPTION)
-if TargetLifePercent(less 25) and Level(more 76) Spell(DRAINSOUL)
+if BuffPresent(DECIMATION) Spell(SOULFIRE)
+
+if TargetLifePercent(less 25) and Level(more 76) and {TalentPoints(TALENTDECIMATION less 1) or ItemCount(SOULSHARD less 16)} Spell(DRAINSOUL)
-if TalentPoints(TALENTEMBERSTORM more 0) Spell(SOULFIRE)
+if TalentPoints(TALENTEMBERSTORM more 0) Spell(INCINERATE)
Spell(SHADOWBOLT)
}
AddIcon
{
Spell(METAMORPHOSIS)
+ Spell(DEMONICEMPOWERMENT)
Item(Trinket0Slot usable=1)
Item(Trinket1Slot usable=1)
}