fix regex for non-alpha zone/mark names

wexxlee · May 19, 2024 · 41837ec · 41837ec
1 parent a050196
commit 41837ec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -6,10 +6,10 @@ function generateMacro() {
     clearOutput();
 
     const regex = {
-        siren: /\(Maybe:\s*(?<mark>[^)]+)\)\s*.(?<zone>[\w ]+)\s*\(\s*(?<x>[0-9\.]+)\s*,\s*(?<y>[0-9\.]+)\s*\)/,
+        siren: /\(Maybe:\s*(?<mark>[^)]+)\)\s*.(?<zone>[\w\'\- ]+)\s*\(\s*(?<x>[0-9\.]+)\s*,\s*(?<y>[0-9\.]+)\s*\)/,
         prime: /(?<mark>[^(]+)\s+\((?<x>[0-9\.]+)\s*,\s*(?<y>[0-9\.]+)\s*\)/,
         primeZoneOnly: /^(?<zone>[\w\'\- ]+)$/,
-        bear: /(?<zone>[\w ]+)\s+\(\s*(?<x>[0-9\.]+)\s*,\s*(?<y>[0-9\.]+)\s*\)\s*(?<mark>[\w ]+)/,
+        bear: /(?<zone>[\w\'\- ]+)\s+\(\s*(?<x>[0-9\.]+)\s*,\s*(?<y>[0-9\.]+)\s*\)\s*(?<mark>[\w\'\- ]+)/,
     }
 
     const scoutSelect = document.querySelector('input[name="tool"]:checked');