Skip to content
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

Jump to bottom

Implement a strawman version of Ret Aura #7418

Open
wants to merge 1 commit into
base: dragonflight
Choose a base branch
from
Open

Implement a strawman version of Ret Aura #7418

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
27 changes: 27 additions & 0 deletions engine/player/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3891,6 +3891,25 @@ void player_t::create_buffs()
->set_duration( sim->max_time * 3 )
->set_chance( as<double>( sim->overrides.windfury_totem ) );

buffs.retribution_aura = make_buff<buff_t>( this, "retribution_aura", find_spell( 183435 ) )
->set_period( 1_s )
->set_tick_callback(
[this]( buff_t* b, int, timespan_t ) {
if ( b->player == this) {
if ( rng().roll( sim->retribution_aura_proc_per_tick ) )
{
// cooldown handled by the buff
buffs.retribution_aura_proc->trigger();
}
}
} );

buffs.retribution_aura_proc = make_buff<buff_t>( this, "retribution_aura_proc", find_spell( 404996 ) )
->set_default_value( find_spell( 404996 )->effectN( 1 ).percent() )
->set_cooldown( 30_s )
->add_invalidate( CACHE_PLAYER_DAMAGE_MULTIPLIER )
->add_invalidate( CACHE_PLAYER_HEAL_MULTIPLIER );

// 9.0 class buffs
buffs.focus_magic = make_buff( this, "focus_magic", find_spell( 321358 ) )
->set_default_value_from_effect( 1 )
Expand Down Expand Up @@ -4821,6 +4840,9 @@ double player_t::composite_player_multiplier( school_e school ) const
if ( buffs.mark_of_lightning && buffs.mark_of_lightning->check() )
m *= 1.0 + buffs.mark_of_lightning->check_value();

if ( is_ptr() )
m *= 1.0 + buffs.retribution_aura_proc->check_value();

return m;
}

Expand Down Expand Up @@ -5516,6 +5538,11 @@ void player_t::combat_begin()
buffs.windfury_totem->trigger();
}

if ( sim->overrides.retribution_aura && buffs.retribution_aura )
{
buffs.retribution_aura->trigger();
}

// Trigger registered combat-begin functions
for ( const auto& f : combat_begin_functions)
{
Expand Down
2 changes: 2 additions & 0 deletions engine/player/player.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ struct player_t : public actor_t
buff_t* berserking;
buff_t* bloodlust;
buff_t* windfury_totem;
buff_t* retribution_aura;
buff_t* retribution_aura_proc;

buff_t* cooldown_reduction;
buff_t* amplification;
Expand Down
28 changes: 16 additions & 12 deletions engine/sim/sim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ sim_t::sim_t() :
progressbar_type( 0 ),
armory_retries( 3 ),
enemy_death_pct( 0 ), rel_target_level( -1 ), target_level( -1 ),
target_adds( 0 ), desired_targets( 1 ),
target_adds( 0 ), desired_targets( 1 ),
dbc(new dbc_t()),
dbc_override( std::make_unique<dbc_override_t>() ),
timewalk( -1 ),
Expand All @@ -1500,6 +1500,7 @@ sim_t::sim_t() :
_rng(), seed( 0 ), deterministic( 0 ), strict_work_queue( 0 ),
average_range( true ), average_gauss( false ),
fight_style(), add_waves( 0 ), overrides( overrides_t() ),
retribution_aura_proc_per_tick( 0.15 ), // arbitrarily pick 15%
default_aura_delay( timespan_t::from_millis( 30 ) ),
default_aura_delay_stddev( timespan_t::from_millis( 5 ) ),
azerite_status( azerite_control::DISABLED_ALL ),
Expand Down Expand Up @@ -2233,11 +2234,11 @@ void sim_t::init_fight_style()
case FIGHT_STYLE_PATCHWERK:
raid_events_str.clear();
break;

case FIGHT_STYLE_CASTING_PATCHWERK:
raid_events_str += "/casting,cooldown=500,duration=500";
break;

case FIGHT_STYLE_HECTIC_ADD_CLEAVE:
{
// Phase 1 - Adds and move into position to fight adds
Expand All @@ -2259,7 +2260,7 @@ void sim_t::init_fight_style()
first2, cooldown2 );
}
break;

case FIGHT_STYLE_DUNGEON_SLICE:
//Based on the Hero Dungeon setup
desired_targets = 1;
Expand All @@ -2274,7 +2275,7 @@ void sim_t::init_fight_style()
"/adds,name=SmallAdd,count=5,count_range=1,first=140,cooldown=45,duration=15,duration_stddev=2"
"/adds,name=BigAdd,count=2,count_range=1,first=160,cooldown=50,duration=30,duration_stddev=2";
break;

