From 821424babd34391c0fc9aec067b7df60d7fbec94 Mon Sep 17 00:00:00 2001
From: "Avi Kelman (fiendish)" <patcherton.fixesthings@gmail.com>
Date: Fri, 26 Jan 2024 02:27:20 -0500
Subject: [PATCH] update simple zmud aliases to include optional group

---
 MUSHclient/worlds/Aardwolf.mcl            | 75 +++++++++++------------
 MUSHclient/worlds/Aardwolf_no_visuals.mcl | 75 +++++++++++------------
 2 files changed, 72 insertions(+), 78 deletions(-)

diff --git a/MUSHclient/worlds/Aardwolf.mcl b/MUSHclient/worlds/Aardwolf.mcl
index 6cde951f..77fa3d8a 100644
--- a/MUSHclient/worlds/Aardwolf.mcl
+++ b/MUSHclient/worlds/Aardwolf.mcl
@@ -115,62 +115,59 @@
 
 <!-- aliases -->
 
-<aliases
-   muclient_version="5.05"
-   world_file_version="15"
-  >
-  <alias
-   match="#alias {*} {*}"
-   enabled="y"
-   group="special_convenience_aliases"
-   send_to="12"
-   ignore_case="y"
-   sequence="100"
-  >
-  <send>require "addxml"  -- addxml extension
-
--- add the alias
+<aliases>
+<alias
+  match="^#alias +{(.*?)} +{(.*?)}( +{(.*?)})?$"
+  enabled="y"
+  group="special_convenience_aliases"
+  regexp="y"
+  send_to="12"
+  ignore_case="y"
+  sequence="100"
+>
+<send>require "addxml"
 
 addxml.alias {
-  name = "command_line_alias_" .. string.gsub(Base64Encode("%1"), "=", ""), 
+  name = "command_line_alias_"..string.gsub(Base64Encode("%1"), "=", ""),
   match = "%1",
   send = "%2",
   sequence = 100,
   enabled = true,
   send_to = 10,
-  group = "command_line_aliases"
-             }
-
-ColourNote ("white", "green", "Added alias to match on '%1', sending '%2'")
-  </send>
-  </alias>
-  <alias
-   match="#trigger {*} {*}"
-   enabled="y"
-   group="special_convenience_aliases"
-   send_to="12"
-   ignore_case="y"
-   sequence="100"
-  >
-  <send>require "addxml"  -- addxml extension
-
--- add the trigger 
+  group = "%4"
+}
+
+ColourNote("white", "green", "Added alias "..(("%4" ~= "") and "to group '%4' " or "").."to match on '%1' and send '%2'")
+</send>
+</alias>
+
+<alias
+  match="^#trigger +{(.*?)} +{(.*?)}( +{(.*?)})?$"
+  enabled="y"
+  group="special_convenience_aliases"
+  regexp="y"
+  send_to="12"
+  ignore_case="y"
+  sequence="100"
+>
+<send>require "addxml"
 
 addxml.trigger {
-  name = "command_line_trigger_" .. string.gsub(Base64Encode("%1"), "=", ""), 
+  name = "command_line_trigger_"..string.gsub(Base64Encode("%1"), "=", ""),
   match = "%1", 
   send = "%2",
   sequence = 100,
   enabled = true,
   send_to = 10,
-  group = "command_line_triggers"
-               }
+  group = "%4"
+}
 
-ColourNote ("white", "green", "Added trigger to match on '%1', sending '%2'")
-  </send>
-  </alias>
+ColourNote("white", "green", "Added trigger "..(("%4" ~= "") and "to group '%4' " or "").."to match on '%1' and send '%2'")
+</send>
+</alias>
 </aliases>
 
+
 <!-- timers -->
 
 <timers
diff --git a/MUSHclient/worlds/Aardwolf_no_visuals.mcl b/MUSHclient/worlds/Aardwolf_no_visuals.mcl
index f6850487..ca9e1b06 100644
--- a/MUSHclient/worlds/Aardwolf_no_visuals.mcl
+++ b/MUSHclient/worlds/Aardwolf_no_visuals.mcl
@@ -115,62 +115,59 @@
 
 <!-- aliases -->
 
-<aliases
-   muclient_version="5.05"
-   world_file_version="15"
-  >
-  <alias
-   match="#alias {*} {*}"
-   enabled="y"
-   group="special_convenience_aliases"
-   send_to="12"
-   ignore_case="y"
-   sequence="100"
-  >
-  <send>require "addxml"  -- addxml extension
-
--- add the alias
+<aliases>
+<alias
+  match="^#alias +{(.*?)} +{(.*?)}( +{(.*?)})?$"
+  enabled="y"
+  group="special_convenience_aliases"
+  regexp="y"
+  send_to="12"
+  ignore_case="y"
+  sequence="100"
+>
+<send>require "addxml"
 
 addxml.alias {
-  name = "command_line_alias_" .. string.gsub(Base64Encode("%1"), "=", ""), 
+  name = "command_line_alias_"..string.gsub(Base64Encode("%1"), "=", ""),
   match = "%1",
   send = "%2",
   sequence = 100,
   enabled = true,
   send_to = 10,
-  group = "command_line_aliases"
-             }
-
-ColourNote ("white", "green", "Added alias to match on '%1', sending '%2'")
-  </send>
-  </alias>
-  <alias
-   match="#trigger {*} {*}"
-   enabled="y"
-   group="special_convenience_aliases"
-   send_to="12"
-   ignore_case="y"
-   sequence="100"
-  >
-  <send>require "addxml"  -- addxml extension
-
--- add the trigger 
+  group = "%4"
+}
+
+ColourNote("white", "green", "Added alias "..(("%4" ~= "") and "to group '%4' " or "").."to match on '%1' and send '%2'")
+</send>
+</alias>
+
+<alias
+  match="^#trigger +{(.*?)} +{(.*?)}( +{(.*?)})?$"
+  enabled="y"
+  group="special_convenience_aliases"
+  regexp="y"
+  send_to="12"
+  ignore_case="y"
+  sequence="100"
+>
+<send>require "addxml"
 
 addxml.trigger {
-  name = "command_line_trigger_" .. string.gsub(Base64Encode("%1"), "=", ""), 
+  name = "command_line_trigger_"..string.gsub(Base64Encode("%1"), "=", ""),
   match = "%1", 
   send = "%2",
   sequence = 100,
   enabled = true,
   send_to = 10,
-  group = "command_line_triggers"
-               }
+  group = "%4"
+}
 
-ColourNote ("white", "green", "Added trigger to match on '%1', sending '%2'")
-  </send>
-  </alias>
+ColourNote("white", "green", "Added trigger "..(("%4" ~= "") and "to group '%4' " or "").."to match on '%1' and send '%2'")
+</send>
+</alias>
 </aliases>
 
+
 <!-- timers -->
 
 <timers