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

Added tracking Gym Leaders beaten #30

Merged
merged 11 commits into from
Jun 30, 2024
Merged

Conversation

KamekoSkye
Copy link
Contributor

Changes

  • Added the Gym Leaders as trackable items
  • Added the Gym Leader items as automatically being marked when the item is collected
  • Added a function to logic.lua to track if any Gym leader has been beaten

As a result:

  • Fixed a small issue with offline tracking (and maybe autotracking) if Rt 3 access is set to "beat any gym" or "beat brock"

@KamekoSkye
Copy link
Contributor Author

I added full pngs of the gym leaders without realising you had the closeups. If you want me to use those images then I can change it if needed.

Copy link
Owner

@coveleski coveleski left a comment

Choose a reason for hiding this comment

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

Currently this doesn't seem to work? You mentioned you updated logic.lua but it's not in the changes.

Possibly a better approach anyway would be to just give each gym gym_beaten as a secondary itemcode, since that's what we're already checking for and it's probably faster than doing lookups on each different gym leaders itemcode.

layouts/itemgrid.json Outdated Show resolved Hide resolved
locations/locations.json Show resolved Hide resolved
@coveleski
Copy link
Owner

Thanks for the PR though, I'd been meaning to fix this but got real busy! (And tbh not too many people seem to use offline tracking so it was kinda low on the list.)

Fixing the issue with missing a bunch of locations accidentally
Should contain the latest version with my change
@KamekoSkye
Copy link
Contributor Author

Sorry for not adding logic.lua, your suggestion is honestly a better solution and one I didn't think of until after PRing

I've made the changes, it should be ready to merge.
On my end it says I haven't made the required changes, but I have updated items.json, itemgrid.json, and locations.json

As for manual tracking, while I personally use autotracking as much as I can, adding the leaders would have fixed the issue and therefore also fixes things for the random manual tracking person.

@KamekoSkye KamekoSkye requested a review from coveleski June 27, 2024 17:02
Copy link
Owner

@coveleski coveleski left a comment

Choose a reason for hiding this comment

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

Made a couple modifications to hide the hosted items (they'll clear automatically since poptracker defaults to clear_as_group: true.

Functionality looks good!

@coveleski coveleski merged commit 09e72bb into coveleski:main Jun 30, 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