From daa19716fef0945939215b3aa5621111b0f71a2f Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Sat, 11 Feb 2012 07:17:31 +0000 Subject: [PATCH] - more buffs and debuffs - fix for attackPower - combat rogue: import from SimulationCraft git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@466 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Condition.lua | 3 ++- Ovale.lua | 29 ++++++++++++++++++++++++++--- defaut/Voleur.lua | 43 ++++++++++++++++++------------------------- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/Condition.lua b/Condition.lua index 64efe21..eab4b83 100644 --- a/Condition.lua +++ b/Condition.lua @@ -454,7 +454,8 @@ Ovale.conditions= return compare(nombre, condition[2], condition[3]) end, attackPower = function(condition) - return UnitAttackPower("player"), 0, 0 + local base, posBuff, negBuff = UnitAttackPower("player") + return base + posBuff + negBuff, 0, 0 end, BuffDuration = function(condition) --local name, rank, icon, count, debuffType, duration = UnitBuff("player", Ovale:GetSpellInfoOrNil(condition[1])) diff --git a/Ovale.lua b/Ovale.lua index 99a1027..b073d77 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -164,7 +164,17 @@ Ovale.buffSpellList = 17800, -- Shadow and Flame 22959 -- Critical Mass }, - -- physicaldamagetaken + physicaldamagetaken= + { + 30069, -- Blood Frenzy (rank 1) + 30070, -- Blood Frenzy (rank 2) + 81327, -- Brittle Bones (rank 1) + 81328, -- Brittle Bones (rank 2) + 58684, -- Savage Combat (rank 1) + 58683, -- Savage Combat (rank 2) + 55749, -- Acid Spit (Worm) + 50518, -- Ravage (Ravager) + }, lowerphysicaldamage= { 99, -- Demoralizing Roar @@ -172,7 +182,8 @@ Ovale.buffSpellList = 1160, -- Demoralizing Shout 26017, -- Vindication 81130, -- Scarlet Fever - 50256 --Demoralizing Roar (Bear) + 50256, --Demoralizing Roar (Bear) + 24423, -- Demoralizing Screech (Carrion Bird) }, meleeslow= { @@ -182,7 +193,8 @@ Ovale.buffSpellList = 68055, --Judgments of the just 6343, --Thunderclap 8042, --Earth Shock - 50285 --Dust Cloud (Tallstrider) + 54404, --Dust Cloud (Tallstrider) + 90315, -- Tailspin (Fox) }, castslow = { @@ -233,6 +245,17 @@ Ovale.buffSpellList = 5229, -- Enrage (Bear) 52610, -- Savage Roar (Cat) 76691, -- Vengeance (All Tank Specs) + }, + criticalstrike = + { + 51740, -- Elemental Oath + 51698, -- Honor Among Thieves (rank 1) + 51700, -- Honor Among Thieves (rank 2) + 51701, -- Honor Among Thieves (rank 3) + 17007, -- Leader of the Pack + 29801, -- Rampage + 24604, -- Furious Howl (Wolf) + 90309, -- Terrifying Roar (Devilsaur) } } diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua index 552b587..a7d90db 100644 --- a/defaut/Voleur.lua +++ b/defaut/Voleur.lua @@ -71,10 +71,10 @@ Define(SHADOWSTEPBUFF 36563) Define(VANISHBUFF 11327) Define(SHALLOWINSIGHT 84745) Define(MODERATEINSIGHT 84746) -Define(DEEPINSIGHT 84747) Define(OVERKILL 58426) Define(MASTEROFSUBTLETY 31223) Define(FINDWEAKNESS 91023) +SpellList(DEEPINSIGHT 84745 84746 84747) #Items Define(INSTANTPOISON 6947) @@ -85,7 +85,6 @@ Define(TALENTCUTTOTHECHASE 2070) Define(TALENTENERGETICRECOVERY 11665) Define(TALENTHEMORRHAGE 681) -SpellList(insight 84745 84746 84747) ScoreSpells(SLICEANDDICE HUNGERFORBLOOD ENVENOM RUPTURE EVISCERATE MUTILATE SINISTERSTRIKE) @@ -148,41 +147,40 @@ AddIcon help=main mastery=2 if WeaponEnchantExpires(offhand 300) Item(DEADLYPOISON) } - #actions+=/slice_and_dice,if=buff.slice_and_dice.down - #actions+=/slice_and_dice,if=buff.slice_and_dice.remains<2 - if {BuffExpires(SLICEANDDICE 0) and ComboPoints(more 0)} or {BuffExpires(SLICEANDDICE 2) and ComboPoints(more 1)} + #slice_and_dice,if=buff.slice_and_dice.down + #slice_and_dice,if=buff.slice_and_dice.remains<2 + if BuffExpires(SLICEANDDICE 2) and ComboPoints(more 0) Spell(SLICEANDDICE) - #actions+=/killing_spree,if=energy<35&buff.slice_and_dice.remains>4&buff.adrenaline_rush.down - unless BuffPresent(ADRENALINERUSH) if Mana(less 35) and BuffPresent(SLICEANDDICE 4) and BuffPresent(DEEPINSIGHT 5) Spell(KILLINGSPREE) + #killing_spree,if=energy<35&buff.slice_and_dice.remains>4&buff.adrenaline_rush.down + if Mana(less 35) and BuffPresent(SLICEANDDICE 4) and BuffExpires(ADRENALINERUSH) + Spell(KILLINGSPREE) - #actions+=/adrenaline_rush,if=energy<35 - unless BuffPresent(KILLINGSPREE) if Mana(less 20) Spell(ADRENALINERUSH) + #adrenaline_rush,if=energy<35 + unless BuffPresent(KILLINGSPREE) if Mana(less 35) Spell(ADRENALINERUSH) - #actions+=/eviscerate,if=combo_points=5&buff.bandits_guile.stack>=12 - if ComboPoints(more 4) and BuffPresent(SLICEANDDICE 4) and BuffPresent(insight) - { - if TargetDebuffPresent(bleed) and TargetDebuffExpires(RUPTURE 0 mine=1) Spell(RUPTURE) + #eviscerate,if=combo_points=5&buff.bandits_guile.stack>=12 + if ComboPoints(more 4) and BuffPresent(SLICEANDDICE 4) and BuffPresent(DEEPINSIGHT 12) Spell(EVISCERATE) - } - #actions+=/rupture,if=!ticking&combo_points=5&target.time_to_die>10 - if ComboPoints(more 4) and TargetDebuffExpires(RUPTURE 0 mine=1) and TargetDeadIn(more 10) Spell(RUPTURE) + #rupture,if=!ticking&combo_points=5&target.time_to_die>10 + if TargetDebuffExpires(RUPTURE 0 mine=1) and ComboPoints(more 4) and TargetDeadIn(more 10) + Spell(RUPTURE) - #actions+=/eviscerate,if=combo_points=5 + #eviscerate,if=combo_points=5 if ComboPoints(equal 5) Spell(EVISCERATE) - #actions+=/revealing_strike,if=combo_points=4&buff.revealing_strike.down + #revealing_strike,if=combo_points=4&buff.revealing_strike.down if ComboPoints(equal 4) and TargetDebuffExpires(REVEALINGSTRIKE 0 mine=1) Spell(REVEALINGSTRIKE) - #actions+=/sinister_strike,if=combo_points<5 + #sinister_strike,if=combo_points<5 if ComboPoints(less 5) Spell(SINISTERSTRIKE) } AddIcon help=aoe mastery=2 { unless BuffPresent(BLADEFLURRY) Spell(BLADEFLURRY) - if BuffPresent(insight) + if BuffPresent(DEEPINSIGHT) { unless BuffPresent(ADRENALINERUSH) Spell(KILLINGSPREE) } @@ -192,11 +190,6 @@ AddIcon help=cd mastery=2 { #actions+=/kick if TargetIsInterruptible(yes) and TargetInRange(KICK) Spell(KICK) - #adrenaline_rush,if=energy<20 - if BuffPresent(insight) - { - unless BuffPresent(KILLINGSPREE) if Mana(less 20) Spell(ADRENALINERUSH) - } Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } -- 1.7.9.5