Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion engine/class_modules/warlock/sc_warlock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ int warlock_td_t::count_affliction_dots() const
warlock_t::warlock_t( sim_t* sim, util::string_view name, race_e r )
: parse_player_effects_t( sim, WARLOCK, name, r ),
havoc_target( nullptr ),
bugged_mayhem( false ),
havoc_spells(),
diabolic_ritual( 0 ),
demonic_art_buff_replaced( false ),
Expand All @@ -214,6 +213,7 @@ warlock_t::warlock_t( sim_t* sim, util::string_view name, race_e r )
eye_explosion_instanced_bug_cb( true ),
eye_explosion_instanced_bug_sb( true ),
eye_explosion_instanced_bug_rof( false ),
fel_armaments_extra_effect_bug( false ),
tyrant_antoran_armaments_target_mul( 1.0 )
{
cooldowns.haunt = get_cooldown( "haunt" );
Expand Down Expand Up @@ -493,6 +493,9 @@ std::string warlock_t::create_profile( save_e stype )
if ( eye_explosion_instanced_bug_rof )
profile_str +=
"eye_explosion_instanced_bug_rof=" + util::to_string( as<int>( eye_explosion_instanced_bug_rof ) ) + "\n";
if ( fel_armaments_extra_effect_bug )
profile_str +=
"fel_armaments_extra_effect_bug" + util::to_string( as<int>( fel_armaments_extra_effect_bug ) ) + "\n";
if ( tyrant_antoran_armaments_target_mul < 1.0 )
profile_str +=
"tyrant_antoran_armaments_target_mul=" + util::to_string( tyrant_antoran_armaments_target_mul ) + "\n";
Expand All @@ -515,6 +518,7 @@ void warlock_t::copy_from( player_t* source )
eye_explosion_instanced_bug_cb = p->eye_explosion_instanced_bug_cb;
eye_explosion_instanced_bug_sb = p->eye_explosion_instanced_bug_sb;
eye_explosion_instanced_bug_rof = p->eye_explosion_instanced_bug_rof;
fel_armaments_extra_effect_bug = p->fel_armaments_extra_effect_bug;
tyrant_antoran_armaments_target_mul = p->tyrant_antoran_armaments_target_mul;

rng_settings = p->rng_settings;
Expand Down
2 changes: 1 addition & 1 deletion engine/class_modules/warlock/sc_warlock.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ struct warlock_t : public parse_player_effects_t
{
public:
player_t* havoc_target;
bool bugged_mayhem; // Used to control if in a particular moment mayhem is bugged and its not working
std::vector<action_t*> havoc_spells; // Used for smarter target cache invalidation.
player_t* haunt_target; // Used for tracking the current haunt target
std::vector<event_t*> wild_imp_spawns; // Used for tracking incoming imps from HoG TODO: Is this still needed with faster spawns?
Expand Down Expand Up @@ -1072,6 +1071,7 @@ struct warlock_t : public parse_player_effects_t
bool eye_explosion_instanced_bug_cb;
bool eye_explosion_instanced_bug_sb;
bool eye_explosion_instanced_bug_rof;
bool fel_armaments_extra_effect_bug;
double tyrant_antoran_armaments_target_mul;

warlock_t( sim_t* sim, util::string_view name, race_e r );
Expand Down
20 changes: 2 additions & 18 deletions engine/class_modules/warlock/sc_warlock_actions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ using namespace helpers;
// It seems that having the GoSac buff prevents these bugs
if ( p()->bugs && !p()->buffs.grimoire_of_sacrifice->check()
&& ( ( this->id == p()->talents.chaos_bolt->id() && p()->eye_explosion_instanced_bug_cb )
|| ( this->id == p()->hero.ruination_cast->id() && p()->eye_explosion_instanced_bug_sb )
|| ( this->id == p()->hero.ruination_cast->id() && destruction() && p()->eye_explosion_instanced_bug_cb )
|| ( this->id == p()->talents.shadowburn->id() && p()->eye_explosion_instanced_bug_sb )
|| ( this->id == p()->talents.rain_of_fire->id() && p()->eye_explosion_instanced_bug_rof ) ) )
{
Expand Down Expand Up @@ -389,23 +389,9 @@ using namespace helpers;
if ( n > 1u )
{
player_t* trigger_target = tl.at( 1u + rng().range( n - 1u ) );
const player_t* prev_havoc_target = p()->havoc_target;

if ( td( trigger_target )->debuffs.havoc->trigger() )
{
assert( p()->havoc_target == trigger_target );

// NOTE: 2026-03-17 Due to a bug, Mayhem will stop working if triggered on another target while another havoc debuff is already active.
// This can only happen with Improved Havoc talent, which makes the ICD less than its duration.
// It will work correctly again if the Havoc debuff expires normally or if it is applied to the same target that already has it.
if ( p()->talents.improved_havoc.ok() )
{
if ( prev_havoc_target == nullptr || trigger_target == prev_havoc_target )
p()->bugged_mayhem = false;
else
p()->bugged_mayhem = true;
}

p()->procs.mayhem->occur();
}
}
Expand Down Expand Up @@ -546,9 +532,7 @@ using namespace helpers;

int n_targets() const override
{
// NOTE: 2026-03-17 Mayhem with Improved Havoc is bugged and there are certain conditions
// that may cause it to stop working for a while (bug)
if ( destruction() && use_havoc() && ( !p()->bugs || !p()->bugged_mayhem ) )
if ( destruction() && use_havoc() )
{
assert( action_base_t::n_targets() == 0 );
return 2;
Expand Down
4 changes: 2 additions & 2 deletions engine/class_modules/warlock/sc_warlock_init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ namespace warlock
parse_passive_effects( hero.mark_of_perotharn, true );

// NOTE: 2026-03-21 An additional effect of Fel Armaments talent is applied even if the talent is not selected (bug)
if ( demonology() && bugs )
if ( demonology() && bugs && ( talents.fel_armaments.ok() || fel_armaments_extra_effect_bug ) )
parse_passive_effects( talents.fel_armaments_2, true );
}

Expand Down Expand Up @@ -1604,6 +1604,7 @@ namespace warlock
add_option( opt_bool( "eye_explosion_instanced_bug_cb", eye_explosion_instanced_bug_cb ) );
add_option( opt_bool( "eye_explosion_instanced_bug_sb", eye_explosion_instanced_bug_sb ) );
add_option( opt_bool( "eye_explosion_instanced_bug_rof", eye_explosion_instanced_bug_rof ) );
add_option( opt_bool( "fel_armaments_extra_effect_bug", fel_armaments_extra_effect_bug ) );
add_option( opt_float( "tyrant_antoran_armaments_target_mul", tyrant_antoran_armaments_target_mul, 0.0, 1.0 ));

rng_settings.for_each( [ this ]( auto& setting )
Expand Down Expand Up @@ -1642,7 +1643,6 @@ namespace warlock

warlock_pet_list.active = nullptr;
havoc_target = nullptr;
bugged_mayhem = false;
haunt_target = nullptr;
wild_imp_spawns.clear();
diabolic_ritual = rng().range( 0, 3 );
Expand Down
Loading