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 17:05:06 +02:00 · 2026-09-09 11:04:40 -04:00 · 2026-09-09 06:32:40 +02:00 · 2026-09-09 06:32:29 +02:00
12 changed files with 28 additions and 31 deletions
@@ -301,11 +301,11 @@
  ],
  "bar_clear_transition": [
    {
-      "x": 741,
+      "x": 738,
      "y": -63
    },
    {
-      "x": 741,
+      "x": 738,
      "y": -87
    }
  ],
@@ -351,42 +351,42 @@
  ],
  "bar_clear_transition_fade": [
    {
-      "x": 732,
-      "y": -63
+      "x": 738,
+      "y": -60
    },
    {
-      "x": 732,
-      "y": -87
+      "x": 738,
+      "y": -84
    }
  ],
  "bar_clear_fade": [
    {
-      "x": 732,
-      "y": -63
+      "x": 738,
+      "y": -60
    },
    {
-      "x": 732,
-      "y": -87
+      "x": 738,
+      "y": -84
    }
  ],
  "1p_bar_fade": [
    {
-      "x": 732,
-      "y": -31
+      "x": 738,
+      "y": -27
    },
    {
-      "x": 732,
-      "y": -87
+      "x": 738,
+      "y": -84
    }
  ],
  "2p_bar_fade": [
    {
-      "x": 732,
-      "y": -31
+      "x": 738,
+      "y": -27
    },
    {
-      "x": 732,
-      "y": -87
+      "x": 738,
+      "y": -84
    }
  ],
  "tamashii": [
@@ -16,7 +16,9 @@
            "dan_confirm_yes_left": false,
            "songselect_2p_join": true,
            "costume_preset_slots": true,
-            "dan_title_horizontal": true
+            "dan_title_horizontal": true,
+            "combo_color_tiers": true,
+            "gauge_cell_fade_in": true
        }
    },
    "score_counter_pos": {
@@ -540,6 +542,9 @@
    "note_arc_start_x_offset": {
        "x": 522
    },
+    "gauge_cells": {
+        "x": 50
+    },
    "gauge_hit_effect_note": {
        "x": 1738,
        "y": -126,
@@ -381,13 +381,8 @@ function Entry:draw_credit(a, sel, blink_f, flash_row, flash_a, loop_rows)
        tex.draw_texture(self.cr_flash, { index = sel - 1, fade = a * pulse })
    end

-    if sel == 0 and self.text_cancel then
-        self.text_cancel:draw({
-            x    = math.floor(CANCEL_CX - self.text_cancel.width / 2 + 0.5),
-            y    = math.floor(CANCEL_CY - self.text_cancel.height / 2 + 0.5),
-            fade = a,
-        })
-    end
+    -- The cabinet never shows a 「つかわない」 caption on this screen (the cancel side is
+    -- just the un-armed state), so nothing is drawn for sel == 0.

    if flash_row and flash_a and flash_a > 0.002 then
        tex.draw_texture(self.cr_flash, { index = flash_row - 1, fade = a * flash_a })
@@ -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
Yonokid	8ad6f0a24d	Merge branch 'main' into entry-no-cancel-caption	2026-09-09 17:05:06 +02:00
Yonokid	2a83611372	Merge branch 'GanYiZhong-fix-gauge-fade'	2026-09-09 11:04:40 -04:00
Yonokid	a82fcee8e6	Merge pull request 'Enable gauge_cell_fade_in' (#3 ) from GanYiZhong/YataiDONNijiiro:sco-gauge-cell-fade-in into main Reviewed-on: Yonokid/YataiDONNijiiro#3	2026-09-09 06:32:40 +02:00
Yonokid	978beb1d21	Merge branch 'main' into sco-gauge-cell-fade-in	2026-09-09 06:32:29 +02:00
Yonokid	c098e1147a	Merge pull request 'Enable combo_color_tiers (silver 50+, gold 100+)' (#2 ) from GanYiZhong/YataiDONNijiiro:sco-combo-color-tiers into main Reviewed-on: Yonokid/YataiDONNijiiro#2	2026-09-09 06:23:22 +02:00
TaikoZhongandClaude Fable 5.1	4c2a7da14b	gauge: draw the fill on the cabinet's 50-cell / 21 px grid The gauge art (border/overlay separators, クリア box, 魂) is a 50-cell, 21 px grid from x=738, but the fill pieces were 12 px wide and the engine stepped in 87 units, so the fill edge landed mid-cell ("超過但不到一格"). Declare gauge_cells = 50 (engine reads it via skin_entry) and widen every fill piece to one 21 px cell; the fade/transition pieces are anchored on the cell they belong to and lined up with the bar rows (1P -34 / 2P -91). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 04:46:42 +08: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
TaikoZhongandClaude Fable 5.1	91529eeb53	entry: drop the 「つかわない」 caption The cabinet's entry screen has no such caption; the cancel side is simply the un-armed state, so the label sat as stray text under the prompts. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 23:04:54 +08:00
TaikoZhongandClaude Fable 5.1	9b16a03b66	Enable gauge_cell_fade_in (new gauge cell fades in instead of flashing) Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 21:22:41 +08:00
TaikoZhongandClaude Fable 5.1	b50605c3f1	gauge: align the cell fade-in sprite with the bar 1p/2p_bar_fade was a 24 px (two-cell) sprite drawn half a cell left of the new cell and 3 px below the bar (4 px for 2P), so gaining a cell looked like a half-cell bump. Crop it to one cell (12 px), anchor it on the new cell and line its body up with the bar rows. Gauge frame position is unchanged. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 20:29:19 +08:00
TaikoZhongandClaude Fable 5.1	a9c214e5d0	Enable combo_color_tiers (silver 50+, gold 100+) Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 17:02:04 +08:00