From f9ef48584b0373d65702a45189dac2a4643b5b1d Mon Sep 17 00:00:00 2001 From: Shawn Shadrix Date: Wed, 10 Jun 2020 22:23:56 -0400 Subject: [PATCH] randomevents: Add missing events This commit adds options and handling for the Beekeeper, Sandwich Lady, and Jekyll & Hyde random events. --- .../randomevents/RandomEventConfig.java | 33 +++++++++++++++++++ .../randomevents/RandomEventPlugin.java | 7 ++++ 2 files changed, 40 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java index 14f6673f75..537387138f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java @@ -161,4 +161,37 @@ public interface RandomEventConfig extends Config { return false; } + + @ConfigItem( + keyName = "notifyJekyll", + name = "Notify on Jekyll & Hyde", + description = "", + section = notificationSection + ) + default boolean notifyJekyll() + { + return false; + } + + @ConfigItem( + keyName = "notifyBeekeeper", + name = "Notify on Beekeeper", + description = "", + section = notificationSection + ) + default boolean notifyBeekeeper() + { + return false; + } + + @ConfigItem( + keyName = "notifySandwich", + name = "Notify on Sandwich Lady", + description = "", + section = notificationSection + ) + default boolean notifySandwich() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java index 20c9f8fdac..2dad55c9bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java @@ -177,6 +177,8 @@ public class RandomEventPlugin extends Plugin switch (id) { + case NpcID.BEE_KEEPER_6747: + return config.notifyBeekeeper(); case NpcID.SERGEANT_DAMIEN_6743: return config.notifyDemon(); case NpcID.FREAKY_FORESTER_6748: @@ -186,6 +188,9 @@ public class RandomEventPlugin extends Plugin case NpcID.GENIE: case NpcID.GENIE_327: return config.notifyGenie(); + case NpcID.DR_JEKYLL: + case NpcID.DR_JEKYLL_314: + return config.notifyJekyll(); case NpcID.EVIL_BOB: case NpcID.EVIL_BOB_6754: return config.notifyBob(); @@ -200,6 +205,8 @@ public class RandomEventPlugin extends Plugin return config.notifyQuiz(); case NpcID.DUNCE_6749: return config.notifyDunce(); + case NpcID.SANDWICH_LADY: + return config.notifySandwich(); default: return false; }