[Death Knight] Refactor Blood Deathbringer APL (#10184)

Author: Khazakdk

engine/class_modules/apl/apl_death_knight.cpp

@@ -111,10 +111,12 @@ void blood( player_t* p )
   action_priority_list_t* default_ = p->get_action_priority_list( "default" );
   action_priority_list_t* precombat = p->get_action_priority_list( "precombat" );
   action_priority_list_t* high_prio_actions = p->get_action_priority_list( "high_prio_actions" );
+  action_priority_list_t* db_cds = p->get_action_priority_list( "db_cds" );
   action_priority_list_t* deathbringer = p->get_action_priority_list( "deathbringer" );
   action_priority_list_t* san_cds = p->get_action_priority_list( "san_cds" );
   action_priority_list_t* san_drw = p->get_action_priority_list( "san_drw" );
   action_priority_list_t* sanlayn = p->get_action_priority_list( "sanlayn" );
+  action_priority_list_t* variables = p->get_action_priority_list( "variables" );
 
   precombat->add_action( "snapshot_stats" );
   precombat->add_action( "deaths_caress" );
@@ -130,49 +132,42 @@ void blood( player_t* p )
   default_->add_action( "fireblood,if=buff.dancing_rune_weapon.up" );
   default_->add_action( "potion,if=buff.dancing_rune_weapon.up" );
   default_->add_action( "vampiric_blood,if=!buff.vampiric_blood.up" );
+  default_->add_action( "call_action_list,name=variables" );
   default_->add_action( "call_action_list,name=high_prio_actions" );
   default_->add_action( "run_action_list,name=san_drw,if=hero_tree.sanlayn&buff.dancing_rune_weapon.up" );
   default_->add_action( "call_action_list,name=san_cds,if=hero_tree.sanlayn" );
   default_->add_action( "run_action_list,name=sanlayn,if=hero_tree.sanlayn" );
+  default_->add_action( "call_action_list,name=db_cds,if=hero_tree.deathbringer" );
   default_->add_action( "run_action_list,name=deathbringer,if=hero_tree.deathbringer" );
 
   high_prio_actions->add_action( "blood_tap,use_off_gcd=1,if=(rune<=2&rune.time_to_3>gcd.max&charges_fractional>=1.8)" );
   high_prio_actions->add_action( "blood_tap,use_off_gcd=1,if=(rune<=1&rune.time_to_3>gcd.max)" );
   high_prio_actions->add_action( "raise_dead,use_off_gcd=1" );
   high_prio_actions->add_action( "deaths_caress,if=buff.bone_shield.remains<gcd.max*2" );
   high_prio_actions->add_action( "death_strike,if=buff.coagulopathy.up&buff.coagulopathy.remains<=gcd.max*2" );
-  high_prio_actions->add_action( "death_and_decay,if=!buff.death_and_decay.up" );
+  high_prio_actions->add_action( "any_dnd,if=!buff.death_and_decay.up" );
   high_prio_actions->add_action( "blood_boil,if=dot.blood_plague.remains<gcd.max*2" );
-  high_prio_actions->add_action( "soul_reaper,if=active_enemies=1&target.time_to_pct_35<5&target.time_to_die>(dot.soul_reaper.remains+5)&(!hero_tree.sanlayn|pet.dancing_rune_weapon.remains<5)" );
-
-  deathbringer->add_action( "rune_tap,if=rune>2" );
-  deathbringer->add_action( "dancing_rune_weapon" );
-  deathbringer->add_action( "death_strike,if=buff.coagulopathy.remains<=gcd" );
-  deathbringer->add_action( "marrowrend,if=!buff.bone_shield.up|buff.bone_shield.remains<1.5|buff.bone_shield.stack<=1" );
-  deathbringer->add_action( "marrowrend,if=(buff.exterminate.up)&(cooldown.reapers_mark.up|cooldown.reapers_mark.remains<3)" );
-  deathbringer->add_action( "deaths_caress,if=!buff.bone_shield.up|buff.bone_shield.remains<1.5|buff.bone_shield.stack<=1" );
-  deathbringer->add_action( "blood_boil,if=dot.blood_plague.remains<3" );
-  deathbringer->add_action( "bonestorm,if=buff.bone_shield.stack>=5&(!talent.shattering_bone.enabled|death_and_decay.ticking)&!buff.dancing_rune_weapon.remains" );
-  deathbringer->add_action( "soul_reaper,if=active_enemies<=2&buff.reaper_of_souls.up&target.time_to_die>(dot.soul_reaper.remains+5)" );
-  deathbringer->add_action( "soul_reaper,if=active_enemies<=2&target.time_to_pct_35<5&target.time_to_die>(dot.soul_reaper.remains+5)" );
-  deathbringer->add_action( "death_and_decay,if=((dot.reapers_mark.ticking)&!death_and_decay.ticking)|!buff.death_and_decay.up" );
-  deathbringer->add_action( "marrowrend,if=buff.exterminate.up" );
-  deathbringer->add_action( "bonestorm,if=buff.bone_shield.stack>=5&(!talent.shattering_bone.enabled|death_and_decay.ticking)&buff.dancing_rune_weapon.remains" );
-  deathbringer->add_action( "death_strike,if=(runic_power.deficit<35|(runic_power.deficit<41&buff.dancing_rune_weapon.up))" );
-  deathbringer->add_action( "reapers_mark" );
+  high_prio_actions->add_action( "soul_reaper,if=active_enemies=1&(target.time_to_pct_35<5)&target.time_to_die>(dot.soul_reaper.remains+5)&(!hero_tree.sanlayn|pet.dancing_rune_weapon.remains<5)" );
+  high_prio_actions->add_action( "rune_tap,use_off_gcd=1,if=rune>3" );
+
+  db_cds->add_action( "reapers_mark" );
+  db_cds->add_action( "dancing_rune_weapon" );
+  db_cds->add_action( "bonestorm,if=buff.bone_shield.stack>=5&(!talent.shattering_bone.enabled|death_and_decay.ticking)" );
+  db_cds->add_action( "tombstone,if=buff.bone_shield.stack>=8&(!talent.shattering_bone.enabled|death_and_decay.ticking)&cooldown.dancing_rune_weapon.remains>=25" );
+  db_cds->add_action( "abomination_limb,if=!buff.dancing_rune_weapon.up" );
+
+  deathbringer->add_action( "death_strike,if=runic_power.deficit<variable.rp_deficit_threshold+(pet.dancing_rune_weapon.active*3)+(talent.everlasting_bond*3)" );
+  deathbringer->add_action( "marrowrend,if=buff.exterminate.react" );
   deathbringer->add_action( "marrowrend,if=buff.bone_shield.stack<6&!dot.bonestorm.ticking" );
-  deathbringer->add_action( "tombstone,if=buff.bone_shield.stack>=8&(!talent.shattering_bone.enabled|death_and_decay.ticking)&cooldown.dancing_rune_weapon.remains>=25" );
-  deathbringer->add_action( "abomination_limb,if=!buff.dancing_rune_weapon.up" );
   deathbringer->add_action( "blood_boil,if=pet.dancing_rune_weapon.active&!drw.bp_ticking" );
-  deathbringer->add_action( "any_dnd,if=!buff.death_and_decay.remains" );
+  deathbringer->add_action( "soul_reaper,if=buff.reaper_of_souls.up&cooldown.dancing_rune_weapon.remains" );
   deathbringer->add_action( "blooddrinker,if=!buff.dancing_rune_weapon.up&active_enemies<=2&buff.coagulopathy.remains>3" );
   deathbringer->add_action( "death_strike" );
   deathbringer->add_action( "consumption" );
   deathbringer->add_action( "blood_boil,if=charges_fractional>=1.5" );
   deathbringer->add_action( "heart_strike,if=rune>=1|rune.time_to_2<gcd" );
   deathbringer->add_action( "blood_boil" );
   deathbringer->add_action( "heart_strike" );
-  deathbringer->add_action( "soul_reaper,if=buff.reaper_of_souls.up" );
   deathbringer->add_action( "arcane_torrent,if=runic_power.deficit>20" );
   deathbringer->add_action( "deaths_caress,if=buff.bone_shield.stack<11" );
 
@@ -182,7 +177,7 @@ void blood( player_t* p )
   san_cds->add_action( "tombstone,if=(!buff.dancing_rune_weapon.up&buff.death_and_decay.up)&buff.bone_shield.stack>5&runic_power.deficit>=30&cooldown.dancing_rune_weapon.remains>25" );
 
   san_drw->add_action( "bonestorm,if=buff.death_and_decay.up&buff.bone_shield.stack>5" );
-  san_drw->add_action( "death_strike,if=(active_enemies=1|buff.luck_of_the_draw.up)&runic_power.deficit<15+(10*talent.relish_in_blood.enabled)+(3*talent.runic_attenuation.enabled)+(spell_targets.heart_strike*talent.heartbreaker.enabled*2)" );
+  san_drw->add_action( "death_strike,if=(active_enemies=1|buff.luck_of_the_draw.up)&runic_power.deficit<variable.rp_deficit_threshold" );
   san_drw->add_action( "blood_boil,if=!drw.bp_ticking" );
   san_drw->add_action( "heart_strike" );
   san_drw->add_action( "death_strike" );
@@ -192,13 +187,15 @@ void blood( player_t* p )
   sanlayn->add_action( "heart_strike,if=buff.infliction_of_sorrow.up" );
   sanlayn->add_action( "heart_strike,if=buff.vampiric_strike.up" );
   sanlayn->add_action( "blooddrinker,if=!buff.dancing_rune_weapon.up&active_enemies<=2&buff.coagulopathy.remains>3" );
-  sanlayn->add_action( "death_strike,if=runic_power.deficit<15+(10*talent.relish_in_blood.enabled)+(3*talent.runic_attenuation.enabled)+(spell_targets.heart_strike*talent.heartbreaker.enabled*2)" );
+  sanlayn->add_action( "death_strike,if=runic_power.deficit<variable.rp_deficit_threshold" );
   sanlayn->add_action( "marrowrend,if=!dot.bonestorm.ticking&buff.bone_shield.stack<variable.bone_shield_refresh_value&runic_power.deficit>20" );
   sanlayn->add_action( "death_strike" );
   sanlayn->add_action( "heart_strike,if=rune>1" );
   sanlayn->add_action( "consumption" );
   sanlayn->add_action( "blood_boil" );
   sanlayn->add_action( "heart_strike" );
+
+  variables->add_action( "variable,name=rp_deficit_threshold,value=15+(10*talent.relish_in_blood.enabled)+(3*talent.runic_attenuation.enabled)+(spell_targets.heart_strike*talent.heartbreaker.enabled*2)" );
 }
 //blood_apl_end