From 11e728e95974265da83e8322b4f9787c383b0cca Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Sun, 12 Nov 2023 03:58:00 -0500
Subject: [PATCH] Bring combo filter into 2023

---
 .../skyblocker/skyblock/filters/ComboFilter.java      |  4 ++--
 .../skyblocker/skyblock/filters/ComboFilterTest.java  | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java
index 5fd6f7415a..d6a40d2d27 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java
@@ -5,8 +5,8 @@
 
 public class ComboFilter extends SimpleChatFilter {
     public ComboFilter() {
-        super("^(\\+\\d+ Kill Combo \\+\\d+(% ✯ Magic Find| coins per kill|% Combat Exp)" +
-                "|Your Kill Combo has expired! You reached a \\d+ Kill Combo!)$");
+        // ^(\+\d+ Kill Combo( \+\d+(✯ Magic Find| coins per kill|☯ Combat Wisdom))?|Your Kill Combo has expired! You reached a \d+ Kill Combo!)$
+        super("^(\\+\\d+ Kill Combo( \\+\\d+(✯ Magic Find| coins per kill|☯ Combat Wisdom))?|Your Kill Combo has expired! You reached a \\d+ Kill Combo!)$");
     }
 
     @Override
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java
index 85b01b4b33..93d3307046 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java
@@ -9,7 +9,7 @@ public ComboFilterTest() {
 
     @Test
     void testComboMF() {
-        assertMatches("+5 Kill Combo +3% ✯ Magic Find");
+        assertMatches("+5 Kill Combo +3✯ Magic Find");
     }
 
     @Test
@@ -18,8 +18,13 @@ void testComboCoins() {
     }
 
     @Test
-    void testComboEXP() {
-        assertMatches("+20 Kill Combo +15% Combat Exp");
+    void testComboWisdom() {
+        assertMatches("+20 Kill Combo +15☯ Combat Wisdom");
+    }
+
+    @Test
+    void testComboNoBonus() {
+        assertMatches("+50 Kill Combo");
     }
 
     @Test