Merge branch 'thewarwithin' of https://github.com/Hekili/hekili into …

…thewarwithin

TheWarWithin/Priorities/RogueAssassination.simc

@@ -147,7 +147,7 @@ actions.stealthed+=/envenom,if=effective_combo_points>=variable.effective_spend_
 # Rupture during Indiscriminate Carnage
 actions.stealthed+=/rupture,cycle_targets=1,if=effective_combo_points>=variable.effective_spend_cp&buff.indiscriminate_carnage.up&(refreshable|!settings.cycle)&(!variable.regen_saturated|!variable.scent_saturation|!dot.rupture.ticking)&target.time_to_die>15
 # Improved Garrote: Apply or Refresh with buffed Garrotes, accounting for Indiscriminate Carnage
-actions.stealthed+=/garrote,cycle_targets=1,if=stealthed.improved_garrote&(remains<12|pmultiplier<=1|(buff.indiscriminate_carnage.up&active_dot.garrote<cycle_enemies|(active_dot.garrote<active_enemies&!settings.cycle)))&active_enemies>1&target.time_to_die-remains>2
+actions.stealthed+=/garrote,cycle_targets=1,if=(remains<12|pmultiplier<=1|((buff.indiscriminate_carnage.up&((active_dot.garrote<cycle_enemies)|(active_dot.garrote<active_enemies&!settings.cycle)))))&active_enemies>1&target.time_to_die-remains>2
 actions.stealthed+=/garrote,if=stealthed.improved_garrote&(pmultiplier<=1|remains<12|active_enemies>1&buff.master_assassin_aura.up&buff.master_assassin_aura.remains<3)&combo_points.deficit>=1+2*talent.shrouded_suffocation
 
 

TheWarWithin/Priorities/RogueSubtlety.simc

@@ -11,8 +11,7 @@ actions.precombat+=/stealth
 actions+=/stealth
 actions+=/kick
 actions+=/variable,name=stealth,value=buff.shadow_dance.up|buff.stealth.up|buff.vanish.up
-actions+=/variable,name=targets,value=spell_targets.shuriken_storm
-actions+=/variable,name=skip_rupture,value=buff.shadow_dance.up|!buff.slice_and_dice.up|buff.darkest_night.up|variable.targets>=8&!talent.replicating_shadows&talent.unseen_blade
+actions+=/variable,name=skip_rupture,value=buff.shadow_dance.up|!buff.slice_and_dice.up|buff.darkest_night.up|active_enemies>=8&!talent.replicating_shadows&talent.unseen_blade
 actions+=/variable,name=maintenance,value=(dot.rupture.ticking|variable.skip_rupture)&buff.slice_and_dice.up
 actions+=/variable,name=secret,value=buff.shadow_dance.up|(cooldown.flagellation.remains<40&cooldown.flagellation.remains>20&talent.death_perception)
 actions+=/variable,name=racial_sync,value=(buff.flagellation_buff.up&buff.shadow_dance.up)|!talent.shadow_blades&buff.symbols_of_death.up|boss&fight_remains<20
@@ -43,9 +42,9 @@ actions+=/call_action_list,name=build
 actions+=/call_action_list,name=fill,if=!variable.stealth
 
 # Combo Point Builder
-actions.build+=/shadowstrike,cycle_targets=1,if=debuff.find_weakness.remains<=2&variable.targets=2&talent.unseen_blade|!used_for_danse&talent.danse_macabre
-actions.build+=/shuriken_storm,if=talent.deathstalkers_mark&!buff.premeditation.up&variable.targets>=(2+3*buff.shadow_dance.up)|buff.clear_the_witnesses.up&!buff.symbols_of_death.up|buff.flawless_form.up&variable.targets>=3&!variable.stealth
-actions.build+=/shuriken_tornado,if=buff.lingering_darkness.up|talent.deathstalkers_mark&cooldown.shadow_blades.remains>=32&variable.targets>=2|talent.unseen_blade&buff.symbols_of_death.up&variable.targets>=4
+actions.build+=/shadowstrike,cycle_targets=1,if=debuff.find_weakness.remains<=2&active_enemies=2&talent.unseen_blade|!used_for_danse&!talent.premeditation
+actions.build+=/shuriken_storm,if=talent.deathstalkers_mark&!buff.premeditation.up&active_enemies>=(2+3*buff.shadow_dance.up)|buff.clear_the_witnesses.up&!buff.symbols_of_death.up|buff.flawless_form.up&active_enemies>=3&!variable.stealth
+actions.build+=/shuriken_tornado,if=buff.lingering_darkness.up|talent.deathstalkers_mark&cooldown.shadow_blades.remains>=32&active_enemies>=2|talent.unseen_blade&buff.symbols_of_death.up&active_enemies>=4
 actions.build+=/shadowstrike
 actions.build+=/goremaws_bite,if=combo_points.deficit>=3
 actions.build+=/gloomblade
