[Priest] Baseline implementation for Forever

engine/action/action.cpp

@@ -794,6 +794,9 @@ void action_t::parse_spell_data( const spell_data_t& spell_data )
   base_crit_bonus += crit_bonus_mod[ 1 ];
   crit_bonus_multiplier *= crit_bonus_mod[ 2 ];
 
+  auto hit_mod = player->get_passive_value( spell_data, "hit" );
+  base_hit += hit_mod[ 1 ];
+
   // handle mechanic modifiers (currently only bleed is found in relevant spell data)
   // as the effect (subtype 276) is player scoped, we call get_passive_player_value()
   // only the spell's mechanic field is checked, the effect's mechanic field is not sufficient for this effect subtype

engine/action/parse_effects.cpp

@@ -1087,6 +1087,16 @@ double parse_player_effects_t::stacking_movement_modifier() const
   return m;
 }
 
+double parse_player_effects_t::composite_mana_regen_while_casting() const
+{
+  auto m = player_t::composite_mana_regen_while_casting();
+
+  for ( const auto& i : mana_regen_while_casting_effects )
+    m += get_effect_value( i );
+
+  return m;
+}
+
 void parse_player_effects_t::invalidate_cache( cache_e c )
 {
   player_t::invalidate_cache( c );
@@ -1268,6 +1278,10 @@ std::vector<player_effect_t>* parse_player_effects_t::get_effect_vector( const s
       str = "absorb received";
       return &absorb_received_mult_effects;
 
+    case A_MOD_MANA_REGEN_INTERRUPT:
+      str = "mana regen while casting";
+      return &mana_regen_while_casting_effects;
+
     case A_MOD_INCREASE_SPEED:
       str = "exclusive move speed";
       invalidate( CACHE_RUN_SPEED );
@@ -1415,6 +1429,7 @@ void parse_player_effects_t::print_custom_parsed_effects( report::sc_html_stream
     print_parsed_type( os, spell_haste_effects, "Spell Haste" );
     print_parsed_type( os, healing_received_effects, "Healing Received" );
     print_parsed_type( os, leech_effects, "Leech" );
+    print_parsed_type( os, mana_regen_while_casting_effects, "Mana Regen While Casting" );
     print_parsed_type( os, non_stacking_movement_effects, "Move Speed Modifier - Exclusive" );
     print_parsed_type( os, stacking_movement_effects, "Move Speed Modifier - Stacking" );
     print_parsed_type( os, parry_effects, "Parry" );
@@ -1461,7 +1476,8 @@ size_t parse_player_effects_t::total_effects_count() const
          target_multiplier_effects.size() +
          target_pet_multiplier_effects.size() +
          non_stacking_movement_effects.size() +
-         stacking_movement_effects.size();
+         stacking_movement_effects.size() +
+         mana_regen_while_casting_effects.size();
 }
 
 void parse_action_base_t::parse_callback_function( pack_t<player_effect_t>& pack, parse_cb_t cb )
@@ -1556,6 +1572,15 @@ std::vector<player_effect_t>* parse_action_base_t::get_effect_vector( const spel
     return &da_multiplier_effects;
   }
 
+  if ( eff.subtype() == A_MOD_POWER_COST_SCHOOL_PCT )
+  {
+    if ( !( dbc::get_school_mask( _action->get_school() ) & eff.affected_schools() ) )
+      return nullptr;
+
+    str = "cost percent";
+    return &cost_effects;
+  }
+
   if ( !force )
   {
     if ( !check_affected_list( pack.affect_lists, eff, force ) )

engine/action/parse_effects.hpp

@@ -706,6 +706,7 @@ struct parse_player_effects_t : public player_t, public parse_effects_t
   std::vector<target_effect_t> target_pet_multiplier_effects;
   std::vector<player_effect_t> non_stacking_movement_effects;
   std::vector<player_effect_t> stacking_movement_effects;
+  std::vector<player_effect_t> mana_regen_while_casting_effects;
 
   // Cache Pairing, invalidate first of the pair when the second is invalidated
   std::vector<std::pair<cache_e, cache_e>> invalidate_with_parent;
@@ -743,6 +744,7 @@ struct parse_player_effects_t : public player_t, public parse_effects_t
                                                       bool direct ) const override;
   double non_stacking_movement_modifier() const override;
   double stacking_movement_modifier() const override;
+  double composite_mana_regen_while_casting() const override;
 
   void invalidate_cache( cache_e c ) override;
 

engine/class_modules/apl/priest.cpp

@@ -29,4 +29,24 @@ std::string temporary_enchant( const player_t* )
 {
   return "disabled";
 }
+
+//priest_apl_start
+void priest( player_t* p )
+{
+  action_priority_list_t* precombat = p->get_action_priority_list( "precombat" );
+  action_priority_list_t* default_  = p->get_action_priority_list( "default" );
+
+  precombat->add_action( "shadowform" );
+
+  default_->add_action( "dark_sacrifice,if=mana.pct<50" );
+  default_->add_action( "shadow_word_pain,if=!ticking" );
+  default_->add_action( "devouring_plague,if=!ticking" );
+  default_->add_action( "mind_blast" );
+  default_->add_action( "shadow_word_death" );
+  default_->add_action( "penance" );
+  default_->add_action( "starshards" );
+  default_->add_action( "mind_flay" );
+  default_->add_action( "smite" );
+}
+//priest_apl_end
 }  // namespace priest_apl

engine/class_modules/apl/priest.hpp

@@ -4,11 +4,12 @@
 
 #include <string>
 
-namespace warlock_apl
+namespace priest_apl
 {
 std::string potion( const player_t* );
 std::string flask( const player_t* );
 std::string food( const player_t* );
 std::string rune( const player_t* );
 std::string temporary_enchant( const player_t* );
-}  // namespace warlock_apl
+void priest( player_t* );
+}  // namespace priest_apl