From aa3bbdf49bc6c6a3bf7a878a099f9b1af967a3de Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Fri, 29 Jan 2010 23:13:10 +0000 Subject: [PATCH] - use its own cooldown with death knight - arcane shot is optional for mm hunters if enough armor penetration rating git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@217 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.lua | 11 +++++++++++ Ovale.toc | 2 +- defaut/Chasseur.lua | 4 +++- defaut/Chevalier.lua | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Ovale.lua b/Ovale.lua index 9e3a441..95d12bb 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -1196,6 +1196,17 @@ function Ovale:GetActionInfo(element) actionEnable = cd.enable else actionCooldownStart, actionCooldownDuration, actionEnable = GetSpellCooldown(spellName) + -- Les chevaliers de la mort ont des infos fausses sur le CD quand ils n'ont plus les runes + -- On force à 1,5s ou 1s en présence impie + if self.className=="DEATHKNIGHT" and actionCooldownDuration==10 and + (not self.spellInfo[spellName] or self.spellInfo[spellName].cd~=10) then + local impie = GetSpellInfo(48265) + if impie and UnitBuff("player", impie) then + actionCooldownDuration=1 + else + actionCooldownDuration=1.5 + end + end if self.spellInfo[spellName] and self.spellInfo[spellName].forcecd then actionCooldownStart, actionCooldownDuration = GetSpellCooldown(GetSpellInfo(self.spellInfo[spellName].forcecd)) end diff --git a/Ovale.toc b/Ovale.toc index 5bcf72e..224709f 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.3.19 +## Version: 3.3.20 ## OptionalDeps: Ace3, ButtonFacade, Recount, LibBabble-CreatureType-3.0 ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index 2808920..92d94d4 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -36,6 +36,7 @@ SpellAddBuff(EXPLOSIVESHOT LOCKANDLOAD=-1) SpellInfo(EXPLOSIVESHOT cd=6 buffnocd=LOCKANDLOAD) SpellAddTargetDebuff(SERPENTSTING SERPENTSTING=15) SpellAddTargetDebuff(BLACKARROW BLACKARROW=15) +SpellAddBuff(RAPIDFIRE RAPIDFIRE=10) SpellInfo(BLACKARROW cd=26) SpellInfo(KILLSHOT cd=15) SpellInfo(AIMEDSHOT cd=10) @@ -47,6 +48,7 @@ SpellInfo(ARCANESHOT cd=6) SpellAddTargetDebuff(HUNTERSMARK HUNTERSMARK=300) AddCheckBox(multi SpellName(MULTISHOT)) +AddCheckBox(arcane SpellName(ARCANESHOT) talent=TALENTCHIMSHOT default) ScoreSpells(HUNTERSMARK BLACKARROW SERPENTSTING CHIMERASHOT AIMEDSHOT MULTISHOT ARCANESHOT KILLSHOT STEADYSHOT) AddIcon help=main @@ -62,7 +64,7 @@ AddIcon help=main Spell(AIMEDSHOT) if TargetDebuffPresent(SERPENTSTING) Spell(CHIMERASHOT) if CheckBoxOn(multi) Spell(MULTISHOT) - unless TalentPoints(TALENTEXPLOSHOT more 0) or TalentPoints(TALENTCHIMSHOT more 0) Spell(ARCANESHOT) + if TalentPoints(TALENTEXPLOSHOT less 1) and {TalentPoints(TALENTCHIMSHOT less 1) or CheckBoxOn(arcane)} Spell(ARCANESHOT) if TargetLifePercent(less 20) Spell(KILLSHOT) if TargetDebuffExpires(HUNTERSMARK 2) and TargetDeadIn(more 20) Spell(HUNTERSMARK nored=1) unless 1.5s before Spell(EXPLOSIVESHOT) or 0.25s before Spell(CHIMERASHOT) Spell(STEADYSHOT) diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua index 78f3087..c4632ea 100644 --- a/defaut/Chevalier.lua +++ b/defaut/Chevalier.lua @@ -66,7 +66,7 @@ AddIcon help=main { if TalentPoints(TALENTBLOODYSTRIKES more 0) { - if Runes(blood 1) + if Runes(blood 1) and {CheckBoxOff(rolldes) or Runes(blood 2)} { Spell(HEARTSTRIKE) Spell(BLOODSTRIKE) @@ -81,7 +81,7 @@ AddIcon help=main Spell(OBLITERATE) Spell(DEATHSTRIKE) } - if Runes(blood 1) + if Runes(blood 1) and {CheckBoxOff(rolldes) or Runes(blood 2)} { Spell(HEARTSTRIKE) Spell(BLOODSTRIKE) -- 1.7.9.5