diff --git a/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java b/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java index 3b2144efb..4702587bb 100644 --- a/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java +++ b/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java @@ -8,6 +8,8 @@ import core.game.node.item.Item; import core.plugin.Initializable; import core.plugin.Plugin; +import static core.api.ContentAPIKt.*; + /** * Handles the search option. * @author 'Vexia @@ -80,6 +82,10 @@ public class SearchOptionPlugin extends OptionHandler { player.getInventory().add(new Item(946)); return true; } + if (node.getId() == 12799 && hasRequirement(player, "In Aid of the Myreque")) { + openBankAccount(player); + return true; + } player.getPacketDispatch().sendMessage("You search the " + node.getName().toLowerCase() + " but find nothing."); return true; } diff --git a/Server/src/main/content/global/skill/thieving/ThievingListeners.kt b/Server/src/main/content/global/skill/thieving/ThievingListeners.kt index 77a7f25dc..c01ef2e6c 100644 --- a/Server/src/main/content/global/skill/thieving/ThievingListeners.kt +++ b/Server/src/main/content/global/skill/thieving/ThievingListeners.kt @@ -95,7 +95,11 @@ class ThievingListeners : InteractionListener { } } //pickpocket again. - InteractionListeners.run(node.id, IntType.NPC,"Pickpocket",player,node) + if (player.skills.lifepoints > pickpocketData.stunDamageMax) { + InteractionListeners.run(node.id, IntType.NPC,"Pickpocket",player,node) + } else { + player.sendMessage("It's probably not a good idea to continue with your injuries.") + } return@on true } diff --git a/Server/src/main/content/region/misc/keldagrim/handlers/KeldagrimPlugin.kt b/Server/src/main/content/region/misc/keldagrim/handlers/KeldagrimPlugin.kt index 24a7a333b..186343d26 100644 --- a/Server/src/main/content/region/misc/keldagrim/handlers/KeldagrimPlugin.kt +++ b/Server/src/main/content/region/misc/keldagrim/handlers/KeldagrimPlugin.kt @@ -46,6 +46,12 @@ class KeldagrimOptionHandlers : OptionHandler() { 28094 -> player.dialogueInterpreter.open(GETrapdoorDialogueID) } } + "ride" -> { + when(node.id){ + 7029 -> player.dialogueInterpreter.open(GETrapdoorDialogueID) + 7030 -> player.dialogueInterpreter.open(GETrapdoorDialogueID) + } + } "enter" -> { when(node.id){ 5014 -> player.properties.teleportLocation = Location.create(2730, 3713, 0) @@ -62,6 +68,8 @@ class KeldagrimOptionHandlers : OptionHandler() { SceneryDefinition.forId(9138).handlers["option:climb-up"] = this SceneryDefinition.forId(28094).handlers["option:open"] = this SceneryDefinition.forId(5014).handlers["option:enter"] = this + SceneryDefinition.forId(7029).handlers["option:ride"] = this + SceneryDefinition.forId(7030).handlers["option:ride"] = this return this } }