[Priest] clean up more old code

Author: seanpeters86

engine/class_modules/priest/sc_priest.cpp

@@ -161,8 +161,6 @@ struct mind_blast_base_t : public priest_spell_t
     {
       priest().trigger_entropic_rift();
     }
-
-    priest().buffs.darkness_from_light->expire();
   }
 
   bool insidious_ire_active() const
@@ -391,7 +389,7 @@ struct halo_spell_t final : public priest_spell_t
   {
     aoe        = -1;
     background = true;
-    radius     = data().max_range() + p.talents.archon.power_surge->effectN( 1 ).base_value();
+    radius     = data().max_range();
     range      = 0;
     travel_speed =
         radius / 2;  // These do not seem to match up to the animation, which would be 2.5s. TODO: Check later
@@ -471,7 +469,7 @@ struct halo_heal_t final : public priest_heal_t
   {
     aoe        = -1;
     background = true;
-    radius     = data().max_range() + p.talents.archon.power_surge->effectN( 1 ).base_value();
+    radius     = data().max_range();
     range      = 0;
     travel_speed =
         radius / 2;  // These do not seem to match up to the animation, which would be 2.5s. TODO: Check later
@@ -714,14 +712,12 @@ struct power_word_fortitude_t final : public priest_spell_t
 // ==========================================================================
 struct smite_base_t : public priest_spell_t
 {
-  timespan_t t31_2pc_extend;
   timespan_t divine_procession_extend;
   action_t* child_searing_light;
 
   smite_base_t( priest_t& p, util::string_view name, const spell_data_t* s, bool bg = false,
                 util::string_view options_str = {} )
     : priest_spell_t( name, p, s ),
-      t31_2pc_extend( priest().sets->set( PRIEST_DISCIPLINE, T31, B2 )->effectN( 1 ).time_value() ),
       divine_procession_extend( priest().talents.discipline.divine_procession->effectN( 1 ).time_value() ),
       child_searing_light( priest().background_actions.searing_light )
 
@@ -757,9 +753,6 @@ struct smite_base_t : public priest_spell_t
     if ( priest().talents.surge_of_light.enabled() )
       priest().buffs.surge_of_light->trigger();
 
-    if ( p().sets->has_set_bonus( PRIEST_DISCIPLINE, TWW1, B4 ) )
-      priest().buffs.darkness_from_light->trigger();
-
     if ( priest().talents.holy.holy_word_chastise.enabled() )
     {
       timespan_t chastise_cdr =
@@ -775,28 +768,6 @@ struct smite_base_t : public priest_spell_t
 
     if ( result_is_hit( s->result ) )
     {
-      if ( priest().sets->has_set_bonus( PRIEST_DISCIPLINE, T31, B2 ) )
-      {
-        if ( p().allies_with_atonement.size() > 0 )
-        {
-          /*auto it = *( std::min_element( p().allies_with_atonement.begin(), p().allies_with_atonement.end(),
-                                         [ this ]( player_t* a, player_t* b ) {
-                                           return a->health_percentage() < b->health_percentage() &&
-                                                  priest().find_target_data( b )->buffs.atonement->remains() < 30_s;
-                                         } ) );*/
-
-          auto idx = rng().range( 0U, as<unsigned>( p().allies_with_atonement.size() ) );
-
-          auto it = p().allies_with_atonement[ idx ];
-
-          auto atone = priest().find_target_data( it )->buffs.atonement;
-          if ( atone->remains() < 30_s )
-          {
-            atone->extend_duration( player, t31_2pc_extend );
-          }
-        }
-      }
-
       if ( priest().talents.discipline.divine_procession.enabled() )
       {
         if ( p().allies_with_atonement.size() > 0 )
@@ -833,11 +804,6 @@ struct smite_t final : public smite_base_t
   smite_t( priest_t& p, util::string_view options_str )
     : smite_base_t( p, "smite", p.find_class_spell( "Smite" ), false, options_str ), shadow_smite( nullptr )
   {
-    if ( p.sets->has_set_bonus( PRIEST_DISCIPLINE, T31, B4 ) )
-    {
-      shadow_smite = new smite_base_t( p, "smite_t31", priest().specs.smite_t31, true );
-      add_child( shadow_smite );
-    }
   }
 
   void impact( action_state_t* s ) override
@@ -921,22 +887,8 @@ struct power_infusion_t final : public priest_spell_t
     // Trigger PI on the actor only if casting on itself
     if ( priest().options.self_power_infusion || priest().talents.twins_of_the_sun_priestess.enabled() )
     {
-      bool tww2_4pc = priest().sets->has_set_bonus( PRIEST_SHADOW, TWW2, B4 );
-      if ( tww2_4pc && player->buffs.power_infusion->check() )
-      {
-        timespan_t extend_amount =
-            std::min( player->buffs.power_infusion->buff_duration(), 30_s - player->buffs.power_infusion->remains() );
-        if ( extend_amount > 0_s )
-          player->buffs.power_infusion->extend_duration( player, extend_amount );
-
-        player->buffs.power_infusion->current_value = power_infusion_magnitude;
-        player->buffs.power_infusion->invalidate_cache();
-      }
-      else
-      {
-        player->buffs.power_infusion->trigger( 1, power_infusion_magnitude, -1,
-                                               player->buffs.power_infusion->buff_duration() );
-      }
+      player->buffs.power_infusion->trigger( 1, power_infusion_magnitude, -1,
+                                             player->buffs.power_infusion->buff_duration() );
     }
   }
 };
@@ -1947,12 +1899,6 @@ struct power_word_shield_t final : public priest_absorb_t
       m *= 1 + priest().buffs.weal_and_woe->data().effectN( 2 ).percent() * priest().buffs.weal_and_woe->check();
     }
 
-    if ( priest().buffs.darkness_from_light->check() )
-    {
-      m *= 1 + priest().buffs.darkness_from_light->data().effectN( 2 ).percent() *
-                   priest().buffs.darkness_from_light->check();
-    }
-
     return m;
   }
 
@@ -1970,11 +1916,6 @@ struct power_word_shield_t final : public priest_absorb_t
 
     priest_absorb_t::execute();
 
-    if ( priest().buffs.darkness_from_light->check() )
-    {
-      priest().buffs.darkness_from_light->expire();
-    }
-
     priest().buffs.weal_and_woe->expire();
   }
 
@@ -1992,11 +1933,6 @@ struct power_word_shield_t final : public priest_absorb_t
       priest_td_t& td = get_td( s->target );
       td.buffs.atonement->trigger( atonement_duration );
     }
