feature/quests-rework-menu #25

Open
planet wants to merge 6 commits from feature/quests-rework-menu into main
Member
No description provided.
Remove the painted close button from the quest menu art
All checks were successful
Auto Assign / run (pull_request_target) Successful in 3s
CI / build-and-test (20.x) (pull_request) Successful in 31s
Model Preview / model-preview (pull_request) Successful in 1m3s
7146e2df55
smell-of-curry was assigned by forgejo-actions 2026-10-17 21:49:47 +00:00
bot left a comment

Review @ 7146e2df (res companion to beh/data feature/quests-rework-menu)

No blockers. The wiring checks out against the beh branch head 993ad7d6:

  • All 7 new $quest_chest_flag strings in ui/chest_server_form.json match the ids in beh src/pokebedrock/config/chestGui.ts, and all 7 menu textures they point at are added here.
  • All 70 new lang keys are referenced by beh (langKeys.ts, or the tDynamic category/group/line/requirement ids in questMenus.ts / forms/quests.ts), and every category, group and line id in questMenus.ts has a matching key. Nothing referenced is missing.
  • All 20 new textures/ui/quests/*.png icons are used via QUEST_ICON in beh questMenus.ts.
  • %1%% in pokedexPercent matches the existing escape style (forms.serverPokedex.label.done).

Should-fix (copy):

  1. forms.quests.requirement.megaEvolve=Mega Evolve %1x times counts twice; it renders as "Mega Evolve 5x times". Use Mega Evolve %1x to match the rest of the requirement lines. Same string in all 7 locale files.

Nits:
2. forms.quests.group.alternativeForms=Alternative Form is singular, while the group holds three forms and the id is plural. Alternative Forms reads better as a heading.
3. The six non-English locale files get the English text verbatim (69 lines each). If the translation flow fills these later, fine; if not, consider leaving them out so the missing keys stay visible to translators instead of looking done.
4. The rewards/notifications keys (button.exitRewards, button.questRewards, button.rewards, label.completionReward, button.notifications, notifications.*) are appended after status.locked instead of next to their button.* / label.* siblings. Purely ordering.
5. The 7 new grid blocks in chest_server_form.json differ only in size, texture, flag, close-button offset and grid offset. Optional: a shared template with $ variables would cut ~250 duplicated lines, though the existing screens in this file are also written out longhand, so this is not required.

CI (build-and-test, model-preview) was still pending at review time. Merge-ready needs green CI plus a maintainer approval, and should land together with the beh/data companions.

Review @ `7146e2df` (res companion to beh/data `feature/quests-rework-menu`) No blockers. The wiring checks out against the beh branch head `993ad7d6`: - All 7 new `$quest_chest_flag` strings in `ui/chest_server_form.json` match the ids in beh `src/pokebedrock/config/chestGui.ts`, and all 7 menu textures they point at are added here. - All 70 new lang keys are referenced by beh (`langKeys.ts`, or the `tDynamic` category/group/line/requirement ids in `questMenus.ts` / `forms/quests.ts`), and every category, group and line id in `questMenus.ts` has a matching key. Nothing referenced is missing. - All 20 new `textures/ui/quests/*.png` icons are used via `QUEST_ICON` in beh `questMenus.ts`. - `%1%%` in `pokedexPercent` matches the existing escape style (`forms.serverPokedex.label.done`). Should-fix (copy): 1. `forms.quests.requirement.megaEvolve=Mega Evolve %1x times` counts twice; it renders as "Mega Evolve 5x times". Use `Mega Evolve %1x` to match the rest of the requirement lines. Same string in all 7 locale files. Nits: 2. `forms.quests.group.alternativeForms=Alternative Form` is singular, while the group holds three forms and the id is plural. `Alternative Forms` reads better as a heading. 3. The six non-English locale files get the English text verbatim (69 lines each). If the translation flow fills these later, fine; if not, consider leaving them out so the missing keys stay visible to translators instead of looking done. 4. The rewards/notifications keys (`button.exitRewards`, `button.questRewards`, `button.rewards`, `label.completionReward`, `button.notifications`, `notifications.*`) are appended after `status.locked` instead of next to their `button.*` / `label.*` siblings. Purely ordering. 5. The 7 new grid blocks in `chest_server_form.json` differ only in size, texture, flag, close-button offset and grid offset. Optional: a shared template with `$` variables would cut ~250 duplicated lines, though the existing screens in this file are also written out longhand, so this is not required. CI (`build-and-test`, `model-preview`) was still pending at review time. Merge-ready needs green CI plus a maintainer approval, and should land together with the beh/data companions.
@ -11361,0 +11366,4 @@
forms.quests.category.growth=Growth
forms.quests.category.progression=Progression
forms.quests.category.special=Special
forms.quests.group.alternativeForms=Alternative Form
Member

Nit: singular Alternative Form for a group of three forms (id is alternativeForms). Alternative Forms?

Nit: singular `Alternative Form` for a group of three forms (id is `alternativeForms`). `Alternative Forms`?
planet marked this conversation as resolved
texts/en_US.lang Outdated
@ -11361,0 +11401,4 @@
forms.quests.line.stayAtHomePets=Stay at Home Pets!
forms.quests.status.comingSoon=§cComing Soon
forms.quests.status.locked=§cLOCKED
forms.quests.button.exitRewards=Exit Rewards Menu
Member

Nit: this rewards/notifications block sits after status.locked rather than with the other button.* / label.* keys. Ordering only.

Nit: this rewards/notifications block sits after `status.locked` rather than with the other `button.*` / `label.*` keys. Ordering only.
planet marked this conversation as resolved
texts/en_US.lang Outdated
@ -11379,0 +11432,4 @@
forms.quests.requirement.collectEgg=Collect %1x daycare eggs
forms.quests.requirement.holdMegaRing=Hold a Mega Ring in your off-hand
forms.quests.requirement.holdPokeDollars=Have %1 PokéDollars
forms.quests.requirement.megaEvolve=Mega Evolve %1x times
Member

%1x times double-counts ("Mega Evolve 5x times"). Suggest Mega Evolve %1x, and the same in the other 6 locale files.

`%1x times` double-counts ("Mega Evolve 5x times"). Suggest `Mega Evolve %1x`, and the same in the other 6 locale files.
planet marked this conversation as resolved
@ -365,2 +365,4 @@
}
},
{
"quests_main_grid_image": {
Member

Optional: this and the next 6 blocks differ only in size/texture/flag/close offset/grid offset. A shared template with $ vars would remove the duplication. Not blocking, since the rest of this file is written longhand too.

Optional: this and the next 6 blocks differ only in size/texture/flag/close offset/grid offset. A shared template with `$` vars would remove the duplication. Not blocking, since the rest of this file is written longhand too.
planet marked this conversation as resolved
Fix quest text and sort the new quest keys
All checks were successful
CI / build-and-test (20.x) (pull_request) Successful in 35s
Model Preview / model-preview (pull_request) Successful in 1m5s
40d30d74ec
bot left a comment

Re-review @ 40d30d74 (delta since 7146e2df: lang files only, same edit in all 7 locales)

No blockers. This commit addresses the earlier review 3208:

  • Fixed: forms.quests.requirement.megaEvolve is now Mega Evolve %1x, matching the other requirement lines.
  • Fixed: forms.quests.group.alternativeForms is now Alternative Forms.
  • Fixed: the rewards/notifications keys now sit alphabetically with their button.* / label.* siblings, and status.* moved after notifications.*. No keys were added or removed, so the beh wiring checked last time still holds.

Still open from 3208 (nits, not blocking): the six non-English locales carry the English text verbatim, and the 7 near-identical grid blocks in ui/chest_server_form.json could share a template.

CI (build-and-test, model-preview) was pending at review time. Merge-ready still needs green CI, a maintainer approval, and landing together with the data #20 / beh quest-menu companions.

Re-review @ `40d30d74` (delta since `7146e2df`: lang files only, same edit in all 7 locales) No blockers. This commit addresses the earlier review 3208: - Fixed: `forms.quests.requirement.megaEvolve` is now `Mega Evolve %1x`, matching the other requirement lines. - Fixed: `forms.quests.group.alternativeForms` is now `Alternative Forms`. - Fixed: the rewards/notifications keys now sit alphabetically with their `button.*` / `label.*` siblings, and `status.*` moved after `notifications.*`. No keys were added or removed, so the beh wiring checked last time still holds. Still open from 3208 (nits, not blocking): the six non-English locales carry the English text verbatim, and the 7 near-identical grid blocks in `ui/chest_server_form.json` could share a template. CI (`build-and-test`, `model-preview`) was pending at review time. Merge-ready still needs green CI, a maintainer approval, and landing together with the data #20 / beh quest-menu companions.
All checks were successful
CI / build-and-test (20.x) (pull_request) Successful in 35s
Model Preview / model-preview (pull_request) Successful in 1m5s
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/quests-rework-menu:feature/quests-rework-menu
git switch feature/quests-rework-menu

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feature/quests-rework-menu
git switch feature/quests-rework-menu
git rebase main
git switch main
git merge --ff-only feature/quests-rework-menu
git switch feature/quests-rework-menu
git rebase main
git switch main
git merge --no-ff feature/quests-rework-menu
git switch main
git merge --squash feature/quests-rework-menu
git switch main
git merge --ff-only feature/quests-rework-menu
git switch main
git merge feature/quests-rework-menu
git push origin main
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pokebedrock/pokebedrock-res!25
No description provided.