Skip to content

Commit 3919039

Browse files
committed
[monk] Fix TWW2 BrM 4p BOK CDR.
1 parent 4fa200c commit 3919039

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

engine/class_modules/monk/sc_monk.cpp

+13-4
Original file line numberDiff line numberDiff line change
@@ -1706,12 +1706,14 @@ struct blackout_kick_t : overwhelming_force_t<charred_passions_t<monk_melee_atta
17061706
{
17071707
blackout_kick_totm_proc_t *bok_totm_proc;
17081708
cooldown_t *keg_smash_cooldown;
1709+
bool tier_tww2_opportunistic_strike;
17091710

17101711
blackout_kick_t( monk_t *p, util::string_view options_str )
17111712
: base_t( p, "blackout_kick",
17121713
( p->specialization() == MONK_BREWMASTER ? p->baseline.brewmaster.blackout_kick
17131714
: p->baseline.monk.blackout_kick ) ),
1714-
keg_smash_cooldown( nullptr )
1715+
keg_smash_cooldown( nullptr ),
1716+
tier_tww2_opportunistic_strike( false )
17151717
{
17161718
parse_options( options_str );
17171719
if ( p->specialization() == MONK_WINDWALKER )
@@ -1727,7 +1729,7 @@ struct blackout_kick_t : overwhelming_force_t<charred_passions_t<monk_melee_atta
17271729
apply_affecting_aura( p->talent.brewmaster.shadowboxing_treads );
17281730
apply_affecting_aura( p->talent.brewmaster.elusive_footwork );
17291731

1730-
parse_effects( p->tier.tww2.opportunistic_strike, DECREMENT_BUFF );
1732+
parse_effects( p->tier.tww2.opportunistic_strike, [ & ]() { return tier_tww2_opportunistic_strike; } );
17311733

17321734
if ( player->sets->set( MONK_BREWMASTER, TWW1, B4 )->ok() )
17331735
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
17771779

17781780
void execute() override
17791781
{
1782+
tier_tww2_opportunistic_strike = p()->tier.tww2.opportunistic_strike->check();
1783+
p()->tier.tww2.opportunistic_strike->decrement();
1784+
17801785
base_t::execute();
17811786

1787+
if ( tier_tww2_opportunistic_strike )
1788+
cooldown->adjust( -p()->tier.tww2.brm_4pc_opportunistic_strike->effectN( 1 ).time_value() );
1789+
17821790
p()->buff.shuffle->trigger( timespan_t::from_seconds( p()->talent.brewmaster.shuffle->effectN( 1 ).base_value() ) );
17831791

17841792
p()->buff.blackout_combo->trigger();
@@ -7950,8 +7958,9 @@ void monk_t::create_buffs()
79507958
if ( old && !new_ )
79517959
tier.tww2.cashout->trigger( old );
79527960
} );
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.
79557964
// BrM
79567965
tier.tww2.luck_of_the_draw =
79577966
make_buff_fallback( tier.tww2.brm_2pc->ok(), this, "luck_of_the_draw", tier.tww2.brm_2pc_luck_of_the_draw )

0 commit comments

Comments
 (0)