From 1ba5ce722bb973871b1981e85b5d5c232b0e4dfc Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Sun, 5 Jul 2009 13:22:12 +0000 Subject: [PATCH] - forgot to remove a debug :( - added trinket cooldown for every class git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@85 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.lua | 6 +----- Ovale.toc | 2 +- defaut/Chaman.lua | 2 ++ defaut/Chasseur.lua | 2 ++ defaut/Chevalier.lua | 2 ++ defaut/Druide.lua | 2 ++ defaut/Guerrier.lua | 4 +++- defaut/Paladin.lua | 2 ++ defaut/Pretre.lua | 6 ++++++ defaut/Voleur.lua | 2 ++ 10 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Ovale.lua b/Ovale.lua index 8d42e28..08ed82b 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -875,11 +875,7 @@ function Ovale:CalculerMeilleureAction(element) actionUsable, actionShortcut = Ovale:CalculerMeilleureAction(v) if (nouveauTemps) then local remplacer - if (not action) then - self:Print("Internal error: "..v.type.." returned nouveauTemps="..nouveauTemps.." and action=nil") - self.bug = true - return nil - end + if (not meilleurTempsFils) then remplacer = true else diff --git a/Ovale.toc b/Ovale.toc index d87a0b1..6284228 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.1.16 +## Version: 3.1.17 ## OptionalDeps: Ace3, ButtonFacade ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua index 7b1042c..2d069a0 100644 --- a/defaut/Chaman.lua +++ b/defaut/Chaman.lua @@ -98,6 +98,8 @@ AddIcon { Spell(ELEMENTALMASTERY) Spell(FERALSPIRIT) + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) Spell(FIREELEMENTALTOTEM) } diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index e3a50fb..ce6b4ab 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -38,6 +38,8 @@ AddIcon { Spell(BESTIALWRATH usable=1) Spell(KILLCOMMAND usable=1) + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) Spell(CALLOFTHEWILD usable=1) Spell(RAPIDFIRE) } diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua index 561fb38..c232ef4 100644 --- a/defaut/Chevalier.lua +++ b/defaut/Chevalier.lua @@ -92,6 +92,8 @@ AddIcon size=small Spell(HYSTERIA) Spell(DANCINGRUNEWEAPON) } + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) Spell(ARMYOFTHEDEAD) } diff --git a/defaut/Druide.lua b/defaut/Druide.lua index e1d6e9d..a321021 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -108,6 +108,8 @@ AddIcon { Spell(FORCEOFNATURE) Spell(BERSERK) + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) } ]] diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua index 2c84a19..c776714 100644 --- a/defaut/Guerrier.lua +++ b/defaut/Guerrier.lua @@ -133,7 +133,7 @@ AddIcon if Mana(more 66) Spell(HEROICSTRIKE doNotRepeat=1) } - if Stance(3) + unless Stance(2) { if Mana(more 66) and TargetLifePercent(more 20) Spell(HEROICSTRIKE doNotRepeat=1) @@ -161,6 +161,8 @@ AddIcon Spell(BLADESTORM) Spell(RETALIATION) } + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) } ]] diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua index 4fe092b..16373bf 100644 --- a/defaut/Paladin.lua +++ b/defaut/Paladin.lua @@ -60,5 +60,7 @@ AddIcon AddIcon { Spell(AVENGINGWRATH) + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) } ]] diff --git a/defaut/Pretre.lua b/defaut/Pretre.lua index b4c70ee..22e35e1 100644 --- a/defaut/Pretre.lua +++ b/defaut/Pretre.lua @@ -57,6 +57,12 @@ if TargetDebuffExpires(DP 0 mine=1) Spell(MF priority=2) } # End of main monitor + +AddIcon +{ + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) +} # Add mana monitor AddIcon { diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua index 858d1cb..43bc957 100644 --- a/defaut/Voleur.lua +++ b/defaut/Voleur.lua @@ -62,6 +62,8 @@ AddIcon unless BuffPresent(ADRENALINERUSH) Spell(KILLINGSPREE) Spell(BLADEFLURRY) Spell(COLDBLOOD) + Item(Trinket0Slot usable=1) + Item(Trinket1Slot usable=1) Spell(PREPARATION) } -- 1.7.9.5