[Priest] start work on 64507 beta changes

Author: seanpeters86

engine/class_modules/priest/sc_priest.cpp

@@ -1051,7 +1051,7 @@ struct summon_fiend_t final : public priest_spell_t
 
   const spell_data_t* pet_summon_spell( priest_t& p )
   {
-    if ( p.talents.voidweaver.voidwraith.enabled() && p.talents.shared.shadowfiend.enabled() )
+    if ( p.talents.voidweaver.voidwraith.enabled() )
       return p.talents.voidweaver.voidwraith_spell;
 
     return p.talents.shared.mindbender.enabled() ? p.talents.shared.mindbender : p.talents.shared.shadowfiend;
@@ -1199,8 +1199,8 @@ struct shadow_word_death_t final : public priest_spell_t
       execute_modifier( data().effectN( 4 ).percent() ),
       shadow_word_death_self_damage( new shadow_word_death_self_damage_t( p ) ),
       depth_of_shadows_duration(
-          timespan_t::from_seconds( p.talents.voidweaver.depth_of_shadows->effectN( 1 ).base_value() ) ),
-      depth_of_shadows_threshold( p.talents.voidweaver.depth_of_shadows->effectN( 2 ).base_value() ),
+          timespan_t::from_seconds( p.talents.shared.depth_of_shadows->effectN( 1 ).base_value() ) ),
+      depth_of_shadows_threshold( p.talents.shared.depth_of_shadows->effectN( 2 ).base_value() ),
       child_expiation( nullptr ),
       child_searing_light( priest().background_actions.searing_light ),
       execute_override( execute_override )
