From e7df29f5533b6bdb6dd7557d9e56769f8d78da59 Mon Sep 17 00:00:00 2001 From: PandahRS Date: Wed, 4 Jul 2018 15:52:15 +0200 Subject: [PATCH] Add bosses to Discord plugin Add support for showing various bosses in Discord plugin. Signed-off-by: Tomas Slusny --- .../client/plugins/discord/DiscordConfig.java | 11 +++++++++++ .../plugins/discord/DiscordGameEventType.java | 19 ++++++++++++++++++- .../client/plugins/discord/DiscordPlugin.java | 7 ++++++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordConfig.java index 76c393338d..99b32d961b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordConfig.java @@ -52,4 +52,15 @@ public interface DiscordConfig extends Config { return true; } + + @ConfigItem( + keyName = "showBossActivity", + name = "Show activity at bosses", + description = "Configures if your activity at bosses should be shown.", + position = 3 + ) + default boolean showBossActivity() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index b5eb6330f5..a65c8c6882 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -60,7 +60,24 @@ enum DiscordGameEventType TRAINING_FARMING(Skill.FARMING), TRAINING_RUNECRAFT(Skill.RUNECRAFT), TRAINING_HUNTER(Skill.HUNTER), - TRAINING_CONSTRUCTION(Skill.CONSTRUCTION); + TRAINING_CONSTRUCTION(Skill.CONSTRUCTION), + + // Bosses + BOSS_ABYSSAL_SIRE("Abyssal Sire", DiscordAreaType.BOSSES, 11851, 11850, 12363, 12362), + BOSS_CERBERUS("Cerberus", DiscordAreaType.BOSSES, 4883, 5140, 5395), + BOSS_COMMANDER_ZILYANA("Commander Zilyana", DiscordAreaType.BOSSES, 11602), + BOSS_DKS("Dagannoth Kings", DiscordAreaType.BOSSES, 11588, 11589), + BOSS_GENERAL_GRAARDOR("General Graardor", DiscordAreaType.BOSSES, 11347), + BOSS_GIANT_MOLE("Giant Mole", DiscordAreaType.BOSSES, 6993, 6992), + BOSS_GROTESQUE_GUARDIANS("Grotesque Guardians", DiscordAreaType.BOSSES, 6727), + BOSS_KQ("Kalphite Queen", DiscordAreaType.BOSSES, 13972), + BOSS_KRAKEN("Kraken", DiscordAreaType.BOSSES, 9116), + BOSS_KREEARRA("Kree'arra", DiscordAreaType.BOSSES, 11346), + BOSS_KRIL_TSUTSAROTH("K'ril Tsutsaroth", DiscordAreaType.BOSSES, 11603), + BOSS_SKOTIZO("Skotizo", DiscordAreaType.BOSSES, 6810), + BOSS_SMOKE_DEVIL("Thermonuclear smoke devil", DiscordAreaType.BOSSES, 9363, 9619), + BOSS_VORKATH("Vorkath", DiscordAreaType.BOSSES, 9023), + BOSS_ZULRAH("Zulrah", DiscordAreaType.BOSSES, 9007); private static final Map FROM_REGION = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index f32992514d..96659016ae 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -231,7 +231,12 @@ public class DiscordPlugin extends Plugin return false; } - return true; + switch (event.getDiscordAreaType()) + { + case BOSSES: return config.showBossActivity(); + } + + return false; } private int getCurrentRegion()