Skip to content

Commit

Permalink
[Gear] rename to sikran's endless arsenal
Browse files Browse the repository at this point in the history
  • Loading branch information
gastank committed Aug 9, 2024
1 parent 5f7bb8d commit e79ca3d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion engine/player/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13161,7 +13161,7 @@ void player_t::create_options()
add_option( opt_string( "dragonflight.windweaver_party_ilvls", dragonflight_opts.windweaver_party_ilvls ) );

// The War Within options
add_option( opt_string( "thewarwithin.sikran_shadow_arsenal_stance", thewarwithin_opts.sikrans_shadow_arsenal_stance ) );
add_option( opt_string( "thewarwithin.sikrans_endless_arsenal_stance", thewarwithin_opts.sikrans_endless_arsenal_stance ) );
add_option( opt_int( "thewarwithin.ovinaxs_mercurial_egg_initial_primary_stacks", thewarwithin_opts.ovinaxs_mercurial_egg_initial_primary_stacks, 0, 30 ) );
add_option( opt_int( "thewarwithin.ovinaxs_mercurial_egg_initial_secondary_stacks", thewarwithin_opts.ovinaxs_mercurial_egg_initial_secondary_stacks, 0, 30 ) );
add_option( opt_timespan( "thewarwithin.entropic_skardyn_core_pickup_delay", thewarwithin_opts.entropic_skardyn_core_pickup_delay, 0_ms, 30_s ) );
Expand Down
2 changes: 1 addition & 1 deletion engine/player/player.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ struct player_t : public actor_t
struct thewarwithin_opt_t
{
// Starting stance for Sik'rans Shadow Arsenal
player_option_t<std::string> sikrans_shadow_arsenal_stance = "";
player_option_t<std::string> sikrans_endless_arsenal_stance = "";
// starting stacks for Ovinax's Mercurial Egg
int ovinaxs_mercurial_egg_initial_primary_stacks = 30;
int ovinaxs_mercurial_egg_initial_secondary_stacks = 0;
Expand Down
14 changes: 7 additions & 7 deletions engine/player/unique_gear_thewarwithin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1010,20 +1010,20 @@ void aberrant_spellforge( special_effect_t& effect )
// TODO: confirm decimation damage does not have standard +15% per target up to five
// TODO: confirm decimation damage on crit to shield only counts the absorbed amount, instead of the full damage
// TODO: confirm barrage damage isn't split and has no diminishing returns
void sikrans_shadow_arsenal( special_effect_t& effect )
void sikrans_endless_arsenal( special_effect_t& effect )
{
unsigned equip_id = 445203;
auto equip = find_special_effect( effect.player, equip_id );
assert( equip && "Sikran's Shadow Arsenal missing equip effect" );

auto data = equip->driver();

struct sikrans_shadow_arsenal_t : public generic_proc_t
struct sikrans_endless_arsenal_t : public generic_proc_t
{
std::vector<std::pair<action_t*, buff_t*>> stance;

sikrans_shadow_arsenal_t( const special_effect_t& e, const spell_data_t* data )
: generic_proc_t( e, "sikrans_shadow_arsenal", e.driver() )
sikrans_endless_arsenal_t( const special_effect_t& e, const spell_data_t* data )
: generic_proc_t( e, "sikrans_endless_arsenal", e.driver() )
{
// stances are populated in order: flourish->decimation->barrage
// TODO: confirm order is flourish->decimation->barrage
Expand Down Expand Up @@ -1111,7 +1111,7 @@ void sikrans_shadow_arsenal( special_effect_t& effect )
stance.emplace_back( b_dam, b_stance );

// adjust for thewarwithin.sikrans.shadow_arsenal_stance= option
const auto& option = e.player->thewarwithin_opts.sikrans_shadow_arsenal_stance;
const auto& option = e.player->thewarwithin_opts.sikrans_endless_arsenal_stance;
if ( !option.is_default() )
{
if ( util::str_compare_ci( option, "decimation" ) )
Expand Down Expand Up @@ -1144,7 +1144,7 @@ void sikrans_shadow_arsenal( special_effect_t& effect )
}
};

effect.execute_action = create_proc_action<sikrans_shadow_arsenal_t>( "sikrans_shadow_arsenal", effect, data );
effect.execute_action = create_proc_action<sikrans_endless_arsenal_t>( "sikrans_endless_arsenal", effect, data );
}

// 444292 equip
Expand Down Expand Up @@ -3609,7 +3609,7 @@ void register_special_effects()
register_special_effect( 444067, items::void_reapers_chime );
register_special_effect( 445619, items::aberrant_spellforge, true );
register_special_effect( 445593, DISABLED_EFFECT ); // aberrant spellforge
register_special_effect( 447970, items::sikrans_shadow_arsenal );
register_special_effect( 447970, items::sikrans_endless_arsenal );
register_special_effect( 445203, DISABLED_EFFECT ); // sikran's shadow arsenal
register_special_effect( 444301, items::swarmlords_authority );
register_special_effect( 444292, DISABLED_EFFECT ); // swarmlord's authority
Expand Down

0 comments on commit e79ca3d

Please sign in to comment.