Skip to content

[Warrior] Adjust Fatality and Master of Warfare proc rate #10976

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 2 commits into from
Feb 18, 2026
Merged

[Warrior] Adjust Fatality and Master of Warfare proc rate #10976

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bf0d10
[Warrior] Fix Fatality
Armadk Feb 18, 2026
b2be5e2
[Warrior] Adjust master of warfare proc rates
Armadk Feb 18, 2026
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
63 changes: 31 additions & 32 deletions engine/class_modules/sc_warrior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3049,12 +3049,6 @@ struct mortal_strike_t : public warrior_attack_t
if( !background )
p()->buff.tactical_edge->decrement();

if ( !background && p()->talents.arms.master_of_warfare_1.ok() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}

if ( !background )
p()->buff.battlelord->expire();
}
Expand Down Expand Up @@ -3110,6 +3104,12 @@ struct mortal_strike_t : public warrior_attack_t
{
target_data->debuffs_colossus_smash->extend_duration_or_trigger( p()->sets->set( WARRIOR_ARMS, MID1, B4 )->effectN( 1 ).time_value() );
}

if ( !background && p()->talents.arms.master_of_warfare_1.ok() && !p()->buff.master_of_warfare_proc->up() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}
}

bool ready() override
Expand Down Expand Up @@ -3433,6 +3433,16 @@ struct slam_base_t : public warrior_attack_t
return warrior_attack_t::cost();
}

void impact( action_state_t* state ) override
{
warrior_attack_t::impact( state );
if ( !background && p()->talents.arms.master_of_warfare_1.ok() && !p()->buff.master_of_warfare_proc->up() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}
}

void execute() override
{
warrior_attack_t::execute();
Expand All @@ -3444,12 +3454,6 @@ struct slam_base_t : public warrior_attack_t

if ( p()->talents.arms.martial_prowess.ok() )
p()->buff.martial_prowess->trigger();

if ( !background && p()->talents.arms.master_of_warfare_1.ok() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}
}

bool ready() override
Expand Down Expand Up @@ -4080,6 +4084,15 @@ struct execute_damage_t : public warrior_attack_t

if ( p()->talents.shared.deep_wounds->ok() )
p()->active.deep_wounds->execute_on_target( state->target );

if( p()->talents.arms.fatality.ok() && td( state->target )->debuffs_fatal_mark->check() )
p()->active.fatality->execute_on_target( state->target );

if ( !background && p()->talents.arms.master_of_warfare_1.ok() && !p()->buff.master_of_warfare_proc->up() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}
}
};

Expand Down Expand Up @@ -4203,26 +4216,12 @@ struct execute_arms_t : public warrior_attack_t
{
lightning_strike->execute();
}

if ( !background && p()->talents.arms.master_of_warfare_1.ok() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}
}

if ( p()->talents.arms.executioners_precision.ok() )
p()->buff.executioners_precision->trigger();
}

void impact( action_state_t* state ) override
{
warrior_attack_t::impact( state );

if( p()->talents.arms.fatality.ok() && td( state->target )->debuffs_fatal_mark->check() )
p()->active.fatality->execute_on_target( state->target );
}

bool target_ready( player_t* candidate_target ) override
{
// Sudden Death allow execution on any target
Expand Down Expand Up @@ -5275,6 +5274,12 @@ struct overpower_t : public warrior_attack_t
{
dreadnaught->execute_on_target( s->target );
}

if ( !background && p()->talents.arms.master_of_warfare_1.ok() && !p()->buff.master_of_warfare_proc->up() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}
}

void execute() override
Expand All @@ -5295,12 +5300,6 @@ struct overpower_t : public warrior_attack_t

if ( p()->talents.arms.martial_prowess.ok() )
p()->buff.martial_prowess->trigger();

if ( !background && p()->talents.arms.master_of_warfare_1.ok() && p()->rng().roll( master_of_warfare_proc_chance * ++p()->master_of_warfare_attempts_since_last_proc ) )
{
p()->buff.master_of_warfare_proc->trigger();
p()->master_of_warfare_attempts_since_last_proc = 0;
}
}

bool ready() override
Expand Down
Loading