From 7ef31f6cf37781fa37388aaae55eaf7049ecad35 Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Wed, 3 Feb 2010 18:10:32 +0000 Subject: [PATCH] - arms warrior: new script - death knight: do not cast horn of winter if strength of earth totem is present git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@221 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.lua | 9 +++++++-- defaut/Chevalier.lua | 4 +++- defaut/Guerrier.lua | 9 +++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Ovale.lua b/Ovale.lua index 17f25c6..7d56400 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -389,6 +389,9 @@ function Ovale:COMBAT_LOG_EVENT_UNFILTERED(event, ...) end end end + --if string.find(event, "SWING")==1 then + -- self:Print(select(1, ...)) + --end end if self.otherDebuffsEnabled then if event == "UNIT_DIED" then @@ -618,11 +621,13 @@ function Ovale:OnDisable() end function Ovale:GLYPH_ADDED(event) - self:Print("GLYPH_ADDED") + -- self:Print("GLYPH_ADDED") + -- self:CompileAll() end function Ovale:GLYPH_UPDATED(event) - self:Print("GLYPH_UPDATED") + -- self:Print("GLYPH_UPDATED") + -- self:CompileAll() end function Ovale:UNIT_SPELLCAST_SENT(event,unit,name,rank,target) diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua index 896f055..85b272c 100644 --- a/defaut/Chevalier.lua +++ b/defaut/Chevalier.lua @@ -33,6 +33,8 @@ Define(ABOMINATIONMIGHT 53136) Define(TALENTABOMINATIONMIGHT 2105) Define(RAISEDEAD 46584) Define(HORNOFWINTER 57330) +Define(STRENGTHOFEARTHTOTEM 8075) + AddCheckBox(rolldes SpellName(GLYPHDISEASE) default glyph=GLYPHDISEASE) @@ -61,7 +63,7 @@ AddIcon help=main { Spell(DANCINGRUNEWEAPON usable=1) - if BuffExpires(HORNOFWINTER 2) Spell(HORNOFWINTER) + if BuffExpires(HORNOFWINTER 2) and BuffExpires(STRENGTHOFEARTHTOTEM 0) Spell(HORNOFWINTER) if CheckBoxOn(rolldes) and Glyph(GLYPHDISEASE) and TargetDebuffPresent(FROSTFEVER mine=1) and TargetDebuffPresent(BLOODPLAGUE mine=1) and diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua index be1623f..3c8562c 100644 --- a/defaut/Guerrier.lua +++ b/defaut/Guerrier.lua @@ -30,6 +30,7 @@ Define(RECKLESSNESS 1719) Define(BLADESTORM 46924) Define(SUDDENDEATH 52437) Define(RETALIATION 20230) +Define(TASTEFORBLOOD 56636) Define(DEMORALIZINGROAR 48560) Define(CURSEOFWEAKNESS 50511) @@ -123,10 +124,14 @@ AddIcon help=main if Stance(1) #combat { - if TargetDebuffExpires(REND 0 mine=1) and TargetDeadIn(more 8) Spell(REND) + #Suggestions by wikiupd + if BuffExpires(TASTEFORBLOOD 1.5) and TargetDebuffExpires(REND 0 mine=1) Spell(OVERPOWER usable=1) + if TargetDebuffExpires(REND 0 mine=1) and TargetDeadIn(more 8) Spell(REND) + unless BuffPresent(TASTEFORBLOOD) Spell(OVERPOWER usable=1) # Dodge OP + if BuffExpires(TASTEFORBLOOD 4.5) Spell(OVERPOWER usable=1) # OP w/ less than 4.5 sec if TargetLifePercent(more 20) Spell(MORTALSTRIKE) - Spell(OVERPOWER usable=1) if BuffPresent(SUDDENDEATH) or TargetLifePercent(less 20) Spell(EXECUTE) + Spell(OVERPOWER usable=1) Spell(VICTORY usable=1) if TalentPoints(SLAMTALENT more 1) -- 1.7.9.5