Merge branch 'master' into Explosive-Bolt-crafting-Hotfix

new-frontiers-14 · Feb 25, 2025 · 389f39e · 389f39e
2 parents fe0039b + a3737e5
commit 389f39e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs
@@ -36,15 +36,19 @@ public void Initialize()
             .Assert(_tagControlParsers.ContainsKey, tag => $"unknown tag: {tag}")
             .Bind(tag => _tagControlParsers[tag]);
 
-        _controlParser = OneOf(_tagParser, TryHeaderControl, TryListControl, TextControlParser) // Frontier: ListControlParser<TryListControl
-            .Before(SkipWhitespaces);
+        // Frontier: comment parser        
+        Parser<char, Unit> whitespaceAndCommentParser = SkipWhitespaces.Then(Try(String("<!--").Then(Parser<char>.Any.SkipUntil(String("-->")))).SkipMany());
+
+        _controlParser = OneOf(_tagParser, TryHeaderControl, TryListControl, TextControlParser)
+            .Before(whitespaceAndCommentParser);
+        // End Frontier
 
         foreach (var typ in _reflectionManager.GetAllChildren<IDocumentTag>())
         {
             _tagControlParsers.Add(typ.Name, CreateTagControlParser(typ.Name, typ, _sandboxHelper));
         }
 
-        ControlParser = SkipWhitespaces.Then(_controlParser.Many());
+        ControlParser = whitespaceAndCommentParser.Then(_controlParser.Many()); // Frontier: SkipWhitespaces<whitespaceAndCommentParser
 
         _sawmill = Logger.GetSawmill("Guidebook");
     }