Merge branch 'master' of https://github.com/zacharied/OngekiFumenEditor into soflan_group

# Conflicts:
#	OngekiFumenEditor/Parser/Ogkr/DefaultOngekiFumenFormatter.cs
#	OngekiFumenEditor/Properties/Resources.resx

Author: MikiraSora

OngekiFumenEditor/Base/OngekiObjects/LaneBlockArea.cs

@@ -89,8 +89,12 @@ public BlockDirection Direction
 			var blockStartTGrid = TGrid;
 			var blockEndTGrid = EndIndicator.TGrid;
 
-			var startWallLane = fumen.Lanes.Where(x => x.LaneType == wallType).LastOrDefault(x => x.TGrid <= blockStartTGrid);
-			var endWallLane = fumen.Lanes.Where(x => x.LaneType == wallType).LastOrDefault(x => x.TGrid <= blockEndTGrid);
+			var lanes = fumen.Lanes.Where(x => x.LaneType == wallType).OrderBy(x => x.TGrid).ToList();
+
+			var startWallLane = lanes.LastOrDefault(x => x.TGrid <= blockStartTGrid);
+			var endWallLane = startWallLane != null && startWallLane.GetTGridRange().Max >= blockEndTGrid
+				? startWallLane
+				: lanes.LastOrDefault(x => x.TGrid <= blockEndTGrid);
 
 			return (startWallLane, endWallLane);
 		}

OngekiFumenEditor/Modules/FumenCheckerListViewer/Base/DefaultRulesImpl/LaneBlockOnMultipleWallsCheckRule.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using OngekiFumenEditor.Base;
+using OngekiFumenEditor.Modules.FumenCheckerListViewer.Base.DefaultNavigateBehaviorImpl;
+using OngekiFumenEditor.Modules.FumenVisualEditor.ViewModels;
+using OngekiFumenEditor.Properties;
+using OngekiFumenEditor.Utils;
+
+namespace OngekiFumenEditor.Modules.FumenCheckerListViewer.Base.DefaultRulesImpl;
+
+[Export(typeof(IFumenCheckRule))]
+public class LaneBlockOnMultipleWallsCheckRule : IFumenCheckRule
+{
+    private const string RuleName = "LaneBlockAcrossWalls";
+
+    public IEnumerable<ICheckResult> CheckRule(OngekiFumen fumen, FumenVisualEditorViewModel fumenHostEditor)
+    {
+        foreach (var laneBlock in fumen.LaneBlocks) {
+            var (refLaneStart, refLaneEnd) = laneBlock.CalculateReferenceWallLanes(fumen);
+            if (refLaneStart != refLaneEnd) {
+                yield return new CommonCheckResult()
+                {
+                    Severity = RuleSeverity.Problem,
+                    Description = Resources.LaneBlockOnMultipleWalls.Format(refLaneStart?.RecordId, refLaneEnd?.RecordId),
+                    LocationDescription = laneBlock.TGrid.ToString(),
+                    NavigateBehavior = new NavigateToTGridBehavior(refLaneEnd?.ReferenceStartObject.TGrid),
+                    RuleName = RuleName
+                };
+            }
+        }
+    }
+}

OngekiFumenEditor/Modules/OptionGeneratorTools/Kernel/AcbGeneratorFuckWrapper.cs

@@ -1,16 +1,16 @@
-using OngekiFumenEditor.Modules.OptionGeneratorTools.Base;
-using OngekiFumenEditor.Modules.OptionGeneratorTools.Models;
-using OngekiFumenEditor.Properties;
-using OngekiFumenEditor.Utils;
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
+using OngekiFumenEditor.Modules.OptionGeneratorTools.Base;
+using OngekiFumenEditor.Modules.OptionGeneratorTools.Models;
+using OngekiFumenEditor.Properties;
+using OngekiFumenEditor.Utils;
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
-namespace OngekiFumenEditor.Modules.OptionGeneratorTools.Kernel
+namespace OngekiFumenEditor.Modules.OptionGeneratorTools.Kernel
 {
 	public static class AcbGeneratorFuckWrapper
 	{
@@ -19,7 +19,7 @@ public static async Task<GenerateResult> Generate(AcbGenerateOption option)
 			if (!File.Exists(option.InputAudioFilePath))
 				return new(false, Resources.ConvertAudioFileNotFound);
 
-			if (option.MusicId < 0 || option.MusicId > 9999)
+			if (option.MusicId < 0)
 				return new(false, Resources.MusicIDInvaild.Format(option.MusicId));
 
 			if (string.IsNullOrWhiteSpace(option.OutputFolderPath))
@@ -94,5 +94,5 @@ private static async Task<GenerateResult> GenerateMusicSourceXmlAsync(string tem
 
 			return new(true);
 		}
-	}
-}
+	}
+}

OngekiFumenEditor/Parser/Ogkr/DefaultOngekiFumenFormatter.cs

@@ -164,7 +164,7 @@ public void ProcessHEADER(OngekiFumen fumen, StringBuilder sb)
 
             sb.AppendLine("[HEADER]");
             //sb.AppendLine($"VERSION\t{metaInfo.Version.Major}\t{metaInfo.Version.Minor}\t{metaInfo.Version.Build}");
-            sb.AppendLine($"VERSION\t{1}\t{6}\t{0}");
+			sb.AppendLine($"VERSION\t{1}\t{7}\t{0}");
             sb.AppendLine($"CREATOR\t{metaInfo.Creator}");
             sb.AppendLine($"BPM_DEF\t{metaInfo.BpmDefinition.First}\t{metaInfo.BpmDefinition.Common}\t{metaInfo.BpmDefinition.Maximum}\t{metaInfo.BpmDefinition.Minimum}");
             sb.AppendLine($"MET_DEF\t{metaInfo.MeterDefinition.Bunshi}\t{metaInfo.MeterDefinition.Bunbo}");

OngekiFumenEditor/Properties/Resources.Designer.cs

@@ -2025,4 +2025,7 @@
   <data name="HideWallLaneWhenEnablePlayField" xml:space="preserve">
     <value>Hide all wall lanes when play field drawing is enable in preview mode</value>
   </data>
+  <data name="LaneBlockOnMultipleWalls" xml:space="preserve">
+    <value>Lane block start wall ({0}) is different than end wall ({1})</value>
+  </data>
 </root>