Implement Halloween Update Res #21
bot
smell-of-curry
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "feature/halloween-update"
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?
Review @
52693e19(res companion to beh#774).Blockers:
build-and-test (20.x)is red on this head (run 391). Fix before merge.electabuzz/electabuzz.png.png,electabuzz/shiny_electabuzz.png.png,electivire/electivire.png.png,electivire/shiny_electivire.png.png,elekid/elekid.png.png,elekid/shiny_elekid.png.png. Nothing references them; delete them.Cleanup:
subpacks/3d/textures/entity/pokemon/eevee/shiny_eevee_halloween.pngis unreferenced (entity uses male/female shiny variants). Drop it or wire it.leafeon_halloween.png/shiny_leafeon_halloween.pngand the defaultleafeon_halloweensprite are added, but leafeon gets no halloween texture/render-controller wiring and has no dark sprite. Either finish leafeon or pull the assets.jolteon_holloween.animation.jsonfilename typo; rename tojolteon_halloween.item.pokeb:candy_bagwas removed and the texture renamed tohalloween_candy_bag. Make sure beh#774 actually renamed the item id, or the old item loses its name and icon.scripts/data/customizations.ts(trailing commas stripped across ~360 lines), and the array collapsing inanimation_controllers/trainer.json/render_controllers/trainer.json. That buries the real halloween entries and is a likely cause of the red CI if prettier/lint runs. Revert the formatting and keep only the real changes.skin_index == 0. Fine if the halloween geos lack those bones, otherwise halloween skins never blink or attack.No open res issues to link.
@ -5,3 +5,3 @@ParticleEffectId,PokemonSkinOptionObject,MaterialId,MaterialIdUnrelated formatting churn: trailing commas stripped across the whole file. Revert it so the diff only shows the halloween/electivire entries; this is also a likely cause of the red CI.
@ -16,0 +14,4 @@"female_default": "textures/entity/pokemon/eevee/female_eevee.png","shiny_female_default": "textures/entity/pokemon/eevee/female_shiny_eevee.png","male_halloween": "textures/entity/pokemon/eevee/male_eevee_halloween.png","shiny_male_halloween": "textures/entity/pokemon/eevee/shiny_male_eevee_halloween.png",shiny_male_eevee_halloween.pngdoesn't exist. The file added in this PR ismale_shiny_eevee_halloween.png. Same on line 19:shiny_female_eevee_halloween.pngvs the addedfemale_shiny_eevee_halloween.png. Shiny halloween Eevee renders with a missing texture.@ -216,0 +238,4 @@# Bossbarsbossbar.bob=Bob The Undefeatedbossbar.randy=Randy The Candy TheifTypo:
Theifshould beThief. Same in the other 6 locales.@ -4598,0 +4644,4 @@boss.message.deathPrefix=§4§l[World Boss]§r §cboss.message.noCredit=§cYou did not receive world boss credit. §7Required: §e%s%§7 damage.boss.message.creditReceived=§aYou received world boss kill credit!boss.actiobar.damageDisplay=§cBoss HP: §f%s% §8| §6Your Damage: §f%s%Key typo:
boss.actiobarshould beboss.actionbar. Fix it here and in every locale, and in beh#774 if it reads this key.Minecraft Model Preview (
52693e1)Model Changes
Review @
858a4881(res companion to beh#774). Delta since52693e19is lang-only: addscommands.worldbosses.remove.error.notActive/remove.success.removedto all 7 locales. Keys look fine and match the existing worldbosses block.Still blocking from the
52693e19review, none addressed:build-and-test (20.x)still red on this head..png.pngduplicate textures (electabuzz/electivire/elekid) still in the diff.boss.actiobarandTheiftypos still present in every locale.scripts/data/customizations.tsformatting churn still there.Rest of the cleanup list from the previous review still applies.
Minecraft Model Preview (
858a488)Model Changes
Review @
7ce4b00e(res companion to beh#774). Delta since858a4881: boss spawn/death broadcast strings, the# Bossbarsheader fixed to## Bossbars, molang+prefix cleanup on the eevee/jolteon halloween leg anims, catmullrom to linear on espeon/sylveon tracks, and the Halloween spirit server-drop string.Delta is fine apart from the inline notes. The
##header fix is correct (a single#line isn't a comment in Bedrock lang).Still blocking, none addressed:
build-and-test (20.x)is still red on this head (run 395)..png.pngduplicate textures (electabuzz/electivire/elekid, 6 files) still in the diff.scripts/data/customizations.tsformatting churn still there (+384/-340).boss.actiobarandbossbar.randy=...Theiftypos still present in every locale.jolteon_holloween.animation.jsonfilename typo still there.shiny_eevee_halloween.pngstill dangling.Rest of the
52693e19cleanup list still applies. No open res issues to link.@ -3851,3 +3895,3 @@commands.serverDrop.broadcast.shopThreshold=§aThe PokeBedrock Shop has reached its donation threshold!commands.serverDrop.broadcast.shopUrl=§ehttps://pokebedrock.com/shopcommands.serverDrop.error.boosterFailed=§cFailed to activate server-drop booster: %scommands.serverDrop.trigger.halloweenSpirit=§5A mysterious spirit has awakened within §dGraveHollow§5... §6§lTHE HALLOWEEN SPIRIT§r§5 has blessed the server with a special booster, and a §eLegendary Pokémon§5 has appeared near a §brandom player§5! Who could be the §alucky trainer§5?This string depends on the beh#774
halloween_spiritserver-drop trigger, which is still a blocker there (player-triggered server drops). Don't land this ahead of that being settled. Also the§lbold stays on past§r-less color changes only until the§rhere, fine, but every non-English locale got the English text verbatim; ok as a fallback, just call it out if translators are expected to pick it up.@ -4598,0 +4648,4 @@boss.actiobar.damageDisplay=§cBoss HP: §f%s% §8| §6Your Damage: §f%s%boss.spawn.bob=The ground trembles beneath your feet... BOB THE UNDEFEATED has awakened! Will anyone finally put him to rest?boss.spawn.randy=The catacombs begin to tremble... RANDY THE CANDY THIEF has awoken deep within the catacombs! Guard your candy, for his hunger knows no bounds!New keys spell it THIEF, but
bossbar.randystill saysTheif. Fix the bossbar so the boss name is spelled the same in the bar and the broadcast.Minecraft Model Preview (
7ce4b00)Model Changes
Delta review for
5a87d921(Update Hex Mania Model). The new geo parses fine:geometry.hex_maniastill matchesentity/npcs/hex_mania.json, 29 bones with no duplicates or orphans, and the texture is a real 128x128 PNG that matchestexture_width/texture_height.Two inline notes on the delta. Also, CI
build-and-test (20.x)is still red on this head (run 397), and the earlier blockers from reviews 3108, 3111 and 3118 are still open, so this stays at request changes.@ -3244,0 +511,4 @@]},{"name": "eyes",Nit: this file is now tab-indented with no trailing newline. The old version and the rest of
models/use 2-space JSON, and that's why the diff shows a full rewrite (3243 lines down to 855) for what is really a model swap. Please re-save it with the repo formatting so later diffs stay reviewable.@ -3244,0 +694,4 @@]},{"name": "skirt",The
points,pointandbottomPointbones are gone from this model, butanimations/npcs/hex_mania.animation.json(animation.hex_mania.idle) still keyframes all three. Those channels now silently do nothing. If dropping the skirt points was on purpose, please trim them out of the idle animation too. If not, they got lost in the re-export.Minecraft Model Preview (
5a87d92)Model Changes
Minecraft Model Preview (
bdb179d)Model Changes
Delta review for
bdb179df(Update Hex Mania Animations). Single-file change toanimations/npcs/hex_mania.animation.json.Good: the orphan
points/point/bottomPointkeyframes from the geo review are gone, and every remaining bone in the idle anim exists ongeometry.hex_mania.New blocker on this delta:
format_versionwas dropped from1.10.0→1.8.0. Repovalidate:formatVersionsrequires animations ≥1.10.0, and CIbuild-and-test (20.x)is already red on this head (run 399) at Validate format versions. Bump it back to1.10.0(or whatever the validator accepts).Still open from earlier reviews (3108 / 3111 / 3118) — not re-inlined:
.png.pngjunk textures for electabuzz / electivire / elekidjolteon_holloween.animation.jsonfilename typoboss.actiobarandbossbar.randy=...Theiftypos in all localesshiny_male_eevee_halloween.png/shiny_female_eevee_halloween.png); on-disk names aremale_shiny_…/female_shiny_…, plus unreferencedshiny_eevee_halloween.pngscripts/data/customizations.tsformatting churnNo open res issues to link (list is PRs only). Res companion — no BEH Reviewer nudge.
@ -2348,3 +2,1 @@}}}"format_version": "1.8.0",Blocker:
format_versionis1.8.0here, butscripts/validateFormatVersions.tsrequires animations ≥1.10.0(and the previous idle file was already1.10.0). This is what is failing CI run 399 at Validate format versions. Set it back to1.10.0.Minecraft Model Preview (
0f38a70)Model Changes
Delta review for
0f38a703(Resolve Res Repo PR Comments). Compared againstbdb179df.Fixed in this push, thanks:
format_versionback to1.10.0. It's gone from the validator output.jolteon_holloween.animation.jsonrenamed tojolteon_halloween.animation.json.bossbar.randynow saysThief, andboss.actiobaris nowboss.actionbarin all 7 locales. Both keys match what beh#774 reads.male_shiny_…/female_shiny_…).forms.quest(s|Npc).requirement.interactWith/interactWithUsingkeys match beh#774's key names and%1/%2arg counts. Non-English locales get the English text, which is fine as a fallback.Still blocking:
build-and-test (20.x)is still red on this head (run 411). It fails atvalidate:formatVersionswith 38 errors, all in files this PR adds or touches. Geos are at1.12.0(needs1.21.0), animations at1.8.0(needs1.10.0), andentity/bosses/randy.jsonis at1.10.0(needs1.18.3). Several are downgrades of files that main already has at the right version, e.g.subpacks/3d/animations/pokemon/eevee.animation.json(main1.10.0→ PR1.8.0) andsubpacks/3d/models/entity/pokemon/leafeon.geo.json(main1.21.0→ PR1.12.0). The Eeveelution/electabuzz line exports were made from pre-bump copies. Main now hasnpm run fix:formatVersions(#22). Rebase on2081f113, run it, and commit the result. Hex Mania was only one of the 39 errors on run 399..png.pngjunk textures are still in the tree. That's 6 files under electabuzz / electivire / elekid.scripts/data/customizations.tsformatting churn is still there (trailing commas stripped, +399/-351 together with thetrainer.jsonarray collapsing). Revert it and keep only the real entries.Still open cleanup:
subpacks/3d/textures/entity/pokemon/eevee/shiny_eevee_halloween.png, and alsoeevee/eevee_halloween.png(the entity only uses the male/female variants, and theeevee_halloweenitem sprite points attextures/sprites/).leafeon_halloween.png/shiny_leafeon_halloween.pngand the sprite are still added, butleafeon.entity.jsonhas no halloween texture or geometry keys. Finish it or pull the assets.pokeb:halloween_candy_bag(iconhalloween_candy_bag), so that part is resolved. Butitems.jsonstill has"pokeb:candy_bag": "candy_bag", and thecandy_bagkey no longer exists initem_texture.json. Drop the stale row or point it at the new id.No open res issues to link. Res companion, so no BEH Reviewer nudge.
@ -1,2442 +1,304 @@{"format_version": "1.10.0","format_version": "1.8.0",Regression vs main: this file is
1.10.0on2081f113and this PR takes it back to1.8.0, which is one of the 38validate:formatVersionserrors in run 411. The same thing happened across the other Eeveelution/elec-line anims (1.8.0) and geos (1.12.0, but main has them at1.21.0). Rebase and runnpm run fix:formatVersionsinstead of hand-editing each file.Minecraft Model Preview (
9249ad5)Model Changes
Delta review for
9249ad51(Update asset formats and candy bag key). Compared against0f38a703.Fixed in this push, thanks:
1.21.0, anims1.10.0,entity/bosses/randy.json1.18.3). No more downgrades vs main on the files that were failing.build-and-test (20.x)is green on this head (run 413). Model Preview also green (run 414).items.jsonnow mapspokeb:halloween_candy_bag→halloween_candy_bag(stalepokeb:candy_bagrow dropped). Matchesitem_texture.jsonand beh#774.Still blocking:
.png.pngjunk textures still in the tree (electabuzz / electivire / elekid — 6 files). Nothing references them; delete them.scripts/data/customizations.tsformatting churn is still there (trailing commas stripped, +384/−340). Same for thetrainer.jsonarray collapsing. Revert and keep only real halloween entries.Still open cleanup:
shiny_eevee_halloween.pngandeevee_halloween.png(entity only uses male/female variants).leafeon.entity.jsonhas no halloween texture/geometry keys (this delta only added blink). Finish it or pull the assets.No open res issues to link. Res companion, so no BEH Reviewer nudge.
Delta review for
07e2e357(Add spirit and world boss failure strings). Compared against9249ad51.Lang delta (+21/−0 across 7 locales) looks good:
commands.halloweenSpirit.error.active,commands.halloweenSpirit.error.cooldown(%1min), andcommands.worldbosses.spawn.error.failed(%1boss name).%1placeholders are consistent, and all 7 locales have parity (non-EN get English fallback, same as prior spirit/worldboss strings).CI:
build-and-test (20.x)is green on this head (run 415). Model Preview was still running at review time (run 416).Still blocking from review 3150 (unchanged by this push):
.png.pngjunk textures still in the tree (electabuzz / electivire / elekid — 6 files). Nothing references them; delete them.scripts/data/customizations.tsformatting churn is still there (trailing commas stripped, +399/−351 with thetrainer.jsonarray collapsing). Revert and keep only real halloween entries.Still open cleanup:
shiny_eevee_halloween.pngandeevee_halloween.png(entity only uses male/female variants).leafeon.entity.jsonhas no halloween texture/geometry keys. Finish it or pull the assets.No open res issues to link. Res companion, so no BEH Reviewer nudge.
Minecraft Model Preview (
07e2e35)Model Changes
Re-review @
984c573("Drop unused Halloween textures and formatting churn")Prior bot REQUEST_CHANGES 3154 @
07e2e35is stale. Most of it is fixed on this head.Fixed
.png.pngElectabuzz-line files are gone; no.png.pngrefs left in the PR.scripts/data/customizations.tschurn is gone. The file is now +39/−0, just the Halloweenskinsentries.eevee_halloween.png/shiny_eevee_halloween.pngand the unwired Leafeon Halloween textures/sprite are removed. Eevee now uses the male/female Halloween set that the 3D entity and render controller actually reference.commands.halloweenSpirit.*was renamed toevents.halloweenSpirit.*in all 7 lang files. That matches what beh#774 (f80312b2) calls viat()and puts inlangKeys.ts.customizations.tsexist on this head.Still blocking (small)
trainer.jsonarray collapsing from 3154 is still here.animation_controllers/trainer.jsoncollapseswalking/swimmingandrender_controllers/trainer.jsoncollapsestextures. Neither change is needed for the Igor/Frankenstein entries. Revert those three hunks so the trainer diff is only the new skins.Nits
eevee_halloween.animation.jsonwired throughcontroller.animation.pokemon.eevee(v.skin_index == 1), but itscustomizations.tsentry lists onlytexture/shiny_texture/model. Jolteon and Electivire listanimationsfor the same setup, so check whether Eevee needs it too.events.halloweenSpirit.*sits in the middle of thecommands.*block (betweencommands.geodexandcommands.hatch). Move it out so the file stays grouped.CI:
build-and-testandModel Previeware still pending on this SHA. No open res issues, so no issue link.@ -216,3 +222,1 @@"animations": ["walking"],"animations": ["walking"],Unrelated collapse of
"animations": ["walking"](andswimmingat L231). Revert to the multi-line form; this PR only needs theigor_idle/frankenstein_scientist_idleentries.@ -203,3 +207,1 @@"textures": ["Array.skins[query.property('pokeb:skin_index')]"]"textures": ["Array.skins[query.property('pokeb:skin_index')]"]Unrelated collapse of the
texturesarray. Revert it; the only change needed here is addingTexture.igor/Texture.frankenstein_scientistand the matching geometries.@ -267,2 +267,4 @@eevee: {genderDifferences: ["texture"],skins: {halloween: ["texture", "shiny_texture", "model"],Eevee now ships
eevee_halloween.animation.jsonand swaps animations onv.skin_index == 1, but this entry has noanimations. Jolteon and Electivire both list it for the same setup. Add it if the skin system uses this list for anything.Minecraft Model Preview (
984c573)Model Changes