From ee6f83eb7e0b1b4d3b1ac970f8bc96a4e650e766 Mon Sep 17 00:00:00 2001 From: randy Date: Sun, 17 Nov 2024 10:56:19 -0700 Subject: [PATCH] Improved timing of pickpocket repeating, and allowed repeating even when caught --- .../content/global/skill/thieving/ThievingListeners.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Server/src/main/content/global/skill/thieving/ThievingListeners.kt b/Server/src/main/content/global/skill/thieving/ThievingListeners.kt index 8068d35eb..77a7f25dc 100644 --- a/Server/src/main/content/global/skill/thieving/ThievingListeners.kt +++ b/Server/src/main/content/global/skill/thieving/ThievingListeners.kt @@ -68,8 +68,8 @@ class ThievingListeners : InteractionListener { return@on true } - //Custom portion. Repeat pickpocket, only proceed every other tick - if (GameWorld.ticks % 2 == 0) { + //Custom portion. Repeat pickpocket, only proceed if it has been long enough since the last pickpocket action + if (getAttribute(player, "pickpockettick", 0) <= GameWorld.ticks) { player.animator.animate(PICKPOCKET_ANIM) val lootTable = pickpocketRoll(player, pickpocketData.low, pickpocketData.high, pickpocketData.table) @@ -79,7 +79,9 @@ class ThievingListeners : InteractionListener { playHurtAudio(player, 20) - stun(player, pickpocketData.stunTime) + //stun(player, pickpocketData.stunTime) + stun(player, 0) + setAttribute(player, "pickpockettick", GameWorld.ticks + pickpocketData.stunTime) player.impactHandler.manualHit(node.asNpc(),RandomFunction.random(pickpocketData.stunDamageMin,pickpocketData.stunDamageMax),ImpactHandler.HitsplatType.NORMAL) @@ -87,6 +89,7 @@ class ThievingListeners : InteractionListener { } else { playAudio(player, Sounds.PICK_2581) //player.lock(2) + setAttribute(player, "pickpockettick", GameWorld.ticks + 2) lootTable.forEach { player.inventory.add(it) } player.skills.addExperience(Skills.THIEVING,pickpocketData.experience) }