@@ -54,7 +53,7 @@ actions.build+=/backstab
 # Cooldowns
 actions.cds+=/cold_blood,if=cooldown.secret_technique.up&buff.shadow_dance.up&combo_points>=6&variable.secret
 actions.cds+=/potion,if=buff.bloodlust.up|boss&fight_remains<30|buff.flagellation_buff.up
-actions.cds+=/symbols_of_death,if=(buff.symbols_of_death.remains<=3&variable.maintenance&(buff.flagellation_buff.up|!talent.flagellation|cooldown.flagellation.remains>=30-15*!talent.death_perception&cooldown.secret_technique.remains<=8|!talent.death_perception)|boss&fight_remains<=15)
+actions.cds+=/symbols_of_death,if=(buff.symbols_of_death.remains<=3&variable.maintenance&(buff.flagellation_buff.up&cooldown.secret_technique.remains<8|!talent.flagellation|buff.flagellation_persist.up&talent.unseen_blade|cooldown.flagellation.remains>=30-15*!talent.death_perception&cooldown.secret_technique.remains<8|!talent.death_perception)|boss&fight_remains<=15)
 actions.cds+=/shadow_blades,if=variable.maintenance&variable.shd_cp&buff.shadow_dance.up&!buff.premeditation.up
 actions.cds+=/thistle_tea,if=buff.shadow_dance.remains>2&!buff.thistle_tea.up
 actions.cds+=/flagellation,if=combo_points>=5|boss&fight_remains<=25
@@ -68,13 +67,13 @@ actions.fill+=/bag_of_tricks
 actions.finish+=/secret_technique,if=variable.secret
 # Maintenance Finisher
 actions.finish+=/rupture,if=!variable.skip_rupture&(!dot.rupture.ticking|refreshable)&target.time_to_die-remains>6
-actions.finish+=/rupture,cycle_targets=1,if=!variable.skip_rupture&!variable.priority_rotation&target.time_to_die>=(2*combo_points)&refreshable&variable.targets>=2
+actions.finish+=/rupture,cycle_targets=1,if=!variable.skip_rupture&!variable.priority_rotation&target.time_to_die>=(2*combo_points)&refreshable&active_enemies>=2
 # Direct Damage Finisher
-actions.finish+=/black_powder,if=!variable.priority_rotation&variable.maintenance&variable.targets>=2&!buff.flawless_form.up&!buff.darkest_night.up
+actions.finish+=/black_powder,if=!variable.priority_rotation&variable.maintenance&active_enemies>=2&!buff.flawless_form.up&!buff.darkest_night.up
 actions.finish+=/coup_de_grace,if=debuff.fazed.up
 actions.finish+=/eviscerate
 
 # Shadow Dance, Vanish, Shadowmeld
-actions.stealth_cds+=/shadow_dance,if=variable.shd_cp&variable.maintenance&cooldown.secret_technique.remains<=24&(buff.symbols_of_death.remains>=6|buff.flagellation_persist.remains>=6)|boss&boss&fight_remains<=10
+actions.stealth_cds+=/shadow_dance,if=variable.shd_cp&variable.maintenance&cooldown.secret_technique.remains<=24&(buff.symbols_of_death.remains>=6|buff.flagellation_persist.remains>=6)|boss&fight_remains<=10
 actions.stealth_cds+=/vanish,if=energy>=40&!buff.subterfuge.up&effective_combo_points<=3
 actions.stealth_cds+=/shadowmeld,if=energy>=40&combo_points.deficit>=3