[Rogue] Sub Pooling Fix & Gear Update (OH)

mick19955 · Nov 26, 2015 · 17b057e · 17b057e
1 parent 336bf81
commit 17b057e
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 45 deletions.
diff --git a/engine/class_modules/sc_rogue.cpp b/engine/class_modules/sc_rogue.cpp
@@ -5540,13 +5540,13 @@ void rogue_t::init_action_list()
     def -> add_action( this, find_class_spell( "Vanish" ), "pool_resource", "for_next=1,extra_amount=50" );
     def -> add_action( this, "Vanish", "if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down" );
 
-    def -> add_action( this, find_class_spell( "Vanish" ), "pool_resource", "for_next=1,extra_amount=90" );
-    def -> add_action( "shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down" );
+    def -> add_action( this, find_class_spell( "Vanish" ), "pool_resource", "for_next=1,extra_amount=115" );
+    def -> add_action( "shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down" );
 
     if ( find_item( "maalus_the_blood_drinker" ) )
       def -> add_action( this, "Vanish", "if=set_bonus.tier18_4pc=1&buff.shadow_reflection.up&combo_points<3");
-    def -> add_action( this, find_class_spell( "Vanish" ), "pool_resource", "for_next=1,extra_amount=100" );
-    def -> add_action( this, "Vanish", "if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down" );
+    def -> add_action( this, find_class_spell( "Vanish" ), "pool_resource", "for_next=1,extra_amount=115" );
+    def -> add_action( this, "Vanish", "if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down" );
 
     def -> add_talent( this, "Marked for Death", "if=combo_points=0" );
 
@@ -5586,7 +5586,7 @@ void rogue_t::init_action_list()
 
     // Resource pooling
     action_priority_list_t* pool = get_action_priority_list( "pool", "Resource pooling" );
-    pool -> add_action( this, "Preparation", "if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50" );
+    pool -> add_action( this, "Preparation", "if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45" );
   }
 
   use_default_action_list = true;

diff --git a/profiles/Tier17H/Rogue_Subtlety_T17H.simc b/profiles/Tier17H/Rogue_Subtlety_T17H.simc
@@ -49,10 +49,10 @@ actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/shadowmeld,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/vanish,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=90
-actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=100
-actions+=/vanish,if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/vanish,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
 actions+=/marked_for_death,if=combo_points=0
 actions+=/run_action_list,name=finisher,if=combo_points=5&debuff.find_weakness.remains&buff.shadow_reflection.remains
 actions+=/pool_resource,for_next=1
@@ -86,7 +86,7 @@ actions.finisher+=/run_action_list,name=pool
 
 # Resource pooling
 
-actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50
+actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45
 
 head=poisoners_helmet,id=115572,bonus_id=566
 neck=engineers_grounded_gorget,id=113892,bonus_id=566,enchant=gift_of_multistrike

diff --git a/profiles/Tier17M/Rogue_Subtlety_T17M.simc b/profiles/Tier17M/Rogue_Subtlety_T17M.simc
@@ -49,10 +49,10 @@ actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/shadowmeld,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/vanish,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=90
-actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=100
-actions+=/vanish,if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/vanish,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
 actions+=/marked_for_death,if=combo_points=0
 actions+=/run_action_list,name=finisher,if=combo_points=5&debuff.find_weakness.remains&buff.shadow_reflection.remains
 actions+=/pool_resource,for_next=1
@@ -86,7 +86,7 @@ actions.finisher+=/run_action_list,name=pool
 
 # Resource pooling
 
-actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50
+actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45
 
 head=poisoners_helmet,id=115572,bonus_id=567
 neck=engineers_grounded_gorget,id=113892,bonus_id=567,enchant=gift_of_multistrike

diff --git a/profiles/Tier17N/Rogue_Subtlety_T17N.simc b/profiles/Tier17N/Rogue_Subtlety_T17N.simc
@@ -49,10 +49,10 @@ actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/shadowmeld,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/vanish,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=90
-actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=100
-actions+=/vanish,if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/vanish,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
 actions+=/marked_for_death,if=combo_points=0
 actions+=/run_action_list,name=finisher,if=combo_points=5&debuff.find_weakness.remains&buff.shadow_reflection.remains
 actions+=/pool_resource,for_next=1
@@ -86,7 +86,7 @@ actions.finisher+=/run_action_list,name=pool
 
 # Resource pooling
 
-actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50
+actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45
 
 head=poisoners_helmet,id=115572
 neck=engineers_grounded_gorget,id=113892,enchant=gift_of_multistrike

diff --git a/profiles/Tier17P/Rogue_Subtlety_T17P.simc b/profiles/Tier17P/Rogue_Subtlety_T17P.simc
@@ -49,10 +49,10 @@ actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/shadowmeld,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/vanish,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=90
-actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=100
-actions+=/vanish,if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/vanish,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
 actions+=/marked_for_death,if=combo_points=0
 actions+=/run_action_list,name=finisher,if=combo_points=5&debuff.find_weakness.remains&buff.shadow_reflection.remains
 actions+=/pool_resource,for_next=1
@@ -86,7 +86,7 @@ actions.finisher+=/run_action_list,name=pool
 
 # Resource pooling
 
-actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50
+actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45
 
 head=bloodfeather_cowl,id=109976,bonus_id=524
 neck=fireblade_collar,id=109951,bonus_id=524,enchant=gift_of_multistrike

