Skip to content

[DH] Reap damage delay #11263

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
Aezeor wants to merge 6 commits into
base: midnight
Choose a base branch
from
+34 −26
Open

[DH] Reap damage delay #11263

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8b6e21
void fall meteor base execute to impact action
Aezeor Mar 21, 2026
33f3605
reap and eradicate damage scheduling delayed
Aezeor Mar 21, 2026
bda3ee7
added tochecks
Aezeor Mar 21, 2026
fe73818
Merge branch 'simulationcraft:midnight' into reap/voidfall
Aezeor Mar 21, 2026
e6add0e
correct fragments_consumed for soulshaper count
Aezeor Mar 21, 2026
d8a6079
add delays to voidfall meteors from meteoric fall
Aezeor Mar 21, 2026
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
60 changes: 34 additions & 26 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 @@ -3035,12 +3035,14 @@ struct meteoric_fall_trigger_t : public BASE

for ( int i = 0; i < stacks; ++i )
{
BASE::p()->active.voidfall_meteor->execute_on_target( BASE::target );
make_event<delayed_execute_event_t>( *BASE::sim, BASE::p(), BASE::p()->active.voidfall_meteor, BASE::target,
( BASE::p()->active.voidfall_meteor->travel_time() * i ) );
}

if ( BASE::p()->talent.annihilator.world_killer->ok() )
{
BASE::p()->active.world_killer->execute_on_target( BASE::target );
make_event<delayed_execute_event_t>( *BASE::sim, BASE::p(), BASE::p()->active.world_killer, BASE::target,
( stacks * BASE::p()->active.voidfall_meteor->travel_time() ) );
}
}
};
Expand Down Expand Up @@ -6120,19 +6122,22 @@ struct reap_base_t : public voidfall_spending_trigger_t<meteoric_fall_trigger_t<
p()->buff.reap->trigger();

base_t::execute();
unsigned fragments_consumed = p()->consume_soul_fragments( soul_fragment::LESSER, true, souls_to_consume() );

damage_action->set_target( target );
action_state_t* damage_state = damage_action->get_state();
damage_state->target = target;
damage_action->snapshot_state( damage_state, result_amount_type::DMG_DIRECT );
unsigned fragments_consumed = p()->consume_soul_fragments( soul_fragment::LESSER, false, souls_to_consume() );

if ( p()->talent.devourer.soulshaper->ok() )
{
damage_state->da_multiplier *= 1.0 + fragments_consumed * p()->talent.devourer.soulshaper->effectN( 1 ).percent();
}
// TOCHECK: This delay is a guess based on averages in logs as there is no spelldata
make_event( *p()->sim, 220_ms, [ this, fragments_consumed ] {
damage_action->set_target( target );
action_state_t* damage_state = damage_action->get_state();
damage_state->target = target;
damage_action->snapshot_state( damage_state, result_amount_type::DMG_DIRECT );

damage_action->schedule_execute( damage_state );
if ( p()->talent.devourer.soulshaper->ok() )
{
damage_state->da_multiplier *=
1.0 + fragments_consumed * p()->talent.devourer.soulshaper->effectN( 1 ).percent();
}
damage_action->schedule_execute( damage_state );
} );

p()->buff.moment_of_craving->expire();
}
Expand Down Expand Up @@ -6206,21 +6211,24 @@ struct eradicate_t : public voidfall_spending_trigger_t<meteoric_fall_trigger_t<

base_t::execute();

unsigned fragments_consumed = p()->consume_soul_fragments( soul_fragment::LESSER, true, souls_to_consume() );
unsigned fragments_consumed = p()->consume_soul_fragments( soul_fragment::LESSER, false, souls_to_consume() );
auto damage = p()->buff.metamorphosis->up() ? damage_action_meta : damage_action;

damage->set_target( target );
action_state_t* damage_state = damage->get_state();
damage_state->target = target;
damage->snapshot_state( damage_state, result_amount_type::DMG_DIRECT );

if ( p()->talent.devourer.soulshaper->ok() )
{
damage_state->da_multiplier *= 1.0 + fragments_consumed * p()->talent.devourer.soulshaper->effectN( 1 ).percent();
}
// TOCHECK: This delay is a guess based on averages in logs as there is no spelldata
make_event( *p()->sim, 220_ms, [ this, fragments_consumed, damage ] {
damage->set_target( target );
action_state_t* damage_state = damage->get_state();
damage_state->target = target;
damage->snapshot_state( damage_state, result_amount_type::DMG_DIRECT );

damage->schedule_execute( damage_state );
if ( p()->talent.devourer.soulshaper->ok() )
{
damage_state->da_multiplier *=
1.0 + fragments_consumed * p()->talent.devourer.soulshaper->effectN( 1 ).percent();
}

damage->schedule_execute( damage_state );
} );
p()->buff.moment_of_craving->expire();

p()->buff.eradicate->expire();
Expand Down Expand Up @@ -6562,9 +6570,9 @@ struct voidfall_meteor_base_t : public demon_hunter_spell_t
voidfall_meteor_base_t( util::string_view n, demon_hunter_t* p, const spell_data_t* s )
: demon_hunter_spell_t( n, p, s )
{
execute_action = p->get_background_action<voidfall_meteor_damage_t>( fmt::format( "{}_damage", name() ),
impact_action = p->get_background_action<voidfall_meteor_damage_t>( fmt::format( "{}_damage", name() ),
s->effectN( 2 ).trigger() );
add_child( execute_action );
add_child( impact_action );
}
};

Expand Down
Loading