@@ -1706,12 +1706,14 @@ struct blackout_kick_t : overwhelming_force_t<charred_passions_t<monk_melee_atta
1706
1706
{
1707
1707
blackout_kick_totm_proc_t *bok_totm_proc;
1708
1708
cooldown_t *keg_smash_cooldown;
1709
+ bool tier_tww2_opportunistic_strike;
1709
1710
1710
1711
blackout_kick_t ( monk_t *p, util::string_view options_str )
1711
1712
: base_t ( p, " blackout_kick" ,
1712
1713
( p->specialization () == MONK_BREWMASTER ? p->baseline.brewmaster.blackout_kick
1713
1714
: p->baseline.monk.blackout_kick ) ),
1714
- keg_smash_cooldown( nullptr )
1715
+ keg_smash_cooldown( nullptr ),
1716
+ tier_tww2_opportunistic_strike( false )
1715
1717
{
1716
1718
parse_options ( options_str );
1717
1719
if ( p->specialization () == MONK_WINDWALKER )
@@ -1727,7 +1729,7 @@ struct blackout_kick_t : overwhelming_force_t<charred_passions_t<monk_melee_atta
1727
1729
apply_affecting_aura ( p->talent .brewmaster .shadowboxing_treads );
1728
1730
apply_affecting_aura ( p->talent .brewmaster .elusive_footwork );
1729
1731
1730
- parse_effects ( p->tier .tww2 .opportunistic_strike , DECREMENT_BUFF );
1732
+ parse_effects ( p->tier .tww2 .opportunistic_strike , [ & ]() { return tier_tww2_opportunistic_strike; } );
1731
1733
1732
1734
if ( player->sets ->set ( MONK_BREWMASTER, TWW1, B4 )->ok () )
1733
1735
keg_smash_cooldown = player->get_cooldown ( " keg_smash" );
@@ -1777,8 +1779,14 @@ struct blackout_kick_t : overwhelming_force_t<charred_passions_t<monk_melee_atta
1777
1779
1778
1780
void execute () override
1779
1781
{
1782
+ tier_tww2_opportunistic_strike = p ()->tier .tww2 .opportunistic_strike ->check ();
1783
+ p ()->tier .tww2 .opportunistic_strike ->decrement ();
1784
+
1780
1785
base_t::execute ();
1781
1786
1787
+ if ( tier_tww2_opportunistic_strike )
1788
+ cooldown->adjust ( -p ()->tier .tww2 .brm_4pc_opportunistic_strike ->effectN ( 1 ).time_value () );
1789
+
1782
1790
p ()->buff .shuffle ->trigger ( timespan_t::from_seconds ( p ()->talent .brewmaster .shuffle ->effectN ( 1 ).base_value () ) );
1783
1791
1784
1792
p ()->buff .blackout_combo ->trigger ();
@@ -7950,8 +7958,9 @@ void monk_t::create_buffs()
7950
7958
if ( old && !new_ )
7951
7959
tier.tww2 .cashout ->trigger ( old );
7952
7960
} );
7953
- tier.tww2 .cashout = make_buff_fallback ( tier.tww2 .ww_4pc ->ok (), this , " cashout" , tier.tww2 .ww_4pc_cashout )
7954
- ->set_max_stack ( 59 ); // Spell says it caps at 8, but have screenshots of it stacking to at least 59.
7961
+ tier.tww2 .cashout =
7962
+ make_buff_fallback ( tier.tww2 .ww_4pc ->ok (), this , " cashout" , tier.tww2 .ww_4pc_cashout )
7963
+ ->set_max_stack ( 59 ); // Spell says it caps at 8, but have screenshots of it stacking to at least 59.
7955
7964
// BrM
7956
7965
tier.tww2 .luck_of_the_draw =
7957
7966
make_buff_fallback ( tier.tww2 .brm_2pc ->ok (), this , " luck_of_the_draw" , tier.tww2 .brm_2pc_luck_of_the_draw )
0 commit comments