Skip to content

Commit

Permalink
[Hunter] Solitary Companion
Browse files Browse the repository at this point in the history
  • Loading branch information
Pewtro committed Feb 8, 2025
1 parent ea26688 commit f8eeff6
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions engine/class_modules/sc_hunter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -509,11 +509,11 @@ struct hunter_t final : public player_t
buff_t* hogstrider;
buff_t* lead_from_the_front;

buff_t* vicious_hunt;
buff_t* vicious_hunt; //TODO delete
buff_t* howl_of_the_pack;
buff_t* frenzied_tear;
buff_t* scattered_prey;
buff_t* furious_assault;
buff_t* furious_assault; //TODO delete
buff_t* beast_of_opportunity;

// Sentinel
Expand Down Expand Up @@ -906,7 +906,7 @@ struct hunter_t final : public player_t
spell_data_ptr_t lead_from_the_front;
spell_data_ptr_t lead_from_the_front_buff;

spell_data_ptr_t vicious_hunt;
spell_data_ptr_t vicious_hunt; //TODO delete

spell_data_ptr_t pack_coordination;
spell_data_ptr_t howl_of_the_pack;
Expand All @@ -919,7 +919,7 @@ struct hunter_t final : public player_t

spell_data_ptr_t scattered_prey;
spell_data_ptr_t covering_fire;
spell_data_ptr_t furious_assault;
spell_data_ptr_t furious_assault; //TODO delete
spell_data_ptr_t beast_of_opportunity;

spell_data_ptr_t pack_assault;
Expand Down Expand Up @@ -2084,6 +2084,7 @@ struct hunter_main_pet_base_t : public stable_pet_t

struct buffs_t
{
buff_t* solitary_companion = nullptr;
buff_t* frenzy = nullptr;
buff_t* thrill_of_the_hunt = nullptr;
buff_t* bestial_wrath = nullptr;
Expand Down Expand Up @@ -2165,6 +2166,9 @@ struct hunter_main_pet_base_t : public stable_pet_t

if ( buffs.bestial_wrath -> has_common_school( school ) )
m *= 1 + buffs.bestial_wrath -> check_value();

if ( buffs.solitary_companion->up() )
m *= 1 + buffs.solitary_companion->check_value();

return m;
}
Expand Down Expand Up @@ -2301,6 +2305,10 @@ struct hunter_main_pet_t final : public hunter_main_pet_base_t
buffs.wild_attacks_dmg_amp =
make_buff( this, "wild_attacks_dmg_amp", o() -> talents.wild_attacks )
-> set_default_value_from_effect( 1 );

buffs.solitary_companion =
make_buff( this, "solitary_companion", find_spell( 474751 ) )
->set_default_value_from_effect( 2 );
}

void init_action_list() override
Expand Down Expand Up @@ -2328,6 +2336,12 @@ struct hunter_main_pet_t final : public hunter_main_pet_base_t
hunter_main_pet_base_t::summon( duration );

o() -> pets.main = this;

if ( o()->talents.solitary_companion.ok() )
{
o()->pets.main->buffs.solitary_companion->trigger();
}

if ( o() -> pets.animal_companion )
{
o() -> pets.animal_companion -> summon();
Expand Down

0 comments on commit f8eeff6

Please sign in to comment.