-
-    if ( priest().sets->has_set_bonus( PRIEST_DISCIPLINE, T29, B2 ) )
-    {
-      priest().buffs.light_weaving->trigger();
-    }
   }
 };
 
@@ -2638,12 +2574,6 @@ double priest_t::composite_player_pet_damage_multiplier( const action_state_t* s
 {
   double m = player_t::composite_player_pet_damage_multiplier( s, guardian );
 
-  // TWW1 Set Bonus for pet spells, this double dips with pet spells
-  if ( buffs.devouring_chorus->check() )
-  {
-    m *= ( 1.0 + buffs.devouring_chorus->check_stack_value() );
-  }
-
   return m;
 }
 
@@ -2837,10 +2767,6 @@ action_t* priest_t::create_action( util::string_view name, util::string_view opt
   {
     return new flash_heal_t( *this, options_str );
   }
-  if ( name == "renew" )
-  {
-    return new renew_t( *this, options_str );
-  }
   if ( name == "void_blast" )
   {
     if ( specialization() == PRIEST_SHADOW )
@@ -3086,8 +3012,8 @@ void priest_t::init_spells()
   talents.purify_disease     = CT( "Purify Disease" );  // NYI
   talents.power_infusion     = CT( "Power Infusion" );
   talents.painful_invocation = CT( "Painful Invocation" );
-  talents.sheer_terror       = CT( "Sheer Terror" );        // NYI
-  talents.petrifying_scream  = CT( "Petrifying Scream" );   // NYI
+  talents.sheer_terror       = CT( "Sheer Terror" );       // NYI
+  talents.petrifying_scream  = CT( "Petrifying Scream" );  // NYI
   // Row 4
   talents.surge_of_light             = CT( "Surge of Light" );
   talents.surge_of_light_buff        = find_spell( 114255 );
@@ -3908,7 +3834,6 @@ void priest_t::create_options()
       opt_float( "priest.crystalline_reflection_damage_mult", options.crystalline_reflection_damage_mult, 0.0, 1.0 ) );
   add_option( opt_bool( "priest.no_channel_macro_mfi", options.no_channel_macro_mfi ) );
   add_option( opt_bool( "priest.discipline_in_raid", options.discipline_in_raid ) );
-  add_option( opt_bool( "priest.shadow_tww2_4pc_insanity", options.shadow_tww2_4pc_insanity ) );
   add_option( opt_float( "priest.synergistic_brewterializer_tof_chance", options.synergistic_brewterializer_tof_chance,
                          0.0, 1.0 ) );
   add_option( opt_float( "priest.synergistic_brewterializer_barrel_hit_chance",

engine/class_modules/priest/sc_priest.hpp

@@ -221,9 +221,6 @@ struct priest_t final : public player_t
     propagate_const<buff_t*> vision_of_nzoth;
 
     // Tier Sets
-    propagate_const<buff_t*> light_weaving;
-    propagate_const<buff_t*> devouring_chorus;
-    propagate_const<buff_t*> darkness_from_light;
     propagate_const<buff_t*> ascension;         // TWW3 Archon Set 2pc
     propagate_const<buff_t*> tww3_archon_4pc;   // TWW3 Archon Set 4pc helper
     propagate_const<buff_t*> overflowing_void;  // TWW3 VW Set 4pc
@@ -617,7 +614,6 @@ struct priest_t final : public player_t
     const spell_data_t* penance;
     const spell_data_t* penance_channel;
     const spell_data_t* penance_tick;
-    const spell_data_t* smite_t31;
 
     // Holy
     const spell_data_t* holy_priest;  // General holy data
@@ -867,8 +863,6 @@ struct priest_t final : public player_t
     // Controls whether Discipline is "in a raid" or not.
     bool discipline_in_raid = false;
 
-    bool shadow_tww2_4pc_insanity = true;
-
     // 30% Chance that a Fire Mage steals the proc because you are slow or you just dont hit it or it just bugs out.
     double synergistic_brewterializer_tof_chance = 0.7;
     // ~20% damage penalty to account for GCD. ~10% Miss general chance.
@@ -1176,31 +1170,12 @@ struct priest_action_t : public parse_action_effects_t<Base>
 
       // Buffs non-periodic spells
       parse_effects( p().buffs.screams_of_the_void );
-
-      if ( p().sets->has_set_bonus( PRIEST_SHADOW, TWW1, B4 ) )
-      {
-        parse_effects( p().buffs.devouring_chorus );
-      }
-
-      if ( p().sets->has_set_bonus( PRIEST_SHADOW, TWW2, B4 ) )
-      {
-        parse_effects( ab::player->buffs.power_infusion,
-                       p().sets->set( PRIEST_SHADOW, TWW2, B4 )->effectN( 2 ).percent() );
-      }
     }
 
     // DISCIPLINE BUFF EFFECTS
     if ( p().specialization() == PRIEST_DISCIPLINE )
     {
-      // 280398 applies the buff to the correct spells, but does not contain the correct buff value
-      // (12% instead of 40%) So, override to use our provided default_value (40%) instead
-      parse_effects( p().buffs.light_weaving );
       parse_effects( p().buffs.weal_and_woe );
-
-      if ( p().sets->has_set_bonus( PRIEST_DISCIPLINE, TWW1, B4 ) )
-      {
-        parse_effects( p().buffs.darkness_from_light );
-      }
     }
 
     // HOLY BUFF EFFECTS

engine/class_modules/priest/sc_priest_discipline.cpp

@@ -563,9 +563,6 @@ struct penance_base_t : public priest_spell_t
     priest().buffs.power_of_the_dark_side->expire();
 
     priest().buffs.harsh_discipline->decrement();
-
-    if ( p().sets->has_set_bonus( PRIEST_DISCIPLINE, TWW1, B4 ) )
-      priest().buffs.darkness_from_light->trigger();
   }
 
   void impact( action_state_t* state ) override
@@ -701,11 +698,6 @@ void priest_t::create_buffs_discipline()
   }
 
   buffs.weal_and_woe = make_buff( this, "weal_and_woe", talents.discipline.weal_and_woe_buff );
-
-  // Discipline T29 2-piece bonus
-  buffs.light_weaving = make_buff( this, "light_weaving", find_spell( 394609 ) );
-
-  buffs.darkness_from_light = make_buff( this, "darkness_from_light", find_spell( 455033 ) );
 }
 
 void priest_t::init_rng_discipline()
