[Retribution] apply +5% chance/+20% effectiveness from spec aura to second sunrise

Author: gastank

engine/class_modules/paladin/sc_paladin.cpp

@@ -3003,7 +3003,10 @@ struct hammer_of_wrath_t : public paladin_melee_attack_t
       echo->base_aoe_multiplier = base_aoe_multiplier;
       echo->crit_bonus_multiplier = crit_bonus_multiplier;
       echo->triggers_higher_calling = true;
-      echo->base_multiplier *= p->talents.herald_of_the_sun.second_sunrise->effectN( 2 ).percent();
+      // ret spec aura applies +20% to second sunrise effectiveness
+      // temporary fix until register_passive_effect_modifier() is implemented
+      echo->base_multiplier *= p->talents.herald_of_the_sun.second_sunrise->effectN( 2 ).percent() +
+                               p->spec.retribution_paladin_2->effectN( 26 ).percent();
     }
   }
 
@@ -3112,7 +3115,12 @@ struct hammer_of_wrath_t : public paladin_melee_attack_t
         s->chain_target == 0 &&
         p()->cooldowns.second_sunrise_icd->up() )
     {
-      if ( rng().roll( p()->talents.herald_of_the_sun.second_sunrise->effectN( 1 ).percent() ) )
+      // ret spec aura applies +5% to second sunrise chance
+      // temporary fix until register_passive_effect_modifier() is implemented
+      auto sunrise_chance = p()->talents.herald_of_the_sun.second_sunrise->effectN( 1 ).percent() +
+                            p()->spec.retribution_paladin_2->effectN( 25 ).percent();
+
+      if ( rng().roll( sunrise_chance ) )
       {
         p()->cooldowns.second_sunrise_icd->start();
         // TODO(mserrano): verify this delay

engine/class_modules/paladin/sc_paladin_retribution.cpp

@@ -564,7 +564,12 @@ struct divine_storm_t: public holy_power_consumer_t<paladin_melee_attack_t>
 
     if ( p->talents.herald_of_the_sun.second_sunrise->ok() )
     {
-      sunrise_echo = new divine_storm_echo_t( p, p->talents.herald_of_the_sun.second_sunrise->effectN( 2 ).percent() );
+      // ret spec aura applies +20% to second sunrise effectiveness
+      // temporary fix until register_passive_effect_modifier() is implemented
+      auto effectiveness = p->talents.herald_of_the_sun.second_sunrise->effectN( 2 ).percent() +
+                           p->spec.retribution_paladin_2->effectN( 26 ).percent();
+
+      sunrise_echo = new divine_storm_echo_t( p, effectiveness );
       add_child( sunrise_echo );
     }
   }
@@ -592,7 +597,12 @@ struct divine_storm_t: public holy_power_consumer_t<paladin_melee_attack_t>
 
     if ( p->talents.herald_of_the_sun.second_sunrise->ok() )
     {
-      sunrise_echo = new divine_storm_echo_t( p, p->talents.herald_of_the_sun.second_sunrise->effectN( 2 ).percent() * mul );
+      // ret spec aura applies +20% to second sunrise effectiveness
+      // temporary fix until register_passive_effect_modifier() is implemented
+      auto effectiveness = p->talents.herald_of_the_sun.second_sunrise->effectN( 2 ).percent() +
+                           p->spec.retribution_paladin_2->effectN( 26 ).percent();
+
+      sunrise_echo = new divine_storm_echo_t( p, effectiveness * mul );
       add_child( sunrise_echo );
     }
   }
@@ -625,7 +635,12 @@ struct divine_storm_t: public holy_power_consumer_t<paladin_melee_attack_t>
 
     if ( sunrise_echo && p()->cooldowns.second_sunrise_icd->up() )
     {
-      if ( rng().roll( p()->talents.herald_of_the_sun.second_sunrise->effectN( 1 ).percent() ) )
+      // ret spec aura applies +5% to second sunrise chance
+      // temporary fix until register_passive_effect_modifier() is implemented
+      auto sunrise_chance = p()->talents.herald_of_the_sun.second_sunrise->effectN( 1 ).percent() +
+                            p()->spec.retribution_paladin_2->effectN( 25 ).percent();
+
+      if ( rng().roll( sunrise_chance ) )
       {
         p()->cooldowns.second_sunrise_icd->start();
         // TODO(mserrano): validate the correct delay here
@@ -1783,7 +1798,7 @@ void paladin_t::init_spells_retribution()
   talents.healing_hands  = find_talent_spell( talent_tree::CLASS, "Healing Hands" );
   // Spec passives and useful spells
   spec.retribution_paladin = find_specialization_spell( "Retribution Paladin" );
-  spec.retribution_paladin_2 = find_spell( 412314 );
+  spec.retribution_paladin_2 = specialization() == PALADIN_RETRIBUTION ? find_spell( 412314 ) : spell_data_t::not_found();
   mastery.highlords_judgment = find_mastery_spell( PALADIN_RETRIBUTION );
 
   if ( specialization() == PALADIN_RETRIBUTION )