X2

also another spot to put a more descriptive error.
minishmaker · Aug 26, 2020 · 189fbca · 189fbca
1 parent 27a69ef
commit 189fbca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Randomizer/Logic/DirectiveParser.cs b/Randomizer/Logic/DirectiveParser.cs
@@ -662,7 +662,7 @@ public LogicDefine ParseAdditionDirective(string[] directiveParts)
                     throw new ParserException("!addition resulted in a value higher than 255 (0xFF)");
                 }
             }
-            return new LogicDefine( directiveParts[1] ,totalValue.ToString("X2"));
+            return new LogicDefine( directiveParts[1] ,totalValue.ToString());
         }
 
         public void ParseSetTypeDirective(string[] directiveParts)

diff --git a/Randomizer/Logic/Parser.cs b/Randomizer/Logic/Parser.cs
@@ -445,7 +445,14 @@ public List<Location> ParseLocations(string[] lines, Random rng)
                         // Parse the string as a directive, ignoring preparsed directives
                         if (!SubParser.ParseOnLoad(locationString))
                         {
-                            SubParser.ParseDirective(locationString);
+                            try
+                            {
+                                SubParser.ParseDirective(locationString);
+                            }
+                            catch(ParserException error)
+                            {
+                                throw new ParserException($"Error at directive \"{locationString}\": {error.Message}");
+                            } 
                         }
 
                     }