From 33fdca34c6bf01220b044143ede2a17a82b1d1f6 Mon Sep 17 00:00:00 2001 From: Hurstilol <85832226+Hurstilol@users.noreply.github.com> Date: Tue, 3 Mar 2026 12:41:10 +0100 Subject: [PATCH 1/3] Update apl_monk.cpp --- engine/class_modules/apl/apl_monk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/class_modules/apl/apl_monk.cpp b/engine/class_modules/apl/apl_monk.cpp index a1794647019..dbb73d23459 100644 --- a/engine/class_modules/apl/apl_monk.cpp +++ b/engine/class_modules/apl/apl_monk.cpp @@ -318,7 +318,7 @@ 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"; if ( step.spell_id == 152175 && rule.condition_type == AC_TARGET_DISTANCE_LESS ) { From 5764276e94431927a7b07ee35887f18610d6c7c8 Mon Sep 17 00:00:00 2001 From: Kate Martin <51387586+renanthera@users.noreply.github.com> Date: Fri, 6 Mar 2026 02:52:50 -0700 Subject: [PATCH 2/3] [monk] Add comment explaining rule override for Emperor's Capacitor. --- engine/class_modules/apl/apl_monk.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/class_modules/apl/apl_monk.cpp b/engine/class_modules/apl/apl_monk.cpp index dbb73d23459..c06117197ec 100644 --- a/engine/class_modules/apl/apl_monk.cpp +++ b/engine/class_modules/apl/apl_monk.cpp @@ -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 "0"; + 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 ) { From f84453e63a06afc4dbaa198843282603a093f004 Mon Sep 17 00:00:00 2001 From: Kate Martin <51387586+renanthera@users.noreply.github.com> Date: Fri, 6 Mar 2026 02:56:46 -0700 Subject: [PATCH 3/3] [monk] Clean up other assisted combat rule comments. --- engine/class_modules/apl/apl_monk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/class_modules/apl/apl_monk.cpp b/engine/class_modules/apl/apl_monk.cpp index c06117197ec..8e91a2648b6 100644 --- a/engine/class_modules/apl/apl_monk.cpp +++ b/engine/class_modules/apl/apl_monk.cpp @@ -354,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 }; }