Merge branch 'main' into fix/dan-select-parent

Reviewed-on: #41

.gitattributes

@@ -1,6 +1,6 @@
+* -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.ogg filter=lfs diff=lfs merge=lfs -text
 *.mp4 filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
-*.ttf. filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text

Graphics/background/bga_bg_fever_2/texture.json

@@ -15,10 +15,6 @@
     "x": 0,
     "y": 0
   },
-  "s11": {
-    "x": 0,
-    "y": 0
-  },
   "s13": {
     "x": 0,
     "y": 0

Graphics/copyright/kenri/texture.json

@@ -1,10 +0,0 @@
-{
-  "page1": {
-    "x": 0,
-    "y": 0
-  },
-  "page2": {
-    "x": 0,
-    "y": 0
-  }
-}

Graphics/dan_result/result_info/texture.json

@@ -128,5 +128,25 @@
     "rank_plate": {
         "x": 64,
         "y": 57
+    },
+    "unreached_ja": {
+        "x": 1252,
+        "y": 171
+    },
+    "unreached_en": {
+        "x": 1252,
+        "y": 171
+    },
+    "unreached_ko": {
+        "x": 1252,
+        "y": 171
+    },
+    "unreached_zh": {
+        "x": 1252,
+        "y": 171
+    },
+    "nosave": {
+        "x": 1344,
+        "y": 22
     }
 }

Graphics/dan_select/animation.json

@@ -114,9 +114,13 @@
     "type": "move",
     "duration": 333.33,
     "total_distance": 548,
-    "comment": "ROUND 17: copied verbatim from song_select/animation.json so the 演奏オプション panel the 段位道場 confirmation dialog's option chip opens runs identically on DAN_SELECT. ModifierSelector's constructor reads 28/29/30/31/32 (+39 optional) and get_animation THROWS on a missing id; a child animation.json replaces the parent's rather than merging, so DAN_SELECT had none of them. option/neiro panel slide IN. Arcade song_select_main_diff_option MC65 'board_left' label 'in' = 20 frames @60fps (333.33 ms), PIECEWISE LINEAR through an OVERSHOOT: y 650 -> -75 over frames 0..14, then -75 -> 0 over frames 14..19. Engine space: json y 1080, resting top 532 => total_distance 548, waypoint 548+75 = 623 at 14/19 = 0.7368. (MC64 'board_right' reaches -75 one frame later, at 15/19; not portable, the two boards share one animation id here.)",
-    "waypoint": 623,
-    "waypoint_at": 0.7368
+    "waypoints": [
+      {
+        "at": 245.6,
+        "value": 623
+      }
+    ],
+    "comment": "ROUND 17: copied verbatim from song_select/animation.json so the 演奏オプション panel the 段位道場 confirmation dialog's option chip opens runs identically on DAN_SELECT. ModifierSelector's constructor reads 28/29/30/31/32 (+39 optional) and get_animation THROWS on a missing id; a child animation.json replaces the parent's rather than merging, so DAN_SELECT had none of them. option/neiro panel slide IN. Arcade song_select_main_diff_option MC65 'board_left' label 'in' = 20 frames @60fps (333.33 ms), PIECEWISE LINEAR through an OVERSHOOT: y 650 -> -75 over frames 0..14, then -75 -> 0 over frames 14..19. Engine space: json y 1080, resting top 532 => total_distance 548, waypoint 548+75 = 623 at 14/19 = 0.7368. (MC64 'board_right' reaches -75 one frame later, at 15/19; not portable, the two boards share one animation id here.)"
   },
   {
     "id": 29,
@@ -153,8 +157,12 @@
     "type": "move",
     "duration": 333.33,
     "total_distance": 548,
-    "waypoint": -75,
-    "waypoint_at": 0.2105,
+    "waypoints": [
+      {
+        "at": 70.17,
+        "value": -75
+      }
+    ],
     "comment": "ROUND 17: copied verbatim from song_select/animation.json so the 演奏オプション panel the 段位道場 confirmation dialog's option chip opens runs identically on DAN_SELECT. ModifierSelector's constructor reads 28/29/30/31/32 (+39 optional) and get_animation THROWS on a missing id; a child animation.json replaces the parent's rather than merging, so DAN_SELECT had none of them. option/neiro panel slide OUT (ModifierSelector/NeiroSelector pick this up on confirm when it exists; without it they replay id 28). Arcade MC65 label 'out' = frames 25..44: y 0 -> -75 over 4 frames, then -75 -> 650 over 15. Engine space the drawn y is `attribute + song_select_offset.x` (= -548 in this skin), so attribute runs 0 -> -75 at 4/19 = 0.2105 -> 548."
   }
 ]

