From d4179ca6b7479af20119cd88c9234fd6fc1acf15 Mon Sep 17 00:00:00 2001 From: halogod35 Date: Thu, 23 Feb 2023 20:26:33 -0500 Subject: [PATCH] Lumbridge Cow Pen update + Bug fixes (#626) * Update npc.json * Update spawns.json * Update shops.json * Update Shops.java * Update Pickpocket.java --- 2006Scape Server/data/cfg/shops.json | 61 +- 2006Scape Server/data/cfg/spawns.json | 920 ++++++++++-------- .../content/skills/thieving/Pickpocket.java | 4 +- .../main/java/com/rs2/game/shops/Shops.java | 2 +- 4 files changed, 565 insertions(+), 422 deletions(-) diff --git a/2006Scape Server/data/cfg/shops.json b/2006Scape Server/data/cfg/shops.json index aa1fc7a4..bbaf1e42 100644 --- a/2006Scape Server/data/cfg/shops.json +++ b/2006Scape Server/data/cfg/shops.json @@ -4,7 +4,6 @@ "sellModifier": 2, "name": "Davon's Amulet Store.", "id": 2, - "id": 2, "items": [ { "itemId": 1718, @@ -3750,6 +3749,10 @@ "itemId": 1921, "itemAmount": 5 }, + { + "itemId": 1929, + "itemAmount": 5 + }, { "itemId": 1935, "itemAmount": 5 @@ -6643,60 +6646,60 @@ { "buyModifier": 2, "sellModifier": 2, - "name": "TzHaar-Hur-Rin's Ore and Gem Store", + "name": "TzHaar-Hur-Lek's Ore and Gem Store", "id": 139, "items": [ { "itemId": 438, - "itemAmount": 25 + "itemAmount": 5 }, { "itemId": 436, - "itemAmount": 25 + "itemAmount": 5 }, { "itemId": 440, - "itemAmount": 15 - }, - { - "itemId": 442, - "itemAmount": 12 - }, - { - "itemId": 453, - "itemAmount": 20 - }, - { - "itemId": 444, - "itemAmount": 12 - }, - { - "itemId": 447, - "itemAmount": 4 - }, - { - "itemId": 449, "itemAmount": 2 }, + { + "itemId": 442, + "itemAmount": 0 + }, + { + "itemId": 453, + "itemAmount": 0 + }, + { + "itemId": 444, + "itemAmount": 0 + }, + { + "itemId": 447, + "itemAmount": 0 + }, + { + "itemId": 449, + "itemAmount": 0 + }, { "itemId": 451, - "itemAmount": 1 + "itemAmount": 0 }, { "itemId": 1623, - "itemAmount": 16 + "itemAmount": 1 }, { "itemId": 1621, - "itemAmount": 12 + "itemAmount": 1 }, { "itemId": 1619, - "itemAmount": 8 + "itemAmount": 0 }, { "itemId": 1617, - "itemAmount": 6 + "itemAmount": 0 }, { "itemId": 1631, diff --git a/2006Scape Server/data/cfg/spawns.json b/2006Scape Server/data/cfg/spawns.json index 737bc709..052d5458 100644 --- a/2006Scape Server/data/cfg/spawns.json +++ b/2006Scape Server/data/cfg/spawns.json @@ -89,6 +89,196 @@ "walk": 0, "height": 0 }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3254, + "y": 3262, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3258, + "y": 3260, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3247, + "y": 3284, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3250, + "y": 3293, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3252, + "y": 3288, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3254, + "y": 3267, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3258, + "y": 3265, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3261, + "y": 3282, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3036, + "y": 3301, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3038, + "y": 3306, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3041, + "y": 3310, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3027, + "y": 3307, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3027, + "y": 3300, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3031, + "y": 3301, + "id": 81, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2583, + "y": 3119, + "id": 81, + "walk": 1, + "height": 1 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2588, + "y": 3120, + "id": 81, + "walk": 1, + "height": 1 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2585, + "y": 3126, + "id": 81, + "walk": 1, + "height": 1 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2580, + "y": 3124, + "id": 81, + "walk": 1, + "height": 1 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2602, + "y": 3117, + "id": 81, + "walk": 1, + "height": 1 + }, { "maxHit": 1, "strength": 3, @@ -503,7 +693,7 @@ "maxHit": 0, "strength": 0, "attack": 0, - "x": 3305, + "x": 3036, "y": 3294, "id": 2304, "walk": 1, @@ -8060,199 +8250,179 @@ "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3254, - "y": 3256, - "id": 1767, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3247, + "y": 3287, + "id": 1766, "walk": 1, "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3260, - "y": 3260, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3255, - "y": 3259, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3170, - "y": 3320, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3173, - "y": 3321, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3175, - "y": 3319, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3180, - "y": 3316, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3178, - "y": 3320, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3167, - "y": 3321, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3263, - "y": 3260, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3259, - "y": 3266, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3262, - "y": 3271, - "id": 1767, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3257, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3256, "y": 3273, "id": 1766, "walk": 1, "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3255, - "y": 3279, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3257, - "y": 3293, - "id": 1767, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3253, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3261, "y": 3289, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3248, - "y": 3284, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3248, - "y": 3288, "id": 1766, "walk": 1, "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3243, - "y": 3296, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3254, + "y": 3255, "id": 1767, "walk": 1, "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3243, + "y": 3295, + "id": 1767, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3252, + "y": 3282, + "id": 1767, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3256, + "y": 3292, + "id": 1767, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3259, + "y": 3295, + "id": 1767, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3261, + "y": 3270, + "id": 1767, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3247, + "y": 3287, + "id": 1768, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3254, + "y": 3291, + "id": 1768, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3257, + "y": 3280, + "id": 1768, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3261, + "y": 3273, + "id": 1768, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3262, + "y": 3287, + "id": 1768, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3254, + "y": 3258, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3261, + "y": 3259, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3244, + "y": 3283, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, "x": 3244, "y": 3289, "id": 397, @@ -8260,32 +8430,202 @@ "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3263, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3246, "y": 3293, "id": 397, "walk": 1, "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 3263, - "y": 3288, - "id": 1768, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3255, + "y": 3278, + "id": 397, "walk": 1, "height": 0 }, { - "maxHit": 2, - "strength": 10, - "attack": 10, + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3257, + "y": 3286, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3261, + "y": 3292, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, "x": 3262, + "y": 3277, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2674, + "y": 3348, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2672, + "y": 3349, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2671, + "y": 3352, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2672, + "y": 3343, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2930, + "y": 3270, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2927, + "y": 3272, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2924, "y": 3283, - "id": 81, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2921, + "y": 3288, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 2925, + "y": 3288, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3170, + "y": 3320, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3173, + "y": 3321, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3175, + "y": 3319, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3180, + "y": 3316, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3178, + "y": 3320, + "id": 397, + "walk": 1, + "height": 0 + }, + { + "maxHit": 1, + "strength": 1, + "attack": 1, + "x": 3167, + "y": 3321, + "id": 397, "walk": 1, "height": 0 }, @@ -13694,69 +14034,9 @@ "strength": 0, "attack": 0, "x": 3035, - "y": 3295, + "y": 3296, "id": 2311, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 2, - "attack": 5, - "x": 3036, - "y": 3301, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 2, - "attack": 5, - "x": 3038, - "y": 3306, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 2, - "attack": 5, - "x": 3041, - "y": 3310, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 2, - "attack": 5, - "x": 3027, - "y": 3307, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 2, - "attack": 5, - "x": 3027, - "y": 3300, - "id": 81, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 2, - "attack": 5, - "x": 3031, - "y": 3301, - "id": 81, - "walk": 1, + "walk": 0, "height": 0 }, { @@ -14174,7 +14454,7 @@ "strength": 20, "attack": 20, "x": 2578, - "y": 3102, + "y": 3103, "id": 2332, "walk": 1, "height": 0 @@ -14589,56 +14869,6 @@ "walk": 1, "height": 1 }, - { - "maxHit": 4, - "strength": 0, - "attack": 4, - "x": 2583, - "y": 3119, - "id": 81, - "walk": 1, - "height": 1 - }, - { - "maxHit": 4, - "strength": 0, - "attack": 4, - "x": 2588, - "y": 3120, - "id": 81, - "walk": 1, - "height": 1 - }, - { - "maxHit": 4, - "strength": 0, - "attack": 4, - "x": 2585, - "y": 3126, - "id": 81, - "walk": 1, - "height": 1 - }, - { - "maxHit": 4, - "strength": 0, - "attack": 4, - "x": 2580, - "y": 3124, - "id": 81, - "walk": 1, - "height": 1 - }, - { - "maxHit": 4, - "strength": 0, - "attack": 4, - "x": 2602, - "y": 3117, - "id": 81, - "walk": 1, - "height": 1 - }, { "maxHit": 1, "strength": 2, @@ -21219,96 +21449,6 @@ "walk": 1, "height": 0 }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2674, - "y": 3348, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2672, - "y": 3349, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2671, - "y": 3352, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2672, - "y": 3343, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2930, - "y": 3270, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2927, - "y": 3272, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2924, - "y": 3283, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2921, - "y": 3288, - "id": 397, - "walk": 1, - "height": 0 - }, - { - "maxHit": 2, - "strength": 10, - "attack": 10, - "x": 2925, - "y": 3288, - "id": 397, - "walk": 1, - "height": 0 - }, { "maxHit": 1, "strength": 2, diff --git a/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java index efee408b..537ef7d3 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java @@ -226,7 +226,7 @@ public class Pickpocket extends SkillHandler { player.getDialogueHandler().sendStatement("You need a Thieving level of " + n.getLevel() + " to pickpocket the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + "."); return; } - player.getPacketSender().sendMessage("You attempt to pick the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + "'s pocket."); + player.getPacketSender().sendMessage("You attempt to pick the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + "'s pocket."); player.startAnimation(881); if (Misc.random(player.playerLevel[Constants.THIEVING] + 5) < Misc.random(n.getLevel())) { RandomEventHandler.addRandom(player); @@ -306,4 +306,4 @@ public class Pickpocket extends SkillHandler { } } -} \ No newline at end of file +} diff --git a/2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java b/2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java index 24e180c0..1c030c4d 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java +++ b/2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java @@ -50,7 +50,7 @@ public class Shops { SHOP133(SANTIRI, 127), SHOP134(SARO, 128), SHOP135(VIGR, 129), SHOP136(NOLAR, 130), SHOP137(RANDIVOR, 131), SHOP138(GULLDAMAR, 132), SHOP139(GNOME_WAITER, 133), SHOP140(GULLUCK, 134), SHOP141(FAT_TONY, 135), SHOP142(NOTERAZZO, 136), SHOP143(NEIL, 137), SHOP144(TZHAARHURTEL, 138), - SHOP145(TZHAARHURLEK, 139), SHOP146(WILLIAM, 140), SHOP147(EDWARD, 141), SHOP148(BARMAN_849, 142), + SHOP145(TZHAARHURLEK, 139), SHOP146(WILLIAM, 140), SHOP147(EDWARD, 141), SHOP148(BARMAN_849, 142), SHOP149(DIANGO, 145), SHOP150(UGLUG_NAR, 165), SHOP151(ROACHEY, 190), SHOP152(SHOP_KEEPER_555, 220), SHOP153(AKHARANU, 284);