[Priest] Move the pet mult to core priest

simulationcraft · Oct 8, 2024 · f98a127 · f98a127
1 parent a74c0b8
commit f98a127
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/engine/class_modules/priest/sc_priest.cpp b/engine/class_modules/priest/sc_priest.cpp
@@ -3065,6 +3065,13 @@ double priest_t::composite_player_pet_damage_multiplier( const action_state_t* s
   double m = player_t::composite_player_pet_damage_multiplier( s, guardian );
 
   // Certain modifiers are only for Guardians, otherwise just give the Pet Modifier
+
+  if ( specialization() == PRIEST_SHADOW )
+  {
+    // Seems to apply to all pets/guardians. Unknown if it applies to non shadow ones currently. 08/10/2024
+    m *= 1.296;
+  }
+
   if ( guardian )
   {
     m *= ( 1.0 + specs.shadow_priest->effectN( 4 ).percent() );

diff --git a/engine/class_modules/priest/sc_priest_pets.cpp b/engine/class_modules/priest/sc_priest_pets.cpp
@@ -233,13 +233,6 @@ struct priest_pet_spell_t : public parse_action_effects_t<spell_t>
       apply_affecting_aura( p.o().specs.shadow_priest );
       apply_affecting_aura( p.o().specs.discipline_priest );
 
-      if ( p.o().specialization() == PRIEST_SHADOW )
-      {
-        // Unknown Multiplier applying to all (?) pet damage (Seems to be all shadow, maybe trinkets?)
-        base_td_multiplier *= 1.296;
-        base_dd_multiplier *= 1.296;
-      }
-
       apply_buff_effects();
       apply_debuffs_effects();
     }