From 4c7a1bb08f9a8996dd9caaab226c55191b7938dd Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Wed, 29 Jun 2011 18:47:02 +0000 Subject: [PATCH] fixes for 4.2.0 scripts are NOT up to date git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@414 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.lua | 8 ++++---- Ovale.toc | 4 ++-- defaut/Guerrier.lua | 37 ++++++++++++++++++++----------------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Ovale.lua b/Ovale.lua index 18353c5..221c838 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -812,13 +812,13 @@ end --Called for each combat log event function Ovale:COMBAT_LOG_EVENT_UNFILTERED(event, ...) - local time, event, hideCaster, sourceGUID, sourceName, sourceFlags, destGUID, destName, destFlags = select(1, ...) + local time, event, hideCaster, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags = select(1, ...) if sourceGUID == self.playerGuid then -- self:Print("event="..event.." source="..nilstring(sourceName).." destName="..nilstring(destName).." " ..GetTime()) if string.find(event, "SPELL_PERIODIC_DAMAGE")==1 or string.find(event, "SPELL_DAMAGE")==1 then - local spellId, spellName, spellSchool, amount = select(10, ...) + local spellId, spellName, spellSchool, amount = select(12, ...) self.spellDamage[spellId] = amount end @@ -833,7 +833,7 @@ function Ovale:COMBAT_LOG_EVENT_UNFILTERED(event, ...) or string.find(event, "SPELL_MISSED") == 1 or string.find(event, "SPELL_CAST_SUCCESS") == 1 or string.find(event, "SPELL_CAST_FAILED") == 1 then - local spellId, spellName = select(10, ...) + local spellId, spellName = select(12, ...) for i,v in ipairs(self.lastSpell) do if (v.spellId == spellId or v.auraSpellId == spellId) and v.allowRemove then if not v.channeled and (v.removeOnSuccess or @@ -850,7 +850,7 @@ function Ovale:COMBAT_LOG_EVENT_UNFILTERED(event, ...) if self.otherDebuffsEnabled then --Track debuffs on units that are not the current target if string.find(event, "SPELL_AURA_") == 1 then - local spellId, spellName, spellSchool, auraType = select(10, ...) + local spellId, spellName, spellSchool, auraType = select(12, ...) if auraType == "DEBUFF" and self.spellInfo[spellId] and self.spellInfo[spellId].duration then local otherDebuff = self:GetOtherDebuffs(spellId) if event == "SPELL_AURA_APPLIED" or event == "SPELL_AURA_REFRESH" then diff --git a/Ovale.toc b/Ovale.toc index ff9fd79..54fe19c 100644 --- a/Ovale.toc +++ b/Ovale.toc @@ -1,9 +1,9 @@ -## Interface: 40100 +## Interface: 40200 ## Title: Ovale Spell Priority ## Notes: Show the icon of the next spell to cast ## Notes-frFR: Affiche l'icône du prochain sort à lancer ## Author: Sidoine -## Version: 4.1.4 +## Version: 4.2.0 ## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0, LibRangeCheck-2.0 ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua index 8f5d49f..6162fff 100644 --- a/defaut/Guerrier.lua +++ b/defaut/Guerrier.lua @@ -143,11 +143,20 @@ AddIcon help=main mastery=1 if TargetClassification(worldboss) and CheckBoxOn(demo) and TargetDebuffExpires(lowerphysicaldamage 2) Spell(DEMOSHOUT nored=1) if TargetDebuffExpires(SUNDERARMORDEBUFF 3 stacks=3) and CheckBoxOn(sunder) and TargetDebuffExpires(lowerarmor 2 mine=0) Spell(SUNDERARMOR nored=1) + if CheckBoxOn(dancing) + { + #/stance,choose=berserker,if=(buff.taste_for_blood.down&rage<75) + if Stance(1) and TargetDebuffPresent(RENDDEBUFF mine=1) and BuffExpires(TASTEFORBLOOD 0) and Mana(less 75) Spell(BERSERKERSTANCE) + #/stance,choose=battle,if=(dot.rend.remains=0|((buff.overpower.up|buff.taste_for_blood.up)&cooldown.mortal_strike.remains>1)&rage<=75) + if Stance(3) and {TargetDebuffExpires(RENDDEBUFF 0 mine=1) or {BuffPresent(TASTEFORBLOOD) and {spell(MORTALSTRIKE)>1}}} + and Mana(less 75) Spell(BATTLESTANCE) + } + #/berserker_rage,if=!buff.deadly_calm.up&rage<70 if Glyph(GLYPHOFBERSERKERRAGE) and BuffExpires(DEADLYCALM) and Mana(less 71) Spell(BERSERKERRAGE) #/deadly_calm,if=rage<30&((target.health_pct>20&target.time_to_die>130)|(target.health_pct<=20&buff.recklessness.up)) if Mana(less 30) and {{TargetLifePercent(more 20) and TargetDeadIn(more 130)} or {TargetLifePercent(less 20) and BuffPresent(RECKLESSNESS)}} Spell(DEADLYCALM) - + if CheckBoxOn(multi) { #/sweeping_strikes,if=target.adds>0 @@ -166,7 +175,7 @@ AddIcon help=main mastery=1 #/rend,if=!ticking if Stance(1) and TargetDebuffExpires(RENDDEBUFF) Spell(REND) #/colossus_smash,if=buff.colossus_smash.remains<0.5 - if BuffExpires(COLOSSUSSMASH 0.5) Spell(COLOSSUSSMASH) + if TargetDebuffExpires(COLOSSUSSMASH 0.5 mine=1) Spell(COLOSSUSSMASH) #/execute,if=(buff.deadly_calm.up|buff.recklessness.up) if BuffPresent(DEADLYCALM) or BuffPresent(RECKLESSNESS) if TargetLifePercent(less 20) Spell(EXECUTE) #/mortal_strike @@ -176,7 +185,7 @@ AddIcon help=main mastery=1 #/execute if TargetLifePercent(less 20) Spell(EXECUTE) #/slam,if=(cooldown.mortal_strike.remains>=1.5&(rage>=35|buff.deadly_calm.up|buff.colossus_smash.up))|(cooldown.mortal_strike.remains>=1.2&buff.colossus_smash.remains>0.5&rage>=35) - if {{spell(MORTALSTRIKE)>1.5} and {Mana(more 34) or BuffPresent(DEADLYCALM) or BuffPresent(COLOSSUSSMASH)}} or {spell(MORTALSTRIKE)>1.2 and BuffPresent(COLOSSUSSMASH 0.5) and Mana(more 34)} + if {{spell(MORTALSTRIKE)>1.5} and {Mana(more 34) or BuffPresent(DEADLYCALM) or TargetDebuffPresent(COLOSSUSSMASH mine=1)}} or {spell(MORTALSTRIKE)>1.2 and TargetDebuffPresent(COLOSSUSSMASH 0.5) and Mana(more 34)} Spell(SLAM) #/battle_shout,if=rage<20 if Mana(less 20) Spell(BATTLESHOUT priority=2) @@ -185,18 +194,12 @@ AddIcon help=main mastery=1 AddIcon help=offgcd mastery=1 { if target.IsInterruptible() Spell(PUMMEL) - if CheckBoxOn(dancing) - { - #/stance,choose=berserker,if=(buff.taste_for_blood.down&rage<75) - if Stance(1) and TargetDebuffPresent(RENDDEBUFF mine=1) and BuffExpires(TASTEFORBLOOD 0) and Mana(less 75) Spell(BERSERKERSTANCE) - #/stance,choose=battle,if=(dot.rend.remains=0|(buff.taste_for_blood.up&cooldown.mortal_strike.remains>1)&rage<=75) - if Stance(3) and {TargetDebuffExpires(RENDDEBUFF 0 mine=1) or {BuffPresent(TASTEFORBLOOD) and {spell(MORTALSTRIKE)>1}}} - and Mana(less 75) Spell(BATTLESTANCE) - } - + if CheckBoxOn(multi) Spell(CLEAVE) - #/heroic_strike,if=(rage>85|buff.deadly_calm.up|buff.incite.up|buff.battle_trance.up) - if Mana(more 85) or BuffPresent(DEADLYCALM) or BuffPresent(INCITE) or BuffPresent(BATTLETRANCE) + #/heroic_strike,if=((rage>=85&target.health_pct>=20)|buff.battle_trance.up|((buff.incite.up|buff.colossus_smash.up)&((rage>=50&target.health_pct>=20)|(rage>=75&target.health_pct<20)))) + if {Mana(more 85) and TargetLifePercent(more 20)} + or BuffPresent(BATTLETRANCE) + or {{BuffPresent(INCITE) or TargetDebuffPresent(COLOSSUSSMASH mine=1)} and {{Mana(more 49) and TargetLifePercent(more 20)} or {Mana(more 74) and TargetLifePercent(less 20)}}} Spell(HEROICSTRIKE) } @@ -261,9 +264,9 @@ AddIcon help=offgcd mastery=2 if target.IsInterruptible() Spell(PUMMEL) #/cleave,if=target.adds>0 if CheckBoxOn(multi) Spell(CLEAVE) - #/heroic_strike,if=((rage>85&target.health_pct>=20)|buff.battle_trance.up|((buff.incite.up|buff.colossus_smash.up)&((rage>=50&target.health_pct>=20)|(rage>=75&target.health_pct<20)))) - if {Mana(more 85) and TargetLifePercent(more 20)} or BuffPresent(BATTLETRANCE) or - {{BuffPresent(INCITE) or BuffPresent(COLOSSUSSMASH)} and {{Mana(more 49) and TargetLifePercent(more 20)} or {Mana(more 74) and TargetLifePercent(less 20)}}} + #/heroic_strike,if=((rage>=85&target.health_pct>=20)|buff.battle_trance.up|((buff.incite.up|buff.colossus_smash.up)&((rage>=50&target.health_pct>=20)|(rage>=75&target.health_pct<20)))) + if {Mana(more 84) and TargetLifePercent(more 20)} or BuffPresent(BATTLETRANCE) or + {{BuffPresent(INCITE) or TargetDebuffPresent(COLOSSUSSMASH mine=1)} and {{Mana(more 49) and TargetLifePercent(more 20)} or {Mana(more 74) and TargetLifePercent(less 20)}}} Spell(HEROICSTRIKE) } -- 1.7.9.5