@@ -13857,38 +13857,41 @@ void death_knight_t::init_blizzard_action_list()
13857
13857
quiet = true;
13858
13858
return;
13859
13859
}
13860
+
13860
13861
if ( main_hand_weapon.group() == WEAPON_2H && off_hand_weapon.type != WEAPON_NONE )
13861
13862
{
13862
13863
if ( !quiet )
13863
13864
sim->errorf( "Player %s has an Off-Hand weapon equipped with a 2h.", name() );
13864
13865
quiet = true;
13865
13866
return;
13866
13867
}
13867
- action_priority_list_t* pre_c = get_action_priority_list( "precombat" );
13868
- if ( specialization() == DEATH_KNIGHT_UNHOLY )
13869
- pre_c->add_action( "raise_dead" );
13868
+
13870
13869
action_priority_list_t* default_ = get_action_priority_list( "default" );
13871
13870
default_->add_action( "auto_attack" ); // Add before generating the other actions so its always the highest priority
13872
13871
player_t::init_blizzard_action_list();
13873
13872
13873
+ action_priority_list_t* pre_c = get_action_priority_list( "precombat" );
13874
+ if (specialization() == DEATH_KNIGHT_UNHOLY)
13875
+ pre_c->add_action( "raise_dead" );
13876
+
13874
13877
action_priority_list_t* cooldowns = get_action_priority_list( "cooldowns" );
13875
13878
13876
13879
switch ( specialization() )
13877
13880
{
13878
13881
case DEATH_KNIGHT_BLOOD:
13879
13882
cooldowns->add_action( "vampiric_blood" );
13880
- cooldowns->add_action( "tombstone", " if=buff.bone_shield.stack>5");
13883
+ cooldowns->add_action( "tombstone, if=buff.bone_shield.stack>5" );
13881
13884
cooldowns->add_action( "abomination_limb" );
13882
13885
break;
13883
13886
case DEATH_KNIGHT_FROST:
13884
- cooldowns->add_action( "breath_of_sindragosa", " if=runic_power>60" );
13887
+ cooldowns->add_action( "breath_of_sindragosa, if=runic_power>60" );
13885
13888
cooldowns->add_action( "empower_rune_weapon" );
13886
13889
cooldowns->add_action( "abomination_limb" );
13887
13890
break;
13888
13891
case DEATH_KNIGHT_UNHOLY:
13889
13892
cooldowns->add_action( "raise_abomination" );
13890
13893
cooldowns->add_action( "army_of_the_dead" );
13891
- cooldowns->add_action( "summon_gargoyle", " if=runic_power>30");
13894
+ cooldowns->add_action( "summon_gargoyle, if=runic_power>30" );
13892
13895
cooldowns->add_action( "abomination_limb" );
13893
13896
break;
13894
13897
default:
@@ -13906,14 +13909,14 @@ std::string death_knight_t::parse_assisted_combat_rule( const assisted_combat_ru
13906
13909
// death_knight_t::blizzard_apl_action_replace ================================
13907
13910
std::string death_knight_t::blizzard_apl_action_replace( std::string options )
13908
13911
{
13909
- switch (specialization())
13912
+ switch ( specialization() )
13910
13913
{
13911
13914
case DEATH_KNIGHT_BLOOD:
13912
13915
break;
13913
13916
case DEATH_KNIGHT_FROST:
13914
13917
break;
13915
13918
case DEATH_KNIGHT_UNHOLY:
13916
- if (options.find( "talent.clawing_shadows" ) != std::string::npos)
13919
+ if ( options.find( "talent.clawing_shadows" ) != std::string::npos )
13917
13920
return "clawing_shadows";
13918
13921
break;
13919
13922
default:
@@ -13936,7 +13939,7 @@ void death_knight_t::parse_assisted_combat_step( const assisted_combat_step_data
13936
13939
options += options.empty() ? rule_str : "&" + rule_str;
13937
13940
}
13938
13941
13939
- // This is kinda ugly, maybe find a better way to do this?
13942
+ // This is kinda ugly, maybe find a better way to do this?
13940
13943
if ( !options.empty() )
13941
13944
{
13942
13945
std::string name = blizzard_apl_action_replace( options );
@@ -13970,7 +13973,8 @@ std::vector<std::string> death_knight_t::action_names_from_spell_id( unsigned in
13970
13973
spell_id = talent.blood.heart_strike->id();
13971
13974
break;
13972
13975
case DEATH_KNIGHT_FROST:
13973
- spell_id = talent.frost.frost_strike->id(); // Yes, Frost Strike replaces Rune Strike as Frost. Makes no sense to me either.
13976
+ spell_id = talent.frost.frost_strike
13977
+ ->id(); // Yes, Frost Strike replaces Rune Strike as Frost. Makes no sense to me either.
13974
13978
break;
13975
13979
case DEATH_KNIGHT_UNHOLY:
13976
13980
spell_id = talent.unholy.festering_strike->id();
0 commit comments