Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c942faf
[Warrior] Base setup
Armadk Nov 3, 2026
d5b8e3a
[Warrior] Baseline setup
Armadk Nov 3, 2026
1926e08
[Warrior] target data setup
Armadk Nov 3, 2026
324b0af
[Warrior] Setup actives list
Armadk Nov 3, 2026
455b101
[Warrior] Stances
Armadk Nov 3, 2026
70c4ccc
[Warrior] Thunderclap debuff tracking
Armadk Nov 3, 2026
a806b79
[Warrior] Hamstring and Overpower
Armadk Nov 3, 2026
d4a92bf
Merge branch 'main' of github.com:simulationcraft/simc-forever into w…
Armadk Nov 3, 2026
b8fe250
[Warrior] Convert to new rank api
Armadk Nov 3, 2026
63ea9ed
Merge branch 'main' of github.com:simulationcraft/simc-forever into w…
Armadk Nov 4, 2026
44ff6dc
[Warrior] Sunder Armor
Armadk Nov 4, 2026
5139d75
[Warrior] Add Sunder Armor to apl
Armadk Nov 4, 2026
20a680c
[Warrior] Taunt
Armadk Nov 4, 2026
f3b5880
[Warrior] Shield Bash
Armadk Nov 4, 2026
1cfbee5
[Warrior] Adjust lookups for hamstring and sunder
Armadk Nov 4, 2026
cd2ef65
[Warrior] Demoralizing Shout
Armadk Nov 4, 2026
6841684
[Warrior] Revenge
Armadk Nov 4, 2026
561ad7b
[Warrior] Mocking Blow
Armadk Nov 4, 2026
9200542
[Warrior] Shield Block
Armadk Nov 4, 2026
9996750
[Warrior] Disarm
Armadk Nov 4, 2026
0fcd1d9
[Warrior] Cleave
Armadk Nov 4, 2026
ad8b777
[Warrior] Retaliation - partially complete
Armadk Nov 4, 2026
75d0c45
[Warrior] Slam and Improved Slam
Armadk Nov 4, 2026
ea7f6ef
[Warrior] Victory Rush
Armadk Nov 4, 2026
b0cf998
[Warrior] Update rend coeff and implement Intimidating Shout
Armadk Nov 15, 2026
0838e2e
Merge branch 'main' of github.com:simulationcraft/simc-forever into w…
Armadk Nov 15, 2026
33e689f
[Warrior] Update retaliation implementation
Armadk Nov 15, 2026
9bb2518
[Warrior] Execute
Armadk Nov 17, 2026
50bb6b4
Merge branch 'main' of github.com:simulationcraft/simc-forever into w…
Armadk Nov 17, 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
15 changes: 15 additions & 0 deletions engine/action/parse_effects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,16 @@ double parse_player_effects_t::composite_parry() const
return parry;
}

double parse_player_effects_t::composite_block() const
{
auto block = player_t::composite_block();

for ( const auto& i : block_effects )
block += get_effect_value( i );

return block;
}

double parse_player_effects_t::composite_base_armor_multiplier() const
{
auto bam = player_t::composite_base_armor_multiplier();
Expand Down Expand Up @@ -1280,6 +1290,11 @@ std::vector<player_effect_t>* parse_player_effects_t::get_effect_vector( const s
invalidate( CACHE_PARRY );
return &parry_effects;

case A_MOD_BLOCK_PERCENT:
str = "block";
invalidate( CACHE_BLOCK );
return &block_effects;

case A_MOD_BASE_RESISTANCE_PCT:
if ( eff.misc_value1() & SCHOOL_MASK_PHYSICAL )
{
Expand Down
2 changes: 2 additions & 0 deletions engine/action/parse_effects.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@ struct parse_player_effects_t : public player_t, public parse_effects_t
std::vector<player_effect_t> spell_hit_effects;
std::vector<player_effect_t> crit_avoidance_effects;
std::vector<player_effect_t> parry_effects;
std::vector<player_effect_t> block_effects;
std::vector<player_effect_t> base_armor_multiplier_effects;
std::vector<player_effect_t> armor_multiplier_effects;
std::vector<player_effect_t> haste_effects;
Expand Down Expand Up @@ -733,6 +734,7 @@ struct parse_player_effects_t : public player_t, public parse_effects_t
double composite_spell_hit() const override;
double composite_crit_avoidance() const override;
double composite_parry() const override;
double composite_block() const override;
double composite_base_armor_multiplier() const override;
double composite_armor_multiplier() const override;
double composite_melee_haste() const override;
Expand Down
14 changes: 14 additions & 0 deletions engine/class_modules/apl/warrior.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,23 @@ void warrior( player_t* p )
default_->add_action( "auto_attack" );

default_->add_action( "battle_shout,if=!buff.battle_shout.up" );
default_->add_action( "demoralizing_shout,if=!debuff.demoralizing_shout.up" );
default_->add_action( "intimidating_shout" );
default_->add_action( "bloodrage,if=rage<80" );
default_->add_action( "victory_rush,if=buff.victorious.up" );
default_->add_action( "execute,if=target.health.pct<=20" );
default_->add_action( "rend,if=!ticking" );
default_->add_action( "overpower,if=buff.overpower.up" );
default_->add_action( "revenge,if=buff.revenge_available.up" );
default_->add_action( "retaliation" );
default_->add_action( "mocking_blow" );
default_->add_action( "disarm" );
default_->add_action( "shield_block" );
default_->add_action( "sunder_armor,if=debuff.sunder_armor.stack<5|debuff.sunder_armor.remains<5" );
default_->add_action( "shield_bash" );
default_->add_action( "thunder_clap,if=spell_targets>=2" );
default_->add_action( "cleave,if=spell_targets>=2" );
default_->add_action( "slam,if=rage>=30" );
default_->add_action( "heroic_strike,if=rage>=30" );
}
//warrior_apl_end
Expand Down
Loading
Loading