feat: trade machine ui #14
bot
smell-of-curry
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "feature/trade-machine"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
COMMENT on
4b08fd7f— trade machine UI companion topokebedrock-beh#727Looks solid:
ui/pokemon/trade.jsonregistered in_ui_defs.json.$flag_tradewired inserver_form.jsonvisibility/enabled bindings.Ship with beh#727 (do not merge res ahead of beh). No blocking asset issues spotted from the file list; UI JSON is large — sanity-check in-game that accept-lock / partner / empty-slot hover textures bind as intended.
@ -47,6 +47,7 @@"$flag_rotom_phone_second": "§2§r","$flag_rotom_phone_third": "§3§r","$flag_pc": "§p§c","$flag_trade": "§t§r§a§d§e",Flag wiring looks correct (
$flag_tradesubtracted from default form visibility and used for the trade control). Keep in lockstep with beh trade title flag.Request changes. The asset companion is not merge-ready: it conflicts with current main and CI build-and-test is failing. Keep it locked to beh#727; do not merge the res side independently. Rebase, resolve all locale conflicts, rerun CI, and keep the trade keys/flag wiring aligned with the behavior-pack head.
APPROVED on
277e1222— main merged intofeature/trade-machine; prior REQUEST_CHANGES (conflicts + red CI) cleared.mergeable=truevs main5a2ff211build-and-testgreen on this head (model-preview still running at review time — not a code blocker)forms.tradeMachine/ skins / loot / test-trade keysui/pokemon/trade.jsonregistered in_ui_defs.json;$flag_tradewired inserver_form.json(catch-all subtract + trade screen enable)textures/ui/trade/*assetsShip with
pokebedrock-beh#727only — do not merge this res companion ahead of the behavior pack.REQUEST_CHANGES on
277e1222— res companion topokebedrock-beh#727(head7b7fc7b2)Good
langKeys(76 keys; no missing/extra).ui/pokemon/trade.jsonregistered in_ui_defs.json;$flag_tradewired inserver_form.json.textures/ui/trade/*referenced by the UI are present.main(5a2ff211); mergeable=true.Must fix
forms.tradeMachine.button.acceptLocked=Accept Trade (%1s). beh declares arity 0 anden_UScorrectly uses§7Accept Trade(lock state is visual viastate_locked). Sync cs/de/es/pt/ru/zh to the en_US value (or a translated gray label without%1).Policy
@ -11781,0 +11781,4 @@## Trade Machineforms.tradeMachine.button.accept=Accept Tradeforms.tradeMachine.button.acceptLocked=Accept Trade (%1s)Stale countdown placeholder. beh
langKeyshasforms.tradeMachine.button.acceptLocked: 0 args, anden_USis§7Accept Trade. Same staleAccept Trade (%1s)is still in cs_CZ / es_ES / pt_BR / ru_RU / zh_CN — align all six with en_US (no%1).REQUEST_CHANGES on
ca2160c0— res companion topokebedrock-beh#727Delta since
277e1222.github/workflows/model-preview.yml: pinusesto Forgejopokebedrock/mc-model-preview@b10a8ffc(wassmell-of-curry/mc-model-preview@latest). Fine for the act runner.Still blocked (unchanged from REQUEST_CHANGES#2944 / inline on
texts/de_DE.lang)forms.tradeMachine.button.acceptLocked=Accept Trade (%1s). beh declares arity 0;en_USis§7Accept Trade. Sync cs/de/es/pt/ru/zh (no%1).Policy / CI
build-and-test/model-preview) — not merge-ready until green + locale fix + beh lands.REQUEST_CHANGES on
05b3116e— res companion topokebedrock-beh#727Delta since
ca2160c0forms.tradeMachine.*keys to all 7 locales (claim-block minimum error/label,success.tradedPokemon,summary.*incl. score lines). Identical across locales, no duplicate keys, arg usage looks sane.mergeable=truevs main7e6ccf54.Still blocked (unchanged from #2944 / #2964)
forms.tradeMachine.button.acceptLocked=Accept Trade (%1s). beh declares arity 0;en_USis§7Accept Trade. Sync those six (no%1).Heads-up
0ba5793d) doesn't reference any of the 11 new keys yet. Make sure the beh side lands them inlangKeyswith matching arity (summary.players/summary.received= 2, the%1ones = 1,summary.nothing/summary.title/success.tradedPokemon= 0).Policy / CI
build-and-test/model-preview). Not merge-ready until green + locale fix + beh lands.@ -11781,0 +11842,4 @@forms.tradeMachine.error.machineInUse=§cYou cannot break a Trade Machine that is in use!forms.tradeMachine.error.pokemonUnavailable=§cA Pokemon in this trade is no longer available!forms.tradeMachine.title.tradingWith=Trading with "%1"forms.tradeMachine.error.claimBlocksMinimum=§cYou must trade at least %1 Claim Blocks!These 11 new keys aren't referenced by beh#727 head
0ba5793dyet. Push the matching behlangKeysentries (with arity) so the companion stays in lockstep.REQUEST_CHANGES on
05b3116e— res companion topokebedrock-beh#727Delta since
ca2160c0forms.tradeMachine.*keys (claim-block minimum, trade summary, Pokémon success) added identically to all 7 locales. Placement and English-placeholder pattern in non-en files match the existing block. Fine on their own.New blocker
feature/trade-machine@0ba5793d) or behmain—langKeys.tsdoesn't declare them and nothing callst(...)with them. Push the beh side so the arities line up:error.claimBlocksMinimum1,label.minimumClaimBlocks1,success.tradedPokemon0,summary.nothing0,summary.players2,summary.received2,summary.score.claimBlocks|pokeDollars|tokens1,summary.title0,summary.traded1. Otherwise this ships dead strings.Still open (existing thread on
texts/de_DE.lang)forms.tradeMachine.button.acceptLockedstillAccept Trade (%1s)vs beh arity 0. Unchanged on this head.Policy / CI
build-and-testgreen;model-previewstill pending.@ -11781,0 +11842,4 @@forms.tradeMachine.error.machineInUse=§cYou cannot break a Trade Machine that is in use!forms.tradeMachine.error.pokemonUnavailable=§cA Pokemon in this trade is no longer available!forms.tradeMachine.title.tradingWith=Trading with "%1"forms.tradeMachine.error.claimBlocksMinimum=§cYou must trade at least %1 Claim Blocks!These 11 new keys (11845–11855) have no matching declarations in beh#727's
langKeys.tsat0ba5793d, and nothing in beh calls them yet. Land the beh side with the arities from the review body, or drop the keys until it does.View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.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.