[Shaman] Implement 11.2 Totemic 2 piece set bonus

Author: navv1234

engine/class_modules/sc_shaman.cpp

@@ -1070,8 +1070,9 @@ struct shaman_t : public parse_player_effects_t
 
     // Doom Winds damage
     action_t* doom_winds;
-    
+
     action_t* set_ascendance;
+    action_t* tww3_primordial_storm;
   } action;
 
   // Pets
@@ -1891,6 +1892,7 @@ struct shaman_t : public parse_player_effects_t
   void trigger_arc_discharge( const action_state_t* state );
   void trigger_flowing_spirits( action_t* action );
   void trigger_lively_totems( const action_state_t* state );
+  void trigger_tww3_totemic_enh_2pc( const action_state_t* state );
 
   // Legendary
   void trigger_legacy_of_the_frost_witch( const action_state_t* state, unsigned consumed_stacks );
@@ -9634,7 +9636,7 @@ struct ascendance_t : public shaman_spell_t
 
 struct ascendance_dre_t : public ascendance_t
 {
-  ascendance_dre_t( shaman_t* player, spell_variant var_ ) : ascendance_t( player, "ascendance_dre", {}, var_) 
+  ascendance_dre_t( shaman_t* player, spell_variant var_ ) : ascendance_t( player, "ascendance_dre", {}, var_)
   {
     background = true;
     cooldown->duration = 0_s;
@@ -10901,15 +10903,24 @@ struct primordial_storm_t : public shaman_spell_t
 {
   struct primordial_damage_t : public shaman_attack_t
   {
-    primordial_damage_t( primordial_storm_t* parent, util::string_view name, const spell_data_t* s ) :
-      shaman_attack_t( name, parent->p(), s )
+    primordial_damage_t( primordial_storm_t* parent, util::string_view name, const spell_data_t* s,
+      spell_variant type_ ) :
+      shaman_attack_t( ::action_name( name, type_ ), parent->p(), s, type_ )
     {
       // Inherit Maelstrom Weapon stacks from the parent cast
       mw_parent = parent;
       background = true;
 
       aoe          = -1;
       reduced_aoe_targets = p()->talent.primordial_storm->effectN( 3 ).base_value();
+
+      switch ( type_ )
+      {
+        case spell_variant::TWW3:
+          base_multiplier *= 1.0 + p()->sets->set( HERO_TOTEMIC, TWW3, B2 )->effectN( 1 ).percent();
+        default:
+          break;
+      }
     }
 
     double action_multiplier() const override
@@ -10929,24 +10940,34 @@ struct primordial_storm_t : public shaman_spell_t
 
   primordial_damage_t* fire, *frost, *nature;
 
-  primordial_storm_t( shaman_t* player, util::string_view options_str ) :
-    shaman_spell_t( "primordial_storm", player, player->find_spell( 1218090 ) )
+  primordial_storm_t( shaman_t* player, spell_variant type_, util::string_view options_str = {} ) :
+    shaman_spell_t( ::action_name( "primordial_storm", type_ ), player,
+      player->find_spell( 1218090 ), type_ )
   {
     parse_options( options_str );
 
     fire = new primordial_damage_t( this, "primordial_fire",
-      player->find_spell( 1218113 ) );
+      player->find_spell( 1218113 ), type_ );
     frost = new primordial_damage_t( this, "primordial_frost",
-      player->find_spell( 1218116 ) );
+      player->find_spell( 1218116 ), type_ );
     nature = new primordial_damage_t( this, "primordial_lightning",
-      player->find_spell( 1218118 ) );
+      player->find_spell( 1218118 ), type_ );
 
     add_child( fire );
     add_child( frost );
     add_child( nature );
 
     // Spell data does not indicate this, textual description does
     affected_by_maelstrom_weapon = true;
+
+    switch ( type_ )
+    {
+      case spell_variant::TWW3:
+        background = true;
+        break;
+      default:
+        break;
+    }
   }
 
   void trigger_lightning_damage()
@@ -11295,6 +11316,8 @@ struct voltaic_blaze_t : public shaman_spell_t
     shaman_spell_t::execute();
 
     p()->buff.whirling_earth->decrement();
+
+    p()->trigger_tww3_totemic_enh_2pc( execute_state );
   }
 
   void impact( action_state_t* state ) override
@@ -11593,7 +11616,7 @@ action_t* shaman_t::create_action( util::string_view name, util::string_view opt
   if ( name == "voltaic_blaze" )
     return new voltaic_blaze_t( this, options_str );
   if ( name == "primordial_storm" )
-    return new primordial_storm_t( this, options_str );
+    return new primordial_storm_t( this, spell_variant::NORMAL, options_str );
 
   // restoration
   if ( name == "spiritwalkers_grace" )
@@ -11866,6 +11889,11 @@ void shaman_t::create_actions()
     action.set_ascendance = new ascendance_dre_t( this, spell_variant::TWW3 );
   }
 
+  if ( sets->has_set_bonus( HERO_TOTEMIC, TWW3, B2 ) && specialization() == SHAMAN_ENHANCEMENT )
+  {
+    action.tww3_primordial_storm = new primordial_storm_t( this, spell_variant::TWW3 );
+  }
+
   if ( talent.tempest_strikes.ok() )
   {
     action.tempest_strikes = new tempest_strikes_damage_t( this );
@@ -13570,6 +13598,8 @@ void shaman_t::trigger_whirling_fire( const action_state_t* state )
   buff.hot_hand->extend_duration_or_trigger( buff.whirling_fire->data().effectN( 1 ).time_value() );
 
   buff.whirling_fire->decrement();
+
+  trigger_tww3_totemic_enh_2pc( state );
 }
 
 void shaman_t::trigger_stormblast( const action_state_t* state )
@@ -13698,6 +13728,8 @@ void shaman_t::trigger_whirling_air( const action_state_t* state )
   }
 
   buff.whirling_air->decrement();
+
+  trigger_tww3_totemic_enh_2pc( state );
 }
 
 void shaman_t::trigger_reactivity( const action_state_t* state )
@@ -14024,6 +14056,22 @@ void shaman_t::trigger_lively_totems( const action_state_t* state )
   }
 }
 
+void shaman_t::trigger_tww3_totemic_enh_2pc( const action_state_t* state )
+{
+  if ( !sets->has_set_bonus( HERO_TOTEMIC, TWW3, B2 ) || specialization() != SHAMAN_ENHANCEMENT )
+  {
+    return;
+  }
+
+  if ( buff.whirling_air->check() || buff.whirling_earth->check() || buff.whirling_fire->check() )
+  {
+    return;
+  }
+
+  sim->print_debug( "{} triggering tww3 totemic enhancement 2pc set bonus", this->name() );
+  action.tww3_primordial_storm->execute_on_target( state->target );
+}
+
 // shaman_t::init_buffs =====================================================
 
 void shaman_t::create_buffs()
@@ -14334,7 +14382,7 @@ void shaman_t::create_buffs()
     ->set_trigger_spell( sets->set( SHAMAN_ENHANCEMENT, TWW2, B4 ) );
   buff.ancestral_wisdom = make_buff( this, "ancestral_wisdom", find_spell( 1238279 ) )
                               ->set_trigger_spell( spell.tww3_farseer_4pc )
-                              ->set_stack_change_callback( [ this ]( buff_t*, int, int cur ) {
+                              ->set_stack_change_callback( [ this ]( buff_t*, int, int ) {
                                 cooldown.lava_burst->adjust_recharge_multiplier();
                               } );
   buff.storms_eye = make_buff( this, "storms_eye", find_spell(1239315) )