aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Chat.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
index 35c764116..2175baa2c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
@@ -64,6 +64,12 @@ public class Chat {
@ConfigAccordionId(id = 0)
public boolean powderMining = true;
+ @Expose
+ @ConfigOption(name = "Kill Combo", desc = "Hide messages about the current kill combo from the Grandma Wolf Pet.")
+ @ConfigEditorBoolean
+ @ConfigAccordionId(id = 0)
+ public boolean killCombo = false;
+
//TODO remove
@Expose
@ConfigOption(name = "Others", desc = "Hide other annoying messages.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index a3289c9e1..1313e45b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -26,8 +26,8 @@ class ChatFilter {
welcome(message) && SkyHanniMod.feature.chat.welcome -> "welcome"
isGuildExp(message) && SkyHanniMod.feature.chat.guildExp -> "guild_exp"
friendJoin(message) && SkyHanniMod.feature.chat.friendJoinLeft -> "friend_join"
+ killCombo(message) && SkyHanniMod.feature.chat.killCombo -> "kill_combo"
- killCombo(message) && SkyHanniMod.feature.chat.others -> "kill_combo"
bazaarAndAHMiniMessages(message) && SkyHanniMod.feature.chat.others -> "bz_ah_minis"
watchdogAnnouncement(message) && SkyHanniMod.feature.chat.others -> "watchdog"
slayer(message) && SkyHanniMod.feature.chat.others -> "slayer"