From f239a408bd0c099ef22e244b498e0d7ab87a2537 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sun, 13 Jul 2014 11:32:56 +0000 Subject: [PATCH] Rogue: Update Combat script to SimC profile as of 2014-07-01. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1555 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- scripts/ovale_rogue.lua | 11 ++++------- scripts/simulationcraft_rogue_combat_t16h.lua | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/ovale_rogue.lua b/scripts/ovale_rogue.lua index ca4ec02..ee8b6b9 100644 --- a/scripts/ovale_rogue.lua +++ b/scripts/ovale_rogue.lua @@ -277,7 +277,7 @@ AddFunction CombatDefaultShortCdActions #vanish,if=time>10&(combo_points<3|(talent.anticipation.enabled&anticipation_charges<3)|(buff.shadow_blades.down&(combo_points<4|(talent.anticipation.enabled&anticipation_charges<4))))&((talent.shadow_focus.enabled&buff.adrenaline_rush.down&energy<20)|(talent.subterfuge.enabled&energy>=90)|(!talent.shadow_focus.enabled&!talent.subterfuge.enabled&energy>=60)) if TimeInCombat() > 10 and { ComboPoints() < 3 or { TalentPoints(anticipation_talent) and BuffStacks(anticipation_buff) < 3 } or { BuffExpires(shadow_blades_buff) and { ComboPoints() < 4 or { TalentPoints(anticipation_talent) and BuffStacks(anticipation_buff) < 4 } } } } and { { TalentPoints(shadow_focus_talent) and BuffExpires(adrenaline_rush_buff) and Energy() < 20 } or { TalentPoints(subterfuge_talent) and Energy() >= 90 } or { not TalentPoints(shadow_focus_talent) and not TalentPoints(subterfuge_talent) and Energy() >= 60 } } Spell(vanish) #killing_spree,if=energy<45 - if Energy() < 45 Spell(killing_spree) + if Energy() < 50 Spell(killing_spree) } AddFunction CombatDefaultCdActions @@ -299,15 +299,12 @@ AddFunction CombatDefaultCdActions unless { Energy() < 60 and Spell(arcane_torrent_energy) } or Spell(ambush usable=1) or { TimeInCombat() > 10 and { ComboPoints() < 3 or { TalentPoints(anticipation_talent) and BuffStacks(anticipation_buff) < 3 } or { BuffExpires(shadow_blades_buff) and { ComboPoints() < 4 or { TalentPoints(anticipation_talent) and BuffStacks(anticipation_buff) < 4 } } } } and { { TalentPoints(shadow_focus_talent) and BuffExpires(adrenaline_rush_buff) and Energy() < 20 } or { TalentPoints(subterfuge_talent) and Energy() >= 90 } or { not TalentPoints(shadow_focus_talent) and not TalentPoints(subterfuge_talent) and Energy() >= 60 } } and Spell(vanish) } + or { Energy() < 50 and Spell(killing_spree) } { #shadow_blades,if=time>5 if TimeInCombat() > 5 Spell(shadow_blades) - - unless { Energy() < 45 and Spell(killing_spree) } - { - #adrenaline_rush,if=energy<35|buff.shadow_blades.up - if Energy() < 35 or BuffPresent(shadow_blades_buff) Spell(adrenaline_rush) - } + #adrenaline_rush,if=energy<35|buff.shadow_blades.up + if Energy() < 35 or BuffPresent(shadow_blades_buff) Spell(adrenaline_rush) } } diff --git a/scripts/simulationcraft_rogue_combat_t16h.lua b/scripts/simulationcraft_rogue_combat_t16h.lua index 1993916..fd29c80 100644 --- a/scripts/simulationcraft_rogue_combat_t16h.lua +++ b/scripts/simulationcraft_rogue_combat_t16h.lua @@ -56,10 +56,10 @@ AddFunction CombatDefaultActions Spell(ambush usable=1) #vanish,if=time>10&(combo_points<3|(talent.anticipation.enabled&anticipation_charges<3)|(buff.shadow_blades.down&(combo_points<4|(talent.anticipation.enabled&anticipation_charges<4))))&((talent.shadow_focus.enabled&buff.adrenaline_rush.down&energy<20)|(talent.subterfuge.enabled&energy>=90)|(!talent.shadow_focus.enabled&!talent.subterfuge.enabled&energy>=60)) if TimeInCombat() > 10 and { ComboPoints() < 3 or { TalentPoints(anticipation_talent) and BuffStacks(anticipation_buff) < 3 } or { BuffExpires(shadow_blades_buff) and { ComboPoints() < 4 or { TalentPoints(anticipation_talent) and BuffStacks(anticipation_buff) < 4 } } } } and { { TalentPoints(shadow_focus_talent) and BuffExpires(adrenaline_rush_buff) and Energy() < 20 } or { TalentPoints(subterfuge_talent) and Energy() >= 90 } or { not TalentPoints(shadow_focus_talent) and not TalentPoints(subterfuge_talent) and Energy() >= 60 } } Spell(vanish) + #killing_spree,if=energy<50 + if Energy() < 50 Spell(killing_spree) #shadow_blades,if=time>5 if TimeInCombat() > 5 Spell(shadow_blades) - #killing_spree,if=energy<45 - if Energy() < 45 Spell(killing_spree) #adrenaline_rush,if=energy<35|buff.shadow_blades.up if Energy() < 35 or BuffPresent(shadow_blades_buff) Spell(adrenaline_rush) #slice_and_dice,if=buff.slice_and_dice.remains<2|(buff.slice_and_dice.remains<15&buff.bandits_guile.stack=11&combo_points>=4) -- 1.7.9.5