Graphics/entry/background/texture.json

@@ -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": {},

Graphics/entry/global/texture.json

@@ -1,10 +0,0 @@
-{
-  "player_entry_en": {
-    "x": 0,
-    "y": 0
-  },
-  "player_entry_ja": {
-    "x": 0,
-    "y": 0
-  }
-}

Graphics/game/animation.json

@@ -92,38 +92,36 @@
  {
   "id": 11,
   "type": "move",
-  "duration": 250,
-  "total_distance": 1080,
-  "ease_out": "quadratic",
-  "comment": "kusudama move down"
- },
- {
-  "id": 12,
-  "type": "move",
-  "duration": 83.33,
-  "total_distance": 150,
-  "delay": {
-   "reference_id": 11,
-   "property": "duration"
-  },
+  "duration": 333.33,
+  "total_distance": 930,
   "ease_in": "quadratic",
-  "comment": "kusudama move up"
+  "waypoints": [
+   {
+    "at": 250,
+    "value": 1080,
+    "ease_out": "quadratic"
+   }
+  ],
+  "comment": "kusudama move down/up (merged from old ids 11+12; engine cf785cf)"
  },
  {
   "id": 13,
   "type": "move",
-  "duration": 116.67,
-  "total_distance": 420,
+  "duration": 233.34,
+  "total_distance": -360,
   "ease_out": "quadratic",
+  "waypoints": [
+   {
+    "at": 116.67,
+    "value": -420,
+    "ease_out": "quadratic"
+   }
+  ],
   "delay": {
-   "init_val": {
-    "reference_id": 11,
-    "property": "duration"
-   },
-   "reference_id": 12,
+   "reference_id": 11,
    "property": "duration"
   },
-  "comment": "kusudama renda move up"
+  "comment": "kusudama renda move up/down (merged from old ids 13+18)"
  },
  {
   "id": 14,
@@ -132,11 +130,7 @@
   "initial_opacity": 0.0,
   "final_opacity": 1.0,
   "delay": {
-   "init_val": {
-    "reference_id": 11,
-    "property": "duration"
-   },
-   "reference_id": 12,
+   "reference_id": 11,
    "property": "duration"
   },
   "comment": "kusudama renda fade in"
@@ -165,22 +159,6 @@
   "loop": true,
   "comment": "renda breathing"
  },
