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

Let repeat trips use combat methods, get correct xp for cannoning, prevent cannoning in catacombs #6214

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

DayV-git
Copy link
Contributor

Description:

Saw that the parsing here removed combat options, so i've just bypassed it and returned the options separately. Perhaps there is a better way but i don't know how the parsing works. Made a handful of changes to make sure repeat trips saves all combat options. Also noticed multi cannoning wasn't giving ranged xp and was using catacombs, so fixed that.
#6169

Changes:

  • speedCalculations now returns currentTaskOptions non-parsed.
  • Added multiCannon check for getting xp from cannoning.
  • Added !multiCannon check for isInCatacombs

Other checks:

  • I have tested all my changes thoroughly.

@gc gc merged commit 9275691 into oldschoolgg:master Nov 25, 2024
4 checks passed
@DayV-git DayV-git deleted the combat2 branch November 26, 2024 11:35
@DayV-git DayV-git restored the combat2 branch November 28, 2024 09:47
@DayV-git DayV-git deleted the combat2 branch November 28, 2024 10:03
gc pushed a commit that referenced this pull request Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants