pokebedrock/pokebedrock-res
4
0
Fork 1
Code Issues Pull requests 7 Projects Releases 17 Packages Wiki Activity Actions

feat: Showdown 0.2 lang, ZA mega substitutes, and stone icons #16

Open
bot wants to merge 5 commits from feature/showdown-0.2-lang into main
pull from: feature/showdown-0.2-lang
merge into: pokebedrock:main
Conversation 5 Commits 5 Files changed 117 +9088 -1526
bot commented 2026-09-11 21:10:21 +00:00
Member
Copy link

Summary

Full RES follow-up for Showdown 0.2 / ZA megas. Builds on the battle-text keys already in this PR.

Lang

  • 4x / 0.25x + tox aliases + failNoStat (existing).
  • generateShowdownMap against Showdown 0.2: new stone shortDescs, 7 Future abilities (Aura Guard, Mega Sol, Dragonize, Piercing Drill, Eelevate, Fire Mane, Spicy Spray), Pretty Feather.
  • generateItemLang: 45 stones + Pretty Feather + 51 spawn-items. Display names from pokemon.json (Greninja-Mega, not Greninjamega). One ## Missing Items section (no last-win wipe).
  • syncLangFiles for cs/de/es/pt/ru/zh.

Items / icons

  • Placeholder stone PNGs (copy of Venusaurite) under textures/items/held_items/.
  • Pretty Feather placeholder (Health Feather).
  • item_texture.json + items.json entries.
  • Pin pokebedrock-showdown ^0.2.0.

Pokémon

  • pokemon.json from beh generate:pokemonList (49 megas + Tatsugiri-Droopy/Stretchy).
  • generatePokemonFiles: substitute entities, RCs, missing_info.md sprite gaps for all 49 megas.
  • Not added to pokemonWithModels.
  • Tatsugiri-Droopy/Stretchy sprites copied from existing tatsugiri_droopy / tatsugiri_stretchy skins.

Docs

  • ZA_MEGAS.md — modeler inventory + player-facing status.

Not included

  • Unique mega sprites/models (listed in missing_info.md on purpose).
  • Nihil Light TM text (no learnset / Future).
  • CAP fakemon.

Test plan

  • generateItemLang + generatePokemonFiles + generateShowdownMap + syncLangFiles
  • Client: Battle Tower stone icons render (placeholder Venusaurite)
  • Mega Greninja shows substitute entity pokemon:greninjamega
  • Lang: item.pokeb:greninjite=Greninjite, item.pokeb:greninjamega=Greninja-Mega
  • Existing ORAS mega models unchanged

Merge order

  1. showdown #15
  2. data #11
  3. beh #735
  4. this PR (can merge after data; beh generates pokemon.json)
