Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Armadk merged 1 commit into from
Feb 3, 2026
+8 −11
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions engine/class_modules/apl/apl_warrior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
17 changes: 6 additions & 11 deletions engine/class_modules/sc_warrior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
}
Expand Down Expand Up @@ -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() )
Expand Down Expand Up @@ -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
Expand Down
Loading