Skip to content

[Monk] Grant Flurry Charges on auto attacks #10785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renanthera merged 3 commits into from
Jan 21, 2026
+31 −3
Merged

[Monk] Grant Flurry Charges on auto attacks #10785

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8c8f16
[Monk] Grant Flurry Charges on auto attacks
justindriggers Jan 19, 2026
ce4f468
[monk] Using best-guess on data. Don't gain charges on miss.
renanthera Jan 20, 2026
72287e8
[monk] Cover all cases in switch, fix variable name.
renanthera Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions engine/class_modules/monk/sc_monk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2083,6 +2083,33 @@ struct auto_attack_t : public monk_melee_attack_t
first = false;
}

void impact( action_state_t *state ) override
{
monk_melee_attack_t::impact( state );

if ( !p()->talent.shado_pan.flurry_strikes->ok() || result_is_miss( state->result ) )
return;

unsigned flurry_charges = 0;
switch ( monk_melee_attack_t::weapon->group() )
{
case WEAPON_1H:
flurry_charges = p()->talent.shado_pan.flurry_strikes->effectN( 1 ).base_value();
break;
case WEAPON_2H:
flurry_charges = p()->talent.shado_pan.flurry_strikes->effectN( 2 ).base_value();
break;
default:
assert( false );
}

if ( state->result == RESULT_CRIT )
flurry_charges *= 1.0 + p()->talent.shado_pan.one_versus_many->effectN( 1 ).base_value();

if ( flurry_charges )
p()->buff.flurry_charge->trigger( flurry_charges );
}

timespan_t execute_time() const override
{
timespan_t time = monk_melee_attack_t::execute_time();
Expand Down Expand Up @@ -5519,9 +5546,10 @@ void monk_t::create_buffs()
// the override is a little weird, we'll just let this always init
buff.shuffle = make_buff<buffs::shuffle_t>( this );

buff.swift_as_a_coursing_river = make_buff_fallback( talent.brewmaster.swift_as_a_coursing_river->ok(), this, "swift_as_a_coursing_river",
talent.brewmaster.swift_as_a_coursing_river->effectN( 1 ).trigger() )
->set_trigger_spell( talent.brewmaster.swift_as_a_coursing_river );
buff.swift_as_a_coursing_river =
make_buff_fallback( talent.brewmaster.swift_as_a_coursing_river->ok(), this, "swift_as_a_coursing_river",
talent.brewmaster.swift_as_a_coursing_river->effectN( 1 ).trigger() )
->set_trigger_spell( talent.brewmaster.swift_as_a_coursing_river );

// Windwalker
buff.teachings_of_the_monastery =
Expand Down
Loading