Skip to content
Merged
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
10 changes: 8 additions & 2 deletions engine/class_modules/sc_shaman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13568,6 +13568,11 @@ void shaman_t::init_blizzard_action_list()
{
cooldowns->add_action( "doom_winds" );
}

action_priority_list_t* precombat = get_action_priority_list( "precombat" );

precombat->add_action( "flametongue_weapon,if=talent.flametongue_weapon" );

}


Expand Down Expand Up @@ -13624,8 +13629,6 @@ parsed_assisted_combat_rule_t shaman_t::parse_assisted_combat_rule( const assist
return { "0" };
}

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 )
Expand All @@ -13639,6 +13642,9 @@ void shaman_t::parse_assisted_combat_step( const assisted_combat_step_data_t& st
if ( step.spell_id == 462854 )
return;

if ( step.spell_id == 318038 )
return;

auto replace_spell = [ & ]( unsigned source_spell_id, unsigned target_spell_id ) {
if ( step.spell_id == source_spell_id )
{
Expand Down
Loading