Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move spell cost calculation up slightly to account for spell cost ternaries #69760

Merged
merged 3 commits into from
Nov 26, 2023
Merged
Changes from 1 commit
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
Next Next commit
Initial commit
  • Loading branch information
Standing-Storm committed Nov 26, 2023
commit 33fcc042ec419b270424643148dc21d38064396a
6 changes: 4 additions & 2 deletions src/activity_handlers.cpp
Original file line number Diff line number Diff line change
@@ -3775,11 +3775,13 @@ void activity_handlers::spellcasting_finish( player_activity *act, Character *yo
// spells with the components in hand.
spell_being_cast.use_components( *you );

// pay the cost. Allows ternaries based on having an effect or trait to calculate cost correctly
int cost = spell_being_cast.energy_cost( *you );

spell_being_cast.cast_all_effects( *you, *target );

if( act->get_value( 2 ) != 0 ) {
// pay the cost
int cost = spell_being_cast.energy_cost( *you );

Standing-Storm marked this conversation as resolved.
Show resolved Hide resolved
switch( spell_being_cast.energy_source() ) {
case magic_energy_type::mana:
you->magic->mod_mana( *you, -cost );