Skip to content

Commit 37e3785

Browse files
committed
[DK] Fix bad syntax on cooldown conditions
1 parent 4ae4fa6 commit 37e3785

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

engine/class_modules/sc_death_knight.cpp

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13857,38 +13857,41 @@ void death_knight_t::init_blizzard_action_list()
1385713857
quiet = true;
1385813858
return;
1385913859
}
13860+
1386013861
if ( main_hand_weapon.group() == WEAPON_2H && off_hand_weapon.type != WEAPON_NONE )
1386113862
{
1386213863
if ( !quiet )
1386313864
sim->errorf( "Player %s has an Off-Hand weapon equipped with a 2h.", name() );
1386413865
quiet = true;
1386513866
return;
1386613867
}
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+
1387013869
action_priority_list_t* default_ = get_action_priority_list( "default" );
1387113870
default_->add_action( "auto_attack" ); // Add before generating the other actions so its always the highest priority
1387213871
player_t::init_blizzard_action_list();
1387313872

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+
1387413877
action_priority_list_t* cooldowns = get_action_priority_list( "cooldowns" );
1387513878

1387613879
switch ( specialization() )
1387713880
{
1387813881
case DEATH_KNIGHT_BLOOD:
1387913882
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" );
1388113884
cooldowns->add_action( "abomination_limb" );
1388213885
break;
1388313886
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" );
1388513888
cooldowns->add_action( "empower_rune_weapon" );
1388613889
cooldowns->add_action( "abomination_limb" );
1388713890
break;
1388813891
case DEATH_KNIGHT_UNHOLY:
1388913892
cooldowns->add_action( "raise_abomination" );
1389013893
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" );
1389213895
cooldowns->add_action( "abomination_limb" );
1389313896
break;
1389413897
default:
@@ -13906,14 +13909,14 @@ std::string death_knight_t::parse_assisted_combat_rule( const assisted_combat_ru
1390613909
// death_knight_t::blizzard_apl_action_replace ================================
1390713910
std::string death_knight_t::blizzard_apl_action_replace( std::string options )
1390813911
{
13909-
switch (specialization())
13912+
switch ( specialization() )
1391013913
{
1391113914
case DEATH_KNIGHT_BLOOD:
1391213915
break;
1391313916
case DEATH_KNIGHT_FROST:
1391413917
break;
1391513918
case DEATH_KNIGHT_UNHOLY:
13916-
if (options.find( "talent.clawing_shadows" ) != std::string::npos)
13919+
if ( options.find( "talent.clawing_shadows" ) != std::string::npos )
1391713920
return "clawing_shadows";
1391813921
break;
1391913922
default:
@@ -13936,7 +13939,7 @@ void death_knight_t::parse_assisted_combat_step( const assisted_combat_step_data
1393613939
options += options.empty() ? rule_str : "&" + rule_str;
1393713940
}
1393813941

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?
1394013943
if ( !options.empty() )
1394113944
{
1394213945
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
1397013973
spell_id = talent.blood.heart_strike->id();
1397113974
break;
1397213975
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.
1397413978
break;
1397513979
case DEATH_KNIGHT_UNHOLY:
1397613980
spell_id = talent.unholy.festering_strike->id();

0 commit comments

Comments
 (0)