Skip to content

Commit

Permalink
[Warlock] 11.0.5 Updates (simulationcraft#9664)
Browse files Browse the repository at this point in the history
  • Loading branch information
Azevara authored Oct 22, 2024
1 parent 89b2748 commit f030c0f
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion engine/class_modules/warlock/sc_warlock_actions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ using namespace helpers;
// Diabolist
bool diabolic_ritual = false;
bool demonic_art = false;
bool rancora_cb_bonus = false;
} triggers;

warlock_spell_t( util::string_view token, warlock_t* p, const spell_data_t* s = spell_data_t::nil() )
Expand Down Expand Up @@ -192,14 +193,23 @@ using namespace helpers;

if ( diabolist() && triggers.diabolic_ritual )
{
timespan_t adjustment = -timespan_t::from_seconds( p()->hero.diabolic_ritual->effectN( 1 ).base_value() ) * shards_used;
timespan_t adjustment = 0_ms;

if ( demonology() )
adjustment = -timespan_t::from_seconds( p()->hero.diabolic_ritual->effectN( 1 ).base_value() ) * shards_used;

if ( destruction() && shards_used > 0 )
adjustment = -timespan_t::from_seconds( p()->hero.diabolic_ritual->effectN( 2 ).base_value() );

if ( demonology() && p()->hero.infernal_machine.ok() && p()->warlock_pet_list.demonic_tyrants.n_active_pets() > 0 )
adjustment += -p()->hero.infernal_machine->effectN( 1 ).time_value();

if ( destruction() && p()->hero.infernal_machine.ok() && p()->warlock_pet_list.infernals.n_active_pets() > 0 )
adjustment += -p()->hero.infernal_machine->effectN( 1 ).time_value();

if ( destruction() && p()->hero.touch_of_rancora.ok() && shards_used > 0 && triggers.rancora_cb_bonus )
adjustment += -timespan_t::from_seconds( p()->hero.touch_of_rancora->effectN( 3 ).base_value() );

switch( p()->diabolic_ritual )
{
case 0:
Expand Down Expand Up @@ -3549,6 +3559,7 @@ using namespace helpers;
affected_by.touch_of_rancora = p->hero.touch_of_rancora.ok();

triggers.diabolic_ritual = triggers.demonic_art = p->hero.diabolic_ritual.ok();
triggers.rancora_cb_bonus = true;

base_dd_multiplier *= 1.0 + p->talents.improved_chaos_bolt->effectN( 1 ).percent();

Expand Down

0 comments on commit f030c0f

Please sign in to comment.