bug fix: TargetInRange
Sidoine De Wispelaere [01-24-11 - 19:08]
bug fix: TargetInRange
bug fix: use of target=pet in scripts
added jinx (aoe curse of elements) to known debuffs
bug fix: check boxes toggled with a key were not saved
rogue script: wrong buff name
git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@347 d5049fe3-3747-40f7-a4b5-f36d6801af5f
diff --git a/Condition.lua b/Condition.lua
index 96f01db..9c7cc29 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -578,7 +578,7 @@ Ovale.conditions=
InCombat = function(condition)
return testbool(Ovale.enCombat, condition[1])
end,
- TargetInRange = function(condition)
+ InRange = function(condition)
local spellName = GetSpellInfo(condition[1])
return testbool(IsSpellInRange(spellName,getTarget(condition.target))==1,condition[2])
end,
diff --git a/Ovale.lua b/Ovale.lua
index 56c12c2..a8ebd69 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -132,6 +132,8 @@ Ovale.buffSpellList =
60433, -- Earth and Moon
93068, -- Master Poisoner
1490, -- Curse of the Elements
+ 85547, -- Jinx 1
+ 86105, -- Jinx 2
34889, --Fire Breath (Dragonhawk)
24844 --Lightning Breath (Wind serpent)
},
@@ -2274,6 +2276,7 @@ function Ovale:ToggleCheckBox(v)
for k,checkBox in pairs(self.casesACocher) do
if v==0 then
self.checkBoxes[k]:SetValue(not self.checkBoxes[k]:GetValue())
+ self.db.profile.check[k] = self.checkBoxes[k]:GetValue()
break
end
v = v - 1
diff --git a/Ovale.toc b/Ovale.toc
index e1aa8da..1385048 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.0.21
+## Version: 4.0.22
## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0
## SavedVariables: OvaleDB
## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/OvaleCompile.lua b/OvaleCompile.lua
index 3c1ff77..fa09152 100644
--- a/OvaleCompile.lua
+++ b/OvaleCompile.lua
@@ -51,7 +51,9 @@ local function ParseFunction(prefix, func, params)
func = prefix
end
if string.find(func, "Target") == 1 then
- paramList.target = "target"
+ if not paramList.target then
+ paramList.target = "target"
+ end
func = string.sub(func, 7)
end
local newNode = { type="function", func=func, params=paramList}
diff --git a/OvaleIcone.lua b/OvaleIcone.lua
index e02a343..e291dc2 100644
--- a/OvaleIcone.lua
+++ b/OvaleIcone.lua
@@ -55,7 +55,7 @@ local function Update(self, element, minAttente, actionTexture, actionInRange, a
--end
if element.params.sound and not self.lastSound then
- local delay = self.soundtime or 0.5
+ local delay = element.params.soundtime or 0.5
if Ovale.maintenant>=minAttente - delay then
self.lastSound = element.params.sound
-- print("Play" .. self.lastSound)
diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua
index 63a9f70..de25303 100644
--- a/defaut/Chasseur.lua
+++ b/defaut/Chasseur.lua
@@ -24,7 +24,7 @@ Define(FERVOR 82726)
Spellinfo(FERVOR mana=-50)
Define(FOCUSFIRE 82692)
Define(KILLCOMMAND 34026)
- SpellInfo(KILLCOMMAND cd=60 resetcounter=ss)
+ SpellInfo(KILLCOMMAND cd=6 resetcounter=ss)
Define(KILLSHOT 53351)
SpellInfo(KILLSHOT cd=15 resetcounter=ss)
Define(HUNTERSMARK 1130)
@@ -62,7 +62,8 @@ AddIcon help=main mastery=1
if Mana(more 24) and TargetDebuffExpires(SERPENTSTING 0 mine=1) and TargetDeadIn(more 8) Spell(SERPENTSTING)
if TargetLifePercent(less 20) Spell(KILLSHOT)
if Mana(less 20) Spell(FERVOR)
- if TargetBuffPresent(FRENZYEFFECT stacks=5 target=pet) and BuffExpires(BEASTWITHIN 0) Spell(FOCUSFIRE)
+ if pet.BuffPresent(FRENZYEFFECT stacks=5) and BuffExpires(BEASTWITHIN 0) Spell(FOCUSFIRE)
+ if TargetInRange(GROWL) Spell(KILLCOMMAND)
if Mana(more 56)
{
if CheckBoxOn(multi) Spell(MULTISHOT)
diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua
index a16be67..b5054bf 100644
--- a/defaut/Chevalier.lua
+++ b/defaut/Chevalier.lua
@@ -184,7 +184,7 @@ AddIcon help=main mastery=3
#if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and TargetDebuffExpires(FROSTFEVER 0 mine=1) Spell(OUTBREAK)
if TargetDebuffExpires(BLOODPLAGUE 3 mine=1) and Runes(unholy 1) Spell(PLAGUESTRIKE)
if TargetDebuffExpires(FROSTFEVER 3 mine=1) and Runes(frost 1) Spell(ICYTOUCH)
- if Runes(unholy 1) and TargetBuffPresent(SHADOWINFUSION stacks=5 target=pet) Spell(DARKTRANSFORMATION)
+ if Runes(unholy 1) and pet.BuffPresent(SHADOWINFUSION stacks=5) Spell(DARKTRANSFORMATION)
if Runes(death 4) or Runes(unholy 2) Spell(SCOURGESTRIKE)
if Runes(blood 2 frost 2 nodeath=1) Spell(FESTERINGSTRIKE)
# if Runes(death 4) or Runes(unholy 2) Spell(DEATHANDECAY)
diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua
index c614f7f..ee56966 100644
--- a/defaut/Voleur.lua
+++ b/defaut/Voleur.lua
@@ -79,7 +79,7 @@ AddIcon help=main mastery=1
if WeaponEnchantExpires(offhand 400) Item(DEADLYPOISON)
}
- if BuffPresent(STEALTHED) Spell(GARROTE)
+ if BuffPresent(STEALTH) Spell(GARROTE)
unless BuffPresent(SLICEANDDICE) if ComboPoints(more 0) Spell(SLICEANDDICE)
if TargetDebuffExpires(VENDETTA) and TargetDeadIn(more 20) Spell(VENDETTA)