Skip to content

[Feral] Added 12.1 2pc + 4pc #11621

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

Open
thevinter wants to merge 1 commit into
base: midnight
Choose a base branch
from
+26 −0
Open

[Feral] Added 12.1 2pc + 4pc #11621

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
26 changes: 26 additions & 0 deletions engine/class_modules/sc_druid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ struct druid_t final : public parse_player_effects_t
moon_stage_e moon_stage;
std::vector<event_t*> persistent_event_delay;
event_t* astral_power_decay;
int cp_spent_in_berserk = 0; // mid2 2pc

struct dot_list_t
{
Expand Down Expand Up @@ -737,6 +738,7 @@ struct druid_t final : public parse_player_effects_t
buff_t* coiled_to_spring;
buff_t* flash_of_clarity; // mid1 2pc
buff_t* frantic_momentum;
buff_t* halazzis_fury; // mid2 2pc
buff_t* hunger_for_battle;
buff_t* incarnation_cat;
buff_t* incarnation_cat_prowl;
Expand Down Expand Up @@ -3773,6 +3775,10 @@ struct cp_spender_t : public trigger_aggravate_wounds_t<DRUID_FERAL, cat_attack_
{
base_t::consume_resource();

// all finishers count their effective combo points, including free finishers (apex, convoke) at max
if ( hit_any_target && p()->buff.b_inc_cat->check() )
p()->cp_spent_in_berserk += _combo_points();

if ( background || !hit_any_target )
return;

Expand Down Expand Up @@ -11108,6 +11114,21 @@ void druid_t::create_buffs()
resource_gain( RESOURCE_COMBO_POINT, cp, gain );
} );

if ( sets->has_set_bonus( DRUID_FERAL, MID2, B2 ) )
{
auto b2 = sets->set( DRUID_FERAL, MID2, B2 );
auto per_cp = timespan_t::from_millis( talent.incarnation_cat.ok() && talent.ashamanes_guidance.ok()
? b2->effectN( 2 ).base_value()
: b2->effectN( 1 ).base_value() );

buff.b_inc_cat->add_stack_change_callback( [ this, per_cp ]( buff_t*, int, int new_ ) {
if ( new_ )
cp_spent_in_berserk = 0;
else if ( cp_spent_in_berserk > 0 )
buff.halazzis_fury->trigger( cp_spent_in_berserk * per_cp );
} );
}

buff.chomp_enabler =
make_fallback( talent.chomp.ok(), this, "chomp_enabler", spec.chomp_controller->effectN( 1 ).trigger() );

Expand All @@ -11127,6 +11148,9 @@ void druid_t::create_buffs()
->set_chance( find_trigger( talent.frantic_momentum ).percent() )
->set_trigger_spell( talent.frantic_momentum );

buff.halazzis_fury =
make_fallback( sets->has_set_bonus( DRUID_FERAL, MID2, B2 ), this, "halazzis_fury", find_spell( 1301600 ) );

buff.incarnation_cat_prowl = make_fallback( talent.incarnation_cat.ok(),
this, "incarnation_avatar_of_ashamane_prowl", find_effect( talent.incarnation_cat, E_TRIGGER_SPELL ).trigger() )
->set_name_reporting( "Prowl" );
Expand Down Expand Up @@ -12946,6 +12970,7 @@ void druid_t::reset()
dot_lists.thrash.clear();
dot_lists.dreadful_wound.clear();
spell_queued = {};
cp_spent_in_berserk = 0;
}

/*
Expand Down Expand Up @@ -14095,6 +14120,7 @@ void druid_t::parse_action_effects( action_t* action )
_a->parse_effects( buff.apex_predators_craving );
_a->parse_effects( buff.berserk_cat );
_a->parse_effects( buff.coiled_to_spring, CONSUME_BUFF );
_a->parse_effects( buff.halazzis_fury );
_a->parse_effects( buff.hunger_for_battle );
_a->parse_effects( buff.incarnation_cat );
_a->parse_effects( buff.predator, USE_CURRENT );
Expand Down
Loading