Skip to content

PokemonSV: move BBQ quest identity into its own Options module - #1631

Merged
kichithewolf merged 1 commit into
PokemonAutomation:mainfrom
dayfine:bbq/quest-identity
Oct 28, 2026
Merged

kichithewolf merged 1 commit into
PokemonAutomation:mainfrom
dayfine:bbq/quest-identity

Conversation

@dayfine

@dayfine dayfine commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor

Moves the BBQuests enum and its slug table out of the BBQ Farmer program into Options/PokemonSV_BBQuests.{h,cpp}, so code that only needs a quest name doesn't depend on the whole program module. No behavior change. About 80% of the diff is moved code: git diff --color-moved=dimmed-zebra main...pr-1631. Adds BBQuests_enum_to_string() and a slug round-trip test.

Part of PokemonAutomation/ComputerControl#263.

🤖 Generated with Claude Code

https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E

@dayfine dayfine changed the title PokemonSV: move BBQ quest identity into a Resources leaf module PokemonSV: Refactor - move BBQ quest enums to a new module Oct 21, 2026
@dayfine
dayfine force-pushed the bbq/quest-identity branch from 445a933 to e36342f Compare October 21, 2026 03:24
@dayfine
dayfine marked this pull request as ready for review October 21, 2026 03:26
@dayfine dayfine changed the title PokemonSV: Refactor - move BBQ quest enums to a new module PokemonSV: move BBQ quest identity into its own Options module Oct 21, 2026
@dayfine

dayfine commented Oct 21, 2026

Copy link
Copy Markdown
Contributor Author

@jw098 PTAL

The BBQuests enum lived in Options/PokemonSV_BBQOption.h, but its slug
map and string_to_enum lived in Programs/Farming/
PokemonSV_BlueberryQuests.{h,cpp}. Anything that needed a quest name
had to depend on the whole BBQ program module, and
BlueberryCatchPhoto.h included BlueberryQuests.h only for these types
while BlueberryQuests.cpp included BlueberryCatchPhoto.h.

Move the enum and slug mapping into Options/PokemonSV_BBQuests.{h,cpp},
next to BBQOption.h, which now includes it. Add
BBQuests_enum_to_string, backed by a reverse map built once from the
existing slug map.

Move CameraAngle into BlueberryCatchPhoto.h, its only user. The
catch/photo module no longer includes BlueberryQuests.h.

No behavior change. Add a unit test that every quest round-trips
through its slug.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
@dayfine
dayfine force-pushed the bbq/quest-identity branch from bce23cd to 6c312f2 Compare October 27, 2026 01:25
@kichithewolf
kichithewolf merged commit ce4f06e into PokemonAutomation:main Oct 28, 2026
7 checks passed
dayfine added a commit to dayfine/Arduino-Source that referenced this pull request Oct 30, 2026
main moved the quest token map, BBQuests_string_to_enum/enum_to_string and
CameraAngle out of BlueberryQuests (PokemonAutomation#1631), and the BP crop into
read_BP_from_image (PokemonAutomation#1628). Took main's versions and kept only this branch's
log_bbq_snapshot() in BlueberryQuests; BlueberryCatchPhoto.cpp now includes
BlueberryQuests.h directly, since its header no longer pulls it in. Unknown
quests now log as an empty slug (main's enum_to_string) instead of "unknown".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
@dayfine
dayfine deleted the bbq/quest-identity branch November 3, 2026 05:46
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