[F] Air-Crush interval 处理错误

Author: Starrah

chart/chu/ChuNote.cs

@@ -49,7 +49,7 @@ public int EndWidth
     /** 结束高度。仅在Air Slide/Air Crush上具有。存储的是C2S格式中的数值，转UGC时需要乘以1.6。 */
     public decimal EndHeight { get; set; } = 5;
     /** Air Crush的interval值 */
-    public int CrushInterval { get; set; } = 0;
+    public Rational CrushInterval { get; set; } = 0;
 
     public override Rational EndTime => (Time + Duration).CanonicalForm;
     /** Air系列音符/Slide系列音符的 关联的目标音符类型。仅供向前兼容使用。 */

generator/chu/C2sGenerator.cs

@@ -119,6 +119,6 @@ private static string FormatAsdAsc(ChuNote n, int m, int o, int durTicks)
 
     private static string FormatAld(ChuNote n, int m, int o, int durTicks)
     {
-        return FormattableString.Invariant($"ALD\t{m}\t{o}\t{n.Cell}\t{n.Width}\t{n.CrushInterval}\t{n.Height:0.#}\t{durTicks}\t{n.EndCell}\t{n.EndWidth}\t{n.EndHeight:0.#}");
+        return FormattableString.Invariant($"ALD\t{m}\t{o}\t{n.Cell}\t{n.Width}\t{Utils.Tick(n.CrushInterval, RSL)}\t{n.Height:0.#}\t{durTicks}\t{n.EndCell}\t{n.EndWidth}\t{n.EndHeight:0.#}");
     }
 }

generator/chu/UgcGenerator.cs

@@ -1,6 +1,7 @@
 using System.Text;
 using MuConvert.generator;
 using MuConvert.utils;
+using Rationals;
 using static MuConvert.utils.ChuUtils;
 
 namespace MuConvert.chu;
@@ -184,9 +185,12 @@ private static bool IsSlideContinueSegments(ChuNote n) // Air Slide的前驱只
     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)
+    private string CrushInterval(Rational crushInterval)
+    {
+        return crushInterval > 25 ? "$" : Utils.Tick(crushInterval, RSL).ToString();
+    }
+
+    private string UCode(ChuNote n)
     {
         string c = IToH36(n.Cell), w = IToH36(n.Width);
         return n.Type switch

parser/chu/C2sParser.cs

@@ -144,7 +144,7 @@ private void ParseNote(string[] p, ChuChart chart, List<Alert> alerts, int lineN
                     return;
                 }
                 note.Cell = Int(p, 3); note.Width = Math.Max(1, Int(p, 4, 1));
-                note.CrushInterval = Int(p, 5);
+                note.CrushInterval = new Rational(Int(p, 5), RSL);
                 note.Height = Decimal(p, 6, 5); note.EndHeight = Decimal(p, 10, 5);
                 note.Duration = new Rational(Int(p, 7), RSL);
                 note.EndCell = Int(p, 8); note.EndWidth = Math.Max(1, Int(p, 9, 1));

parser/chu/UgcParser.cs

@@ -362,8 +362,8 @@ private void ParseHeightAndColor(ChuNote n, string str, List<Alert> alerts, int
         {
             var intervalStr = str[(posOfComma+1)..];
             str = str[..posOfComma];
-            if (intervalStr == "$") n.CrushInterval = 38400;
-            else if (int.TryParse(intervalStr, out var interval)) n.CrushInterval = interval;
+            if (intervalStr == "$") n.CrushInterval = 100;
+            else if (int.TryParse(intervalStr, out var interval)) n.CrushInterval = new Rational(interval, RSL);
             else alerts.Add(new Alert(Warning, "解析Air-Crush的interval属性失败！", n.Time, null, lineNum, FormatNoteRef(n, str)));
         }
 
@@ -575,7 +575,7 @@ private int ParseAirCrushNote(string[] lines, int idx, string code, ChuNote note
 
             if (Version <= 6 && !intervalSet && marker == "s")
             {
-                note.CrushInterval = endTick;
+                note.CrushInterval = new Rational(endTick, RSL);
                 intervalSet = true;
             }
 

tests/chu/ChuTests.cs

@@ -87,7 +87,7 @@ public static bool CompareNote(ChuNote expected, ChuNote actual, bool allowExDif
         if (expected.Cell != actual.Cell || expected.Width != actual.Width) return false;
         if (expected.EndCell != actual.EndCell || expected.EndWidth != actual.EndWidth) return false;
         if (Math.Abs(expected.Height - actual.Height) > 0.05m || Math.Abs(expected.EndHeight - actual.EndHeight) > 0.05m) return false;
-        if (expected.CrushInterval != actual.CrushInterval) return false;
+        if (!TimesEquivalent(expected.CrushInterval, actual.CrushInterval)) return false;
         if (!TagsEquivalent(expected, actual)) return false;
         if (!TypesEquivalent(expected.TargetNote, actual.TargetNote, allowExDiff)) return false;
         return true;

utils/ChuUtils.cs

@@ -13,28 +13,25 @@ public class ChuUtils
         ["DR"] = "ADR",
         ["DL"] = "ADL",
     };
-    public static readonly Dictionary<string, string> C2U_AirDirections = ReverseDict(U2C_AirDirections);
+    public static readonly Dictionary<string, string> C2U_AirDirections = Utils.ReverseDict(U2C_AirDirections);
 
     public static readonly Dictionary<string, string> U2C_ChrExtras = new()
     {
         ["U"] = "UP",
         ["D"] = "DW",
         ["C"] = "CE",
     };
-    public static readonly Dictionary<string, string> C2U_ChrExtras = ReverseDict(U2C_ChrExtras);
+    public static readonly Dictionary<string, string> C2U_ChrExtras = Utils.ReverseDict(U2C_ChrExtras);
 
     public static readonly Dictionary<string, string> U2C_AirColor = new()
     {
         ["N"] = "DEF",
         ["I"] = "I", // TODO 搞清楚UGC里的'I'颜色，在C2S里，对应的字符串是什么
     };
-    public static readonly Dictionary<string, string> C2U_AirColor = ReverseDict(U2C_AirColor);
+    public static readonly Dictionary<string, string> C2U_AirColor = Utils.ReverseDict(U2C_AirColor);
 
     public static decimal U2C_Height(decimal input) => input / 1.6m;
     public static decimal C2U_Height(decimal input) => input * 1.6m;
-
-    private static Dictionary<string, string> ReverseDict(Dictionary<string, string> dict) =>
-        dict.ToDictionary(x => x.Value, x => x.Key);
 
     public static bool IsHold(string t) => t is "HLD" or "HXD";
     public static bool IsSlide(string t) => t is "SLD" or "SLC" or "SXD" or "SXC";

utils/Utils.cs

@@ -135,6 +135,9 @@ public static string IToH(int value, int N)
         if (negative) sb.Append('-');
         return new string(sb.ToString().Reverse().ToArray());
     }
+    
+    public static Dictionary<string, string> ReverseDict(Dictionary<string, string> dict) =>
+        dict.ToDictionary(x => x.Value, x => x.Key);
 }
 
 public static class ExtensionUtils