aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java4
-rw-r--r--src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java11
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 5fd6f741..d6a40d2d 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 @@ import de.hysky.skyblocker.utils.chat.ChatFilterResult;
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 85b01b4b..93d33070 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 class ComboFilterTest extends ChatFilterTest<ComboFilter> {
@Test
void testComboMF() {
- assertMatches("+5 Kill Combo +3% ✯ Magic Find");
+ assertMatches("+5 Kill Combo +3✯ Magic Find");
}
@Test
@@ -18,8 +18,13 @@ public class ComboFilterTest extends ChatFilterTest<ComboFilter> {
}
@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