Skip to content

[ele] some more OBR fixes #10952

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
HawkCorrigan merged 1 commit into from
Feb 14, 2026
+18 −2
Merged

[ele] some more OBR fixes #10952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions engine/class_modules/sc_shaman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,6 +1951,8 @@ struct shaman_t : public parse_player_effects_t
std::vector<std::string> 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;
Expand Down Expand Up @@ -12706,11 +12708,25 @@ std::vector<std::string> 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()
Expand Down
Loading