[R]将clockCount参数从MA2Generator内移动到Chart内和SimaiParser的参数上。

Author: Starrah

Program.cs

@@ -175,8 +175,8 @@ private static void ConvertPlainSimai(string text, string outputDir, HashSet<int
 
     private static string SimaiToMa2(string inote, int clockCount=4, bool bigTouch=false, bool isUtage=false)
     {
-        var (chart, parseAlerts) = new SimaiParser(bigTouch, isUtage).Parse(inote);
-        var (ma2, genAlerts) = new MA2Generator(clockCount).Generate(chart);
+        var (chart, parseAlerts) = new SimaiParser(bigTouch, isUtage, clockCount).Parse(inote);
+        var (ma2, genAlerts) = new MA2Generator().Generate(chart);
         var combined = new List<Alert>(parseAlerts.Count + genAlerts.Count);
         combined.AddRange(parseAlerts);
         combined.AddRange(genAlerts);

chart/Chart.cs

@@ -9,6 +9,7 @@ public class Chart
 
     public string DefaultTouchSize = "M1";
     public bool IsUtage = false;
+    public int ClockCount = 4;
 
     public Rational ToSecond(Rational barTime) => BpmList.ToSecond(barTime);
 

generator/MA2Generator.cs

@@ -12,15 +12,9 @@ public class MA2Generator : IGenerator
     private List<MA2Line> lines = [];
     private readonly List<Alert> alerts = [];
 
-    public int ClockCount = 4;
     // 除非你知道你在做什么，不然以下两个变量请勿修改！
     public int MA2Version = 105;
     public int RSL = 384;
-
-    public MA2Generator(int clockCount = 4)
-    {
-        ClockCount = clockCount;
-    }
 
     private string headTemplate = @"VERSION	0.00.00	{0}
 FES_MODE	{1}
@@ -87,7 +81,7 @@ private void AddTap(Tap tap, int bar, int tick)
         string head = string.Format(headTemplate, 
             $"{MA2Version / 100}.{MA2Version % 100:D2}.00", chart.IsUtage?1:0, 
             bpmStatistics.Item1, bpmStatistics.Item2,  bpmStatistics.Item3, bpmStatistics.Item4,
-            RSL, 96*ClockCount, Utils.AppVersion);
+            RSL, 96*chart.ClockCount, Utils.AppVersion);
         result.Append(head);
 
         // bpm段
@@ -96,7 +90,7 @@ private void AddTap(Tap tap, int bar, int tick)
             var (bar, tick) = BT(bpm.Time);
             result.AppendLine($"BPM\t{bar}\t{tick}\t{bpm.Bpm:F3}");
         }
-        result.AppendLine($"MET\t0\t0\t4\t{ClockCount}");
+        result.AppendLine($"MET\t0\t0\t4\t{chart.ClockCount}");
         result.AppendLine();
 
         // 主体：音符段

parser/simai/SimaiParser.cs

@@ -21,9 +21,9 @@ public class SimaiParser : SimaiBaseVisitor<object>, IParser
     private Note? currNote; // 用于在部分visitor之间传递额外的参数，如visitDuration、visitSlideBody等，都需要Note对象作为参数传入的情况
     private readonly List<string> extraModifiers = [];
 
-    public SimaiParser(bool bigTouch = false, bool isUtage = false)
+    public SimaiParser(bool bigTouch = false, bool isUtage = false, int clockCount = 4)
     {
-        chart = new Chart { DefaultTouchSize = bigTouch ? "L1" : "M1", IsUtage = isUtage };
+        chart = new Chart { DefaultTouchSize = bigTouch ? "L1" : "M1", IsUtage = isUtage, ClockCount = clockCount};
     }
 
     private void AddAlert(Alert.LEVEL level, string content, ParserRuleContext? context = null)

tests/自制谱测试.cs

@@ -56,8 +56,8 @@ public void TestChart(TestInput input)
         Assert.True(expected.Count == 1,
             $"Expected exactly one golden file matching '*{expectedSuffix}' in '{dir.FullName}', got {expected.Count}.");
 
-        var (chart, _) = new SimaiParser(bigTouch: false, isUtage: false).Parse(chartInfo.Inote);
-        var (ma2, _) = new MA2Generator(clockCount: maidata.ClockCount).Generate(chart);
+        var (chart, _) = new SimaiParser(bigTouch: false, isUtage: false, clockCount: maidata.ClockCount).Parse(chartInfo.Inote);
+        var (ma2, _) = new MA2Generator().Generate(chart);
 
         var expectedMa2 = File.ReadAllText(expected[0].FullName, Encoding.UTF8);