Skip to content

[demon-hunter] Split Abyssal Gaze and Eye Beam #11942

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
renanthera wants to merge 1 commit into
base: midnight
Choose a base branch
from
+17 −33
Open

[demon-hunter] Split Abyssal Gaze and Eye Beam #11942

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
50 changes: 17 additions & 33 deletions engine/class_modules/sc_demon_hunter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4082,48 +4082,30 @@ struct eye_beam_base_t : public student_of_suffering_trigger_t<final_breath_trig

struct abyssal_gaze_t : public demonsurge_trigger_t<demonsurge_ability::ABYSSAL_GAZE, eye_beam_base_t>
{
abyssal_gaze_t( demon_hunter_t* p ) : base_t( "abyssal_gaze", p, p->hero_spec.abyssal_gaze, "" )
abyssal_gaze_t( demon_hunter_t* p, util::string_view options_str )
: base_t( "abyssal_gaze", p, p->hero_spec.abyssal_gaze, options_str )
{
}
};

struct eye_beam_t : public eye_beam_base_t
{
abyssal_gaze_t* abyssal_gaze;
double abyssal_gaze_cost;

eye_beam_t( demon_hunter_t* p, util::string_view options_str )
: eye_beam_base_t( "eye_beam", p, p->talent.havoc.eye_beam, options_str ),
abyssal_gaze( nullptr ),
abyssal_gaze_cost( 0 )
void init() override
{
if ( p->talent.scarred.demonic_intensity->ok() )
{
abyssal_gaze = new abyssal_gaze_t( p );
abyssal_gaze_cost = abyssal_gaze->data().cost( POWER_FURY );
add_child( abyssal_gaze );
}
}
base_t::init();

double cost() const override
{
if ( dh()->buff.demonsurge_demonic_intensity->check() )
{
return abyssal_gaze_cost;
}
return eye_beam_base_t::cost();
if ( action_t* parent = player->find_action( "eye_beam" ); parent )
parent->add_child( this );
}

void execute() override
bool ready() override
{
if ( dh()->buff.demonsurge_demonic_intensity->check() )
{
abyssal_gaze->execute_on_target( target );
stats->add_execute( time_to_execute, target );
return;
}
return dh()->buff.demonsurge_demonic_intensity->up() && base_t::ready();
};
};

eye_beam_base_t::execute();
struct eye_beam_t : public eye_beam_base_t
{
eye_beam_t( demon_hunter_t* p, util::string_view options_str )
: eye_beam_base_t( "eye_beam", p, p->talent.havoc.eye_beam, options_str )
{
}
};

Expand Down Expand Up @@ -9742,6 +9724,8 @@ action_t* demon_hunter_t::create_action( util::string_view name, util::string_vi
return new disrupt_t( this, options_str );
if ( name == "eye_beam" )
return new eye_beam_t( this, options_str );
if ( name == "abyssal_gaze" )
return new abyssal_gaze_t( this, options_str );
if ( name == "fel_devastation" )
return new fel_devastation_t( this, options_str );
if ( name == "fiery_brand" )
Expand Down
Loading