simulationcraft#2775 - PRIEST: add holy priest heal APL template - pa…

…rtial progress
kendrick-walls-work · Sep 10, 2019 · 0fd0dea · 0fd0dea
1 parent c12548b
commit 0fd0dea
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/engine/class_modules/priest/sc_priest.cpp b/engine/class_modules/priest/sc_priest.cpp
@@ -1208,7 +1208,8 @@ std::string priest_t::default_potion() const
 {
   std::string lvl120_potion =
     ( specialization() == PRIEST_SHADOW ) ? "unbridled_fury" :
-                                            "battle_potion_of_intellect";
+    ( primary_role() != ROLE_HEAL ) ? "potion_of_wild_mending" : /* id 300741 - healers */
+                                      "superior_battle_potion_of_intellect";
 
   return ( true_level >  110 ) ? lvl120_potion :
          ( true_level >= 100 ) ? "prolonged_power" :
@@ -1269,7 +1270,12 @@ void priest_t::create_apl_default()
   {
     def->add_action( "arcane_torrent,if=mana.pct<=90" );
   }
-  def->add_action( this, "Shadow Word: Pain", ",if=remains<tick_time|!ticking" );
+  if ( find_class_spell( "Shadow Word: Pain" )->ok() )
+  {
+    // THIS MUST be skipped by holy priest healers who can not use this spell
+    // as of at least 2019-09-01, but likly much earlyer
+    def->add_action( this, "Shadow Word: Pain", ",if=remains<tick_time|!ticking" );
+  }
   def->add_action( this, "Smite" );
 }
 

diff --git a/engine/class_modules/priest/sc_priest_holy.cpp b/engine/class_modules/priest/sc_priest_holy.cpp
@@ -381,7 +381,45 @@ void priest_t::generate_apl_holy_d()
 /** Holy Heal Combat Action Priority List */
 void priest_t::generate_apl_holy_h()
 {
-  create_apl_default();
+  action_priority_list_t* default_list = get_action_priority_list( "default" );
+  action_priority_list_t* precombat    = get_action_priority_list( "precombat" );
+
+  // Precombat actions
+  precombat->add_action( "potion" );
+  // should implement prayer of mending too
+  precombat->add_action( this, "Renew" );
+
+  // On-Use Items
+  default_list->add_action( "use_items" );
+
+  // Professions
+  for ( const std::string& profession_action : get_profession_actions() )
+  {
+    default_list->add_action( profession_action );
+  }
+
+  // Potions
+  default_list->add_action(
+      "potion,if=buff.bloodlust.react|(raid_event.adds.up&(raid_event.adds.remains>20|raid_event.adds.duration<20))|"
+      "target.time_to_die<=30" );
+
+  // Default APL
+  default_list->add_action( this, "Renew", "cycle_targets=1,max_cycle_targets=15,if=!ticking&target.health.pct<=99&mana.pct>20" );
+  default_list->add_action( this, "Renew", "cycle_targets=1,max_cycle_targets=15,if=!ticking&target.health.pct<=80" );
+  default_list->add_action( this, "Flash Heal", "if=target.health.pct>=1&target.health.pct<50&cooldown.holy_word_serenity.remains>=0.2,cycle_targets=1,max_cycle_targets=5" );
+  default_list->add_action( this, "Holy Word: Serenity", "if=target.health.pct>=1&target.health.pct<50,cycle_targets=1,max_cycle_targets=5" );
+  default_list->add_action( this, "Heal", "if=target.health.pct>49&target.health.pct<98,cycle_targets=1" );
+  default_list->add_action( "stop_moving", "if=self.mana.pct>14&cooldown.holy_word_serenity.remains>=0.3" );
+  default_list->add_action( "start_moving", "if=self.mana.pct<=5" );
+
+
+  // offence to reduce incoming damage APL
+  default_list->add_action( this, "Holy Fire", "if=!dot.holy_fire.ticking&spell_targets.holy_nova<7" );
+  default_list->add_action( this, "Holy Nova", "if=spell_targets.holy_nova>3" );
+  default_list->add_talent(
+      this, "Apotheosis", "if=active_enemies<5&(raid_event.adds.in>15|raid_event.adds.in>raid_event.adds.cooldown-5)" );
+  default_list->add_action( this, "Smite" );
+  default_list->add_action( this, "Holy Fire" );
 }
 
 }  // namespace priestspace