Subtlety, Assassin updates.

Dragonflight/APLs/RogueAssassination.simc

@@ -70,7 +70,7 @@ actions.cds+=/call_action_list,name=vanish,if=!stealthed.all&master_assassin_rem
 actions.cds+=/cold_blood,if=combo_points>=4
 
 # Direct Damage Abilities   Envenom at 4+ (5+ with DS) CP if not pooling, capped on amplifying poison stacks, on an animacharged CP, or in aoe
-actions.direct+=/envenom,if=effective_combo_points>=4&(variable.not_pooling|debuff.amplifying_poison.stack>=20|effective_combo_points>cp_max_spend|!variable.single_target)
+actions.direct+=/envenom,if=effective_combo_points>=4&(variable.not_pooling|!talent.amplifying_poison|effective_combo_points=combo_points.max&!ticking|debuff.amplifying_poison_dot.stack>=20|effective_combo_points>cp_max_spend|!variable.single_target)
 # Check if we should be using a filler
 actions.direct+=/variable,name=use_filler,value=combo_points.deficit>1|variable.not_pooling|!variable.single_target
 # Maintain Caustic Spatter

Dragonflight/APLs/RogueSubtlety.simc

@@ -45,9 +45,9 @@ actions.build+=/backstab
 # Helper Variable for Flagellation for trinket synchronisation
 actions.cds+=/variable,name=trinket_conditions,value=(!equipped.witherbarks_branch&!equipped.ashes_of_the_embersoul|!equipped.witherbarks_branch&trinket.witherbarks_branch.cooldown.remains<=8|equipped.witherbarks_branch&trinket.witherbarks_branch.cooldown.remains<=8|equipped.bandolier_of_twisted_blades|talent.invigorating_shadowdust)
 # Cooldowns Use Shadow Dance off-gcd before the first Shuriken Storm from Tornado comes in.
-actions.cds+=/shadow_dance,use_off_gcd=1,if=!buff.shadow_dance.up&buff.shuriken_tornado.up&buff.shuriken_tornado.remains<=3.5
+actions.cds+=/shadow_dance,use_off_gcd=1,if=!buff.shadow_dance.up&buff.shuriken_tornado.up&buff.shuriken_tornado.remains<=3.5&spell_targets.shuriken_storm>=2
 # (Unless already up because we took Shadow Focus) use Symbols off-gcd before the first Shuriken Storm from Tornado comes in.
-actions.cds+=/symbols_of_death,use_off_gcd=1,if=buff.shuriken_tornado.up&buff.shuriken_tornado.remains<=3.5&!set_bonus.tier30_2pc
+actions.cds+=/symbols_of_death,use_off_gcd=1,if=buff.shuriken_tornado.up&buff.shuriken_tornado.remains<=3.5&!set_bonus.tier30_2pc&spell_targets.shuriken_storm>=2
 # Cold Blood on 5 combo points when not playing Secret Technique
 actions.cds+=/cold_blood,if=!talent.secret_technique&combo_points>=5
 actions.cds+=/sepsis,if=variable.snd_condition&target.time_to_die>=16&(buff.perforated_veins.up|!talent.perforated_veins)
@@ -60,8 +60,9 @@ actions.cds+=/shadow_blades,if=variable.snd_condition&(combo_points<=1|set_bonus
 # ER during Shadow Dance.
 actions.cds+=/echoing_reprimand,if=variable.snd_condition&combo_points.deficit>=3
 # Shuriken Tornado with Symbols of Death.
-actions.cds+=/shuriken_tornado,if=variable.snd_condition&buff.symbols_of_death.up&combo_points<=2&!buff.premeditation.up&(!talent.flagellation|cooldown.flagellation.remains>20)
-actions.cds+=/shuriken_tornado,if=cooldown.shadow_dance.ready&!stealthed.all&spell_targets.shuriken_storm>=3&!talent.flagellation.enabled
+actions.cds+=/shuriken_tornado,if=variable.snd_condition&buff.symbols_of_death.up&combo_points<=2&!buff.premeditation.up&(!talent.flagellation|cooldown.flagellation.remains>20)&spell_targets.shuriken_storm>=2
+actions.cds+=/shuriken_tornado,if=cooldown.shadow_dance.ready&!stealthed.all&spell_targets.shuriken_storm>=3&!talent.flagellation.enabled&spell_targets.shuriken_storm>=2
+actions.cds+=/shuriken_tornado,if=variable.snd_condition&!buff.shadow_dance.up&!buff.flagellation_buff.up&!buff.flagellation.up&!buff.shadow_blades.up&spell_targets.shuriken_storm=1
 actions.cds+=/shadow_dance,if=!buff.shadow_dance.up&fight_remains<=8+talent.subterfuge.enabled
 # Goremaws Bite during Shadow Dance if possible.
 actions.cds+=/goremaws_bite,if=variable.snd_condition&combo_points.deficit>=3&(!cooldown.shadow_dance.up|talent.shadow_dance&buff.shadow_dance.up&!talent.invigorating_shadowdust|spell_targets.shuriken_storm<4&!talent.invigorating_shadowdust|talent.the_rotten|raid_event.adds.up)
@@ -123,9 +124,7 @@ actions.stealth_cds+=/shadow_dance,if=(dot.rupture.ticking|talent.invigorating_s
 # Always Strike fro Stealth
 actions.stealthed+=/shadowstrike,if=buff.stealth.up&(spell_targets.shuriken_storm<4|variable.priority_rotation)
 # Finish when on Anaima charged combo points or max combo points.
-actions.stealthed+=/call_action_list,name=finish,if=effective_combo_points>=cp_max_spend
-actions.stealthed+=/call_action_list,name=finish,if=buff.shuriken_tornado.up&combo_points.deficit<=2
-actions.stealthed+=/call_action_list,name=finish,if=combo_points.deficit<=1+(talent.deeper_stratagem|talent.secret_stratagem)
+actions.stealthed+=/call_action_list,name=finish,if=effective_combo_points>=cp_max_spend|buff.shuriken_tornado.up&combo_points.deficit<=2&spell_targets.shuriken_storm>=2|combo_points.deficit<=1+(talent.deeper_stratagem|talent.secret_stratagem)
 # Backstab for Danse Macabre stack generation during Shadowblades.
 actions.stealthed+=/backstab,if=!buff.premeditation.up&buff.shadow_dance.remains>=3&buff.shadow_blades.up&!used_for_danse&talent.danse_macabre&spell_targets.shuriken_storm<=3&!buff.the_rotten.up
 # Gloomblade for Danse Macabre stack generation during Shadowblades.