[Warrior] Add wrecking and shattering throw, fix ravager buff (#10858)

Author: Armadk

engine/class_modules/apl/apl_warrior.cpp

@@ -350,6 +350,8 @@ void protection( player_t* p )
   generic->add_action( "shield_slam,if=(buff.burst_of_power.stack=2&buff.thunder_blast.stack<=1|buff.violent_outburst.up)|rage<=70&talent.demolish.enabled" );
   generic->add_action( "execute,if=rage>=70|(rage>=40&cooldown.shield_slam.remains&talent.demolish.enabled|rage>=50&cooldown.shield_slam.remains)|buff.sudden_death.up&talent.sudden_death.enabled" );
   generic->add_action( "shield_slam" );
+  generic->add_action( "wrecking_throw" );
+  generic->add_action( "shattering_throw" );
   generic->add_action( "thunder_blast,if=dot.rend.remains<=2&buff.violent_outburst.down" );
   generic->add_action( "thunder_blast" );
   generic->add_action( "thunder_clap,if=dot.rend.remains<=2&buff.violent_outburst.down" );

engine/class_modules/sc_warrior.cpp

@@ -1091,7 +1091,8 @@ struct warrior_action_t : public parse_action_effects_t<Base>
       parse_effects( p()->buff.revenge );
 
       parse_effects( p()->buff.best_served_cold );
-      parse_effects( p()->buff.ravager, effect_mask_t( false ).enable( 5 ) );
+      if ( p()->talents.protection.ravager.ok() )
+        parse_effects( p()->buff.ravager, effect_mask_t( false ).enable( 5 ) );
 
       parse_effects( p()->buff.shield_block, effect_mask_t( false ).enable( 2, 4 ) );
     }
@@ -5934,8 +5935,8 @@ struct shield_slam_t : public warrior_attack_t
 
     if ( p()->buff.shield_block->up() && p()->talents.protection.heavy_repercussions->ok() )
     {
-      p () -> buff.shield_block -> extend_duration( p(),
-          timespan_t::from_seconds( p() -> talents.protection.heavy_repercussions -> effectN( 1 ).percent() ) );
+      p()->buff.shield_block->extend_duration( p(),
+          timespan_t::from_seconds( p()->talents.protection.heavy_repercussions->effectN( 1 ).percent() ) );
     }
 
     if ( p()->talents.protection.impenetrable_wall->ok() )
@@ -6812,14 +6813,8 @@ struct shield_block_t : public warrior_spell_t
   {
     warrior_spell_t::execute();
 
-    if ( p()->buff.shield_block->check() )
-    {
-      p()->buff.shield_block->extend_duration( p(), p() -> buff.shield_block->buff_duration() );
-    }
-    else
-    {
-      p()->buff.shield_block->trigger();
-    }
+    p()->buff.shield_block->extend_duration_or_trigger( p()->buff.shield_block->buff_duration() );
+
   }
 
   bool ready() override