diff --git a/index.js b/index.js index 7f8cda8..e77f87d 100644 --- a/index.js +++ b/index.js @@ -6,10 +6,10 @@ function generateMacro() { clearOutput(); const regex = { - siren: /\(Maybe:\s*(?[^)]+)\)\s*.(?[\w ]+)\s*\(\s*(?[0-9\.]+)\s*,\s*(?[0-9\.]+)\s*\)/, + siren: /\(Maybe:\s*(?[^)]+)\)\s*.(?[\w\'\- ]+)\s*\(\s*(?[0-9\.]+)\s*,\s*(?[0-9\.]+)\s*\)/, prime: /(?[^(]+)\s+\((?[0-9\.]+)\s*,\s*(?[0-9\.]+)\s*\)/, primeZoneOnly: /^(?[\w\'\- ]+)$/, - bear: /(?[\w ]+)\s+\(\s*(?[0-9\.]+)\s*,\s*(?[0-9\.]+)\s*\)\s*(?[\w ]+)/, + bear: /(?[\w\'\- ]+)\s+\(\s*(?[0-9\.]+)\s*,\s*(?[0-9\.]+)\s*\)\s*(?[\w\'\- ]+)/, } const scoutSelect = document.querySelector('input[name="tool"]:checked');