@@ -1331,7 +1331,7 @@ struct shadow_word_death_t final : public priest_spell_t
     {
       double save_health_percentage = s->target->health_percentage();
 
-      if ( priest().talents.voidweaver.depth_of_shadows.enabled() )
+      if ( priest().talents.shared.depth_of_shadows.enabled() )
       {
         double chance = 0.9;
         // TODO: Find out the actual chance, this is a guess
@@ -2730,10 +2730,6 @@ action_t* priest_t::create_action( util::string_view name, util::string_view opt
   {
     return new power_word_fortitude_t( *this, options_str );
   }
-  if ( ( name == "shadowfiend" ) || ( name == "mindbender" ) || ( name == "fiend" ) || ( name == "voidwraith" ) )
-  {
-    return new summon_fiend_t( *this, options_str );
-  }
   if ( name == "mind_blast" )
   {
     return new mind_blast_t( *this, options_str );
@@ -2968,7 +2964,8 @@ void priest_t::init_spells()
   // Shared Spells
   talents.shared.mindbender          = ST( "Mindbender" );
   talents.shared.inescapable_torment = ST( "Inescapable Torment" );
-  talents.shared.shadowfiend         = ST( "Shadowfiend" );
+  talents.shared.shadowfiend         = find_spell( 34433 );
+  talents.shared.depth_of_shadows    = ST( "Depth of Shadows" );
 
   // Generic Spells
   specs.levitate_buff     = find_spell( 111759 );
@@ -3131,7 +3128,6 @@ void priest_t::init_spells()
   talents.voidweaver.void_empowerment       = HT( "Void Empowerment" );
   talents.voidweaver.void_empowerment_buff  = find_spell( 450140 );
   talents.voidweaver.darkening_horizon      = HT( "Darkening Horizon" );
-  talents.voidweaver.depth_of_shadows       = HT( "Depth of Shadows" );
   talents.voidweaver.voidwraith             = HT( "Voidwraith" );
   talents.voidweaver.voidwraith_spell       = find_spell( 451235 );
   talents.voidweaver.touch_of_the_void      = HT( "Touch of the Void" );
@@ -3144,8 +3140,8 @@ void priest_t::init_spells()
   talents.voidweaver.collapsing_void_damage = find_spell( 448405 );
 
   tww3_spells.voidweaver_4pc = sets->set( HERO_VOIDWEAVER, TWW3, B4 );
-  
-  if ( specialization()  == PRIEST_SHADOW)
+
+  if ( specialization() == PRIEST_SHADOW )
     deregister_passive_effect( talents.voidweaver.overwhelming_shadows->effectN( 2 ) );
 
   // Register passives

engine/class_modules/priest/sc_priest.hpp

@@ -311,9 +311,10 @@ struct priest_t final : public player_t
 
     struct
     {
-      player_talent_t shadowfiend;
+      const spell_data_t* shadowfiend;
       player_talent_t mindbender;
       player_talent_t inescapable_torment;
+      player_talent_t depth_of_shadows;
     } shared;
 
     struct
@@ -322,6 +323,7 @@ struct priest_t final : public player_t
       // Row 2
       player_talent_t psychic_link;
       player_talent_t misery;
+      player_talent_t invoked_nightmares;
       player_talent_t intangibility;
       player_talent_t mental_fortitude;
       // Row 3
@@ -342,6 +344,7 @@ struct priest_t final : public player_t
       const spell_data_t* void_volley_buff;
       const spell_data_t* void_volley_missile;
       const spell_data_t* void_volley_damage;
+      player_talent_t haunting_shadows;
       player_talent_t mental_decay;
       // Row 6
       player_talent_t dark_thoughts;
@@ -366,12 +369,14 @@ struct priest_t final : public player_t
       const spell_data_t* death_and_madness_reset_buff;
       player_talent_t mind_devourer;
       player_talent_t auspicious_spirits;
+      player_talent_t maddening_tentacles;
       // Row 9
       player_talent_t madness_weaving;
       player_talent_t deaths_torment;
       player_talent_t screams_of_the_void;
       player_talent_t tormented_spirits;
       player_talent_t insidious_ire;
+      player_talent_t crushing_void;
       // Row 10
       player_talent_t idol_of_yshaarj;
       const spell_data_t* call_of_the_void;
@@ -590,7 +595,6 @@ struct priest_t final : public player_t
       player_talent_t void_empowerment;
       const spell_data_t* void_empowerment_buff;
       player_talent_t darkening_horizon;
-      player_talent_t depth_of_shadows;
       player_talent_t voidwraith;
       const spell_data_t* voidwraith_spell;
       player_talent_t touch_of_the_void;

engine/class_modules/priest/sc_priest_pets.cpp

@@ -596,7 +596,7 @@ struct shadowfiend_pet_t final : public base_fiend_pet_t
   }
   double insanity_gain() const override
   {
-    if ( o().talents.shared.shadowfiend.enabled() )
+    if ( o().talents.shared.depth_of_shadows.enabled() )
     {
       return power_leech_insanity;
     }
@@ -737,7 +737,7 @@ struct fiend_melee_t : public priest_pet_melee_t
 
       p().o().trigger_atonement( s, composite_atonement_multiplier( s ) );
 
-      if ( p().o().talents.shared.shadowfiend.enabled() || p().o().talents.shared.mindbender.enabled() )
+      if ( p().o().talents.shared.depth_of_shadows.enabled() || p().o().talents.shared.mindbender.enabled() )
       {
         if ( p().o().specialization() == PRIEST_SHADOW )
         {

engine/class_modules/priest/sc_priest_shadow.cpp

@@ -57,16 +57,6 @@ struct mind_flay_base_t : public priest_spell_t
 
     priest().trigger_idol_of_cthun( d->state );
 
-    if ( priest().talents.shadow.mental_decay.enabled() )
-    {
-      timespan_t dot_extension =
-          timespan_t::from_seconds( priest().talents.shadow.mental_decay->effectN( 1 ).base_value() );
-      priest_td_t& td = get_td( d->state->target );
-
-      td.dots.shadow_word_pain->adjust_duration( dot_extension );
-      td.dots.vampiric_touch->adjust_duration( dot_extension );
-    }
-
     if ( priest().talents.shadow.psychic_link.enabled() )
     {
       priest().trigger_psychic_link( d->state );
@@ -392,6 +382,16 @@ struct shadowy_apparition_base_t : public priest_spell_t
           priest().generate_insanity( insanity_gain, priest().gains.insanity_auspicious_spirits, s->action );
         }
       }
+
+      if ( priest().talents.shadow.haunting_shadows.enabled() )
+      {
+        timespan_t dot_extension =
+            timespan_t::from_millis( priest().talents.shadow.haunting_shadows->effectN( 2 ).base_value() );
+        priest_td_t& td = get_td( s->target );
+
+        td.dots.shadow_word_pain->adjust_duration( dot_extension );
+        td.dots.vampiric_touch->adjust_duration( dot_extension );
+      }
     }
   };
 
@@ -529,11 +529,6 @@ struct shadow_word_pain_t final : public priest_spell_t
       return false;
     }
 
-    if ( priest().specialization() == PRIEST_SHADOW && priest().talents.shadow.misery.enabled() )
-    {
-      return false;
-    }
-
     return priest_spell_t::ready();
   }
 
@@ -762,18 +757,24 @@ struct vampiric_touch_t final : public priest_spell_t
 };
 
 // ==========================================================================
