Skip to content

Commit e011a49

Browse files
committed
[Unholy] Fix Blightfall in 12.0.5
1 parent 6f612c9 commit e011a49

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

engine/class_modules/apl/apl_death_knight.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void unholy( player_t* p )
336336
if ( p->sim->dbc->wowv() < wowv_t( 12, 0, 5 ) )
337337
cooldowns->add_action( "soul_reaper,target_if=min:health.pct,if=!talent.pestilence&(!debuff.soul_reaper_debuff.up|!variable.cds_active&cooldown.dark_transformation.remains>cooldown.soul_reaper.duration-1|cooldown.dark_transformation.remains<gcd.max&talent.reaping)|talent.pestilence&talent.infliction_of_sorrow&(buff.dark_transformation.remains<5|buff.reaping.remains<=gcd.max)" );
338338
else
339-
cooldowns->add_action( "soul_reaper,target_if=min:health.pct,if=!talent.blightfall&(!debuff.soul_reaper_debuff.up|!variable.cds_active&cooldown.dark_transformation.remains>cooldown.soul_reaper.duration-1|cooldown.dark_transformation.remains<gcd.max&talent.reaping)|talent.blightfall&talent.infliction_of_sorrow&(buff.dark_transformation.remains<5|buff.reaping.remains<=gcd.max)" );
339+
cooldowns->add_action( "soul_reaper,target_if=min:health.pct,if=!talent.blightfall&(!debuff.soul_reaper_debuff.up|!variable.cds_active&cooldown.dark_transformation.remains>cooldown.soul_reaper.duration-1|cooldown.dark_transformation.remains<gcd.max&talent.reaping)|talent.blightfall&talent.infliction_of_sorrow&(buff.dark_transformation.remains<5|buff.reaping.remains<=gcd.max)" );
340340
cooldowns->add_action( "putrefy,if=(variable.st_planning|variable.adds_remain)*(target.health.pct>35|!talent.soul_reaper)&(charges=max_charges&!buff.sudden_doom.react&(cooldown.dark_transformation.remains>9|!talent.reaping)|buff.dark_transformation.up)|fight_remains<cooldown.soul_reaper.remains|raid_event.adds.exists&raid_event.adds.remains<3" );
341341
cooldowns->add_action( "dark_transformation,if=(variable.st_planning|variable.adds_remain)&pet.lesser_ghoul_army.active|cooldown.army_of_the_dead.remains>30|!talent.army_of_the_dead" );
342342

engine/class_modules/sc_death_knight.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8420,6 +8420,13 @@ struct pestilence_t final : public death_knight_spell_t
84208420
}
84218421
}
84228422

8423+
void init_finished() override
8424+
{
8425+
death_knight_spell_t::init_finished();
8426+
cooldown->set_max_charges( 1 );
8427+
cooldown->duration = 0_ms;
8428+
}
8429+
84238430
void execute() override
84248431
{
84258432
death_knight_spell_t::execute();
@@ -8490,7 +8497,7 @@ struct dark_transformation_t : public death_knight_spell_t
84908497

84918498
if ( p->talent.sanlayn.the_blood_is_life.ok() )
84928499
{
8493-
p->pets.blood_beast.set_creation_event_callback( pets::parent_pet_action_fn( p->pet_summon.blood_beast ) );
8500+
p->pets.blood_beast.set_creation_event_callback( pets::parent_pet_action_fn( p->pet_summon.blood_beast ) );
84948501
add_child( p->pet_summon.blood_beast );
84958502
p->pet_summon.blood_beast->add_child( p->background_actions.the_blood_is_life );
84968503
}
@@ -8502,6 +8509,8 @@ struct dark_transformation_t : public death_knight_spell_t
85028509
void execute() override
85038510
{
85048511
death_knight_spell_t::execute();
8512+
if ( was_replaced )
8513+
return;
85058514

85068515
p()->pets.ghoul_pet.active_pet()->resource_gain( RESOURCE_ENERGY,
85078516
p()->talent.unholy.dark_transformation->effectN( 4 ).resource(),
@@ -8539,6 +8548,9 @@ struct dark_transformation_t : public death_knight_spell_t
85398548

85408549
bool ready() override
85418550
{
8551+
if ( p()->buffs.pestilence->check() && p()->sim->dbc->wowv() >= wowv_t( 12, 0, 5 ) )
8552+
return death_knight_spell_t::ready();
8553+
85428554
if ( p()->pets.ghoul_pet.active_pet() == nullptr || p()->pets.ghoul_pet.active_pet()->is_sleeping() )
85438555
return false;
85448556

0 commit comments

Comments
 (0)