diff --git a/profiles/Tier18H/Rogue_Subtlety_T18H.simc b/profiles/Tier18H/Rogue_Subtlety_T18H.simc
@@ -48,10 +48,10 @@ actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/shadowmeld,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/vanish,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=90
-actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=100
-actions+=/vanish,if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/vanish,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
 actions+=/marked_for_death,if=combo_points=0
 actions+=/run_action_list,name=finisher,if=combo_points=5&debuff.find_weakness.remains&buff.shadow_reflection.remains
 actions+=/pool_resource,for_next=1
@@ -85,7 +85,7 @@ actions.finisher+=/run_action_list,name=pool
 
 # Resource pooling
 
-actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50
+actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45
 
 head=felblade_hood,id=124263,bonus_id=566
 neck=choker_of_the_great_betrayer,id=124210,bonus_id=566,enchant_id=5320

diff --git a/profiles/Tier18M/Rogue_Subtlety_T18M.simc b/profiles/Tier18M/Rogue_Subtlety_T18M.simc
@@ -49,11 +49,11 @@ actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/shadowmeld,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/vanish,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=90
-actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/vanish,if=set_bonus.tier18_4pc=1&buff.shadow_reflection.up&combo_points<3
-actions+=/pool_resource,for_next=1,extra_amount=100
-actions+=/vanish,if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/vanish,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
 actions+=/marked_for_death,if=combo_points=0
 actions+=/run_action_list,name=finisher,if=combo_points=5&debuff.find_weakness.remains&buff.shadow_reflection.remains
 actions+=/pool_resource,for_next=1
@@ -87,7 +87,7 @@ actions.finisher+=/run_action_list,name=pool
 
 # Resource pooling
 
-actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50
+actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45
 
 head=felblade_hood,id=124263,bonus_id=567,upgrade=2
 neck=choker_of_the_great_betrayer,id=124210,bonus_id=567,upgrade=2,enchant_id=5320
@@ -104,16 +104,16 @@ finger2=portal_key_signet,id=124189,bonus_id=567,upgrade=2,enchant_id=5327
 trinket1=soul_capacitor,id=124225,bonus_id=567,upgrade=2
 trinket2=bleeding_hollow_toxin_vessel,id=124520,bonus_id=567,upgrade=2
 main_hand=fang_of_the_pit,id=124367,bonus_id=567,upgrade=2,enchant_id=5334
-off_hand=demonblade_eviscerator,id=124368,bonus_id=567,upgrade=2,enchant_id=5334
+off_hand=hammer_of_wicked_infusion,id=124371,bonus_id=567,upgrade=2,enchant_id=5334
 
 # Gear Summary
 # gear_ilvl=741.88
 # gear_agility=5139
 # gear_stamina=6888
-# gear_crit_rating=1841
-# gear_haste_rating=961
+# gear_crit_rating=1951
+# gear_haste_rating=789
 # gear_mastery_rating=583
-# gear_multistrike_rating=2721
+# gear_multistrike_rating=2783
 # gear_versatility_rating=270
 # gear_armor=1451
 # set_bonus=tier18_2pc=1

diff --git a/profiles/Tier18M/generate_Rogue_T18M.simc b/profiles/Tier18M/generate_Rogue_T18M.simc
@@ -78,5 +78,5 @@ finger2=portal_key_signet,id=124189,bonus_id=567,upgrade=2,enchant_id=5327
 trinket1=soul_capacitor,id=124225,bonus_id=567,upgrade=2
 trinket2=bleeding_hollow_toxin_vessel,id=124520,bonus_id=567,upgrade=2
 main_hand=fang_of_the_pit,id=124367,bonus_id=567,upgrade=2,enchant_id=5334
-off_hand=demonblade_eviscerator,id=124368,bonus_id=567,upgrade=2,enchant_id=5334
+off_hand=hammer_of_wicked_infusion,id=124371,bonus_id=567,upgrade=2,enchant_id=5334
 save=Rogue_Subtlety_T18M.simc
diff --git a/profiles/Tier18N/Rogue_Subtlety_T18N.simc b/profiles/Tier18N/Rogue_Subtlety_T18N.simc
@@ -48,10 +48,10 @@ actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/shadowmeld,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
 actions+=/pool_resource,for_next=1,extra_amount=50
 actions+=/vanish,if=talent.shadow_focus.enabled&energy>=45&energy<=75&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=90
-actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=90&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
-actions+=/pool_resource,for_next=1,extra_amount=100
-actions+=/vanish,if=talent.subterfuge.enabled&energy>=100&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/shadowmeld,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.stealth.down&buff.shadow_dance.down&buff.master_of_subtlety.down&debuff.find_weakness.down
+actions+=/pool_resource,for_next=1,extra_amount=115
+actions+=/vanish,if=talent.subterfuge.enabled&energy>=115&combo_points<4-talent.anticipation.enabled&buff.shadow_dance.down
 actions+=/marked_for_death,if=combo_points=0
 actions+=/run_action_list,name=finisher,if=combo_points=5&debuff.find_weakness.remains&buff.shadow_reflection.remains
 actions+=/pool_resource,for_next=1
@@ -85,7 +85,7 @@ actions.finisher+=/run_action_list,name=pool
 
 # Resource pooling
 
-actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>50
+actions.pool=preparation,if=!buff.vanish.up&!buff.shadow_dance.up&cooldown.vanish.remains>45
 
 head=felblade_hood,id=124263
 neck=choker_of_the_great_betrayer,id=124210,enchant_id=5320