Merge branch 'main' into folder-open-leg

Merge pull request 'Light effects: entry glow patch size, add-blended layers drawn additively' (#21 ) from GanYiZhong/YataiDONNijiiro:light-effects into main
Reviewed-on: Yonokid/YataiDONNijiiro#21
2026-09-10 19:32:18 +02:00 · 2026-09-10 19:32:08 +02:00 · 2026-09-11 00:38:33 +08:00 · 2026-09-11 00:37:30 +08:00 · 2026-09-10 18:35:47 +08:00 · 2026-09-10 07:26:09 +08:00
434 changed files with 5693 additions and 910 deletions
@@ -15,10 +15,6 @@
    "x": 0,
    "y": 0
  },
-  "s11": {
-    "x": 0,
-    "y": 0
-  },
  "s13": {
    "x": 0,
    "y": 0
@@ -12,16 +12,32 @@
    "y2": 1080
  },
  "glow": [
-    { "x": 1704, "y": 234 },
-    { "x": 0,    "y": 186 },
-    { "x": 1533, "y": 297 },
-    { "x": 1331, "y": 329 }
+    {
+      "x": 0,
+      "y": 186
+    },
+    {
+      "x": 1331,
+      "y": 234
+    }
  ],
  "twinkle": [
-    { "x": 1186, "y": -142 },
-    { "x": 576,  "y": 16 },
-    { "x": 206,  "y": -108 },
-    { "x": 928,  "y": 104 }
+    {
+      "x": 1186,
+      "y": -142
+    },
+    {
+      "x": 576,
+      "y": 16
+    },
+    {
+      "x": 206,
+      "y": -108
+    },
+    {
+      "x": 928,
+      "y": 104
+    }
  ],
  "tower": {},
  "shops_center": {},