-// Devouring Plague
+// Shadow Word: Madness
 // ==========================================================================
 struct shadow_word_madness_t final : public priest_spell_t
 {
-  shadow_word_madness_t( priest_t& p ) : priest_spell_t( "shadow_word_madness", p, p.dot_spells.shadow_word_madness )
+  bool casted;
+  bool triggered_by_maddening_tentacles;
+
+  shadow_word_madness_t( priest_t& p, bool _casted = false, bool _triggered_by_maddening_tentacles = true )
+    : priest_spell_t( "shadow_word_madness", p, p.dot_spells.shadow_word_madness )
   {
-    may_crit                     = true;
-    affected_by_shadow_weaving   = true;
-    idol_of_nzoth_execute_stacks = 12;
+    casted                           = _casted;
+    triggered_by_maddening_tentacles = _triggered_by_maddening_tentacles;
+    may_crit                         = true;
+    affected_by_shadow_weaving       = true;
+    idol_of_nzoth_execute_stacks     = 12;
   }
 
-  shadow_word_madness_t( priest_t& p, util::string_view options_str ) : shadow_word_madness_t( p )
+  shadow_word_madness_t( priest_t& p, util::string_view options_str ) : shadow_word_madness_t( p, true, false )
   {
     parse_options( options_str );
   }
@@ -783,21 +784,29 @@ struct shadow_word_madness_t final : public priest_spell_t
     double m = priest_spell_t::composite_persistent_multiplier( s );
 
     // Dummy effect that is hard-coded to 20
-    if ( priest().buffs.mind_devourer->check() )
+    if ( priest().buffs.mind_devourer->check() && casted && !triggered_by_maddening_tentacles )
     {
       m *= 1 + priest().buffs.mind_devourer->data().effectN( 2 ).percent();
     }
 
+    if ( !casted && triggered_by_maddening_tentacles )
+    {
+      m *= priest().talents.shadow.maddening_tentacles->effectN( 1 ).percent();
+    }
+
     return m;
   }
 
   void consume_resource() override
   {
-    priest_spell_t::consume_resource();
-
-    if ( priest().buffs.mind_devourer->up() )
+    if ( casted )
     {
-      priest().buffs.mind_devourer->decrement();
+      priest_spell_t::consume_resource();
+
+      if ( priest().buffs.mind_devourer->up() )
+      {
+        priest().buffs.mind_devourer->decrement();
+      }
     }
   }
 
@@ -828,12 +837,13 @@ struct shadow_word_madness_t final : public priest_spell_t
   {
     priest_spell_t::execute();
 
+    // TODO: check this with Maddening Tentacles
     if ( priest().sets->has_set_bonus( HERO_ARCHON, TWW3, B4 ) && priest().buffs.power_surge->check() )
     {
       priest().buffs.tww3_archon_4pc->trigger();
     }
 
-    if ( priest().talents.shadow.ancient_madness.enabled() && priest().buffs.voidform->up() )
+    if ( priest().talents.shadow.ancient_madness.enabled() && priest().buffs.voidform->up() && casted )
     {
       priest().buffs.voidform->extend_duration(
           &priest(), timespan_t::from_millis( priest().talents.shadow.voidform->effectN( 2 ).base_value() ) );
@@ -844,7 +854,7 @@ struct shadow_word_madness_t final : public priest_spell_t
       priest().buffs.screams_of_the_void->trigger();
     }
 
-    if ( priest().talents.voidweaver.collapsing_void.enabled() )
+    if ( priest().talents.voidweaver.collapsing_void.enabled() && casted )
     {
       priest().expand_entropic_rift();
     }
@@ -1067,6 +1077,11 @@ struct voidform_t final : public priest_spell_t
 
       priest().buffs.sustained_potency->expire();
     }
