Skip to content

[monk] Fixes for RSk/RWK, Chi Burst, Purified Spirit #11902

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 4 commits into from
Sep 27, 2026
Merged

[monk] Fixes for RSk/RWK, Chi Burst, Purified Spirit #11902

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
781b6cf
[monk] RWK trigger resets RSK.
renanthera Sep 27, 2026
b4b1d8a
[monk] Chi Burst consumes Balanced Stratagem.
renanthera Sep 27, 2026
9fc6915
feels templates man
renanthera Sep 27, 2026
07406ff
[monk] Purified Spirit stack change callback was never configured due…
renanthera Sep 27, 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
22 changes: 11 additions & 11 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 @@ -1270,11 +1270,10 @@ struct charred_passions_t : base_action_t

struct base_blackout_kick_t : monk_melee_attack_t
{
cooldown_t *rising_sun_kick;
proc_t *rising_sun_kick_reset;

base_blackout_kick_t( monk_t *player, std::string_view name, const spell_data_t *spell_data )
: monk_melee_attack_t( player, name, spell_data ), rising_sun_kick( nullptr ), rising_sun_kick_reset( nullptr )
: monk_melee_attack_t( player, name, spell_data ), rising_sun_kick_reset( nullptr )
{
// TODO: check this
ap_type = attack_power_type::WEAPON_BOTH;
Expand All @@ -1294,7 +1293,6 @@ struct base_blackout_kick_t : monk_melee_attack_t
if ( !p()->talent.windwalker.teachings_of_the_monastery->ok() )
return;

rising_sun_kick = p()->get_cooldown( "rising_sun_kick" );
rising_sun_kick_reset = p()->get_proc( "Teachings of the Monastery - Rising Sun Kick Reset" );
}

Expand All @@ -1308,7 +1306,7 @@ struct base_blackout_kick_t : monk_melee_attack_t
double chance = p()->talent.windwalker.teachings_of_the_monastery->effectN( 1 ).percent();
if ( rng().roll( chance ) )
{
rising_sun_kick->reset( true );
p()->cooldown.rising_sun_kick->reset( true );
rising_sun_kick_reset->occur();
}
}
Expand Down Expand Up @@ -1411,7 +1409,10 @@ struct blackout_kick_t : overwhelming_force_t<charred_passions_t<teachings_of_th
{
double rwk_chance = p()->talent.windwalker.rushing_wind_kick->effectN( 1 ).percent();
if ( p()->rng().roll( rwk_chance ) )
{
p()->cooldown.rising_sun_kick->reset( true );
p()->buff.rushing_wind_kick->trigger();
}

double eb_chance = p()->talent.windwalker.energy_burst->effectN( 1 ).percent();
if ( p()->rng().roll( eb_chance ) )
Expand Down Expand Up @@ -3010,7 +3011,10 @@ struct chi_burst_t : monk_spell_t
add_parse_entry( TBase::da_multiplier_effects )
.set_buff( player->buff.balanced_stratagem_magic )
.set_value( effect.percent() )
.set_eff( &effect );
.set_eff( &effect )
.add_parse_callback( this, PARSE_CALLBACK_POST_EXECUTE, [ & ]( action_state_t * ) {
TBase::p()->buff.balanced_stratagem_magic->consume( this );
} );
}
};

Expand Down Expand Up @@ -4756,6 +4760,8 @@ void aspect_of_harmony_t::construct_actions( monk_t *player )
purified_spirit = new spender_t::purified_spirit_t<actions::monk_spell_t>(
player, player->talent.master_of_harmony.purified_spirit_damage, this );
damage->add_child( purified_spirit );

spender->set_expire_callback( [ & ]( buff_t *, int, timespan_t ) { purified_spirit->execute(); } );
}
}

Expand Down Expand Up @@ -4884,12 +4890,6 @@ aspect_of_harmony_t::spender_t::spender_t( monk_t *player, aspect_of_harmony_t *
pool( 0.0 )
{
set_default_value( 0.0 );

if ( aspect_of_harmony->purified_spirit )
set_stack_change_callback( [ = ]( buff_t *, int, int new_ ) {
if ( !new_ )
aspect_of_harmony->purified_spirit->execute();
} );
}

void aspect_of_harmony_t::spender_t::reset()
Expand Down
Loading