[+] UGC AirCrush

Author: Starrah

generator/chu/UgcGenerator.cs

@@ -100,6 +100,8 @@ private static string Serialize(ChuChart ugc, List<Alert> alerts)
                 var marker = (n.Type == "AHX") ? 'c' : 's';
                 sb.AppendLine($"#{durTicks}>{marker}");
             }
+            else if (n.Type is "ALD" && durTicks > 0)
+                sb.AppendLine($"#{durTicks}>c{IToH36(n.EndCell)}{IToH36(n.EndWidth)}{EncodeAirHeight(n.EndHeight)}");
         }
         return sb.ToString();
     }
@@ -150,7 +152,10 @@ private static bool IsSlideContinueSegments(ChuNote n) // Air Slide的前驱只
         => (IsSlide(n) && IsSlide(n.Previous)) || (IsAirSlide(n) && IsAirSlide(n.Previous));
     private static char SlideFollowerMarker(string t) => t is "SLC" or "SXC" or "ASC" ? 'c' : 's';
 
-    private static string EncodeAirHeight(decimal value) => IToH36((int)Math.Round(C2U_Height(value) * 10));
+    private static string EncodeAirHeight(decimal value) => IToH36((int)Math.Round(C2U_Height(value) * 10)).PadLeft(2, '0');
+    
+    private static string CrushColor(string t) => C2U_AirColor.GetValueOrDefault(t, t.Length > 0 ? t[..1] : "0");
+    private static string CrushInterval(int crushInterval) => crushInterval > 10000 ? "$" : crushInterval.ToString();
 
     private static string UCode(ChuNote n)
     {
@@ -169,7 +174,7 @@ private static string UCode(ChuNote n)
             "AIR" or "AUR" or "AUL" or "ADW" or "ADR" or "ADL" => $"a{c}{w}{C2U_AirDirections[n.Type]}{C2U_AirColor.GetValueOrDefault(n.Tag, "N")}",
             // AIR-HOLD (v8): #BarTick:H x w c + 子行 #OffsetTick:s / :c（见 Umiguri Chart v8 doc）
             "AHD" or "AHX" => $"H{c}{w}{C2U_AirColor.GetValueOrDefault(n.Tag, "N")}",
-            "ALD" => "", // TODO
+            "ALD" => $"C{c}{w}{EncodeAirHeight(n.Height)}{CrushColor(n.Tag)},{CrushInterval(n.CrushInterval)}",
             _ => ""
         };
     }

parser/chu/UgcParser.cs

@@ -364,14 +364,6 @@ private void ParseHeightAndColor(ChuNote n, string str, List<Alert> alerts, int
             else if (int.TryParse(intervalStr, out var interval)) n.CrushInterval = interval;
             else alerts.Add(new Alert(Warning, "解析Air-Crush的interval属性失败！", n.Time, null, lineNum, FormatNoteRef(n, str)));
         }
-        else if (noteType is "C" && str.Length == 2 && Version < 8)
-        {
-            var intervalStr = str.Last();
-            str = str[..^1] + "N";
-            if (intervalStr == 'Z') n.CrushInterval = 38400;
-            else if (TryHToI(intervalStr, out var interval)) n.CrushInterval = interval;
-            else alerts.Add(new Alert(Warning, "解析Air-Crush的interval属性失败！", n.Time, null, lineNum, FormatNoteRef(n, str)));
-        }
 
         // 剩的部分都满足：最后一位是颜色，前面是高度
         if (str.Length > 0)
@@ -544,25 +536,42 @@ private void ParseAirNote(string code, ChuNote note, List<Alert> alerts, int lin
         ParseHeightAndColor(note, mainPart[2..], alerts, lineNum, "a");
     }
 
-    private static int ParseAirCrushNote(string[] lines, int idx, string code, ChuNote previousNote, List<Alert> alerts, ChuChart chart)
+    private int ParseAirCrushNote(string[] lines, int idx, string code, ChuNote note, List<Alert> alerts, ChuChart chart)
     {
-        // TODO 尚未实现，所以先给个警告
-        alerts.Add(new Alert(Warning, "当前版本尚未实现对Air-Crush(UMIGURI的':C'或':T'音符)的解析。") { Line = idx, RelevantNote = lines[idx] });
+        note.Type = "ALD";
+        ParseCellWidth(code, 1, note, alerts, idx + 1, chart);
+        if (code.Length <= 3) alerts.Add(new Alert(Warning, "AirCrush缺少参数！", note.Time, (double)chart.ToSecond(note.Time), idx+1, lines[idx]));
+        else ParseHeightAndColor(note, code[3..], alerts, idx+1, "C");
 
         bool foundFirst = false;
+        bool intervalSet = Version >= 8;
         while (idx + 1 < lines.Length)
-        { // 循环处理所有的跟随行。idx始终指向上一条已经处理完的行。
+        {
             var nextLine = lines[idx + 1].Trim();
-            if (!TryParseFollowerLine(nextLine, out var marker, out var duration, out _, out _, out _, false))
+            if (!TryParseFollowerLine(nextLine, out var marker, out var endTick, out var endCell, out var endWidth, out var endHeight, Version >= 8))
             {
                 if (nextLine.StartsWith('\'') || nextLine.StartsWith('@')) { idx++; continue; }
                 break;
             }
 
-            // TODO 尚未实现
+            if (Version >= 8 && marker != "c")
+                alerts.Add(new Alert(Warning, $"Air-Crush（v8）子行标记应为 'c'，实际为 '{marker}'", note.Time, (double)chart.ToSecond(note.Time), idx + 1, nextLine));
+
+            if (Version <= 6 && !intervalSet && marker == "s")
+            {
+                note.CrushInterval = endTick;
+                intervalSet = true;
+            }
+            
+            note.Duration = new Rational(endTick, RSL);
+            if (endCell != null) note.EndCell = endCell.Value;
+            if (endWidth != null) note.EndWidth = endWidth.Value;
+            if (endHeight != null) note.EndHeight = U2C_Height(endHeight.Value);
+
             idx++;
             foundFirst = true;
         }
+        chart.Notes.Add(note);
 
         if (!foundFirst)
             alerts.Add(new Alert(Warning, $"air-crush 音符缺少时长跟随行") { Line = idx + 1, RelevantNote = lines[idx] });

tests/chu/ChuTests.cs

@@ -109,6 +109,7 @@ private static bool DurationsEquivalent(ChuNote e, ChuNote a)
     private static bool TagsEquivalent(ChuNote e, ChuNote a)
     {
         if (e.Tag == a.Tag) return true;
+        if (e.Type == "ALD") return true; // C2S的ALD行，根据观测，是不支持颜色tag的。因此不要比较
         if (ChuUtils.IsGeneralizedAir(e))
         {
             if ((e.Tag == "DEF" && a.Tag == "") || (e.Tag == "" && a.Tag == "DEF"))