case FIGHT_STYLE_DUNGEON_ROUTE:
// To be used in conjunction with "pull" raid events for a simulated dungeon run.
range::for_each( target_list, []( player_t* t ) {
Expand All @@ -2285,7 +2286,7 @@ void sim_t::init_fight_style()
// Bloodlust is handled by an option on each pull raid event.
overrides.bloodlust = 0;
break;

case FIGHT_STYLE_CLEAVE_ADD:
{
auto first_and_duration = static_cast<unsigned>( max_time.total_seconds() * 0.05 );
Expand All @@ -2296,16 +2297,16 @@ void sim_t::init_fight_style()
first_and_duration, cooldown, first_and_duration, last );
}
break;

case FIGHT_STYLE_LIGHT_MOVEMENT:
raid_events_str += "/movement,players_only=1,cooldown=40,cooldown_stddev=10,distance=15,distance_min=10,distance_max=20,first=15";
break;

case FIGHT_STYLE_HEAVY_MOVEMENT:
raid_events_str += "/movement,players_only=1,cooldown=20,cooldown_stddev=15,distance=25,distance_min=20,distance_max=30,first=15";
raid_events_str += "/movement,players_only=1,cooldown=45,cooldown_stddev=15,distance=45,distance_min=40,distance_max=50,first=30";
break;

case FIGHT_STYLE_BEASTLORD:
{
deprecated = true;
Expand All @@ -2328,15 +2329,15 @@ void sim_t::init_fight_style()
beast_last );
}
break;

case FIGHT_STYLE_HELTER_SKELTER:
deprecated = true;
raid_events_str += "/casting,cooldown=30,duration=3,first=15";
raid_events_str += "/movement,cooldown=30,distance=20";
raid_events_str += "/stun,cooldown=60,duration=2";
raid_events_str += "/invulnerable,cooldown=120,duration=3";
break;

case FIGHT_STYLE_ULTRAXION:
deprecated = true;
max_time = timespan_t::from_seconds( 366.0 );
Expand All @@ -2353,7 +2354,7 @@ void sim_t::init_fight_style()
raid_events_str += "/damage,first=240.0,period=2.0,last=299.5,amount=44855,type=shadow";
raid_events_str += "/damage,first=300.0,period=1.0,amount=44855,type=shadow";
break;

default:
fight_style = FIGHT_STYLE_PATCHWERK;
break;
Expand Down Expand Up @@ -3248,6 +3249,7 @@ void sim_t::use_optimal_buffs_and_debuffs( int value )
overrides.mark_of_the_wild = optimal_raid;
overrides.power_word_fortitude = optimal_raid;
overrides.windfury_totem = optimal_raid;
overrides.retribution_aura = optimal_raid;

overrides.chaos_brand = optimal_raid;
overrides.mystic_touch = optimal_raid;
Expand Down Expand Up @@ -3508,6 +3510,8 @@ void sim_t::create_options()
add_option( opt_int( "override.mark_of_the_wild", overrides.mark_of_the_wild ) );
add_option( opt_int( "override.power_word_fortitude", overrides.power_word_fortitude ) );
add_option( opt_int( "override.windfury_totem", overrides.windfury_totem ) );
add_option( opt_int( "override.retribution_aura", overrides.retribution_aura ) );
add_option( opt_float( "override.retribution_aura_proc_per_tick", retribution_aura_proc_per_tick, 0.0, 1.0 ) );
add_option( opt_int( "override.chaos_brand", overrides.chaos_brand ) );
add_option( opt_int( "override.mystic_touch", overrides.mystic_touch ) );
add_option( opt_int( "override.mortal_wounds", overrides.mortal_wounds ) );
Expand Down
5 changes: 4 additions & 1 deletion engine/sim/sim.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ struct sim_t : private sc_thread_t
int mark_of_the_wild;
int power_word_fortitude;
int windfury_totem;
int retribution_aura;

// Debuff overrides
int chaos_brand;
Expand All @@ -225,13 +226,15 @@ struct sim_t : private sc_thread_t
int bloodlust;
std::vector<uint64_t> target_health;
} overrides;
double retribution_aura_proc_per_tick;

struct auras_t
{
buff_t* arcane_intellect;
buff_t* battle_shout;
buff_t* mark_of_the_wild;
buff_t* power_word_fortitude;
buff_t* retribution_aura;
} auras;

// Expansion specific custom parameters. Defaults in the constructor.
Expand Down Expand Up @@ -597,7 +600,7 @@ struct sim_t : private sc_thread_t
std::vector<sim_t*> children; // Manual delete!
int thread_index;
computer_process::priority_e process_priority;

std::shared_ptr<work_queue_t> work_queue;

// Related Simulations
Expand Down