Merge branch 'main' into diffselect-no-neiro-frame

Merge pull request 'entry: drop the 「つかわない」 caption' (#5 ) from GanYiZhong/YataiDONNijiiro:entry-no-cancel-caption into main
Reviewed-on: Yonokid/YataiDONNijiiro#5
2026-09-09 17:05:36 +02:00 · 2026-09-09 17:05:27 +02:00 · 2026-09-09 02:05:53 +08:00
1 changed files with 2 additions and 5 deletions
@@ -255,7 +255,6 @@ function SongSelect.new()
    -- the 演奏オプション panel, so the NEIRO slot is unreachable and is not drawn.
    local neiro_row = tex.get_skin_config("option_neiro_row")
    self._neiro_in_options = (neiro_row ~= nil) and (neiro_row.x >= 1)
-    self._id_btn_neiro   = (not self._neiro_in_options) and get_any("diff_select", "neiro") or nil
    self._id_btn_glow    = tex.get_id("yellow_box", "s_crown_clear")            -- 168x168 button cursor plate (moved off diff_select: every 1p/2p_* name there is drawn by the engine in 2P)
    self._id_small_crown = tex.get_id("diff_select", "difficulty_crown")       -- 40x40, frame = crown (0 none)
    self._id_small_rank  = tex.get_id("yellow_box", "s_crown_outline")          -- 40x40, frame = rank-1 (moved off 1p_outline_back)
@@ -1622,10 +1621,8 @@ function SongSelect:draw_song_diff_select(box)
    -- ROUND 4d (user): option = same 128 px plain icon as return, full opacity (main_diff_other_board
    -- 'option' / 'return' are the same-size boards; the cursor frame/glow geometry is shared in draw_selector)
    draw_centered(self._id_btn_option, DS_SLOT_X[DIFF_MODIFIER], DS_BTN_Y,   128, 128, { fade = fade })
-    if self._id_btn_neiro then
-        draw_centered(self._id_btn_neiro, DS_SLOT_X[DIFF_NEIRO], DS_NEIRO_Y, 80, 80,
-                      { fade = fade * 0.35, x2 = 80 - 168, y2 = 80 - 168 })
-    end
+    -- (The faint 80 px NEIRO placeholder frame that used to sit under the return button
+    -- is gone: the cabinet's course-select board has no such element.)

    -- diff boards
    for i = 0, 3 do
Author	SHA1	Message	Date
Yonokid	12ead8f71b	Merge branch 'main' into diffselect-no-neiro-frame	2026-09-09 17:05:36 +02:00
Yonokid	76168ea4bb	Merge pull request 'entry: drop the 「つかわない」 caption' (#5 ) from GanYiZhong/YataiDONNijiiro:entry-no-cancel-caption into main Reviewed-on: Yonokid/YataiDONNijiiro#5	2026-09-09 17:05:27 +02:00
TaikoZhongandClaude Fable 5.1	50cd893a3e	song select: drop the placeholder NEIRO frame under the return button The course-select board drew a faint 80 px square at (440, 602) as a stand-in for a separate NEIRO slot; the cabinet has no such element and it read as a stray popup. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 02:05:53 +08:00