@@ -0,0 +1,238 @@
+{
+  "s158": {
+    "x": 0,
+    "y": 0
+  },
+  "s160": {
+    "x": 0,
+    "y": 0
+  },
+  "s162": {
+    "x": 0,
+    "y": 0
+  },
+  "s164": {
+    "x": 0,
+    "y": 0
+  },
+  "s166": {
+    "x": 0,
+    "y": 0
+  },
+  "s168": {
+    "x": 0,
+    "y": 0
+  },
+  "s170": {
+    "x": 0,
+    "y": 0
+  },
+  "s172": {
+    "x": 0,
+    "y": 0
+  },
+  "s174": {
+    "x": 0,
+    "y": 0
+  },
+  "s176": {
+    "x": 0,
+    "y": 0
+  },
+  "s178": {
+    "x": 0,
+    "y": 0
+  },
+  "s180": {
+    "x": 0,
+    "y": 0
+  },
+  "s184": {
+    "x": 0,
+    "y": 0
+  },
+  "s274": {
+    "x": 0,
+    "y": 0
+  },
+  "s276": {
+    "x": 0,
+    "y": 0
+  },
+  "s278": {
+    "x": 0,
+    "y": 0
+  },
+  "s280": {
+    "x": 0,
+    "y": 0
+  },
+  "s282": {
+    "x": 0,
+    "y": 0
+  },
+  "s284": {
+    "x": 0,
+    "y": 0
+  },
+  "s286": {
+    "x": 0,
+    "y": 0
+  },
+  "s288": {
+    "x": 0,
+    "y": 0
+  },
+  "s290": {
+    "x": 0,
+    "y": 0
+  },
+  "s293": {
+    "x": 0,
+    "y": 0
+  },
+  "s295": {
+    "x": 0,
+    "y": 0
+  },
+  "s297": {
+    "x": 0,
+    "y": 0
+  },
+  "s299": {
+    "x": 0,
+    "y": 0
+  },
+  "s301": {
+    "x": 0,
+    "y": 0
+  },
+  "s303": {
+    "x": 0,
+    "y": 0
+  },
+  "s305": {
+    "x": 0,
+    "y": 0
+  },
+  "s307": {
+    "x": 0,
+    "y": 0
+  },
+  "s309": {
+    "x": 0,
+    "y": 0
+  },
+  "s311": {
+    "x": 0,
+    "y": 0
+  },
+  "s313": {
+    "x": 0,
+    "y": 0
+  },
+  "s316": {
+    "x": 0,
+    "y": 0
+  },
+  "s318": {
+    "x": 0,
+    "y": 0
+  },
+  "s320": {
+    "x": 0,
+    "y": 0
+  },
+  "s322": {
+    "x": 0,
+    "y": 0
+  },
+  "s324": {
+    "x": 0,
+    "y": 0
+  },
+  "s326": {
+    "x": 0,
+    "y": 0
+  },
+  "s328": {
+    "x": 0,
+    "y": 0
+  },
+  "s330": {
+    "x": 0,
+    "y": 0
+  },
+  "s332": {
+    "x": 0,
+    "y": 0
+  },
+  "s334": {
+    "x": 0,
+    "y": 0
+  },
+  "s336": {
+    "x": 0,
+    "y": 0
+  },
+  "s339": {
+    "x": 0,
+    "y": 0
+  },
+  "s341": {
+    "x": 0,
+    "y": 0
+  },
+  "s343": {
+    "x": 0,
+    "y": 0
+  },
+  "s345": {
+    "x": 0,
+    "y": 0
+  },
+  "s347": {
+    "x": 0,
+    "y": 0
+  },
+  "s349": {
+    "x": 0,
+    "y": 0
+  },
+  "s351": {
+    "x": 0,
+    "y": 0
+  },
+  "s353": {
+    "x": 0,
+    "y": 0
+  },
+  "s355": {
+    "x": 0,
+    "y": 0
+  },
+  "s357": {
+    "x": 0,
+    "y": 0
+  },
+  "s359": {
+    "x": 0,
+    "y": 0
+  },
+  "s411": {
+    "x": 0,
+    "y": 0
+  },
+  "s414": {
+    "x": 0,
+    "y": 0
+  },
+  "s417": {
+    "x": 0,
+    "y": 0
+  },
+  "s420": {
+    "x": 0,
+    "y": 0
+  }
+}
Author	SHA1	Message	Date
Yonokid	a0eedc6ae5	Merge branch 'main' into folder-open-leg	2026-09-10 19:32:18 +02:00
Yonokid	bebc6fe22e	Merge pull request 'Light effects: entry glow patch size, add-blended layers drawn additively' (#21 ) from GanYiZhong/YataiDONNijiiro:light-effects into main Reviewed-on: Yonokid/YataiDONNijiiro#21	2026-09-10 19:32:08 +02:00
TaikoZhongandClaude Fable 5.1	111269bc65	Result: the shinuchi SCORE caption is plain white too Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-11 00:38:33 +08:00
TaikoZhongandClaude Fable 5.1	2a7a6e7f1f	Song select: a furled board is drawn as crisp columns, not a squashed bitmap Squashing the 960-wide board texture to a few px averaged the outline away and, because the GPU picks the mip level from the larger axis, blurred every row too; the cabinet scales a vector shape and stays sharp. draw_board now builds a furled board from columns: both rounded corners at 1:1 and the band / panel / band between them scaled in proportion, each drawn from an 8 px flat slice of itself and magnified. Narrower than both corners it becomes a solid bar with the outline columns on either side and the flat centre between them (squeezed corners left two hollow strokes with nothing between). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-11 00:37:30 +08:00
TaikoZhongandClaude Fable 5.1	977bf23a2c	Song select: the folder close leg plays the cabinet's return half Closing a folder (もどる) had no wheel motion at all: the fly table only covered the open leg (clip f27..150), fly_offset only ran for kind "open", and the engine's 166 ms fade took the song boxes and the back board out right after the press -- the cabinet keeps them solid until they fly out (f184..204) and the board furls (f205..217). - anim/wheel_decide now spans f27..255 (open leg + `return` leg, straight from the cabinet clip); fly_offset plays the return half on the close leg: song boxes fly out, wait off screen across the swap (f219) and the genre boxes fly back in f234..254. f255 re-bases the clip, so the leg stops before it. - The engine's box fade is ignored during the pre-swap half of the close leg (box_fade); the clip channels already drive the back board's title fade and furl. Verified with captures: press -> boxes stay -> contents fade / boxes fly out -> back board furls -> genre board unfurls -> contents return -> boxes fly in. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 18:35:47 +08:00
TaikoZhongandClaude Fable 5.1	1c6243baf2	Song select: the decided genre board stays up while its songs load Opening a folder on this engine differs from the cabinet in one way that matters for the animation: the cabinet swaps the content 69 frames into the decide leg, this engine swaps when its loader is done, which can be a couple of seconds for a big folder. The leg clock parked one frame short of the swap (f113), i.e. with the decided board already furled away and the neighbours flown out, so the screen sat empty for the whole load -- and before that the engine re-grows the decided box's yellow frame, which made the board close and reopen right after the press. - The open leg now parks one frame short of the furl (f99): the decided board stays up, contents faded per the clip, as the loading state. On the swap the clock resumes from the furl, so furl (f100..113) and the new board's unfurl (f114..) play back to back; a swap that lands before the park point just lets the clock run. - The neighbours' fly-out (f86..99) plays before the swap as on the cabinet; it used to wait for the swap and then jump straight to the off-screen hold. - The decided board is remembered at OPEN_BEGIN and drawn fully open for the whole leg, past the engine's closed re-grow and past the moment the engine takes the box off the wheel for the loader (draw_overlays bridges it from the still-live box handle until it has furled). - The new content's song / back board is not drawn before the swap frame. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 07:26:09 +08:00
TaikoZhongandClaude Fable 5.1	f6f87682ea	Result: the スコア / SCORE caption is plain white on the cabinet The caption textures carried a heavy dark outline; the cabinet's board header shows the caption in plain white. Re-rendered with the skin font, white fill, no outline, same size and position as before. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 06:50:12 +08:00
TaikoZhongandClaude Fable 5.1	9c3c5c49f3	Result: centre the スコア caption on the board's header band The caption sat at y 281, which put its glyphs at 290..321 on a header band that spans 284..314, so the bottom of the text spilled onto the body of the board. At y 274 the glyphs sit at 283..314, centred on the band. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 06:21:18 +08:00
TaikoZhongandClaude Fable 5.1	818036e505	Fever backdrops: export the steady state, not the transition's parked copies The fever movies' root timeline is a state machine: frame 0 (`init`) parks the fly-in copies of the transition -- a second sky plate, the wave scrollers, the boats -- at alpha 0, and the steady state is the `fever` label, where only fever_mc remains. The export took the root's frame-0 children and forced the parked ones visible, so the third backdrop drew its sky and its big waves twice (one row over the other) and the boats and Mt Fuji ended up behind an extra wave layer. movie_export now takes the root's children at the `fever` label and only the ones shown there; all three fever backdrops re-exported. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 06:10:36 +08:00
TaikoZhongandClaude Fable 5.1	3887a9f288	Fever backdrop 3: stop painting the movie's mask plate bg_fever_a_03 places a full-stage plate at fever_mc depth 4 with a clip depth: it is a mask that only clips the layer above it and is never painted, but the export drew it as an ordinary leaf, which put a flat green sheet over the sky. movie_export now skips placements that carry a clip depth; re-exported, the plate and its texture are the only change. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 03:34:02 +08:00
TaikoZhongandClaude Fable 5.1	54c33d4475	Entry: bake the warm glows as two non-overlapping patches The four pre-composited patches overlapped (2 and 3 by 31 px, and after the size fix 0 and 2 as well), and where they overlapped the later patch replaced the earlier one's glow instead of adding to it, which showed as a vertical dark band between the lamps. The glows are now summed onto the backdrop once and cut into two boxes that do not touch: the left lamp, and the three right-hand lamps together. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 03:30:55 +08:00
TaikoZhong	fd0242e31e	Update checksums.sha256 for the changed textures and scripts	2026-09-10 03:30:03 +08:00
TaikoZhongandClaude Fable 5.1	4d3127d9ea	Replay the cabinet's add-blended light effects as additive The exported clips and backdrop movies were drawn source-over everywhere, but the cabinet places a number of glow layers with its add blend mode: the lantern glows of the lower backdrops (bg_nomal_a_01..05), the crown's radial burst, the score rank plate's effect copy, and the full-combo / donderful letter glows. Drawn source-over, those textures show up as dark or grey patches. - movie_export / clip_export record the placement's blend mode (`blend = 8` on a backdrop leaf, an 8th row value on a clip leaf; the root placement's mode is folded into its group), and bg_anim / clip_player / ending draw such leaves with blend = "additive". Data re-exported; only the blend field changed. - result_crown: the burst copies draw additively; the crown_loop shine sweep is a plain white polygon on the cabinet, so gleam frames 0..2 are white now instead of the atlas colour they were exported with. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 01:49:19 +08:00
TaikoZhongandClaude Fable 5.1	acfc59c69e	Entry: give the four warm-glow patches one common size The engine sizes every frame of a folder texture like frame 0 (source rect and default x2/y2), so the 177x311 and 233x233 patches were being stretched to 216x311 and their edges showed as boxes around the lamps. Each patch is now padded to 233x311 with the untouched backdrop around it; the patch is bg + glow, so the extra backdrop is invisible at any fade. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 01:49:17 +08:00
Yonokid	939d7d2e8c	Update checksums.sha256	2026-09-09 12:07:03 -04:00
Yonokid	3c8a16c6f6	Merge pull request 'Song select: the course mark pops to its decided look once the course is locked in' (#20 ) from GanYiZhong/YataiDONNijiiro:diff-mark-decide into main Reviewed-on: Yonokid/YataiDONNijiiro#20	2026-09-09 17:35:33 +02:00
Yonokid	cb641b96be	Merge branch 'main' into diff-mark-decide	2026-09-09 17:35:23 +02:00
Yonokid	bec74c81f5	Merge pull request 'Score rank (粋 / 雅 / 極): in-game badge and result plate' (#19 ) from GanYiZhong/YataiDONNijiiro:score-rank-display into main Reviewed-on: Yonokid/YataiDONNijiiro#19	2026-09-09 17:35:14 +02:00
Yonokid	f9204ce321	Merge branch 'main' into score-rank-display	2026-09-09 17:33:26 +02:00
Yonokid	43ea983afe	Merge pull request 'Ending banners: replay the original clips (clear / full combo / donderful / fail)' (#18 ) from GanYiZhong/YataiDONNijiiro:ending-clips into main Reviewed-on: Yonokid/YataiDONNijiiro#18	2026-09-09 17:25:58 +02:00
Yonokid	b949ab4c44	Merge pull request 'Entry: draw the mode-select cursor glow under the board' (#17 ) from GanYiZhong/YataiDONNijiiro:entry-mode-cursor-under into main Reviewed-on: Yonokid/YataiDONNijiiro#17	2026-09-09 17:25:26 +02:00
Yonokid	f90d6b2be0	Merge branch 'main' into entry-mode-cursor-under	2026-09-09 17:22:51 +02:00
Yonokid	2801122c3a	Merge pull request 'Lower backdrops: replay every element of the original movies' (#16 ) from GanYiZhong/YataiDONNijiiro:lower-bg-anim into main Reviewed-on: Yonokid/YataiDONNijiiro#16	2026-09-09 17:21:58 +02:00
TaikoZhongandClaude Fable 5.1	cc8ccdd83d	Song select: the course mark pops to its decided look once the course is locked in main_diff_mark 'course_decide_start' (frames 35..64): once player:difficulty_decided() (engine PR #162) the translucent 680x680 mark behind the difficulty board goes opaque over a white backing, stretching to 1.235x its height and back while a white copy flashes on top, then holds the 'course_decide' look. Opaque shapes of mark_course (course_1..5) and mark_course_white exported to Graphics/song_select/diff_mark_anim. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 16:09:11 +08:00
TaikoZhongandClaude Fable 5.1	8ac1ac9f22	Result: play the score-rank sound with the rank plate The original plays se_result `scorerank_NN_<seat>` (one sample for every rank) when the plate appears; shipped as scorerank_{c,l,r} and played when the ScoreRank state starts, seat chosen like the crown sound. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 15:26:32 +08:00
TaikoZhongandClaude Fable 5.1	cb022740cd	Score rank badge: one clip, restarted per rank line The original only ever plays `in`; the clip then keeps and fades out by itself, and a new rank line restarts it. Exported as one 162-frame clip instead of the in/out pair, so the plate fades out after its keep span as on the cabinet. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 15:12:23 +08:00
TaikoZhongandClaude Fable 5.1	70154489f0	Score rank (粋 / 雅 / 極): in-game badge and result plate - In game: the rank plate slides in at the player panel's top-left as the score crosses each rank line (500k white, 600k bronze, 700k silver, 800k gold, 900k pink, 950k purple, 1M rainbow), swapping through the out/in pair on the next line. Uses the engine's Background:handle_score hook. - Result: a ScoreRank state between the score count-up and the crown, playing the original's plate clip (極 with its own burst) under the score box. - Song select already draws the chips from the stored rank. Clips exported from the original with the rank plates as swappable shapes; Scripts/game/clip_player.lua is the shared frame player. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 14:44:37 +08:00
TaikoZhongandClaude Fable 5.1	f1744e859b	Ending banners: replay the original clips (clear / full combo / donderful / fail) Uses the engine's new Background:handle_ending / draw_ending hook. The four ending clips are exported frame by frame (Scripts/game/ending_anim, textures under game/ending_<kind>_anim) and replayed on the lane at 60 fps: the banner text reveal, the fans, the two dancers and the confetti all move as in the original, then loop. Without the engine hook the skin's static plates still draw as before. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 14:07:48 +08:00
TaikoZhongandClaude Fable 5.1	ea77074484	Entry: draw the mode-select cursor glow under the board The original stacks the cursor glow below the board, so the characters that lean out of the board stand in front of it; ours drew the glow on top and covered them. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 13:46:32 +08:00