+
+    if ( priest().talents.shared.mindbender.enabled() )
+    {
+      priest().pets.mindbender.spawn();
+    }
   }
 
   bool ready() override
@@ -1378,11 +1393,14 @@ struct shadow_weaving_t final : public priest_spell_t
 struct tentacle_slam_damage_t final : public priest_spell_t
 {
   double parent_targets = 1;
+  propagate_const<shadow_word_madness_t*> child_swm;
 
-  tentacle_slam_damage_t( util::string_view n, priest_t& p, const spell_data_t* s ) : priest_spell_t( n, p, s )
+  tentacle_slam_damage_t( util::string_view n, priest_t& p, const spell_data_t* s )
+    : priest_spell_t( n, p, s ), child_swm( new shadow_word_madness_t( priest(), false, true ) )
   {
     background                 = true;
     affected_by_shadow_weaving = true;
+    child_swm->background      = true;
   }
 
   // Hacked in until the base spell covers this
@@ -1416,6 +1434,12 @@ struct tentacle_slam_damage_t final : public priest_spell_t
     {
       priest().trigger_random_idol( s );
     }
+
+    if ( priest().talents.shadow.maddening_tentacles.enabled() )
+    {
+      child_swm->target = s->target;
+      child_swm->execute();
+    }
   }
 };
 
@@ -1433,6 +1457,9 @@ struct tentacle_slam_dots_t final : public priest_spell_t
     background = true;
     aoe        = as<int>( s->effectN( 3 ).base_value() );
 
+    // TODO: confirm this works
+    idol_of_nzoth_execute_stacks = 6;
+
     child_vt->background = true;
   }
 
@@ -1928,10 +1955,11 @@ void priest_t::init_spells_shadow()
   auto ST = [ this ]( std::string_view n ) { return find_talent_spell( talent_tree::SPECIALIZATION, n ); };
 
   // Row 2
-  talents.shadow.psychic_link     = ST( "Psychic Link" );
-  talents.shadow.misery           = ST( "Misery" );
-  talents.shadow.intangibility    = ST( "Intangibility" );
-  talents.shadow.mental_fortitude = ST( "Mental Fortitude" );
+  talents.shadow.psychic_link       = ST( "Psychic Link" );
+  talents.shadow.misery             = ST( "Misery" );
+  talents.shadow.invoked_nightmares = ST( "Invoked Nightmares" );
+  talents.shadow.intangibility      = ST( "Intangibility" );
+  talents.shadow.mental_fortitude   = ST( "Mental Fortitude" );
   // Row 3
   talents.shadow.thought_harvester    = ST( "Thought Harvester" );
   talents.shadow.tentacle_slam        = ST( "Tentacle Slam" );
@@ -1949,6 +1977,7 @@ void priest_t::init_spells_shadow()
   talents.shadow.void_volley         = ST( "Void Volley" );
   talents.shadow.void_volley_missile = find_spell( 1242173 );
   talents.shadow.void_volley_damage  = find_spell( 1242189 );
+  talents.shadow.haunting_shadows    = ST( "Haunting Shadows" );
   talents.shadow.mental_decay        = ST( "Mental Decay" );
   // Row 6
   talents.shadow.dark_thoughts            = ST( "Dark Thoughts" );
@@ -1973,12 +2002,14 @@ void priest_t::init_spells_shadow()
   talents.shadow.death_and_madness_reset_buff = find_spell( 390628 );
   talents.shadow.mind_devourer                = ST( "Mind Devourer" );
   talents.shadow.auspicious_spirits           = ST( "Auspicious Spirits" );
+  talents.shadow.maddening_tentacles          = ST( "Maddening Tentacles" );
   // Row 9
   talents.shadow.madness_weaving     = ST( "Madness Weaving" );
   talents.shadow.deaths_torment      = ST( "Death's Torment" );
   talents.shadow.screams_of_the_void = ST( "Screams of the Void" );
   talents.shadow.tormented_spirits   = ST( "Tormented Spirits" );
   talents.shadow.insidious_ire       = ST( "Insidious Ire" );
+  talents.shadow.crushing_void       = ST( "Crushing Void" );
   // Row 10
   talents.shadow.idol_of_yshaarj        = ST( "Idol of Y'Shaarj" );
   talents.shadow.call_of_the_void       = find_spell( 373316 );   // Idol of Y'Shaarj positive haste buff