Skip to content

Commit

Permalink
[Warlock] Update Pit Lord energy consumption (#9436)
Browse files Browse the repository at this point in the history
* [Warlock] Update Pit Lord energy consumption

* Add note for further Mother checking
  • Loading branch information
Azevara authored Sep 7, 2024
1 parent 630374e commit 7294c92
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
15 changes: 11 additions & 4 deletions engine/class_modules/warlock/sc_warlock_pets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2239,8 +2239,6 @@ namespace diabolist
mother_of_chaos_t::mother_of_chaos_t( warlock_t* owner, util::string_view name )
: warlock_pet_t( owner, name, PET_WARLOCK_RANDOM, true )
{
resource_regeneration = regen_type::DISABLED;

action_list_str = "chaos_salvo";
}

Expand All @@ -2262,8 +2260,7 @@ namespace diabolist
: warlock_pet_spell_t( "Chaos Salvo", p, p->o()->hero.chaos_salvo )
{
channeled = true;
base_costs_per_tick[ RESOURCE_ENERGY ] = 0.0;

// TOCHECK: Does Mother of Chaos have any cap with haste scaling?
tick_action = new chaos_salvo_tick_t( p ); }

bool ready() override
Expand Down Expand Up @@ -2312,6 +2309,7 @@ namespace diabolist
{
background = dual = true;
aoe = -1;

base_costs[ RESOURCE_ENERGY ] = 0.0;
}
};
Expand All @@ -2322,7 +2320,9 @@ namespace diabolist
: warlock_pet_spell_t( "Felseeker", p, p->o()->hero.felseeker )
{
channeled = true;
tick_zero = tick_on_application = false;
tick_action = new felseeker_tick_t( p );
base_costs_per_tick[ RESOURCE_ENERGY ] = p->o()->hero.felseeker_dmg->cost( POWER_ENERGY );
}

bool ready() override
Expand All @@ -2348,6 +2348,13 @@ namespace diabolist
felseekers = 1;
}

void pit_lord_t::init_base_stats()
{
warlock_pet_t::init_base_stats();

resources.base[ RESOURCE_ENERGY ] = 99; // Fudge this so that Felseeker only does 4 ticks instead of an extra one at zero resources
}

action_t* pit_lord_t::create_action( util::string_view name, util::string_view options_str )
{
if ( name == "felseeker" )
Expand Down
1 change: 1 addition & 0 deletions engine/class_modules/warlock/sc_warlock_pets.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ namespace diabolist

pit_lord_t( warlock_t*, util::string_view = "pit_lord" );
void arise() override;
void init_base_stats() override;
action_t* create_action( util::string_view, util::string_view ) override;
};

Expand Down

0 comments on commit 7294c92

Please sign in to comment.