@@ -788,7 +780,6 @@ void priest_t::init_spells_discipline()
   specs.penance         = find_spell( 47540 );
   specs.penance_channel = find_spell( 47758 );   // Channel spell, triggered by 47540, executes 47666 every tick
   specs.penance_tick    = find_spell( 47666 );   // Not triggered from 47540, only 47758
-  specs.smite_t31       = find_spell( 425529 );  // T31 Shadow Smite
 }
 
 action_t* priest_t::create_action_discipline( util::string_view name, util::string_view options_str )

engine/class_modules/priest/sc_priest_pets.cpp

@@ -290,11 +290,6 @@ struct priest_pet_spell_t : public parse_action_effects_t<spell_t>
       parse_effects( p().o().buffs.voidform, effect_mask_t( true ).disable( 3 ), IGNORE_STACKS );  // Skip E3 for AM
       parse_effects( p().o().buffs.shadowform );
     }
-
-    if ( p().o().sets->has_set_bonus( PRIEST_SHADOW, TWW1, B4 ) )
-    {
-      parse_effects( p().o().buffs.devouring_chorus );
-    }
   }
   void apply_debuffs_effects()
   {

engine/class_modules/priest/sc_priest_shadow.cpp

@@ -808,11 +808,6 @@ struct shadow_word_madness_t final : public priest_spell_t
     {
       priest().buffs.mind_devourer->decrement();
     }
-
-    if ( priest().sets->has_set_bonus( PRIEST_SHADOW, TWW1, B4 ) )
-    {
-      priest().buffs.devouring_chorus->trigger();
-    }
   }
 
   void impact( action_state_t* s ) override
@@ -1921,13 +1916,6 @@ void priest_t::create_buffs_shadow()
   buffs.death_and_madness_reset =
       make_buff( this, "death_and_madness_reset", talents.shadow.death_and_madness_reset_buff )
           ->set_trigger_spell( talents.shadow.death_and_madness );
-
-  // Tier Sets
-  buffs.devouring_chorus = make_buff_fallback( sets->has_set_bonus( PRIEST_SHADOW, TWW1, B4 ), this, "devouring_chorus",
-                                               sets->set( PRIEST_SHADOW, TWW1, B4 )->effectN( 1 ).trigger() )
-                               ->set_stack_behavior( buff_stack_behavior::ASYNCHRONOUS )
-                               ->set_default_value_from_effect( 1 );
-
 }  // namespace priestspace
 
 void priest_t::init_rng_shadow()