From 41837ecba03b771e56f2fe6c1b2ff1edc11aa99b Mon Sep 17 00:00:00 2001
From: Wexx <86693821+wexxlee@users.noreply.github.com>
Date: Sun, 19 May 2024 16:43:58 -0700
Subject: [PATCH] fix regex for non-alpha zone/mark names

---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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*(?<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');