Bring combo filter into 2023 (#416)

SkyblockerMod · Nov 14, 2023 · cb495ea · cb495ea
1 parent f4ff9aa
commit cb495ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -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
@@ -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