Quantcast

bug with AddListItem: parameters were ignored

Sidoine De Wispelaere [10-17-10 - 09:30]
bug with AddListItem: parameters were ignored
warlock: some tweaks following evenprimes advices

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@290 d5049fe3-3747-40f7-a4b5-f36d6801af5f
Filename
OvaleCompile.lua
defaut/Demoniste.lua
defaut/Guerrier.lua
diff --git a/OvaleCompile.lua b/OvaleCompile.lua
index 49c65cb..2810fd0 100644
--- a/OvaleCompile.lua
+++ b/OvaleCompile.lua
@@ -205,7 +205,7 @@ local function subtest(text, pattern, func)
 	return text
 end

-local function ParseAddListItem(list, item, text, default)
+local function ParseAddListItem(list, item, text, params)
 	local paramList = ParseParameters(params)
 	if (paramList.talent and not HasTalent(paramList.talent)) or
 		(paramList.glyph and not HasGlyph(paramList.glyph)) then
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index 222d7ed..02095c9 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -63,9 +63,10 @@ Define(IMPROVEDSOULFIRE 11197)
 AddListItem(curse elements SpellName(CURSEELEMENTS))
 AddListItem(curse tongues SpellName(CURSETONGUES))
 AddListItem(curse weakness SpellName(CURSEWEAKNESS))
+AddListItem(curse none L(None) default)
 AddListItem(bane agony SpellName(BANEOFAGONY))
-AddListItem(bane doom SpellName(BANEOFDOOM))
-AddListItem(bane havoc SpellName(BANEOFHAVOC))
+AddListItem(bane doom SpellName(BANEOFDOOM) default)
+AddListItem(bane havoc SpellName(BANEOFHAVOC) mastery=3)

 ScoreSpells(CURSEELEMENTS SHADOWBOLT HAUNT UNSTABLEAFFLICTION IMMOLATE CONFLAGRATE CURSEWEAKNESS
 	BANEOFAGONY CORRUPTION SOULFIRE DRAINSOUL INCINERATE SHADOWBOLT CHAOSBOLT)
@@ -106,20 +107,20 @@ AddIcon help=main mastery=2
 	if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(IMMOLATE)
 	if TargetDebuffPresent(IMMOLATE) Spell(HANDOFGULDAN)
 	if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION)
-	if TargetDebuffExpires(BANEOFDOOM 0 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1)
+	if TargetDebuffExpires(BANEOFDOOM 5 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1)
 	{
-		if List(curse doom) and TargetDeadIn(more 60) Spell(BANEOFDOOM)
+		if List(curse doom) and TargetDeadIn(more 15) Spell(BANEOFDOOM)
 		if TargetDeadIn(more 10) Spell(BANEOFAGONY)
 	}
-	if BuffPresent(DECIMATION) Spell(SOULFIRE)
 	if BuffPresent(MOLTENCORE) Spell(INCINERATE)
+	if BuffPresent(DECIMATION) Spell(SOULFIRE)
+
 	Spell(SHADOWBOLT)
 }

 AddIcon help=cd mastery=2
 {
 	Spell(METAMORPHOSIS)
-	Spell(DEMONICEMPOWERMENT)
 	Spell(SUMMONFELGUARD)
 	Item(Trinket0Slot usable=1)
 	Item(Trinket1Slot usable=1)
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index cea09cb..a991a7c 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -82,7 +82,7 @@ AddCheckBox(multi L(AOE))
 AddCheckBox(demo SpellName(DEMOSHOUT))
 AddCheckBox(sunder SpellName(SUNDERARMOR) default)
 AddListItem(shout none L(None))
-AddListItem(shout battle SpellName(BATTLESHOUT))
+AddListItem(shout battle SpellName(BATTLESHOUT) default)
 AddListItem(shout command SpellName(COMMANDINGSHOUT))

 ScoreSpells(DEADLYCALM COLOSSUSSMASH RAGINGBLOW OVERPOWER VICTORYRUSH BLOODTHIRST SLAM REND MORTALSTRIKE EXECUTE SHIELDSLAM REVENGE