From e1b066c049cad8c81a4bb762a0f336525b12c40d Mon Sep 17 00:00:00 2001 From: Mlklock <118071530+Mlklock@users.noreply.github.com> Date: Sat, 1 Mar 2025 13:19:47 -0300 Subject: [PATCH 1/3] [Warlock] [Demonology] Demonic Brutality fix for Player --- engine/class_modules/warlock/sc_warlock.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/class_modules/warlock/sc_warlock.cpp b/engine/class_modules/warlock/sc_warlock.cpp index 3333253d355..cadc7d4b8d9 100644 --- a/engine/class_modules/warlock/sc_warlock.cpp +++ b/engine/class_modules/warlock/sc_warlock.cpp @@ -280,6 +280,9 @@ warlock_t::warlock_t( sim_t* sim, util::string_view name, race_e r ) resource_regeneration = regen_type::DYNAMIC; regen_caches[ CACHE_HASTE ] = true; regen_caches[ CACHE_SPELL_HASTE ] = true; + + if ( talents.demonic_brutality.ok() ) + base.crit_damage_multiplier = talents.demonic_brutality->effectN( 1 ).percent(); } void warlock_t::invalidate_cache( cache_e c ) From 25efdff4a518c7bca08043a22d5482f4a8fa43dd Mon Sep 17 00:00:00 2001 From: Mlklock <118071530+Mlklock@users.noreply.github.com> Date: Sat, 1 Mar 2025 13:28:53 -0300 Subject: [PATCH 2/3] Update sc_warlock.cpp --- engine/class_modules/warlock/sc_warlock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/class_modules/warlock/sc_warlock.cpp b/engine/class_modules/warlock/sc_warlock.cpp index cadc7d4b8d9..2fc49ffa702 100644 --- a/engine/class_modules/warlock/sc_warlock.cpp +++ b/engine/class_modules/warlock/sc_warlock.cpp @@ -282,7 +282,7 @@ warlock_t::warlock_t( sim_t* sim, util::string_view name, race_e r ) regen_caches[ CACHE_SPELL_HASTE ] = true; if ( talents.demonic_brutality.ok() ) - base.crit_damage_multiplier = talents.demonic_brutality->effectN( 1 ).percent(); + base.crit_damage_multiplier += talents.demonic_brutality->effectN( 1 ).percent(); } void warlock_t::invalidate_cache( cache_e c ) From 83f463ed167b4e7fb5f368f31f8c380a150e97f1 Mon Sep 17 00:00:00 2001 From: Mlklock <118071530+Mlklock@users.noreply.github.com> Date: Sat, 1 Mar 2025 13:32:47 -0300 Subject: [PATCH 3/3] Update sc_warlock_actions.cpp --- engine/class_modules/warlock/sc_warlock_actions.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/engine/class_modules/warlock/sc_warlock_actions.cpp b/engine/class_modules/warlock/sc_warlock_actions.cpp index 4e3d685083f..4adafc6d1fb 100644 --- a/engine/class_modules/warlock/sc_warlock_actions.cpp +++ b/engine/class_modules/warlock/sc_warlock_actions.cpp @@ -33,7 +33,6 @@ using namespace helpers; bool sacrificed_souls = false; bool wicked_maw = false; bool soul_conduit_base_cost = false; - bool demonic_brutality = false; // Destruction bool chaotic_energies = false; @@ -109,7 +108,6 @@ using namespace helpers; affected_by.master_demonologist_dd = data().affected_by( p->warlock_base.master_demonologist->effectN( 2 ) ); // TOCHECK: 2024-07-12 Despite the value of Effect 2 being 0 for Wicked Maw's debuff, the spells listed for it gain full value as if from Effect 1 affected_by.wicked_maw = data().affected_by( p->talents.wicked_maw_debuff->effectN( 1 ) ) || data().affected_by( p->talents.wicked_maw_debuff->effectN( 2 ) ); - affected_by.demonic_brutality = data().affected_by( p->talents.demonic_brutality->effectN( 1 ) ); affected_by.backdraft = data().affected_by( p->talents.backdraft_buff->effectN( 1 ) ); affected_by.roaring_blaze = p->talents.roaring_blaze.ok() && data().affected_by( p->talents.conflagrate_debuff->effectN( 1 ) ); @@ -457,9 +455,6 @@ using namespace helpers; if ( affliction() && affected_by.contagion ) m *= 1.0 + p()->talents.contagion->effectN( 1 ).percent(); - if ( demonology() && affected_by.demonic_brutality ) - m *= 1.0 + p()->talents.demonic_brutality->effectN( 1 ).percent(); - if ( destruction() && affected_by.ruin ) m *= 1.0 + p()->talents.ruin->effectN( 1 ).percent(); @@ -5131,4 +5126,4 @@ using namespace helpers; // Action Creation End -} //namespace warlock \ No newline at end of file +} //namespace warlock