- {
-  "id": 18,
-  "type": "move",
-  "duration": 116.67,
-  "total_distance": 60,
-  "delay": {
-   "init_val": {
-    "reference_id": 13,
-    "property": "duration"
-   },
-   "reference_id": 13,
-   "property": "delay"
-  },
-  "ease_out": "quadratic",
-  "comment": "kusudama renda move down"
- },
  {
   "id": 19,
   "type": "texture_change",
@@ -460,23 +438,12 @@
  },
  {
   "id": 24,
-  "type": "sample",
-  "table": "gogo_fire",
-  "track": "#37@1",
-  "field": "sx",
-  "range": [
-   10,
-   42
-  ],
-  "comment": "R54 sample: gogo fire scale - lane_hit gogo MC #37@1 sx: 0.4 -> pop 3.6 (f10..14) -> ease 1.325 (f30) -> breathe -> settle 1.3988 (f42). The old texture_resize flattened the pop-then-ease into one linear ramp (r53 flag)",
-  "fallback": {
-   "type": "texture_resize",
-   "duration": 266.72,
-   "initial_size": 3.474,
-   "final_size": 1.351,
-   "comment": "gogotime fire resize (arcade lane_hit MC38 - pops to 3.474 then eases to the steady 1.351 over 16 frames)",
-   "delay": 66.68
-  }
+  "type": "texture_resize",
+  "duration": 266.72,
+  "initial_size": 3.474,
+  "final_size": 1.351,
+  "comment": "gogotime fire resize (arcade lane_hit MC38 - pops to 3.474 then eases to the steady 1.351 over 16 frames)",
+  "delay": 66.68
  },
  {
   "id": 25,
@@ -659,29 +626,33 @@
  {
   "id": 38,
   "type": "move",
-  "duration": 66,
-  "delay": 80,
-  "total_distance": 0,
-  "start_position": 255,
-  "comment": "score counter move animation 2"
+  "duration": 345.36,
+  "start_position": 222,
+  "total_distance": -6,
+  "waypoints": [
+   {
+    "at": 146,
+    "value": 0
+   },
+   {
+    "at": 146,
+    "value": -3
+   },
+   {
+    "at": 279.36,
+    "value": -3
+   }
+  ],
+  "comment": "score counter move (y, pre-fan): hold 222, snap to 219, hold, ->216 (old ids 38/39 + start y)"
  },
  {
   "id": 39,
   "type": "move",
-  "duration": 66,
-  "delay": 279.36,
-  "total_distance": -3,
-  "start_position": 219,
-  "comment": "score counter move animation 3"
- },
- {
-  "id": 40,
-  "type": "move",
   "duration": 80,
   "delay": 366.74,
   "total_distance": 15,
   "start_position": 222,
-  "comment": "score counter move animation 4"
+  "comment": "score counter move (y, fan-out): digits cascade once y_pre finished (old id 40)"
  },
  {
   "id": 41,

Graphics/game/gauge_dan/texture.json

@@ -70,19 +70,19 @@
     ]
   },
   "1p_bar": {
-    "x": 726,
+    "x": 738,
     "y": 248
   },
   "2p_bar": {
-    "x": 726,
+    "x": 738,
     "y": 248
   },
   "1p_bar_fade": {
-    "x": 716,
+    "x": 733,
     "y": 241
   },
   "2p_bar_fade": {
-    "x": 716,
+    "x": 733,
     "y": 241
   },
   "tamashii": {

Graphics/game/notes/texture.json

@@ -1,30 +1,113 @@
-{
-  "0": {
-    "y": 0
-  },
-  "1": {},
-  "2": {},
-  "3": {},
-  "4": {},
-  "5": {},
-  "6": {},
-  "7": {},
-  "8": {},
-  "9": {
-    "frame_order": [
-      0,
-      0
-    ]
-  },
-  "10": {
-    "frame_order": [
-      0,
-      0
-    ]
-  },
-  "moji": {},
-  "moji_drumroll_mid": {},
-  "moji_drumroll_mid_big": {},
-  "drumroll_tail": {},
-  "drumroll_big_tail": {}
-}
+{
+  "0": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 0, 12, 200],
+      [12, 0, 12, 200]
+    ]
+  },
+  "1": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 200, 192, 192],
+      [192, 200, 192, 192],
+      [384, 200, 192, 192]
+    ]
+  },
+  "2": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 392, 192, 192],
+      [192, 392, 192, 192],
+      [384, 392, 192, 192]
+    ]
+  },
+  "3": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 584, 192, 192],
+      [192, 584, 192, 192]
+    ]
+  },
+  "4": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 776, 192, 192],
+      [192, 776, 192, 192]
+    ]
+  },
+  "5": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 968, 192, 192],
+      [192, 968, 192, 192],
+      [384, 968, 192, 192]
+    ]
+  },
+  "6": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1160, 192, 192],
+      [192, 1160, 192, 192]
+    ]
+  },
+  "7": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1352, 192, 192],
+      [192, 1352, 192, 192],
+      [384, 1352, 192, 192]
+    ]
+  },
+  "8": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1544, 72, 192],
+      [72, 1544, 72, 192]
+    ]
+  },
+  "9": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1736, 192, 192],
+      [0, 1736, 192, 192]
+    ]
+  },
+  "10": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1928, 192, 192],
+      [0, 1928, 192, 192]
+    ]
+  },
+  "moji": {
+    "crop": [
+      [0, 0, 256, 48],
+      [0, 48, 256, 48],
+      [0, 96, 256, 48],
+      [0, 144, 256, 48],
+      [0, 192, 256, 48],
+      [0, 240, 256, 48],
+      [0, 288, 256, 48],
+      [0, 336, 256, 48],
+      [0, 384, 256, 48],
+      [0, 432, 256, 48],
+      [0, 480, 256, 48],
+      [0, 528, 256, 48]
+    ]
+  },
+  "moji_drumroll_mid": {},
+  "moji_drumroll_mid_big": {},
+  "drumroll_tail": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 2120, 80, 192]
+    ]
+  },
+  "drumroll_big_tail": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 2312, 120, 192]
+    ]
+  }
+}