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.

Sign up for GitHub

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

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33fcc04
Initial commit
Standing-Storm Nov 26, 2023
5480f63
Merge branch 'CleverRaven:master' into move-spell-cost
Standing-Storm Nov 26, 2023
ddb4eaa
Update src/activity_handlers.cpp
Standing-Storm Nov 26, 2023
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
5 changes: 3 additions & 2 deletions src/activity_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3775,11 +3775,12 @@ 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 );
switch( spell_being_cast.energy_source() ) {
case magic_energy_type::mana:
you->magic->mod_mana( *you, -cost );
Expand Down
Loading