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

Consume Resource After Successful Spell/Oil Usage #6310

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from

Conversation

kphoenix137
Copy link
Collaborator

@kphoenix137 kphoenix137 commented Jul 5, 2023

This PR will redefine the behavior of spells that use a targeting cursor.

Default behavior:

  • Identify, Resurrect, Heal Other, and Telekinesis cast first, give cursor second
  • All other spells give cursor first, cast second

Fixed Scroll behavior

  • All spells give cursor first, cast second

Oils will behave in the same manner, not being consumed until successfully used.

Fixes #6105
Fixes #6324

@kphoenix137
Copy link
Collaborator Author

I need help with the time demo

@StephenCWills
Copy link
Member

It's broken because your PR is broken. Go cast a Heal scroll and then try to do something after.

@kphoenix137 kphoenix137 marked this pull request as draft July 7, 2023 13:11
@kphoenix137 kphoenix137 marked this pull request as ready for review July 9, 2023 03:18
@kphoenix137
Copy link
Collaborator Author

Any brave souls willing to playtest this? Also I cannot figure out how to correctly handle oils. Any help would be appreciated. The problematic line has // FIXME by it

@kphoenix137 kphoenix137 changed the title Consume Resource After Successful Spell Usage Consume Resource After Successful Spell/Oil Usage Jul 9, 2023
ConsumeSpell(player, spl);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo avoid adding empty diff like in this file - changes not really relevant to the PR

@AJenbo AJenbo added this to the 1.6.0 milestone Jul 9, 2023
@kphoenix137 kphoenix137 marked this pull request as draft July 10, 2023 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants