diff --git a/client.jar b/client.jar index 8b63efd..04f0a1f 100644 Binary files a/client.jar and b/client.jar differ diff --git a/data/botdata/namesandarmor.txt b/data/botdata/namesandarmor.txt index aa642ed..1759f16 100644 --- a/data/botdata/namesandarmor.txt +++ b/data/botdata/namesandarmor.txt @@ -332,3 +332,4 @@ iism0ke:51:1169:4325:1725:853:1129:0:0:1099:0:1065:626:0: Dzestiz:3:5533:0:21314:20779:0:24325:0:3059:0:3060:3061:0: Justiniksass:3:0:0:0:0:0:0:0:0:0:0:0:0: rag 1:66:2619:23410:1731:853:2661:0:0:2663:0:1065:23285:0: + diff --git a/data/cache/main_file_cache.dat2 b/data/cache/main_file_cache.dat2 index 946b16d..0728488 100644 Binary files a/data/cache/main_file_cache.dat2 and b/data/cache/main_file_cache.dat2 differ diff --git a/data/cache/main_file_cache.idx10 b/data/cache/main_file_cache.idx10 index fade74a..38fadc7 100644 Binary files a/data/cache/main_file_cache.idx10 and b/data/cache/main_file_cache.idx10 differ diff --git a/data/cache/main_file_cache.idx11 b/data/cache/main_file_cache.idx11 index 481c674..a1f3b8b 100644 Binary files a/data/cache/main_file_cache.idx11 and b/data/cache/main_file_cache.idx11 differ diff --git a/data/cache/main_file_cache.idx12 b/data/cache/main_file_cache.idx12 index 550c2a7..cf92cb4 100644 Binary files a/data/cache/main_file_cache.idx12 and b/data/cache/main_file_cache.idx12 differ diff --git a/data/cache/main_file_cache.idx13 b/data/cache/main_file_cache.idx13 index 81a01a2..d57ad20 100644 Binary files a/data/cache/main_file_cache.idx13 and b/data/cache/main_file_cache.idx13 differ diff --git a/data/cache/main_file_cache.idx14 b/data/cache/main_file_cache.idx14 index 2e77bc6..082eecd 100644 Binary files a/data/cache/main_file_cache.idx14 and b/data/cache/main_file_cache.idx14 differ diff --git a/data/cache/main_file_cache.idx15 b/data/cache/main_file_cache.idx15 index eaaa6be..0c05c5a 100644 Binary files a/data/cache/main_file_cache.idx15 and b/data/cache/main_file_cache.idx15 differ diff --git a/data/cache/main_file_cache.idx16 b/data/cache/main_file_cache.idx16 index 3c7fd3a..37964db 100644 Binary files a/data/cache/main_file_cache.idx16 and b/data/cache/main_file_cache.idx16 differ diff --git a/data/cache/main_file_cache.idx17 b/data/cache/main_file_cache.idx17 index aae218c..2f77233 100644 Binary files a/data/cache/main_file_cache.idx17 and b/data/cache/main_file_cache.idx17 differ diff --git a/data/cache/main_file_cache.idx18 b/data/cache/main_file_cache.idx18 index 437408b..d35c304 100644 Binary files a/data/cache/main_file_cache.idx18 and b/data/cache/main_file_cache.idx18 differ diff --git a/data/cache/main_file_cache.idx19 b/data/cache/main_file_cache.idx19 index 8a52fbf..38a3535 100644 Binary files a/data/cache/main_file_cache.idx19 and b/data/cache/main_file_cache.idx19 differ diff --git a/data/cache/main_file_cache.idx20 b/data/cache/main_file_cache.idx20 index e2b5963..bbf1bdf 100644 Binary files a/data/cache/main_file_cache.idx20 and b/data/cache/main_file_cache.idx20 differ diff --git a/data/cache/main_file_cache.idx21 b/data/cache/main_file_cache.idx21 index c5e486f..a5e628d 100644 Binary files a/data/cache/main_file_cache.idx21 and b/data/cache/main_file_cache.idx21 differ diff --git a/data/cache/main_file_cache.idx22 b/data/cache/main_file_cache.idx22 index 0990297..a9b0f58 100644 Binary files a/data/cache/main_file_cache.idx22 and b/data/cache/main_file_cache.idx22 differ diff --git a/data/cache/main_file_cache.idx23 b/data/cache/main_file_cache.idx23 index 2ba3046..52d21de 100644 Binary files a/data/cache/main_file_cache.idx23 and b/data/cache/main_file_cache.idx23 differ diff --git a/data/cache/main_file_cache.idx24 b/data/cache/main_file_cache.idx24 index b17783c..516a2a9 100644 Binary files a/data/cache/main_file_cache.idx24 and b/data/cache/main_file_cache.idx24 differ diff --git a/data/cache/main_file_cache.idx25 b/data/cache/main_file_cache.idx25 index c605479..b9f89b7 100644 Binary files a/data/cache/main_file_cache.idx25 and b/data/cache/main_file_cache.idx25 differ diff --git a/data/cache/main_file_cache.idx255 b/data/cache/main_file_cache.idx255 index ee6bc2d..d9ca1d8 100644 Binary files a/data/cache/main_file_cache.idx255 and b/data/cache/main_file_cache.idx255 differ diff --git a/data/cache/main_file_cache.idx26 b/data/cache/main_file_cache.idx26 index 3efeefc..60702b3 100644 Binary files a/data/cache/main_file_cache.idx26 and b/data/cache/main_file_cache.idx26 differ diff --git a/data/cache/main_file_cache.idx27 b/data/cache/main_file_cache.idx27 index 9771967..56841c8 100644 Binary files a/data/cache/main_file_cache.idx27 and b/data/cache/main_file_cache.idx27 differ diff --git a/data/cache/main_file_cache.idx28 b/data/cache/main_file_cache.idx28 index e8aa66f..54d8503 100644 --- a/data/cache/main_file_cache.idx28 +++ b/data/cache/main_file_cache.idx28 @@ -1 +1 @@ -ȵ  fq \ No newline at end of file +ȵC( 4 ;B<f>  ~ \ No newline at end of file diff --git a/data/cache/main_file_cache.idx3 b/data/cache/main_file_cache.idx3 index d510f13..4a2e693 100644 Binary files a/data/cache/main_file_cache.idx3 and b/data/cache/main_file_cache.idx3 differ diff --git a/data/cache/main_file_cache.idx4 b/data/cache/main_file_cache.idx4 index 2a4fe1a..450f521 100644 Binary files a/data/cache/main_file_cache.idx4 and b/data/cache/main_file_cache.idx4 differ diff --git a/data/cache/main_file_cache.idx5 b/data/cache/main_file_cache.idx5 index 088dca5..1f8ca2c 100644 Binary files a/data/cache/main_file_cache.idx5 and b/data/cache/main_file_cache.idx5 differ diff --git a/data/cache/main_file_cache.idx6 b/data/cache/main_file_cache.idx6 index ec8863f..fb5af92 100644 Binary files a/data/cache/main_file_cache.idx6 and b/data/cache/main_file_cache.idx6 differ diff --git a/data/cache/main_file_cache.idx7 b/data/cache/main_file_cache.idx7 index b890d30..1cd4782 100644 Binary files a/data/cache/main_file_cache.idx7 and b/data/cache/main_file_cache.idx7 differ diff --git a/data/cache/main_file_cache.idx8 b/data/cache/main_file_cache.idx8 index ac7233d..7e8ceba 100644 Binary files a/data/cache/main_file_cache.idx8 and b/data/cache/main_file_cache.idx8 differ diff --git a/data/cache/main_file_cache.idx9 b/data/cache/main_file_cache.idx9 index f341106..fc771ee 100644 Binary files a/data/cache/main_file_cache.idx9 and b/data/cache/main_file_cache.idx9 differ diff --git a/data/configs/drop_tables.json b/data/configs/drop_tables.json index 99fed4f..01b3c3d 100644 --- a/data/configs/drop_tables.json +++ b/data/configs/drop_tables.json @@ -14341,12 +14341,6 @@ "id": "1931", "maxAmount": "1" }, - { - "minAmount": "1", - "weight": "5", - "id": "2311", - "maxAmount": "1" - }, { "minAmount": "1", "weight": "5", @@ -16621,524 +16615,6 @@ } ] }, - { - "ids": "1020,4910", - "main": [ - { - "minAmount": "1", - "weight": "25", - "id": "565", - "maxAmount": "2" - }, - { - "minAmount": "1", - "weight": "25", - "id": "560", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "563", - "maxAmount": "1" - }, - { - "minAmount": "2", - "weight": "25", - "id": "562", - "maxAmount": "2" - }, - { - "minAmount": "15", - "weight": "25", - "id": "557", - "maxAmount": "20" - }, - { - "minAmount": "2", - "weight": "25", - "id": "561", - "maxAmount": "2" - }, - { - "minAmount": "1", - "weight": "25", - "id": "1440", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1385", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "199", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "201", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "203", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "205", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "207", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "209", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "211", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "213", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "215", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "2485", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "217", - "maxAmount": "1" - }, - { - "minAmount": "12", - "weight": "50", - "id": "995", - "maxAmount": "12" - }, - { - "minAmount": "42", - "weight": "50", - "id": "995", - "maxAmount": "42" - }, - { - "minAmount": "250", - "weight": "50", - "id": "995", - "maxAmount": "250" - }, - { - "minAmount": "3000", - "weight": "50", - "id": "995", - "maxAmount": "3000" - }, - { - "minAmount": "1", - "weight": "50", - "id": "1623", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "50", - "id": "1621", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "50", - "id": "1619", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "1617", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "987", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "985", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1631", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1615", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "1215", - "maxAmount": "1" - }, - { - "minAmount": "5", - "weight": "5", - "id": "830", - "maxAmount": "5" - }, - { - "minAmount": "20", - "weight": "5", - "id": "829", - "maxAmount": "20" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1319", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1247", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1249", - "maxAmount": "1" - }, - { - "minAmount": "50", - "weight": "5", - "id": "1216", - "maxAmount": "50" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1185", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1201", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "2366", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "1149", - "maxAmount": "1" - }, - { - "minAmount": "200", - "weight": "25", - "id": "9143", - "maxAmount": "200" - }, - { - "minAmount": "150", - "weight": "5", - "id": "9342", - "maxAmount": "150" - }, - { - "minAmount": "150", - "weight": "5", - "id": "892", - "maxAmount": "200" - }, - { - "minAmount": "500", - "weight": "5", - "id": "892", - "maxAmount": "500" - }, - { - "minAmount": "200", - "weight": "5", - "id": "1392", - "maxAmount": "200" - }, - { - "minAmount": "1000", - "weight": "5", - "id": "574", - "maxAmount": "1000" - }, - { - "minAmount": "1000", - "weight": "5", - "id": "570", - "maxAmount": "1000" - }, - { - "minAmount": "1", - "weight": "25", - "id": "1444", - "maxAmount": "1" - }, - { - "minAmount": "25", - "weight": "25", - "id": "1441", - "maxAmount": "35" - }, - { - "minAmount": "25", - "weight": "25", - "id": "1443", - "maxAmount": "35" - }, - { - "minAmount": "1", - "weight": "25", - "id": "1452", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "25", - "id": "1462", - "maxAmount": "1" - }, - { - "minAmount": "500", - "weight": "25", - "id": "7937", - "maxAmount": "15000" - }, - { - "minAmount": "47", - "weight": "5", - "id": "561", - "maxAmount": "77" - }, - { - "minAmount": "20", - "weight": "5", - "id": "566", - "maxAmount": "20" - }, - { - "minAmount": "45", - "weight": "5", - "id": "563", - "maxAmount": "45" - }, - { - "minAmount": "50", - "weight": "5", - "id": "560", - "maxAmount": "50" - }, - { - "minAmount": "121", - "weight": "5", - "id": "560", - "maxAmount": "121" - }, - { - "minAmount": "50", - "weight": "5", - "id": "565", - "maxAmount": "50" - }, - { - "minAmount": "125", - "weight": "25", - "id": "372", - "maxAmount": "250" - }, - { - "minAmount": "1000", - "weight": "25", - "id": "372", - "maxAmount": "1000" - }, - { - "minAmount": "250", - "weight": "25", - "id": "384", - "maxAmount": "500" - }, - { - "minAmount": "150", - "weight": "25", - "id": "533", - "maxAmount": "500" - }, - { - "minAmount": "150", - "weight": "25", - "id": "454", - "maxAmount": "7500" - }, - { - "minAmount": "150", - "weight": "25", - "id": "450", - "maxAmount": "800" - }, - { - "minAmount": "100", - "weight": "5", - "id": "443", - "maxAmount": "100" - }, - { - "minAmount": "100", - "weight": "5", - "id": "452", - "maxAmount": "100" - }, - { - "minAmount": "1000", - "weight": "5", - "id": "2362", - "maxAmount": "7000" - }, - { - "minAmount": "1", - "weight": "5", - "id": "2364", - "maxAmount": "1" - }, - { - "minAmount": "50", - "weight": "5", - "id": "2364", - "maxAmount": "50" - }, - { - "minAmount": "33", - "weight": "25", - "id": "258", - "maxAmount": "33" - }, - { - "minAmount": "25", - "weight": "25", - "id": "2999", - "maxAmount": "250" - }, - { - "minAmount": "30", - "weight": "25", - "id": "3001", - "maxAmount": "120" - }, - { - "minAmount": "10", - "weight": "25", - "id": "270", - "maxAmount": "100" - }, - { - "minAmount": "250", - "weight": "5", - "id": "6686", - "maxAmount": "250" - }, - { - "minAmount": "3", - "weight": "25", - "id": "5321", - "maxAmount": "3" - }, - { - "minAmount": "1", - "weight": "5", - "id": "5315", - "maxAmount": "50" - }, - { - "minAmount": "1", - "weight": "5", - "id": "5316", - "maxAmount": "6" - }, - { - "minAmount": "10", - "weight": "5", - "id": "5289", - "maxAmount": "10" - }, - { - "minAmount": "1", - "weight": "5", - "id": "5300", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "5304", - "maxAmount": "31" - }, - { - "minAmount": "100", - "weight": "5", - "id": "1516", - "maxAmount": "20000" - } - ], - "charm": [], - "default": [ - { - "minAmount": "1", - "weight": "100", - "id": "2892", - "maxAmount": "1" - } - ] - }, { "ids": "1021", "main": [ @@ -32054,30 +31530,6 @@ "id": "5521", "maxAmount": "1" }, - { - "minAmount": "1", - "weight": "5", - "id": "5221", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "5221", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "5221", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5", - "id": "5221", - "maxAmount": "1" - }, { "minAmount": "1", "weight": "50", diff --git a/data/configs/item_configs.json b/data/configs/item_configs.json index 1bfd9ff..9d05280 100644 --- a/data/configs/item_configs.json +++ b/data/configs/item_configs.json @@ -84573,7 +84573,7 @@ { "id": "9478", "name": "Half made batta", - "examine": "This XX batta needs baking (and garnishing with YY).", + "examine": "This cheese & tomato batta needs baking (and garnishing with equa leaves).", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84582,7 +84582,7 @@ { "id": "9479", "name": "Unfinished batta", - "examine": "This XX batta needs garnishing with YY.", + "examine": "This cheese & tomato batta needs garnishing with equa leaves.", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84591,7 +84591,7 @@ { "id": "9480", "name": "Half made batta", - "examine": "This XX batta needs baking (and garnishing with YY).", + "examine": "This fruit batta needs baking (and garnishing with gnome spices).", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84600,7 +84600,7 @@ { "id": "9481", "name": "Unfinished batta", - "examine": "This XX batta needs garnishing with YY.", + "examine": "This fruit batta needs garnishing with gnome spices.", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84609,7 +84609,7 @@ { "id": "9482", "name": "Half made batta", - "examine": "This XX batta needs baking (and garnishing with YY).", + "examine": "This toad batta needs baking.", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84618,7 +84618,7 @@ { "id": "9483", "name": "Half made batta", - "examine": "This XX batta needs baking (and garnishing with YY).", + "examine": "This veggie batta needs baking (and garnishing with equa leaves).", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84627,7 +84627,7 @@ { "id": "9484", "name": "Unfinished batta", - "examine": "This XX batta needs garnishing with YY.", + "examine": "This veggie batta needs garnishing with equa leaves.", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84636,7 +84636,7 @@ { "id": "9485", "name": "Half made batta", - "examine": "This XX batta needs baking (and garnishing with YY).", + "examine": "This worm batta needs baking (and garnishing with equa leaves).", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -84645,7 +84645,7 @@ { "id": "9486", "name": "Unfinished batta", - "examine": "This XX batta needs garnishing with YY.", + "examine": "This worm batta needs garnishing with equa leaves.", "high_alchemy": "1", "shop_price": "1", "archery_ticket_price": "0", @@ -85090,7 +85090,7 @@ { "id": "9558", "name": "Half made bowl", - "examine": "This unfinished xxx needs baking, and final ingredients", + "examine": "This unfinished choco bomb needs baking, and final ingredients", "high_alchemy": "1", "weight": "0.2", "archery_ticket_price": "0", @@ -85099,7 +85099,7 @@ { "id": "9559", "name": "Half made bowl", - "examine": "This unfinished xxx needs baking, and final ingredients", + "examine": "This unfinished tangled toad legs bowl needs baking, and final ingredients", "high_alchemy": "1", "weight": "0.2", "archery_ticket_price": "0", @@ -85108,7 +85108,7 @@ { "id": "9560", "name": "Unfinished bowl", - "examine": "This unfinished XX needs YY.", + "examine": "This unfinished choc bomb needs cream and chocolate dust.", "high_alchemy": "1", "archery_ticket_price": "0", "durability": null @@ -85116,7 +85116,7 @@ { "id": "9561", "name": "Half made bowl", - "examine": "This unfinished xxx needs baking, and final ingredients", + "examine": "This unfinished veggie ball needs baking, and final ingredients", "high_alchemy": "1", "weight": "0.2", "archery_ticket_price": "0", @@ -85125,7 +85125,7 @@ { "id": "9562", "name": "Unfinished bowl", - "examine": "This unfinished XX needs YY.", + "examine": "This unfinished veggie ball needs equa leaves.", "high_alchemy": "1", "archery_ticket_price": "0", "durability": null @@ -85133,7 +85133,7 @@ { "id": "9563", "name": "Half made bowl", - "examine": "This unfinished xxx needs baking, and final ingredients", + "examine": "This unfinished worm hole needs baking, and final ingredients", "high_alchemy": "1", "weight": "0.2", "archery_ticket_price": "0", @@ -85142,7 +85142,7 @@ { "id": "9564", "name": "Unfinished bowl", - "examine": "This unfinished XX needs YY.", + "examine": "This unfinished worm hole needs equa leaves.", "high_alchemy": "1", "archery_ticket_price": "0", "durability": null @@ -85197,7 +85197,7 @@ { "id": "9577", "name": "Half made crunchy", - "examine": "This XX crunchy needs baking and garnishing with YY.", + "examine": "This choco chip crunchy needs baking and garnishing with chocolate dust.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", @@ -85206,7 +85206,7 @@ { "id": "9578", "name": "Unfinished crunchy", - "examine": "This XX crunchy needs garnishing with YY.", + "examine": "This choco chip crunchy needs garnishing with chocolate dust.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", @@ -85215,7 +85215,7 @@ { "id": "9579", "name": "Half made crunchy", - "examine": "This XX crunchy needs baking and garnishing with YY.", + "examine": "This spicy crunchy needs baking and garnishing with gnome spices.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", @@ -85224,7 +85224,7 @@ { "id": "9580", "name": "Unfinished crunchy", - "examine": "This XX crunchy needs garnishing with YY.", + "examine": "This spicy crunchy needs garnishing with gnome spices.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", @@ -85233,7 +85233,7 @@ { "id": "9581", "name": "Half made crunchy", - "examine": "This XX crunchy needs baking and garnishing with YY.", + "examine": "This toad crunchy needs baking and garnishing with equa leaves.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", @@ -85242,7 +85242,7 @@ { "id": "9582", "name": "Unfinished crunchy", - "examine": "This XX crunchy needs garnishing with YY.", + "examine": "This toad crunchy needs garnishing with equa leaves.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", @@ -85251,7 +85251,7 @@ { "id": "9583", "name": "Half made crunchy", - "examine": "This XX crunchy needs baking and garnishing with YY.", + "examine": "This worm crunchy needs baking and garnishing with gnome spices.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", @@ -85260,7 +85260,7 @@ { "id": "9584", "name": "Unfinished crunchy", - "examine": "This XX crunchy needs garnishing with YY.", + "examine": "This worm crunchy needs garnishing with gnome spices.", "tradeable": "true", "high_alchemy": "1", "archery_ticket_price": "0", diff --git a/data/configs/npc_configs.json b/data/configs/npc_configs.json index 7b41d42..3a548bb 100644 --- a/data/configs/npc_configs.json +++ b/data/configs/npc_configs.json @@ -13804,7 +13804,7 @@ "attack_level": "1", "strength_level": "1", "defence_level": "64", - "range_level": "64", + "range_level": "72", "respawn_delay": "60", "melee_animation": "428", "defence_animation": "0", @@ -13824,9 +13824,9 @@ "name": "Elf warrior", "examine": "I don't wanna be at the wrong end of that pike.", "lifepoints": "85", - "attack_level": "60", - "strength_level": "60", - "defence_level": "60", + "attack_level": "68", + "strength_level": "68", + "defence_level": "68", "range_level": "1", "respawn_delay": "60", "attack_speed": "5", @@ -63714,6 +63714,86 @@ "aggressive": "true", "safespot": null }, + { + "id": "7010", + "name": "Grenwall", + "examine": "An active spiny creature.", + "lifepoints": "10", + "attack_level": "1", + "strength_level": "1", + "defence_level": "1", + "range_level": "1", + "melee_animation": "0", + "defence_animation": "0", + "death_animation": "0", + "magic_animation": "0", + "range_animation": "0", + "safespot": null + }, + { + "id": "7011", + "name": "Grenwall", + "examine": "A hiding spiny creature.", + "lifepoints": "10", + "attack_level": "1", + "strength_level": "1", + "defence_level": "1", + "range_level": "1", + "melee_animation": "0", + "defence_animation": "0", + "death_animation": "0", + "magic_animation": "0", + "range_animation": "0", + "safespot": null + }, + { + "id": "7012", + "name": "Pawya", + "examine": "What a strange little creature.", + "lifepoints": "10", + "attack_level": "1", + "strength_level": "1", + "defence_level": "1", + "range_level": "1", + "melee_animation": "0", + "defence_animation": "0", + "death_animation": "0", + "magic_animation": "0", + "range_animation": "0", + "safespot": null + }, + { + "id": "7013", + "name": "Earth Mound", + "examine": "Dug by a Pawya (Not actual exam).", + "lifepoints": "10", + "attack_level": "1", + "strength_level": "1", + "defence_level": "1", + "range_level": "1", + "melee_animation": "0", + "defence_animation": "0", + "death_animation": "0", + "magic_animation": "0", + "range_animation": "0", + "safespot": null + }, + { + "id": "7014", + "name": "Pawya", + "examine": "What a strange little creature.", + "lifepoints": "10", + "attack_level": "1", + "strength_level": "1", + "defence_level": "1", + "range_level": "1", + "melee_animation": "0", + "defence_animation": "0", + "death_animation": "0", + "magic_animation": "0", + "range_animation": "0", + "safespot": null + }, { "id": "7021", "name": "Platypus", @@ -67012,11 +67092,11 @@ "name": "TzTok-Jad", "examine": "This is going to hurt...", "lifepoints": "250", - "attack_level": "640", - "strength_level": "960", - "defence_level": "480", - "range_level": "960", - "magic_level": "480", + "attack_level": "700", + "strength_level": "1600", + "defence_level": "700", + "range_level": "1600", + "magic_level": "2400", "bonuses": "0,0,0,60,0,0,0,0,0,0,0,0,0,0,0", "attack_speed": "8", "agg_radius": "64", diff --git a/data/configs/npc_spawns.json b/data/configs/npc_spawns.json index 8af5bae..d7f8ab9 100644 --- a/data/configs/npc_spawns.json +++ b/data/configs/npc_spawns.json @@ -849,7 +849,7 @@ }, { "npc_id": "316", - "loc_data": "{2986,3176,0,0,4}-{3086,3227,0,0,1}-{2996,3157,0,0,1}-{2986,3176,0,0,0}-{2986,3176,0,0,0}-{3085,3230,0,0,0}-{162,41,0,0,6}" + "loc_data": "{2986,3176,0,0,4}-{3086,3227,0,0,1}-{2996,3157,0,0,1}-{2986,3176,0,0,0}-{2986,3176,0,0,0}-{3085,3230,0,0,0}" }, { "npc_id": "322", @@ -7103,6 +7103,10 @@ "npc_id": "5086", "loc_data": "{2321,3593,0,1,1}-{2322,3597,0,1,0}-{2309,3603,0,1,5}-{2306,3607,0,1,0}-{2305,3619,0,1,1}-{2309,3618,0,1,6}-{2322,3627,0,1,3}-{2324,3614,0,1,1}-{2323,3614,0,1,1}-{2323,3629,0,1,6}-{2329,3633,0,1,4}-{2328,3634,0,1,3}-{2311,3642,0,1,1}-{2307,3644,0,1,6}-{2318,3645,0,1,1}-{2323,3645,0,1,3}-{2333,3629,0,1,3}-{2340,3641,0,1,7}-{2343,3640,0,1,6}-{2335,3633,0,1,6}" }, + { + "npc_id": "5087", + "loc_data": "{2706,3776,0,1,4}-{2712,3774,0,1,3}-{2716,3778,0,1,4}-{2715,3772,0,1,3}-{2720,3767,0,1,4}-{2712,3766,0,1,0}-{2718,3767,0,1,7}-{2719,3771,0,1,3}" + }, { "npc_id": "5088", "loc_data": "{2586,2883,0,1,6}-{2589,2909,0,1,1}-{2574,2915,0,1,3}-{2572,2928,0,1,3}-{2567,2932,0,1,6}-{2568,2933,0,1,0}-{2538,2889,0,1,3}-{2538,2902,0,1,4}-{2536,2872,0,1,4}-{2536,2872,0,1,6}-{2536,2872,0,1,4}-{2536,2872,0,1,6}-{2536,2872,0,1,3}-{2585,2884,0,1,5}-{2577,2890,0,1,0}-{2578,2918,0,1,1}-{2536,2864,0,1,7}-{2568,2934,0,1,1}-{2574,2930,0,1,1}-{2576,2928,0,1,4}-{2512,2864,0,1,6}-{2512,2864,0,1,1}-{2580,2889,0,1,1}-{2580,2886,0,1,1}-{2580,2886,0,1,0}-{2572,2900,0,1,4}-{2572,2896,0,1,3}-{2568,2905,0,1,4}" @@ -9799,10 +9803,6 @@ "npc_id": "7451", "loc_data": "{2328,3170,0,1,6}-{2341,3179,0,1,4}-{2338,3164,0,1,4}-{2189,3181,0,1,2}-{2178,3186,0,1,7}-{2199,3182,0,1,0}-{2288,3149,0,1,2}-{2282,3144,0,1,3}-{2285,3144,0,1,2}-{2281,3139,0,1,1}-{2289,3152,0,1,6}-{2287,3155,0,1,1}-{2286,3146,0,1,1}-{2289,3156,0,0,5}-{2285,3136,0,1,3}" }, - { - "npc_id": "7550", - "loc_data": "{2617,3144,0,0,0}" - }, { "npc_id": "7636", "loc_data": "{3618,9736,0,0,0}-{3620,9732,0,0,0}-{3624,9736,0,0,0}-{3625,9738,0,0,0}-{3618,9736,0,0,4}-{3620,9732,0,0,4}-{3624,9736,0,0,4}-{3625,9738,0,0,4}" @@ -10002,6 +10002,366 @@ { "npc_id": "5424", "loc_data": "{2594,3269,0,0,0}" + }, + { + "npc_id": "7010", + "loc_data": "{2243,3200,0,1,3}-{2204,3229,0,1,3}-{2204,3229,0,1,3}-{2204,3229,0,1,3}-{2268,3239,0,1,3}-{2268,3239,0,1,3}-{2268,3239,0,1,3}-{2261,3260,0,1,3}-{2261,3260,0,1,3}-{2261,3260,0,1,3}" + }, + { + "npc_id": "7011", + "loc_data": "{2243,3200,0,1,3}-{2268,3239,0,1,3}-{2261,3260,0,1,3}-{2261,3260,0,1,3}" + }, + { + "npc_id": "7014", + "loc_data": "{2180,3201,0,1,3}-{2226,3143,0,1,3}-{2288,3147,0,1,3}-{2247,3187,0,1,3}" + }, + { + "npc_id": "7012", + "loc_data": "{2180,3201,0,1,3}-{2180,3201,0,1,3}-{2182,3204,0,1,3}-{2226,3143,0,1,3}-{2226,3143,0,1,3}-{2226,3143,0,1,3}-{2223,3146,0,1,3}-{2223,3146,0,1,3}-{2288,3147,0,1,3}-{2288,3147,0,1,3}-{2288,3147,0,1,3}-{2247,3187,0,1,3}-{2247,3187,0,1,3}" + }, + { + "npc_id": "1183", + "loc_data": "{2206,3258,0,1,3}-{2200,3261,0,1,3}-{2193,3253,0,1,3}-{2192,3243,0,1,3}" + }, + { + "npc_id": "1184", + "loc_data": "{2192,3249,0,1,3}-{2200,3249,0,1,3}-{2195,3247,0,1,3}-{2212,3258,0,1,3}" + }, + { + "npc_id": "2424", + "loc_data": "{2871,10187,0,1,0}" + }, + { + "npc_id": "1843", + "loc_data": "{2841,10129,0,1,0}" + }, + { + "npc_id": "1844", + "loc_data": "{2840,10127,0,1,0}" + }, + { + "npc_id": "2205", + "loc_data": "{2839,10128,0,1,0}" + }, + { + "npc_id": "2154", + "loc_data": "{2839,10128,0,1,0}" + }, + { + "npc_id": "2160", + "loc_data": "{2925,10211,0,1,0}" + }, + { + "npc_id": "2191", + "loc_data": "{2925,10213,0,1,0}" + }, + { + "npc_id": "4248", + "loc_data": "{2849,10183,0,1,0}" + }, + { + "npc_id": "2153", + "loc_data": "{2826,10197,0,1,0}" + }, + { + "npc_id": "2152", + "loc_data": "{2827,10231,0,1,0}" + }, + { + "npc_id": "2161", + "loc_data": "{2869,10211,0,1,0}" + }, + { + "npc_id": "2162", + "loc_data": "{2886,10187,0,1,0}" + }, + { + "npc_id": "2151", + "loc_data": "{2873,10210,0,1,0}" + }, + { + "npc_id": "4558", + "loc_data": "{2885,10202,0,1,0}" + }, + { + "npc_id": "2158", + "loc_data": "{2885,10207,0,1,0}" + }, + { + "npc_id": "2157", + "loc_data": "{2887,10212,0,1,0}" + }, + { + "npc_id": "2156", + "loc_data": "{2892,10212,0,1,0}" + }, + { + "npc_id": "2159", + "loc_data": "{2885,10196,0,1,0}" + }, + { + "npc_id": "2565", + "loc_data": "{1937,4972,0,1,0}" + }, + { + "npc_id": "2564", + "loc_data": "{1935,4964,0,0,4}" + }, + { + "npc_id": "2321", + "loc_data": "{2918,10194,0,0,3}" + }, + { + "npc_id": "2198", + "loc_data": "{2905,10213,0,1,0}" + }, + { + "npc_id": "2164", + "loc_data": "{2838,10205,0,0,1}" + }, + { + "npc_id": "2163", + "loc_data": "{2836,10205,0,1,0}" + }, + { + "npc_id": "2130", + "loc_data": "{2892,10191,0,1,0}-{2919,10206,0,1,0}-{2923,10230,0,1,0}-{2865,10193,0,1,0}" + }, + { + "npc_id": "2131", + "loc_data": "{2893,10205,0,1,0}-{2895,10223,0,1,0}-{2871,10199,0,1,0}-{2890,10199,0,1,0}" + }, + { + "npc_id": "2132", + "loc_data": "{2913,10211,0,1,0}-{2901,10232,0,1,0}-{2823,10193,0,1,0}" + }, + { + "npc_id": "5880", + "loc_data": "{2888,10226,0,1,0}-{2920,10196,0,1,0}-{2844,10214,0,1,0}" + }, + { + "npc_id": "5881", + "loc_data": "{2847,10200,0,1,0}-{2863,10233,0,1,0}-{2920,10216,0,1,0}" + }, + { + "npc_id": "5882", + "loc_data": "{2916,10191,0,1,0}-{2841,10195,0,1,0}-{2831,10219,0,1,0}" + }, + { + "npc_id": "2138", + "loc_data": "{2890,10232,0,1,0}" + }, + { + "npc_id": "2178", + "loc_data": "{2916,10192,0,1,0}-{2839,10196,0,1,0}" + }, + { + "npc_id": "2187", + "loc_data": "{2913,10200,0,1,0}" + }, + { + "npc_id": "1546", + "loc_data": "{2911,10175,0,0,4}-{2912,10175,0,0,4}-{2913,10175,0,0,4}-{2914,10175,0,0,4}-{2909,10173,0,0,4}-{2910,10173,0,0,4}-{2911,10173,0,0,4}-{2912,10173,0,0,4}-{2913,10173,0,0,4}-{2909,10171,0,0,4}-{2910,10171,0,0,4}-{2911,10169,0,0,4}-{2912,10169,0,0,4}-{2913,10169,0,0,4}" + }, + { + "npc_id": "2181", + "loc_data": "{2874,9871,0,1,0}" + }, + { + "npc_id": "2182", + "loc_data": "{2908,10176,0,1,0}" + }, + { + "npc_id": "2092", + "loc_data": "{2869,10196,1,1,0}" + }, + { + "npc_id": "2100", + "loc_data": "{2870,10196,1,1,0}" + }, + { + "npc_id": "2101", + "loc_data": "{2868,10202,1,1,0}" + }, + { + "npc_id": "2094", + "loc_data": "{2869,10205,1,0,6}" + }, + { + "npc_id": "2096", + "loc_data": "{2890,10207,1,0,6}" + }, + { + "npc_id": "2104", + "loc_data": "{2890,10204,1,1,0}" + }, + { + "npc_id": "2095", + "loc_data": "{2889,10211,1,0,6}" + }, + { + "npc_id": "2103", + "loc_data": "{2892,10209,1,1,0}" + }, + { + "npc_id": "2105", + "loc_data": "{2890,10196,1,1,0}" + }, + { + "npc_id": "2097", + "loc_data": "{2891,10196,1,0,6}" + }, + { + "npc_id": "2102", + "loc_data": "{2869,10208,1,1,0}" + }, + { + "npc_id": "2093", + "loc_data": "{2871,10207,1,1,0}" + }, + { + "npc_id": "2098", + "loc_data": "{2890,10192,1,0,6}" + }, + { + "npc_id": "2106", + "loc_data": "{2892,10190,1,1,0}" + }, + { + "npc_id": "2110", + "loc_data": "{2877,10198,1,1,0}-{2878,10196,1,1,0}" + }, + { + "npc_id": "2111", + "loc_data": "{2878,10201,1,1,0}-{2876,10201,1,1,0}" + }, + { + "npc_id": "2113", + "loc_data": "{2878,10201,1,1,0}-{2876,10201,1,1,0}" + }, + { + "npc_id": "2115", + "loc_data": "{2882,10201,1,1,0}-{2883,10200,1,1,0}" + }, + { + "npc_id": "2117", + "loc_data": "{2883,10198,1,1,0}-{2884,10199,1,1,0}" + }, + { + "npc_id": "2119", + "loc_data": "{2882,10197,1,1,0}-{2883,10196,1,1,0}" + }, + { + "npc_id": "2121", + "loc_data": "{2880,10195,1,1,0}-{2879,10193,1,1,0}" + }, + { + "npc_id": "2193", + "loc_data": "{2887,10223,0,1,0}" + }, + { + "npc_id": "2197", + "loc_data": "{2848,10198,0,1,0}" + }, + { + "npc_id": "2188", + "loc_data": "{2851,10223,0,1,0}" + }, + { + "npc_id": "2189", + "loc_data": "{2851,10223,0,1,0}" + }, + { + "npc_id": "2171", + "loc_data": "{2930,10184,0,1,0}" + }, + { + "npc_id": "1848", + "loc_data": "{2868,10168,0,1,0}" + }, + { + "npc_id": "1849", + "loc_data": "{2868,10168,0,1,0}" + }, + { + "npc_id": "1847", + "loc_data": "{2868,10168,0,1,0}" + }, + { + "npc_id": "1839", + "loc_data": "{2825,10167,0,1,0}" + }, + { + "npc_id": "2127", + "loc_data": "{2880,10199,1,1,0}" + }, + { + "npc_id": "2201", + "loc_data": "{2866,10208,0,1,0}" + }, + { + "npc_id": "2179", + "loc_data": "{2840,10199,0,0,6}" + }, + { + "npc_id": "2177", + "loc_data": "{2843,10191,1,0,1}" + }, + { + "npc_id": "2140", + "loc_data": "{2835,10226,0,0,6}" + }, + { + "npc_id": "2169", + "loc_data": "{2836,10222,0,1,0}" + }, + { + "npc_id": "2196", + "loc_data": "{2838,10196,0,1,0}" + }, + { + "npc_id": "2170", + "loc_data": "{2853,10196,0,1,0}" + }, + { + "npc_id": "2199", + "loc_data": "{2855,10199,0,1,0}" + }, + { + "npc_id": "2192", + "loc_data": "{2933,10219,0,1,0}" + }, + { + "npc_id": "2141", + "loc_data": "{2906,10204,0,1,0}" + }, + { + "npc_id": "2202", + "loc_data": "{2912,10222,0,1,0}" + }, + { + "npc_id": "2195", + "loc_data": "{2901,10227,0,1,0}" + }, + { + "npc_id": "2194", + "loc_data": "{2926,10225,0,1,0}" + }, + { + "npc_id": "2142", + "loc_data": "{2904,10206,0,1,0}" + }, + { + "npc_id": "2190", + "loc_data": "{2922,10201,0,1,0}" + }, + { + "npc_id": "2155", + "loc_data": "{2871,10199,0,1,0}" + }, + { + "npc_id": "603", + "loc_data": "{2450,3510,1,1,0}" } ] diff --git a/data/configs/shops.json b/data/configs/shops.json index a1bba0b..304b2da 100644 --- a/data/configs/shops.json +++ b/data/configs/shops.json @@ -820,7 +820,7 @@ }, { "id": "92", - "title": "Gem Store (monkey Colony)", + "title": "Gem Store", "general_store": "0", "stock": "{1623,1}-{1621,1}-{1619,0}-{1617,0}", "npcs": "2157", @@ -1470,7 +1470,7 @@ "id": "164", "title": "Vigr's Warhammers", "general_store": "0", - "stock": "{1337,10}-{1335,10}-{139,10}-{1341,10}-{1343,10}", + "stock": "{1337,10}-{1335,10}-{1339,10}-{1341,10}-{1343,10}", "npcs": "2151", "currency": "995", "high_alch": "0" @@ -1633,7 +1633,7 @@ "title": "Delicious Goods", "general_store": "0", "stock": "{2436,150000}-{2440,150000}-{2442,150000}-{2444,150000}-{3040,150000}-{2434,150000}-{3024,150000}-{2452,150000}-{6685,150000}-{9739,150000}-{385,150000}-{3144,150000}-{391,150000}-{7060,150000}-{7946,150000}-{379,150000}-{7218,150000}-{2301,150000}", - "npcs": "3117", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1642,7 +1642,7 @@ "title": "Armour & Supplies", "general_store": "0", "stock": "{5698,150000}-{1305,150000}-{4587,150000}-{1377,150000}-{1434,150000}-{7158,150000}-{3204,150000}-{4151,150000}-{4153,150000}-{6528,150000}-{1333,150000}-{1319,150000}-{10887,150000}-{5574,150000}-{5575,150000}-{5576,150000}-{9672,150000}-{9674,150000}-{9676,150000}-{1067,150000}-{1115,150000}-{1153,150000}-{1079,150000}-{1127,150000}-{1163,150000}-{6107,150000}-{6109,150000}-{6108,150000}-{6524,150000}-{10828,150000}-{3751,150000}-{3753,150000}-{3105,150000}-{7460,150000}", - "npcs": "5503", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1651,7 +1651,7 @@ "title": "Range Supplies", "general_store": "0", "stock": "{9241,150000}-{9243,150000}-{9242,150000}-{9244,150000}-{9245,150000}-{9144,150000}-{9305,150000}-{868,150000}-{11230,150000}-{6522,150000}-{892,150000}-{2491,150000}-{2497,150000}-{2503,150000}-{6328,150000}-{3749,150000}-{861,150000}-{9185,150000}-{4214,150000}-{1169,150000}-{1129,150000}-{10034,150000}", - "npcs": "649", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1660,7 +1660,7 @@ "title": "Magic Emporium", "general_store": "0", "stock": "{554,150000}-{555,150000}-{556,150000}-{557,150000}-{558,150000}-{559,150000}-{560,150000}-{561,150000}-{562,150000}-{563,150000}-{564,150000}-{565,150000}-{566,150000}-{9075,150000}-{4089,150000}-{4091,150000}-{4093,150000}-{4095,150000}-{4097,150000}-{4099,150000}-{4101,150000}-{4103,150000}-{4105,150000}-{4107,150000}-{4109,150000}-{4111,150000}-{4113,150000}-{4115,150000}-{4117,150000}-{6912,150000}-{3840,150000}-{3842,150000}-{3844,150000}-{1540,150000}-{2412,150000}-{2413,150000}-{2414,150000}-{4675,150000}-{2415,150000}-{2416,150000}-{2417,150000}-{577,150000}-{579,150000}-{2579,150000}", - "npcs": "707", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1768,7 +1768,7 @@ "title": "Donator Island General Store", "general_store": "1", "stock": "{1931,30}-{1935,30}-{1735,10}-{1925,10}-{1923,10}-{1887,10}-{590,10}-{1755,10}-{2347,10}-{550,10}-{9003,10}", - "npcs": "561", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1781,15 +1781,6 @@ "currency": "995", "high_alch": "0" }, - { - "id": "199", - "title": "The Researcher's Wares", - "general_store": "0", - "stock": "{7409,1}-{4081,1}-{10588,1}-{7003,1}-{4502,1}-{775,1}-{777,1}-{776,1}-{6617,1}-{6619,1}-{6623,1}-{6625,1}-{6627,1}-{6629,1}-{6631,1}-{6633,1}-{2379,1}", - "npcs": "4568", - "currency": "995", - "high_alch": "0" - }, { "id": "200", "title": "The Teleporter's Tabs", @@ -1804,7 +1795,7 @@ "title": "The Fairy's Culinary Goods", "general_store": "0", "stock": "{330, 10000000}-{6706, 10000000}-{380, 10000000}-{7219, 10000000}-{2290, 10000000}-{2302, 10000000}-{1892, 10000000}-{229, 10000000}", - "npcs": "3322", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1813,7 +1804,7 @@ "title": "The Wizard's Goods", "general_store": "0", "stock": "{554,10000000}-{555,10000000}-{556,10000000}-{557,10000000}-{558,10000000}-{559,10000000}-{562,10000000}-{560,10000000}-{563,10000000}-{14730,10000000}-{14732,10000000}-{14734,10000000}-{14736,10000000}-{14738,10000000}-{14740,10000000}-{11872,10}-{11960,10}-{11962,10}-{579,10}-{577,10}-{1011,10}-{1389,10}-{1381,10}-{1381,10}-{1383,10}-{1385,10}-{1387,10}-{4675,10}-{2890,10}-{9731,10}-{3755,10}-{1727,10}-{656, 10}-{658,10}-{660,10}-{662, 10}-{664,10}-{3839, 10}-{3841, 10}-{3843,10}", - "npcs": "8029", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1822,7 +1813,7 @@ "title": "2009Scape Protective Goods", "general_store": "0", "stock": "{11814,10}-{11816,10}-{11818,10}-{11820,10}-{11822,10}-{11824, 10}-{11826,10}-{11828,10}-{11830,10}-{11832,10}-{11834,10}-{11836,10}-{11838,10}-{11840,10}-{3105,10}-{4119,10}-{4121,10}-{4123,10}-{4125,10}-{4127,10}-{4129,10}-{1725,10}-{1729,10}-{3751,10}-{3753,10}-{1149,10}-{542,10}-{544,10}-{5574,10}-{5575,10}-{5576,10}-{6106,10}-{6107,10}-{6108,10}-{6109,10}-{6110,10}-{6111,10}-{4502,10}-{7458,10}", - "npcs": "4905", + "npcs": "", "currency": "995", "high_alch": "0" }, @@ -1951,5 +1942,59 @@ "npcs": "596", "currency": "995", "high_alch": "0" + }, + { + "id": "218", + "title": "Silver Cog Silver Stall", + "general_store": "0", + "stock": "{1714,2}-{442,1}-{2355,1}", + "npcs": "2159", + "currency": "995", + "high_alch": "0" + }, + { + "id": "219", + "title": "Carefree Crafting Stall", + "general_store": "0", + "stock": "{1755,2}-{1592,4}-{1597,2}-{1733,3}-{1734,100}-{1759,100}", + "npcs": "2158", + "currency": "995", + "high_alch": "0" + }, + { + "id": "220", + "title": "Keldagrim's Best Bread", + "general_store": "0", + "stock": "{2309,10}-{1891,3}-{1901,8}", + "npcs": "2156", + "currency": "995", + "high_alch": "0" + }, + { + "id": "221", + "title": "Quality Armour Shop", + "general_store": "0", + "stock": "{1105,3}-{1109,1}-{1107,1}-{1111,1}-{1141,3}-{1143,1}-{1145,1}-{1177,0}-{1195,0}", + "npcs": "2153", + "currency": "995", + "high_alch": "0" + }, + { + "id": "222", + "title": "Ore Shop", + "general_store": "0", + "stock": "{436,100}-{438,100}-{440,100}-{442,100}-{444,100}-{447,100}-{453,100}", + "npcs": "2564", + "currency": "995", + "high_alch": "0" + }, + { + "id": "223", + "title": "Funch's Fine Groceries", + "general_store": "0", + "stock": "{2021,10}-{2019,10}-{2015,10}-{2017,10}-{2114,10}-{2128,20}-{2108,20}-{2102,20}-{2126,5}-{2026,20}-{2017,10}-{2114,10}-{2128,10}-{2108,10}", + "npcs": "603", + "currency": "995", + "high_alch": "0" } ] \ No newline at end of file diff --git a/server.jar b/server.jar index 7a6c546..67aa9e5 100644 Binary files a/server.jar and b/server.jar differ