Skip to content

Commit

Permalink
[monk] Update OE behaviour to match 58774 PTR notes. (#9882)
Browse files Browse the repository at this point in the history
* [monk] Update OE behaviour to match 58774 PTR notes.

* Add ptr checks and clean up stack change callback.

* Clean up spacing.

* [monk] Remove redundant talent check, as `buff.ordered_elements` is created as a fallback buff.

---------

Co-authored-by: Hinalover <[email protected]>
  • Loading branch information
renanthera and Hinalover authored Jan 27, 2025
1 parent bda50f2 commit e6a70fd
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion engine/class_modules/monk/sc_monk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,7 @@ struct rising_sun_kick_t : public monk_melee_attack_t

p()->active_actions.chi_wave->execute();

if ( p()->buff.storm_earth_and_fire->up() && p()->talent.windwalker.ordered_elements->ok() )
if ( !p()->is_ptr() && p()->buff.storm_earth_and_fire->up() && p()->talent.windwalker.ordered_elements->ok() )
p()->buff.ordered_elements->trigger();

p()->buff.tigers_ferocity->trigger();
Expand Down Expand Up @@ -7764,6 +7764,15 @@ void monk_t::create_buffs()
buff.storm_earth_and_fire =
make_buff_fallback( talent.windwalker.storm_earth_and_fire->ok(), this, "storm_earth_and_fire",
talent.windwalker.storm_earth_and_fire )
->set_stack_change_callback( [ & ]( buff_t *, int new_, int old_ ) {
if ( is_ptr() )
{
if ( new_ )
buff.ordered_elements->trigger();
else if ( old_ )
buff.ordered_elements->expire();
}
} )
->add_invalidate( CACHE_PLAYER_DAMAGE_MULTIPLIER )
->add_invalidate( CACHE_PLAYER_HEAL_MULTIPLIER )
->set_can_cancel( false ) // Undocumented hotfix 2018-09-28 - SEF can no longer be canceled.
Expand Down

0 comments on commit e6a70fd

Please sign in to comment.