## Summary Full RES follow-up for Showdown 0.2 / ZA megas. Builds on the battle-text keys already in this PR. ### Lang - 4x / 0.25x + tox aliases + `failNoStat` (existing). - `generateShowdownMap` against Showdown 0.2: new stone shortDescs, 7 Future abilities (Aura Guard, Mega Sol, Dragonize, Piercing Drill, Eelevate, Fire Mane, Spicy Spray), Pretty Feather. - `generateItemLang`: 45 stones + Pretty Feather + 51 spawn-items. Display names from `pokemon.json` (Greninja-Mega, not Greninjamega). One `## Missing Items` section (no last-win wipe). - `syncLangFiles` for cs/de/es/pt/ru/zh. ### Items / icons - Placeholder stone PNGs (copy of Venusaurite) under `textures/items/held_items/`. - Pretty Feather placeholder (Health Feather). - `item_texture.json` + `items.json` entries. - Pin `pokebedrock-showdown` `^0.2.0`. ### Pokémon - `pokemon.json` from beh `generate:pokemonList` (49 megas + Tatsugiri-Droopy/Stretchy). - `generatePokemonFiles`: substitute entities, RCs, `missing_info.md` sprite gaps for all 49 megas. - **Not** added to `pokemonWithModels`. - Tatsugiri-Droopy/Stretchy sprites copied from existing `tatsugiri_droopy` / `tatsugiri_stretchy` skins. ### Docs - `ZA_MEGAS.md` — modeler inventory + player-facing status. ### Not included - Unique mega sprites/models (listed in `missing_info.md` on purpose). - Nihil Light TM text (no learnset / Future). - CAP fakemon. ## Test plan - [x] generateItemLang + generatePokemonFiles + generateShowdownMap + syncLangFiles - [ ] Client: Battle Tower stone icons render (placeholder Venusaurite) - [ ] Mega Greninja shows substitute entity `pokemon:greninjamega` - [ ] Lang: `item.pokeb:greninjite=Greninjite`, `item.pokeb:greninjamega=Greninja-Mega` - [ ] Existing ORAS mega models unchanged ## Merge order 1. [showdown #15](https://git.pokebedrock.com/pokebedrock/pokebedrock-showdown/pulls/15) 2. [data #11](https://git.pokebedrock.com/pokebedrock/pokebedrock-data/pulls/11) 3. [beh #735](https://git.pokebedrock.com/pokebedrock/pokebedrock-beh/pulls/735) 4. **this PR** (can merge after data; beh generates `pokemon.json`)
feat: add showdown 0.2 battle text keys
Some checks failed
Auto Assign / run (pull_request_target) Successful in 3s
Details
Model Preview / model-preview (pull_request) Successful in 13s
Details
CI / build-and-test (20.x) (pull_request) Failing after 21s
Details
e0bbe576b1
 
Upstream DefaultText gained 4x / 0.25x effectiveness,
tox aliases, and unboost.failNoStat.

Co-authored-by: Cursor <cursoragent@cursor.com>
smell-of-curry was assigned by forgejo-actions 2026-09-11 21:10:24 +00:00
Add ZA mega substitutes, stone icons, and Showdown 0.2 lang.
Some checks failed
Model Preview / model-preview (pull_request) Failing after 18s
Details
CI / build-and-test (20.x) (pull_request) Failing after 19s
Details
104866c35d
 
Wire 49 new megas plus Tatsugiri-Droopy/Stretchy into pokemon.json, generate substitute entities, placeholder stone icons, and battle/item lang. Models stay off pokemonWithModels until art exists.

Co-authored-by: Cursor <cursoragent@cursor.com>
bot changed title from feat: add showdown 0.2 battle text keys to feat: Showdown 0.2 lang, ZA mega substitutes, and stone icons 2026-09-12 16:04:51 +00:00
Merge branch 'main' into feature/showdown-0.2-lang
Some checks failed
CI / build-and-test (20.x) (pull_request) Failing after 14s
Details
Model Preview / model-preview (pull_request) Failing after 2m17s
Details
31ef5dbe96 
Keep safari egg and ZA stone textures together, and point new mega, charcoal, snowball, and silicon item icons at art that already exists.

Co-authored-by: Cursor <cursoragent@cursor.com>
Pin pokebedrock-showdown to the published release npm ci can install.
Some checks failed
CI / build-and-test (20.x) (pull_request) Successful in 29s
Details
Model Preview / model-preview (pull_request) Has been cancelled
Details
8bb48f0ffa
Point model preview at the Forgejo copy of the action.
All checks were successful
CI / build-and-test (20.x) (pull_request) Successful in 30s
Details
Model Preview / model-preview (pull_request) Successful in 2m27s
Details
96f253a25d
bot reviewed 2026-10-01 19:07:11 +00:00
bot left a comment
Copy link

Review update (tip 96f253a) — prior COMMENT blocker cleared

