From b38820abe55003ff37087bc7edd8fa1214c3cd9d Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 10 Mar 2023 04:45:17 +0100 Subject: Made Kill Combo chat message hider a separate toggle --- src/main/java/at/hannibal2/skyhanni/config/features/Chat.java | 6 ++++++ src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main') 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" -- cgit