From c2bda2d47f7d4bf1af662101d6abb0f3fbdfe752 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 23 Aug 2019 22:30:10 -0400 Subject: [PATCH] menu entry swapper: expand talk-to/pickpocket swap to non-blackjack npcs --- .../plugins/menuentryswapper/MenuEntrySwapperConfig.java | 4 ++-- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index 8fa26b7f2f..b7decee5d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -194,8 +194,8 @@ public interface MenuEntrySwapperConfig extends Config @ConfigItem( keyName = "swapPickpocket", - name = "Pickpocket on H.A.M.", - description = "Swap Talk-to with Pickpocket on H.A.M members" + name = "Pickpocket", + description = "Swap Talk-to with Pickpocket" ) default boolean swapPickpocket() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 534b1447f2..8f2464dd4d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -373,7 +373,7 @@ public class MenuEntrySwapperPlugin extends Plugin if (option.equals("talk-to")) { - if (config.swapPickpocket() && target.contains("h.a.m.")) + if (config.swapPickpocket() && shouldSwapPickpocket(target)) { swap("pickpocket", option, target, true); } @@ -596,6 +596,11 @@ public class MenuEntrySwapperPlugin extends Plugin } } + private static boolean shouldSwapPickpocket(String target) + { + return !target.startsWith("villager") && !target.startsWith("bandit") && !target.startsWith("menaphite thug"); + } + @Subscribe public void onPostItemComposition(PostItemComposition event) {