fix: handle inline border defs in sand/sandstone brushes, separate error handling for brush loaders

Author: BrewertonSantos

src/App/BrushData.cs

@@ -75,6 +75,10 @@ public sealed class GroundBorderRef
     public int BorderId { get; set; }
     public string? To { get; set; } // brush name or "none"
     public bool Super { get; set; }
+    /// <summary>True when this is an inline border definition (has borderitem children, no id).</summary>
+    public bool Inline { get; set; }
+    public ushort GroundEquivalent { get; set; }
+    public Dictionary<string, ushort> InlineEdges { get; set; } = [];
 }
 
 // ── Wall brush ──
@@ -249,13 +253,26 @@ private static void LoadGrounds(string path, BrushCatalog db)
 
             foreach (var border in el.Elements("border"))
             {
-                def.Borders.Add(new GroundBorderRef
+                var bref = new GroundBorderRef
                 {
                     Align = (string?)border.Attribute("align") ?? "",
                     BorderId = (int?)border.Attribute("id") ?? 0,
                     To = (string?)border.Attribute("to"),
                     Super = (string?)border.Attribute("super") == "true",
-                });
+                };
+                // Handle inline border definitions (have <borderitem> children but no id)
+                if (border.Attribute("id") == null && border.HasElements)
+                {
+                    bref.Inline = true;
+                    bref.GroundEquivalent = (ushort?)(int?)border.Attribute("ground_equivalent") ?? 0;
+                    foreach (var bi in border.Elements("borderitem"))
+                    {
+                        var edge = (string?)bi.Attribute("edge") ?? "";
+                        var itemId = (ushort?)(int?)bi.Attribute("item") ?? 0;
+                        if (itemId > 0) bref.InlineEdges[edge] = itemId;
+                    }
+                }
+                def.Borders.Add(bref);
             }
 
             foreach (var friend in el.Elements("friend"))

src/App/ViewModels/MainWindowViewModel.cs

@@ -2535,10 +2535,12 @@ private void InitializePalette()
 
     private void LoadBrushDatabase()
     {
+        var baseDir = AppDomain.CurrentDomain.BaseDirectory;
+        var brushDir = Path.Combine(baseDir, "data", "brushes");
+
+        // Load OTB autobordering system
         try
         {
-            var baseDir = AppDomain.CurrentDomain.BaseDirectory;
-            var brushDir = Path.Combine(baseDir, "data", "brushes");
             var bordersPath = Path.Combine(brushDir, "borders.xml");
             var groundsPath = Path.Combine(brushDir, "grounds.xml");
             if (File.Exists(bordersPath) && File.Exists(groundsPath))
@@ -2547,8 +2549,15 @@ private void LoadBrushDatabase()
                 OnPropertyChanged(nameof(BrushDb));
                 AddMapLog($"Brush system loaded: {BrushDb.GroundBrushes.Count} ground brushes, {BrushDb.AutoBorders.Count} borders");
             }
+        }
+        catch (Exception ex)
+        {
+            AddMapLog($"Brush system error: {ex.Message}");
+        }
 
-            // Load full catalog (all brush types + tilesets)
+        // Load full catalog (all brush types + tilesets)
+        try
+        {
             if (Directory.Exists(brushDir))
             {
                 BrushCatalog = BrushXmlLoader.LoadFromDirectory(brushDir);
@@ -2559,7 +2568,7 @@ private void LoadBrushDatabase()
         }
         catch (Exception ex)
         {
-            AddMapLog($"Brush load error: {ex.Message}");
+            AddMapLog($"Brush catalog error: {ex.Message}");
         }
     }
 

src/OTB/BrushSystem.cs

@@ -159,6 +159,8 @@ private void LoadGrounds(string path)
             // Border rules
             foreach (var borderEl in el.Elements("border"))
             {
+                // Skip inline border definitions (they have <borderitem> children but no id)
+                if (borderEl.Attribute("id") == null) continue;
                 brush.Borders.Add(new BorderBlock
                 {
                     IsOuter = (string?)borderEl.Attribute("align") == "outer",