[R] IsUtage移动到MA2Generator上

Author: Starrah

Program.cs

@@ -312,9 +312,9 @@ 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, clockCount).Parse(inote);
+        var (chart, parseAlerts) = new SimaiParser(bigTouch, clockCount).Parse(inote);
         PrintAlerts(parseAlerts);
-        var (ma2, genAlerts) = new MA2Generator().Generate(chart);
+        var (ma2, genAlerts) = new MA2Generator(isUtage).Generate(chart);
         PrintAlerts(genAlerts);
         return ma2;
     }

chart/Chart.cs

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

chart/Note.cs

@@ -15,6 +15,8 @@ public abstract class Note
 
     public int FalseEachIdx = 0; // 如果>0，表示这是一个伪双押，数字越大、延后的时刻越多
 
+    public Rational TimeInSeconds => throw new NotImplementedException();
+    
     public virtual Duration Duration
     {
         get => new(this);

generator/MA2Generator.cs

@@ -10,13 +10,19 @@ record MA2Line(string Name, int Bar, int Tick, int Key, string Extra = "");
 
 public class MA2Generator : IGenerator
 {
-    private List<MA2Line> lines = [];
-    private readonly List<Alert> alerts = [];
+    public MA2Generator(bool isUtage = false)
+    {
+        IsUtage = isUtage;
+    }
 
     // 除非你知道你在做什么，不然以下两个变量请勿修改！
+    public bool IsUtage;
     public int MA2Version = 105;
     public int RSL = 384;
 
+    private List<MA2Line> lines = [];
+    private readonly List<Alert> alerts = [];
+    
     private string headTemplate = @"VERSION	0.00.00	{0}
 FES_MODE	{1}
 BPM_DEF	{2:F3}	{3:F3}	{4:F3}	{5:F3}
@@ -82,7 +88,7 @@ private void AddTap(Tap tap, int bar, int tick)
         // 文件头
         var bpmStatistics = bpmStats(chart);
         string head = string.Format(headTemplate, 
-            $"{MA2Version / 100}.{MA2Version % 100:D2}.00", chart.IsUtage?1:0, 
+            $"{MA2Version / 100}.{MA2Version % 100:D2}.00", IsUtage?1:0, 
             bpmStatistics.Item1, bpmStatistics.Item2,  bpmStatistics.Item3, bpmStatistics.Item4,
             RSL, RSL/4 * chart.ClockCount, Utils.AppVersion);
         result.Append(head);

parser/simai/SimaiParser.cs

@@ -24,9 +24,9 @@ public partial class SimaiParser : SimaiBaseVisitor<object>, IParser
     private readonly List<string> extraModifiers = [];
     private bool absoluteTimeStepWarned; // 用于确保Warning只打印一次
 
-    public SimaiParser(bool bigTouch = false, bool isUtage = false, int clockCount = 4)
+    public SimaiParser(bool bigTouch = false, int clockCount = 4)
     {
-        chart = new Chart { DefaultTouchSize = bigTouch ? "L1" : "M1", IsUtage = isUtage, ClockCount = clockCount};
+        chart = new Chart { DefaultTouchSize = bigTouch ? "L1" : "M1", ClockCount = clockCount};
     }
 
     private void AddAlert(Alert.LEVEL level, string content, ParserRuleContext? context = null)

tests/ChartShift测试.cs

@@ -25,7 +25,7 @@ private static Chart LoadChart(out List<Alert> alerts)
         Assert.True(maidata.Levels.ContainsKey(6), "Expected lv6 (inote_6) in maidata.");
         var chartInfo = maidata.Levels[6];
 
-        var (chart, parseAlerts) = new SimaiParser(bigTouch: false, isUtage: false, clockCount: maidata.ClockCount)
+        var (chart, parseAlerts) = new SimaiParser(clockCount: maidata.ClockCount)
             .Parse(chartInfo.Inote);
         alerts = parseAlerts;
         chart.Sort();

tests/Simai转MA2测试.cs

@@ -44,8 +44,8 @@ private void TestChart(TestInput input)
         var chartInfo = maidata.Levels[input.LevelId];
         var expectedMa2 = File.ReadAllText(input.MA2, Encoding.UTF8);
 
-        var (chart, _) = new SimaiParser(bigTouch: false, isUtage: false, clockCount: maidata.ClockCount).Parse(chartInfo.Inote);
-        var (ma2, _) = new MA2Generator().Generate(chart);
+        var (chart, _) = new SimaiParser(bigTouch: false, clockCount: maidata.ClockCount).Parse(chartInfo.Inote);
+        var (ma2, _) = new MA2Generator(isUtage: false).Generate(chart);
 
         ma2 = keepNotesOnly(ma2);
         expectedMa2 = keepNotesOnly(expectedMa2);

tests/Simai预处理纠错测试.cs

@@ -19,7 +19,7 @@ public class Simai预处理纠错测试
     /// <summary>规范 simai → 完整 MA2 文本（含头与 BPM）。</summary>
     private string SimaiToMa2(string inote, bool DontTryFix = false)
     {
-        var parser = new SimaiParser(bigTouch: false, isUtage: false, clockCount: 4) { DontTryFix = DontTryFix };
+        var parser = new SimaiParser() { DontTryFix = DontTryFix };
         var (chart, alerts) = parser.Parse(inote);
         var (ma2, alerts2) = new MA2Generator().Generate(chart);
         _output.WriteLine(string.Join('\n', alerts));