From 4ee26bcdc9cec479ec2a37709e8791d92ac7cf9d Mon Sep 17 00:00:00 2001 From: HawkCorrigan Date: Sat, 14 Feb 2026 19:25:16 +0100 Subject: [PATCH] [ele] some more OBR fixes --- engine/class_modules/sc_shaman.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/engine/class_modules/sc_shaman.cpp b/engine/class_modules/sc_shaman.cpp index dc1803840d2..02c2e31f8eb 100644 --- a/engine/class_modules/sc_shaman.cpp +++ b/engine/class_modules/sc_shaman.cpp @@ -1951,6 +1951,8 @@ struct shaman_t : public parse_player_effects_t std::vector action_names_from_spell_id( unsigned int spell_id ) const override; parsed_assisted_combat_rule_t parse_assisted_combat_rule( const assisted_combat_rule_data_t& rule, const assisted_combat_step_data_t& step ) const override; + void parse_assisted_combat_step( const assisted_combat_step_data_t& step, + action_priority_list_t* assisted_combat ) override; std::string generate_bloodlust_options(); std::string default_potion() const override; std::string default_flask() const override; @@ -12706,11 +12708,25 @@ std::vector shaman_t::action_names_from_spell_id( unsigned int spel parsed_assisted_combat_rule_t shaman_t::parse_assisted_combat_rule( const assisted_combat_rule_data_t& rule, const assisted_combat_step_data_t& step ) const { - if ( rule.condition_type == AC_AURA_ON_PLAYER && rule.condition_value_1 == 1271904 ) // Skyfury Highlight - return { "0" }; //lets just ignore it for today TODO + + if ( step.spell_id == 318038 && rule.condition_type == AC_AURA_ON_PLAYER && rule.condition_value_1 == 382027 ) + return { "talent.flametongue_weapon" }; + if ( rule.condition_type == AC_AURA_ON_PLAYER && rule.condition_value_1 == 384087 ) + return { "0" }; + if ( rule.condition_type == AC_AURA_MISSING_PLAYER && rule.condition_value_1 == 384087 ) + return { "1" }; return parse_player_effects_t::parse_assisted_combat_rule( rule, step ); } +void shaman_t::parse_assisted_combat_step( const assisted_combat_step_data_t& step, + action_priority_list_t* assisted_combat ) +{ + if ( step.spell_id == 462854 ) + return; + + player_t::parse_assisted_combat_step( step, assisted_combat ); +} + // shaman_t::moving ========================================================= void shaman_t::moving()