Race note: earlier bot COMMENT cited head 31ef5dbe / ^0.2.0 install failure (CI run #329). Tip now includes 8bb48f0 (pin to published 0.1.18) + 96f253a (Forgejo model-preview action).

Status

  • npm ci / CI: green — pokebedrock-showdown@0.1.18 in package.json + lock (matches main). CI #345, model-preview #346.
  • Scope (unchanged, non-blocking): lang/items/stone icons/ZA substitute entities look coherent; not in pokemonWithModels; placeholders match ZA_MEGAS.md.
  • Merge order still applies for true 0.2: showdown #15 → data #11 → beh #735 → this PR. Re-pin to ^0.2.0 only after 0.2 is published.

Issues

  • Open pokebedrock-res issues: 0 — no Fixes: / Could Fix:.

mergeable=true · CI green · RES companion · no second review on unchanged tip · rebase-keeper N/A · no BEH nudge

## Review update (tip `96f253a`) — prior COMMENT blocker cleared Race note: earlier bot COMMENT cited head `31ef5dbe` / `^0.2.0` install failure (CI run #329). Tip now includes `8bb48f0` (pin to published `0.1.18`) + `96f253a` (Forgejo model-preview action). ### Status - **`npm ci` / CI:** green — `pokebedrock-showdown@0.1.18` in `package.json` + lock (matches `main`). [CI #345](https://git.pokebedrock.com/pokebedrock/pokebedrock-res/actions/runs/345), [model-preview #346](https://git.pokebedrock.com/pokebedrock/pokebedrock-res/actions/runs/346). - **Scope (unchanged, non-blocking):** lang/items/stone icons/ZA substitute entities look coherent; not in `pokemonWithModels`; placeholders match `ZA_MEGAS.md`. - **Merge order still applies** for true 0.2: [showdown #15](https://git.pokebedrock.com/pokebedrock/pokebedrock-showdown/pulls/15) → data #11 → beh #735 → this PR. Re-pin to `^0.2.0` only after 0.2 is published. ### Issues - Open `pokebedrock-res` issues: **0** — no `Fixes:` / `Could Fix:`. mergeable=true · CI green · RES companion · no second review on unchanged tip · rebase-keeper N/A · no BEH nudge
package.json
bot commented 2026-10-01 19:07:11 +00:00
Author
Member
Copy link

Update (tip 96f253a, includes 8bb48f0): install blocker resolved. pokebedrock-showdown is pinned to 0.1.18 in package.json and package-lock.json (matches main). CI build-and-test green (run #345); model-preview also green (run #346).

Earlier note about ^0.2.0 / run #329 applied to pre-pin tip 31ef5dbe only — ignore as current blocker.

Residual (non-blocking for CI): PR body still describes a ^0.2.0 pin / Showdown 0.2 merge order. Real 0.2 ship still waits showdown #15 publish, then re-pin + lock regen if regenerating against 0.2.

**Update (tip `96f253a`, includes `8bb48f0`):** install blocker **resolved**. `pokebedrock-showdown` is pinned to `0.1.18` in `package.json` and `package-lock.json` (matches `main`). CI `build-and-test` green ([run #345](https://git.pokebedrock.com/pokebedrock/pokebedrock-res/actions/runs/345)); model-preview also green ([run #346](https://git.pokebedrock.com/pokebedrock/pokebedrock-res/actions/runs/346)). Earlier note about `^0.2.0` / run #329 applied to pre-pin tip `31ef5dbe` only — ignore as current blocker. Residual (non-blocking for CI): PR body still describes a `^0.2.0` pin / Showdown 0.2 merge order. Real 0.2 ship still waits [showdown #15](https://git.pokebedrock.com/pokebedrock/pokebedrock-showdown/pulls/15) publish, then re-pin + lock regen if regenerating against 0.2.
forgejo-actions commented 2026-10-01 19:10:03 +00:00
Copy link

Minecraft Model Preview (96f253a)

Model Changes

Entity Before After
No renderable model changes detected
## Minecraft Model Preview (96f253a) ### Model Changes | Entity | Before | After | |--------|--------|-------| | _No renderable model changes detected_ | | |
bot reviewed 2026-10-01 19:12:25 +00:00
bot left a comment
Copy link

Re-review (head 96f253a25) — shippable

Forgejo blocks APPROVE/REQUEST_CHANGES on bot-authored PRs; this COMMENT is the approve-equivalent.

Prior COMMENT#2951 blockers (superseded — edited): event head 31ef5dbe had pokebedrock-showdown@^0.2.0 (unpublished) + lock desync → npm ci fail on run #329. Fixed by:

  • 8bb48f0 — pin back to published 0.1.18
  • 96f253a — model-preview → Forgejo pokebedrock/mc-model-preview@b10a8ffc…

CI @ 96f253a25

  • build-and-test: success (#345)
  • model-preview: success (#346)

Scope OK

Showdown 0.2 lang, ZA mega substitute entities, stone/Pretty Feather icons, item_texture/items.json, ZA_MEGAS.md. Display names (Greninjite, Greninja-Mega) + locale sync look good. Dep stays 0.1.18 until 0.2.0 is on npm — re-bump+lock then.

Issues

Open res issues: 0 — no Fixes: / Could Fix:.

mergeable=true · RES companion · rebase-keeper N/A · no BEH nudge · merge order: showdown → data → beh#735 → this

## Re-review (head `96f253a25`) — shippable Forgejo blocks APPROVE/REQUEST_CHANGES on bot-authored PRs; this COMMENT is the **approve-equivalent**. Prior COMMENT#2951 blockers (**superseded** — edited): event head `31ef5dbe` had `pokebedrock-showdown@^0.2.0` (unpublished) + lock desync → `npm ci` fail on run #329. Fixed by: - `8bb48f0` — pin back to published `0.1.18` - `96f253a` — model-preview → Forgejo `pokebedrock/mc-model-preview@b10a8ffc…` ### CI @ `96f253a25` - **build-and-test**: success ([#345](https://git.pokebedrock.com/pokebedrock/pokebedrock-res/actions/runs/345)) - **model-preview**: success ([#346](https://git.pokebedrock.com/pokebedrock/pokebedrock-res/actions/runs/346)) ### Scope OK Showdown 0.2 lang, ZA mega substitute entities, stone/Pretty Feather icons, `item_texture`/`items.json`, `ZA_MEGAS.md`. Display names (`Greninjite`, `Greninja-Mega`) + locale sync look good. Dep stays `0.1.18` until `0.2.0` is on npm — re-bump+lock then. ### Issues Open res issues: **0** — no `Fixes:` / `Could Fix:`. mergeable=true · RES companion · rebase-keeper N/A · no BEH nudge · merge order: showdown → data → beh#735 → this
bot reviewed 2026-10-01 19:16:29 +00:00
bot left a comment
Copy link

Review @ 96f253a2

Event: COMMENT (Forgejo rejects bot self-APPROVE on author=bot — content LGTM, not a changes request).
CI: green — ci.yml #2318 success + model-preview.yml #2319 success on this tip.
Policy: RES companion — do not merge res alone; keep merge order showdown → data → beh#735 → this. No BEH Reviewer nudge. Open res issues: 0 (no Fixes link). Not deps; rebase-keeper N/A.
Behind main: tip merge_base 5a2ff211; main is +1 (d9b4c7e6 Forgejo model-preview tolerate-missing-artifacts). Optional merge-main later — no force-push.

Findings

  • Showdown pin: pokebedrock-showdown is 0.1.18 in package.json + lock (matches published npm install after 8bb48f0f). PR body still says ^0.2.0 — stale; tip content is what CI installs. Installable; lock in sync.
  • Items/icons: stone + pretty_feather entries in items.json / item_texture.json; PNG paths exist under textures/items/held_items/ (+ healing for feather). Silicon armor textures from main-merge present — no dangling silicon/charcoal/snowball refs spotted.
  • Substitute entities: sampled greninjamega, tatsugiridroopy, absolmegaz — pokemon:<id>, geometry.substitute, controller.render.pokemon; matches main venusaurmega pattern. Mega sprite PNGs absent by design (placeholders / sprite-gap docs).
  • Lang: item.pokeb:greninjite / greninjamega, extremelyEffective / mostlyIneffective (4× / 0.25×), failNoStat, Future abilities, Pretty Feather present. Locale sync: no dirty wipe — shared keys unchanged vs merge_base; new keys English-fallback only (cs/de/ru/zh ok).
  • pokemon.json: all 49 ZA megas + Tatsugiri-Droopy/Stretchy present; not added to pokemonWithModels.
  • ZA_MEGAS.md: accurate inventory + player-facing placeholder status. References missing_info.md but that file is not in the tip tree (nit).
  • model-preview.yml: points at Forgejo pokebedrock/mc-model-preview@b10a8ffc (vs merge_base smell-of-curry/...@latest); tip now matches current main for that line.
  • Binary Venusaurite-copy stone icons: intentional — not blocking.

Verdict: Content LGTM. Needs a human APPROVE (bot cannot self-approve). Ship only after beh#735 (and upstream showdown/data) per stated merge order; CI already green on tip.

## Review @ `96f253a2` **Event:** COMMENT (Forgejo rejects bot self-APPROVE on author=bot — content LGTM, not a changes request). **CI:** green — `ci.yml` #2318 success + `model-preview.yml` #2319 success on this tip. **Policy:** RES companion — **do not merge res alone**; keep merge order showdown → data → **beh#735** → this. No BEH Reviewer nudge. Open res issues: 0 (no Fixes link). Not deps; rebase-keeper N/A. **Behind main:** tip merge_base `5a2ff211`; main is +1 (`d9b4c7e6` Forgejo model-preview tolerate-missing-artifacts). Optional merge-main later — no force-push. ### Findings - **Showdown pin:** `pokebedrock-showdown` is `0.1.18` in package.json + lock (matches published npm install after `8bb48f0f`). PR body still says `^0.2.0` — stale; tip content is what CI installs. Installable; lock in sync. - **Items/icons:** stone + `pretty_feather` entries in `items.json` / `item_texture.json`; PNG paths exist under `textures/items/held_items/` (+ healing for feather). Silicon armor textures from main-merge present — no dangling silicon/charcoal/snowball refs spotted. - **Substitute entities:** sampled `greninjamega`, `tatsugiridroopy`, `absolmegaz` — `pokemon:<id>`, `geometry.substitute`, `controller.render.pokemon`; matches main `venusaurmega` pattern. Mega sprite PNGs absent by design (placeholders / sprite-gap docs). - **Lang:** `item.pokeb:greninjite` / `greninjamega`, `extremelyEffective` / `mostlyIneffective` (4× / 0.25×), `failNoStat`, Future abilities, Pretty Feather present. Locale sync: **no dirty wipe** — shared keys unchanged vs merge_base; new keys English-fallback only (cs/de/ru/zh ok). - **pokemon.json:** all 49 ZA megas + Tatsugiri-Droopy/Stretchy present; **not** added to `pokemonWithModels`. - **ZA_MEGAS.md:** accurate inventory + player-facing placeholder status. References `missing_info.md` but that file is **not in the tip tree** (nit). - **model-preview.yml:** points at Forgejo `pokebedrock/mc-model-preview@b10a8ffc` (vs merge_base `smell-of-curry/...@latest`); tip now matches current main for that line. - Binary Venusaurite-copy stone icons: intentional — not blocking. **Verdict:** Content LGTM. Needs a human APPROVE (bot cannot self-approve). Ship only after beh#735 (and upstream showdown/data) per stated merge order; CI already green on tip.
.github/workflows/model-preview.yml
@ -32,3 +32,3 @@
- name: Minecraft Model Preview
uses: smell-of-curry/mc-model-preview@latest
uses: https://git.pokebedrock.com/pokebedrock/mc-model-preview@b10a8ffcf825203aa537c56ce48531249bf1ca6e
bot commented 2026-10-01 19:16:29 +00:00
Author
Member
Copy link

Good: Forgejo-hosted action pin. Tip matches current main for this line; main is still +1 for the tolerate-missing-artifacts follow-up — optional merge-main, not a content blocker.

Good: Forgejo-hosted action pin. Tip matches current main for this line; main is still +1 for the tolerate-missing-artifacts follow-up — optional merge-main, not a content blocker.
ZA_MEGAS.md
@ -0,0 +21,4 @@
49 mega sprites are listed under **Missing Pokémon Sprite Textures**. Also
need geometry, textures, and animations before they leave the substitute.
| id | name | stone |
bot commented 2026-10-01 19:16:29 +00:00
Author
Member
Copy link

Nit: this section points at missing_info.md, but that path is not in the tip tree (only ZA_MEGAS.md itself). Either drop the reference or land the generated sprite-gap list so modelers have one SoT.

Nit: this section points at `missing_info.md`, but that path is not in the tip tree (only `ZA_MEGAS.md` itself). Either drop the reference or land the generated sprite-gap list so modelers have one SoT.
package.json
bot commented 2026-10-01 19:16:29 +00:00
Author
Member
Copy link

Note (non-blocking): tip pins pokebedrock-showdown to 0.1.18 (lock matches; CI installable after the pin commit). PR summary still says ^0.2.0 — update the body when convenient so operators do not chase a nonexistent range.

Note (non-blocking): tip pins `pokebedrock-showdown` to `0.1.18` (lock matches; CI installable after the pin commit). PR summary still says `^0.2.0` — update the body when convenient so operators do not chase a nonexistent range.
bot commented 2026-10-17 19:39:27 +00:00
Author
Member
Copy link

Follow-up on COMMENT 2951/2966/2969 (head 96f253a2 hasn't changed). This isn't a new review.

New conflicts: against res main b4a8343a, this branch now conflicts in items.json, textures/item_texture.json and all 7 texts/*.lang files.

  • items/texture: main's Halloween items (clown_*, pumpkin_killer_*, halloween_candy_bag) sit next to this branch's plasma/neoplasma entries in the sorted maps. Keep both.
  • langs: end-of-file append after message.rewards.grantError. Keep both blocks, with the same order in every lang.

These are mechanical. The pair order is unchanged: data#11 → BEH #735 (re-pinned, see the follow-up there) → this PR.

Follow-up on COMMENT 2951/2966/2969 (head `96f253a2` hasn't changed). This isn't a new review. **New conflicts:** against res main `b4a8343a`, this branch now conflicts in `items.json`, `textures/item_texture.json` and all 7 `texts/*.lang` files. - **items/texture:** main's Halloween items (`clown_*`, `pumpkin_killer_*`, `halloween_candy_bag`) sit next to this branch's plasma/neoplasma entries in the sorted maps. Keep both. - **langs:** end-of-file append after `message.rewards.grantError`. Keep both blocks, with the same order in every lang. These are mechanical. The pair order is unchanged: data#11 → BEH #735 (re-pinned, see the follow-up there) → this PR.
All checks were successful
CI / build-and-test (20.x) (pull_request) Successful in 30s
Details
Model Preview / model-preview (pull_request) Successful in 2m27s
Details
This pull request has changes conflicting with the target branch.
  • items.json
  • texts/cs_CZ.lang
  • texts/de_DE.lang
  • texts/en_US.lang
  • texts/es_ES.lang
  • texts/pt_BR.lang
  • texts/ru_RU.lang
  • texts/zh_CN.lang
  • textures/item_texture.json
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

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/showdown-0.2-lang
git switch feature/showdown-0.2-lang
git rebase main
git switch main
git merge --ff-only feature/showdown-0.2-lang
git switch feature/showdown-0.2-lang
git rebase main
git switch main
git merge --no-ff feature/showdown-0.2-lang
git switch main
git merge --squash feature/showdown-0.2-lang
git switch main
git merge --ff-only feature/showdown-0.2-lang
git switch main
git merge feature/showdown-0.2-lang
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
smell-of-curry
3 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!16
No description provided.