Skip to content

[Monk] Adjust assisted combat #11091

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
Mar 6, 2026
+4 −2
Merged

[Monk] Adjust assisted combat #11091

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33fdca3
Update apl_monk.cpp
Hurstilol Mar 3, 2026
5764276
[monk] Add comment explaining rule override for Emperor's Capacitor.
renanthera Mar 6, 2026
f84453e
[monk] Clean up other assisted combat rule comments.
renanthera Mar 6, 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
6 changes: 4 additions & 2 deletions engine/class_modules/apl/apl_monk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,9 @@ parsed_assisted_combat_rule_t monk_t::parse_assisted_combat_rule( const assisted
// Assisted Combat APL is partially updated and still includes references to Emperor's Capacitor
if ( step.spell_id == 117952 && rule.condition_type == AC_PLAYER_AURA_APPLICATION_GREATER &&
rule.condition_value_1 == 393039 && rule.condition_value_2 == 20 && rule.condition_value_3 == 0 )
return "1";
return {
"0",
"Condition `buff.emperors_capacitor.stack>=20` is not resolvable, as the source talent no longer exists." };

if ( step.spell_id == 152175 && rule.condition_type == AC_TARGET_DISTANCE_LESS )
{
Expand Down Expand Up @@ -352,7 +354,7 @@ parsed_assisted_combat_rule_t monk_t::parse_assisted_combat_rule( const assisted
case 1249765:
case 1249766:
return { "combo_strike",
fmt::format( "Spell id {} is a helper buff to avoid breaking Combo Strikes for {}.",
fmt::format( "Rule contains a helper buff to avoid breaking Combo Strikes for {}.",
rule.condition_value_1, find_spell( step.spell_id )->name_cstr() ),
false };
}
Expand Down
Loading