From 38c60388926da889d602f954a8b65927214aa78c Mon Sep 17 00:00:00 2001
From: ccubed <ccubed.techno@gmail.com>
Date: Mon, 17 Jun 2024 03:52:13 -0400
Subject: [PATCH] Switch to tempregextriggers

---
 src/aliases/bashmatic/BM_Config.lua      | 28 ++++++++++++------------
 src/scripts/bashmatic/bashmatic_init.lua |  7 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/aliases/bashmatic/BM_Config.lua b/src/aliases/bashmatic/BM_Config.lua
index e7e607e..ddaba3b 100644
--- a/src/aliases/bashmatic/BM_Config.lua
+++ b/src/aliases/bashmatic/BM_Config.lua
@@ -4,40 +4,40 @@ cecho("<DarkSlateBlue>See bm help for information on configuration.")
 cecho("<DarkSlateBlue>")
 cecho("<MediumPurple>\nBattle Commands:")
 if Bashmatic.commands.start then 
-    cecho("<DarkSlateBlue>-- Start : " .. Bashmatic.commands.start)
+    cecho("\n<DarkSlateBlue>-- Start : " .. Bashmatic.commands.start)
 else
-    cecho("<DarkSlateBlue>-- Start : Not Set.")
+    cecho("\n<DarkSlateBlue>-- Start : Not Set.")
 end
 if Bashmatic.commands.before then 
-    cecho("<DarkSlateBlue>-- Before : " .. Bashmatic.commands.before)
+    cecho("\n<DarkSlateBlue>-- Before : " .. Bashmatic.commands.before)
 else
-    cecho("<DarkSlateBlue>-- Before : Not Set.")
+    cecho("\n<DarkSlateBlue>-- Before : Not Set.")
 end
 if Bashmatic.commands.during then 
-    cecho("<DarkSlateBlue>-- During : " .. Bashmatic.commands.during .. "(Every " .. Bashmatic.commands.duringTime .. "s)")
+    cecho("\n<DarkSlateBlue>-- During : " .. Bashmatic.commands.during .. "(Every " .. Bashmatic.commands.duringTime .. "s)")
 else
-    cecho("<DarkSlateBlue>-- During : Not Set.")
+    cecho("\n<DarkSlateBlue>-- During : Not Set.")
 end
 if Bashmatic.commands.after then 
-    cecho("<DarkSlateBlue>-- After : " .. Bashmatic.commands.after)
+    cecho("\n<DarkSlateBlue>-- After : " .. Bashmatic.commands.after)
 else
-    cecho("<DarkSlateBlue>-- After : Not Set.")
+    cecho("\n<DarkSlateBlue>-- After : Not Set.")
 end
 cecho("<MediumPurple>\n\nDeath Trigger:")
 if Bashmatic.death.phrase then
-    cecho("<DarkSlateBlue>-- Phrase: " .. Bashmatic.death.phrase)
+    cecho("\n<DarkSlateBlue>-- Phrase: " .. Bashmatic.death.phrase)
 else
-    cecho("<DarkSlateBlue>-- Phrase: Not Set.")
+    cecho("\n<DarkSlateBlue>-- Phrase: Not Set.")
 end
 if Bashmatic.death.event then
-    cecho("<DarkSlateBlue>-- Activated?: Yes")
+    cecho("\n<DarkSlateBlue>-- Activated?: Yes")
 else
-    cecho("<DarkSlateBlue>-- Activated?: No")
+    cecho("\n<DarkSlateBlue>-- Activated?: No")
 end
 cecho("<MediumPurple>\n\nEnemies:")
 if Bashmatic.enemies.group then
-    cecho("<DarkSlateBlue>-- Grouping Enemies by Areas: Yes")
+    cecho("\n<DarkSlateBlue>-- Grouping Enemies by Areas: Yes")
 else
-    cecho("<DarkSlateBlue>-- Grouping Enemies by Areas: No")
+    cecho("\n<DarkSlateBlue>-- Grouping Enemies by Areas: No")
 end
 cecho("<reset>")
\ No newline at end of file
diff --git a/src/scripts/bashmatic/bashmatic_init.lua b/src/scripts/bashmatic/bashmatic_init.lua
index 8e00052..a5eb3c2 100644
--- a/src/scripts/bashmatic/bashmatic_init.lua
+++ b/src/scripts/bashmatic/bashmatic_init.lua
@@ -90,19 +90,20 @@ end
 
 -- Functions for handling inline matching
 
-function handleBashingMatches(match)
+function handleBashingMatches()
+    local keyword = matches[1]
     if not Bashmatic.enabled or Bashmatic.bashing then
         -- bashing is disabled or we're currently bashing something, so clear the triggers
         killBashingTriggers()
     else
         if Bashmatic.commands.before then send(Bashmatic.commands.before) end
-        send(Bashmatic.commands.start .. match)
+        send(Bashmatic.commands.start .. " " .. keyword)
         if Bashmatic.commands.during then tempTimer(Bashmatic.commands.duringTime,handleDuringTick) end
     end
 end
 
 function bmCreateTrigger(keyword)
-    table.insert(Bashmatic.hunting.events, tempTrigger(keyword, handleBashingMatches(keyword), 1))
+    table.insert(Bashmatic.hunting.events, tempRegexTrigger(".*" .. keyword .. ".*", handleBashingMatches, 1))
 end
 
 -- Functions for handling adding targets