Skip to content
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.

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

[monk] Fix Slicing Winds. #9862

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 18 additions & 7 deletions engine/class_modules/monk/sc_monk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3232,21 +3232,31 @@ struct flying_serpent_kick_t : public monk_melee_attack_t
// ==========================================================================
// TODO: Potentially add the "empowered" channel. "Empowered" channel increases
// the "lunge" or movement of the attack, but also delays the actual attack by
// as little as 500 milliseconds. Just pressing the attack; without the
// as little as 500 milliseconds. Just pressing the attack; without the
// "empowered" channel, animation lasts 1 second.
// Empowered channel has 4 stages; with each lasting about 350 milliseconds.

struct slicing_winds_t : public monk_melee_attack_t
{
slicing_winds_t( monk_t *p, util::string_view options_str )
: monk_melee_attack_t( p, "slicing_winds", p->talent.windwalker.slicing_winds )
struct damage_t : monk_melee_attack_t
{
damage_t( monk_t *player )
: monk_melee_attack_t( player, "slicing_winds_damage", player->talent.windwalker.slicing_winds_damage )
{
background = dual = true;
ww_mastery = true;
may_combo_strike = true;
aoe = -1;
reduced_aoe_targets = player->talent.windwalker.slicing_winds->effectN( 3 ).base_value();
}
};

slicing_winds_t( monk_t *player, util::string_view options_str )
: monk_melee_attack_t( player, "slicing_winds", player->talent.windwalker.slicing_winds )
{
parse_options( options_str );

ww_mastery = true;
may_combo_strike = true;
aoe = -1;
reduced_aoe_targets = data().effectN( 3 ).base_value();
execute_action = new damage_t( player );
}
};
} // namespace attacks
Expand Down Expand Up @@ -6941,6 +6951,7 @@ void monk_t::init_spells()
talent.windwalker.jadefire_brand_heal = find_spell( 395413 );
talent.windwalker.darting_hurricane = _ST( "Darting Hurricane" );
talent.windwalker.slicing_winds = _ST( "Slicing Winds" );
talent.windwalker.slicing_winds_damage = find_spell( 1217411 );
}

current_spec = specialization();
Expand Down
1 change: 1 addition & 0 deletions engine/class_modules/monk/sc_monk.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,7 @@ struct monk_t : public stagger_t<parse_player_effects_t, monk_t>
const spell_data_t *jadefire_brand_heal;
player_talent_t darting_hurricane;
player_talent_t slicing_winds;
const spell_data_t *slicing_winds_damage;
} windwalker;

// Master of Harmony
Expand Down