diff --git a/Server/data/configs/drop_tables.json b/Server/data/configs/drop_tables.json index d790ac09b..45d1db4f7 100644 --- a/Server/data/configs/drop_tables.json +++ b/Server/data/configs/drop_tables.json @@ -948,18 +948,6 @@ "weight": "5.0", "id": "2353", "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5.0", - "id": "2434", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "5.0", - "id": "173", - "maxAmount": "1" } ] }, @@ -9972,7 +9960,7 @@ }, { "minAmount": "1", - "weight": "5.0", + "weight": "3.0", "id": "143", "maxAmount": "1" }, @@ -36947,7 +36935,7 @@ }, { "minAmount": "1", - "weight": "25.0", + "weight": "20.0", "id": "141", "maxAmount": "1" }, @@ -51807,10 +51795,10 @@ "maxAmount": "2" }, { - "minAmount": "3", - "weight": "250.0", + "minAmount": "1", + "weight": "200.0", "id": "2434", - "maxAmount": "3" + "maxAmount": "2" }, { "minAmount": "3", diff --git a/Server/data/configs/ground_spawns.json b/Server/data/configs/ground_spawns.json index 145d087af..59faf0d5f 100644 --- a/Server/data/configs/ground_spawns.json +++ b/Server/data/configs/ground_spawns.json @@ -15,6 +15,10 @@ "item_id": "88", "loc_data": "{1,2654,9767,0,4587583}" }, + { + "item_id": "185", + "loc_data": "{1,2467,3176,0,7209050}" + }, { "item_id": "223", "loc_data": "{1,3128,9956,0,7864410}-{1,3129,9954,0,7864410}-{1,3126,9958,0,7864410}-{1,3117,9951,0,7864410}-{1,3118,9948,0,7864410}-{1,3119,9949,0,7864410}-{1,3179,9881,0,7864410}-{1,3177,9880,0,7864410}" @@ -427,6 +431,10 @@ "item_id": "2347", "loc_data": "{1,2934,3286,0,7209050}-{1,2579,3463,0,5242920}-{1,2975,3368,1,5898270}" }, + { + "item_id": "2351", + "loc_data": "{1,3062,3657,0,11141270}" + }, { "item_id": "2357", "loc_data": "{1,3192,9822,0,11141270}" diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index ec39caaf6..ae009f99d 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -1167,7 +1167,7 @@ { "shop_price": "780", "ge_buy_limit": "100", - "examine": "X doses of Strength potion.", + "examine": "4 doses of Strength potion.", "grand_exchange_price": "1041", "durability": null, "name": "Strength potion(4)", @@ -1189,7 +1189,7 @@ { "shop_price": "780", "ge_buy_limit": "100", - "examine": "X doses of Strength potion.", + "examine": "3 doses of Strength potion.", "grand_exchange_price": "812", "durability": null, "name": "Strength potion(3)", @@ -1211,7 +1211,7 @@ { "shop_price": "780", "ge_buy_limit": "100", - "examine": "X doses of Strength potion.", + "examine": "2 doses of Strength potion.", "grand_exchange_price": "656", "durability": null, "name": "Strength potion(2)", @@ -1233,7 +1233,7 @@ { "shop_price": "780", "ge_buy_limit": "100", - "examine": "X doses of Strength potion.", + "examine": "1 dose of Strength potion.", "grand_exchange_price": "355", "durability": null, "name": "Strength potion(1)", @@ -1255,7 +1255,7 @@ { "shop_price": "560", "ge_buy_limit": "100", - "examine": "X doses of Attack potion.", + "examine": "3 doses of Attack potion.", "grand_exchange_price": "195", "durability": null, "name": "Attack potion(3)", @@ -1277,7 +1277,7 @@ { "shop_price": "560", "ge_buy_limit": "100", - "examine": "X doses of Attack potion.", + "examine": "2 doses of Attack potion.", "grand_exchange_price": "113", "durability": null, "name": "Attack potion(2)", @@ -1299,7 +1299,7 @@ { "shop_price": "560", "ge_buy_limit": "100", - "examine": "X doses of Attack potion.", + "examine": "1 dose of Attack potion.", "grand_exchange_price": "197", "durability": null, "name": "Attack potion(1)", @@ -1321,7 +1321,7 @@ { "shop_price": "139", "ge_buy_limit": "100", - "examine": "X dose(s) of restore potion.", + "examine": "3 doses of restore potion.", "grand_exchange_price": "59", "durability": null, "name": "Restore potion(3)", @@ -1344,7 +1344,7 @@ { "shop_price": "139", "ge_buy_limit": "100", - "examine": "X dose(s) of restore potion.", + "examine": "2 doses of restore potion.", "grand_exchange_price": "35", "durability": null, "name": "Restore potion(2)", @@ -1367,7 +1367,7 @@ { "shop_price": "139", "ge_buy_limit": "100", - "examine": "X dose(s) of restore potion.", + "examine": "1 dose of restore potion.", "grand_exchange_price": "21", "durability": null, "name": "Restore potion(1)", @@ -1390,7 +1390,7 @@ { "shop_price": "114", "ge_buy_limit": "100", - "examine": "(x) doses of Defence Potion.", + "examine": "3 doses of Defence Potion.", "grand_exchange_price": "323", "durability": null, "name": "Defence potion(3)", @@ -1412,7 +1412,7 @@ { "shop_price": "114", "ge_buy_limit": "100", - "examine": "(x) doses of Defence Potion.", + "examine": "2 doses of Defence Potion.", "grand_exchange_price": "247", "durability": null, "name": "Defence potion(2)", @@ -1434,7 +1434,7 @@ { "shop_price": "114", "ge_buy_limit": "100", - "examine": "(x) doses of Defence Potion.", + "examine": "1 dose of Defence Potion.", "grand_exchange_price": "148", "durability": null, "name": "Defence potion(1)", @@ -1455,7 +1455,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Prayer restore potion.", + "examine": "3 doses of Prayer restore potion.", "grand_exchange_price": "4134", "durability": null, "name": "Prayer potion(3)", @@ -1476,7 +1476,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Prayer restore potion.", + "examine": "2 doses of Prayer restore potion.", "grand_exchange_price": "2868", "durability": null, "name": "Prayer potion(2)", @@ -1497,7 +1497,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Prayer restore potion.", + "examine": "1 dose of Prayer restore potion.", "grand_exchange_price": "1353", "durability": null, "name": "Prayer potion(1)", @@ -1518,7 +1518,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Attack potion.", + "examine": "3 doses of super Attack potion.", "grand_exchange_price": "691", "durability": null, "name": "Super attack(3)", @@ -1539,7 +1539,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Attack potion.", + "examine": "2 doses of super Attack potion.", "grand_exchange_price": "451", "durability": null, "name": "Super attack(2)", @@ -1560,7 +1560,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Attack potion.", + "examine": "1 dose of super Attack potion.", "grand_exchange_price": "243", "durability": null, "name": "Super attack(1)", @@ -1581,7 +1581,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of Fishing potion.", + "examine": "3 doses of Fishing potion.", "grand_exchange_price": "40", "durability": null, "name": "Fishing potion(3)", @@ -1603,7 +1603,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of Fishing potion.", + "examine": "2 doses of Fishing potion.", "grand_exchange_price": "56", "durability": null, "name": "Fishing potion(2)", @@ -1625,7 +1625,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of Fishing potion.", + "examine": "1 dose of Fishing potion.", "grand_exchange_price": "87", "durability": null, "name": "Fishing potion(1)", @@ -1647,7 +1647,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Strength potion.", + "examine": "3 doses of super Strength potion.", "grand_exchange_price": "1679", "durability": null, "name": "Super strength(3)", @@ -1668,7 +1668,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Strength potion.", + "examine": "2 doses of super Strength potion.", "grand_exchange_price": "1164", "durability": null, "name": "Super strength(2)", @@ -1689,7 +1689,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Strength potion.", + "examine": "1 dose of super Strength potion.", "grand_exchange_price": "603", "durability": null, "name": "Super strength(1)", @@ -1710,7 +1710,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Defence potion.", + "examine": "3 doses of super Defence potion.", "grand_exchange_price": "113", "durability": null, "name": "Super defence(3)", @@ -1731,7 +1731,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Defence potion.", + "examine": "2 doses of super Defence potion.", "grand_exchange_price": "65", "durability": null, "name": "Super defence(2)", @@ -1752,7 +1752,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super Defence potion.", + "examine": "1 dose of super Defence potion.", "grand_exchange_price": "41", "durability": null, "name": "Super defence(1)", @@ -1773,7 +1773,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of ranging potion.", + "examine": "3 doses of ranging potion.", "grand_exchange_price": "6224", "durability": null, "name": "Ranging potion(3)", @@ -1794,7 +1794,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of ranging potion.", + "examine": "2 doses of ranging potion.", "grand_exchange_price": "4330", "durability": null, "name": "Ranging potion(2)", @@ -1815,7 +1815,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of ranging potion.", + "examine": "1 dose of ranging potion.", "grand_exchange_price": "2068", "durability": null, "name": "Ranging potion(1)", @@ -1837,7 +1837,7 @@ { "shop_price": "375", "ge_buy_limit": "1000", - "examine": "X doses of antipoison potion.", + "examine": "3 doses of antipoison potion.", "grand_exchange_price": "1239", "durability": null, "name": "Antipoison(3)", @@ -1859,7 +1859,7 @@ { "shop_price": "375", "ge_buy_limit": "1000", - "examine": "X doses of antipoison potion.", + "examine": "2 doses of antipoison potion.", "grand_exchange_price": "822", "durability": null, "name": "Antipoison(2)", @@ -1881,7 +1881,7 @@ { "shop_price": "375", "ge_buy_limit": "1000", - "examine": "X doses of antipoison potion.", + "examine": "1 dose of antipoison potion.", "grand_exchange_price": "460", "durability": null, "name": "Antipoison(1)", @@ -1902,7 +1902,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super anti poison potion.", + "examine": "3 doses of super anti poison potion.", "grand_exchange_price": "872", "durability": null, "name": "Super antipoison(3)", @@ -1923,7 +1923,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super anti poison potion.", + "examine": "2 doses of super anti poison potion.", "grand_exchange_price": "509", "durability": null, "name": "Super antipoison(2)", @@ -1944,7 +1944,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super anti poison potion.", + "examine": "1 dose of super anti poison potion.", "grand_exchange_price": "366", "durability": null, "name": "Super antipoison(1)", @@ -1986,7 +1986,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose[s] of Zamorak brew.", + "examine": "3 doses of Zamorak brew.", "grand_exchange_price": "1818", "durability": null, "name": "Zamorak brew(3)", @@ -2008,7 +2008,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose[s] of Zamorak brew.", + "examine": "2 doses of Zamorak brew.", "grand_exchange_price": "1004", "durability": null, "name": "Zamorak brew(2)", @@ -2030,7 +2030,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose[s] of Zamorak brew.", + "examine": "1 dose of Zamorak brew.", "grand_exchange_price": "1175", "durability": null, "name": "Zamorak brew(1)", @@ -19022,7 +19022,7 @@ }, { "ge_buy_limit": "100", - "examine": "Uncharged: A very powerful dragonstone amulet. 1-4 charges: A dragonstone amulet with X magic charges.", + "examine": "A very powerful dragonstone amulet.", "grand_exchange_price": "28000", "durability": null, "name": "Amulet of glory", @@ -19044,7 +19044,7 @@ "id": "1705" }, { - "examine": "Uncharged: A very powerful dragonstone amulet. 1-4 charges: A dragonstone amulet with X magic charges.", + "examine": "A dragonstone amulet with 1 magic charges.", "grand_exchange_price": "1", "durability": null, "name": "Amulet of glory(1)", @@ -19064,7 +19064,7 @@ "id": "1707" }, { - "examine": "Uncharged: A very powerful dragonstone amulet. 1-4 charges: A dragonstone amulet with X magic charges.", + "examine": "A dragonstone amulet with 2 magic charges.", "grand_exchange_price": "1", "durability": null, "name": "Amulet of glory(2)", @@ -19084,7 +19084,7 @@ "id": "1709" }, { - "examine": "Uncharged: A very powerful dragonstone amulet. 1-4 charges: A dragonstone amulet with X magic charges.", + "examine": "A dragonstone amulet with 3 magic charges.", "grand_exchange_price": "1", "durability": null, "name": "Amulet of glory(3)", @@ -19105,7 +19105,7 @@ }, { "ge_buy_limit": "100", - "examine": "Uncharged: A very powerful dragonstone amulet. 1-4 charges: A dragonstone amulet with X magic charges.", + "examine": "A dragonstone amulet with 4 magic charges.", "grand_exchange_price": "29300", "durability": null, "name": "Amulet of glory(4)", @@ -20281,7 +20281,7 @@ "tradeable": "true", "low_alchemy": "12", "high_alchemy": "18", - "weight": "4", + "weight": "0.1", "archery_ticket_price": "0", "id": "1823" }, @@ -20303,7 +20303,7 @@ "tradeable": "true", "low_alchemy": "12", "high_alchemy": "18", - "weight": "4", + "weight": "0.1", "archery_ticket_price": "0", "id": "1825" }, @@ -20323,7 +20323,7 @@ "tradeable": "true", "low_alchemy": "12", "high_alchemy": "18", - "weight": "4", + "weight": "0.1", "archery_ticket_price": "0", "id": "1827" }, @@ -20343,7 +20343,7 @@ "tradeable": "true", "low_alchemy": "12", "high_alchemy": "18", - "weight": "4", + "weight": "0.1", "archery_ticket_price": "0", "id": "1829" }, @@ -20364,7 +20364,7 @@ "tradeable": "true", "low_alchemy": "12", "high_alchemy": "18", - "weight": "4", + "weight": "0.1", "archery_ticket_price": "0", "id": "1831" }, @@ -26159,7 +26159,7 @@ { "shop_price": "8002", "ge_buy_limit": "100", - "examine": "X doses of Attack potion.", + "examine": "4 doses of Attack potion.", "grand_exchange_price": "275", "durability": null, "name": "Attack potion(4)", @@ -26181,7 +26181,7 @@ { "shop_price": "139", "ge_buy_limit": "100", - "examine": "X dose(s) of restore potion.", + "examine": "4 doses of restore potion.", "grand_exchange_price": "101", "durability": null, "name": "Restore potion(4)", @@ -26204,7 +26204,7 @@ { "shop_price": "7832", "ge_buy_limit": "100", - "examine": "(x) doses of Defence Potion.", + "examine": "4 doses of Defence Potion.", "grand_exchange_price": "448", "durability": null, "name": "Defence potion(4)", @@ -26225,7 +26225,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Prayer restore potion.", + "examine": "4 doses of Prayer restore potion.", "grand_exchange_price": "5687", "durability": null, "name": "Prayer potion(4)", @@ -26247,7 +26247,7 @@ { "shop_price": "8000", "ge_buy_limit": "1000", - "examine": "X dose(s) of super Attack potion.", + "examine": "4 doses of super Attack potion.", "grand_exchange_price": "898", "durability": null, "name": "Super attack(4)", @@ -26269,7 +26269,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of Fishing potion.", + "examine": "4 doses of Fishing potion.", "grand_exchange_price": "73", "durability": null, "name": "Fishing potion(4)", @@ -26292,7 +26292,7 @@ { "shop_price": "8000", "ge_buy_limit": "1000", - "examine": "X dose(s) of super Strength potion.", + "examine": "4 doses of super Strength potion.", "grand_exchange_price": "2278", "durability": null, "name": "Super strength(4)", @@ -26315,7 +26315,7 @@ { "shop_price": "7000", "ge_buy_limit": "1000", - "examine": "X dose(s) of super Defence potion.", + "examine": "4 doses of super Defence potion.", "grand_exchange_price": "153", "durability": null, "name": "Super defence(4)", @@ -26337,7 +26337,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of ranging potion.", + "examine": "4 doses of ranging potion.", "grand_exchange_price": "8317", "durability": null, "name": "Ranging potion(4)", @@ -26359,7 +26359,7 @@ { "shop_price": "375", "ge_buy_limit": "1000", - "examine": "X doses of antipoison potion.", + "examine": "4 doses of antipoison potion.", "grand_exchange_price": "1624", "durability": null, "name": "Antipoison(4)", @@ -26380,7 +26380,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super anti poison potion.", + "examine": "4 doses of super anti poison potion.", "grand_exchange_price": "1062", "durability": null, "name": "Super antipoison(4)", @@ -26401,7 +26401,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose[s] of Zamorak brew.", + "examine": "4 doses of Zamorak brew.", "grand_exchange_price": "2838", "durability": null, "name": "Zamorak brew(4)", @@ -26423,7 +26423,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of anti-firebreath potion.", + "examine": "4 doses of anti-firebreath potion.", "grand_exchange_price": "4743", "durability": null, "name": "Antifire potion(4)", @@ -26444,7 +26444,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of anti-firebreath potion.", + "examine": "3 doses of anti-firebreath potion.", "grand_exchange_price": "3518", "durability": null, "name": "Antifire potion(3)", @@ -26465,7 +26465,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of anti-firebreath potion.", + "examine": "2 doses of anti-firebreath potion.", "grand_exchange_price": "2291", "durability": null, "name": "Antifire potion(2)", @@ -26486,7 +26486,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of anti-firebreath potion.", + "examine": "1 dose of anti-firebreath potion.", "grand_exchange_price": "1099", "durability": null, "name": "Antifire potion(1)", @@ -31878,7 +31878,7 @@ { "shop_price": "145", "ge_buy_limit": "100", - "examine": "X doses of energy potion.", + "examine": "4 doses of energy potion.", "grand_exchange_price": "33", "durability": null, "name": "Energy potion(4)", @@ -31900,7 +31900,7 @@ { "shop_price": "145", "ge_buy_limit": "100", - "examine": "X doses of energy potion.", + "examine": "3 doses of energy potion.", "grand_exchange_price": "18", "durability": null, "name": "Energy potion(3)", @@ -31922,7 +31922,7 @@ { "shop_price": "145", "ge_buy_limit": "100", - "examine": "X doses of energy potion.", + "examine": "2 doses of energy potion.", "grand_exchange_price": "11", "durability": null, "name": "Energy potion(2)", @@ -31944,7 +31944,7 @@ { "shop_price": "145", "ge_buy_limit": "100", - "examine": "X doses of energy potion.", + "examine": "1 dose of energy potion.", "grand_exchange_price": "25", "durability": null, "name": "Energy potion(1)", @@ -31966,7 +31966,7 @@ { "shop_price": "4000", "ge_buy_limit": "1000", - "examine": "X dose(s) of super energy potion.", + "examine": "4 doses of super energy potion.", "grand_exchange_price": "3088", "durability": null, "name": "Super energy(4)", @@ -31988,7 +31988,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super energy potion.", + "examine": "3 doses of super energy potion.", "grand_exchange_price": "2485", "durability": null, "name": "Super energy(3)", @@ -32009,7 +32009,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super energy potion.", + "examine": "2 doses of super energy potion.", "grand_exchange_price": "1592", "durability": null, "name": "Super energy(2)", @@ -32030,7 +32030,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super energy potion.", + "examine": "1 dose of super energy potion.", "grand_exchange_price": "1432", "durability": null, "name": "Super energy(1)", @@ -32052,7 +32052,7 @@ { "shop_price": "12000", "ge_buy_limit": "1000", - "examine": "X dose(s) of super restore potion.", + "examine": "4 doses of super restore potion.", "grand_exchange_price": "11500", "durability": null, "name": "Super restore(4)", @@ -32075,7 +32075,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super restore potion.", + "examine": "3 doses of super restore potion.", "grand_exchange_price": "8690", "durability": null, "name": "Super restore(3)", @@ -32097,7 +32097,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super restore potion.", + "examine": "2 doses of super restore potion.", "grand_exchange_price": "5637", "durability": null, "name": "Super restore(2)", @@ -32119,7 +32119,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X dose(s) of super restore potion.", + "examine": "1 dose of super restore potion.", "grand_exchange_price": "2606", "durability": null, "name": "Super restore(1)", @@ -32141,7 +32141,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Agility potion.", + "examine": "4 doses of Agility potion.", "grand_exchange_price": "276", "durability": null, "name": "Agility potion(4)", @@ -32161,7 +32161,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Agility potion.", + "examine": "3 doses of Agility potion.", "grand_exchange_price": "148", "durability": null, "name": "Agility potion(3)", @@ -32181,7 +32181,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Agility potion.", + "examine": "2 doses of Agility potion.", "grand_exchange_price": "115", "durability": null, "name": "Agility potion(2)", @@ -32201,7 +32201,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Agility potion.", + "examine": "1 dose of Agility potion.", "grand_exchange_price": "306", "durability": null, "name": "Agility potion(1)", @@ -32221,7 +32221,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of Magic potion.", + "examine": "4 doses of Magic potion.", "grand_exchange_price": "7214", "durability": null, "name": "Magic potion(4)", @@ -32242,7 +32242,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of Magic potion.", + "examine": "3 doses of Magic potion.", "grand_exchange_price": "5285", "durability": null, "name": "Magic potion(3)", @@ -32263,7 +32263,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of Magic potion.", + "examine": "2 doses of Magic potion.", "grand_exchange_price": "3697", "durability": null, "name": "Magic potion(2)", @@ -32284,7 +32284,7 @@ }, { "ge_buy_limit": "100", - "examine": "X dose(s) of Magic potion.", + "examine": "1 dose of Magic potion.", "grand_exchange_price": "1826", "durability": null, "name": "Magic potion(1)", @@ -35209,7 +35209,7 @@ "id": "3407" }, { - "examine": "X doses serum 207 as described in Herbi Flax's diary.", + "examine": "4 doses serum 207 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 207 (4)", "low_alchemy": "5", @@ -35218,7 +35218,7 @@ "id": "3408" }, { - "examine": "X doses serum 207 as described in Herbi Flax's diary.", + "examine": "3 doses serum 207 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 207 (3)", "low_alchemy": "5", @@ -35227,7 +35227,7 @@ "id": "3410" }, { - "examine": "X doses serum 207 as described in Herbi Flax's diary.", + "examine": "2 doses serum 207 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 207 (2)", "low_alchemy": "5", @@ -35236,7 +35236,7 @@ "id": "3412" }, { - "examine": "X doses serum 207 as described in Herbi Flax's diary.", + "examine": "1 dose serum 207 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 207 (1)", "low_alchemy": "5", @@ -35246,7 +35246,7 @@ }, { "shop_price": "208", - "examine": "X doses permanent serum 208 as described in Herbi Flax's diary.", + "examine": "3 doses permanent serum 208 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 208 (4)", "low_alchemy": "5", @@ -35256,7 +35256,7 @@ }, { "shop_price": "208", - "examine": "X doses permanent serum 208 as described in Herbi Flax's diary.", + "examine": "3 doses permanent serum 208 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 208 (3)", "low_alchemy": "5", @@ -35266,7 +35266,7 @@ }, { "shop_price": "208", - "examine": "X doses permanent serum 208 as described in Herbi Flax's diary.", + "examine": "2 doses permanent serum 208 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 208 (2)", "low_alchemy": "5", @@ -35276,7 +35276,7 @@ }, { "shop_price": "208", - "examine": "X doses permanent serum 208 as described in Herbi Flax's diary.", + "examine": "1 dose permanent serum 208 as described in Herbi Flax's diary.", "durability": null, "name": "Serum 208 (1)", "low_alchemy": "5", @@ -35310,7 +35310,7 @@ { "shop_price": "26", "ge_buy_limit": "1000", - "examine": "X doses of olive oil.", + "examine": "4 doses of olive oil.", "grand_exchange_price": "678", "durability": null, "name": "Olive oil(4)", @@ -35332,7 +35332,7 @@ { "shop_price": "26", "ge_buy_limit": "1000", - "examine": "X doses of olive oil.", + "examine": "3 doses of olive oil.", "grand_exchange_price": "413", "durability": null, "name": "Olive oil(3)", @@ -35354,7 +35354,7 @@ { "shop_price": "26", "ge_buy_limit": "1000", - "examine": "X doses of olive oil.", + "examine": "2 doses of olive oil.", "grand_exchange_price": "173", "durability": null, "name": "Olive oil(2)", @@ -35376,7 +35376,7 @@ { "shop_price": "26", "ge_buy_limit": "1000", - "examine": "X doses of olive oil.", + "examine": "1 dose of olive oil.", "grand_exchange_price": "110", "durability": null, "name": "Olive oil(1)", @@ -46847,7 +46847,7 @@ { "shop_price": "200", "ge_buy_limit": "1000", - "examine": "X doses of Relicym's balm, which helps cure disease.", + "examine": "4 doses of Relicym's balm, which helps cure disease.", "grand_exchange_price": "1430", "durability": null, "name": "Relicym's balm(4)", @@ -46867,7 +46867,7 @@ { "shop_price": "200", "ge_buy_limit": "1000", - "examine": "X doses of Relicym's balm, which helps cure disease.", + "examine": "3 doses of Relicym's balm, which helps cure disease.", "grand_exchange_price": "654", "durability": null, "name": "Relicym's balm(3)", @@ -46887,7 +46887,7 @@ { "shop_price": "200", "ge_buy_limit": "1000", - "examine": "X doses of Relicym's balm, which helps cure disease.", + "examine": "2 doses of Relicym's balm, which helps cure disease.", "grand_exchange_price": "325", "durability": null, "name": "Relicym's balm(2)", @@ -46907,7 +46907,7 @@ { "shop_price": "200", "ge_buy_limit": "1000", - "examine": "X doses of Relicym's balm, which helps cure disease.", + "examine": "1 dose of Relicym's balm, which helps cure disease.", "grand_exchange_price": "204", "durability": null, "name": "Relicym's balm(1)", @@ -57625,7 +57625,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of a super-strong antipoison potion.", + "examine": "4 doses of a super-strong antipoison potion.", "grand_exchange_price": "1138", "durability": null, "name": "Antipoison++(4)", @@ -57646,7 +57646,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of a super-strong antipoison potion.", + "examine": "3 doses of a super-strong antipoison potion.", "grand_exchange_price": "1071", "durability": null, "name": "Antipoison++(3)", @@ -57667,7 +57667,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of a super-strong antipoison potion.", + "examine": "2 doses of a super-strong antipoison potion.", "grand_exchange_price": "632", "durability": null, "name": "Antipoison++(2)", @@ -57688,7 +57688,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of a super-strong antipoison potion.", + "examine": "1 dose of a super-strong antipoison potion.", "grand_exchange_price": "821", "durability": null, "name": "Antipoison++(1)", @@ -82793,6 +82793,7 @@ { "shop_price": "30000", "turn90cw_anim": "1207", + "requirements": "{6,65}", "examine": "A Moonclan staff.", "walk_anim": "1205", "durability": null, @@ -82872,6 +82873,7 @@ }, { "turn90cw_anim": "1207", + "requirements": "{6,65}", "examine": "A staff enchanted by air.", "walk_anim": "1205", "durability": null, @@ -82897,6 +82899,7 @@ }, { "turn90cw_anim": "1207", + "requirements": "{6,65}", "examine": "A staff enchanted by air and fire.", "walk_anim": "1205", "durability": null, @@ -82922,6 +82925,7 @@ }, { "turn90cw_anim": "1207", + "requirements": "{6,65}", "examine": "A staff enchanted by air, fire and water.", "walk_anim": "1205", "durability": null, @@ -82962,6 +82966,7 @@ { "remove_head": "true", "shop_price": "15000", + "requirements": "{1,40}-{6,65}", "examine": "A mystical helmet.", "durability": null, "low_alchemy": "40", @@ -82980,6 +82985,7 @@ }, { "shop_price": "120000", + "requirements": "{1,40}-{6,65}", "examine": "Provides good protection.", "durability": null, "low_alchemy": "40", @@ -82998,6 +83004,7 @@ }, { "shop_price": "80000", + "requirements": "{1,40}-{6,65}", "examine": "These should protect my legs.", "durability": null, "low_alchemy": "40", @@ -83015,6 +83022,7 @@ }, { "shop_price": "10000", + "requirements": "{1,40}-{6,65}", "examine": "These should keep my hands safe.", "durability": null, "low_alchemy": "40", @@ -83031,6 +83039,7 @@ }, { "shop_price": "10000", + "requirements": "{1,40}-{6,65}", "examine": "Mystical foot protection.", "durability": null, "low_alchemy": "40", @@ -83047,6 +83056,7 @@ }, { "shop_price": "12000", + "requirements": "{1,40}-{6,65}", "examine": "Oooo pretty!", "durability": null, "low_alchemy": "1", @@ -83064,6 +83074,7 @@ { "shop_price": "4000", "examine": "Awesome.", + "requirements": "{1,40}-{6,65}", "durability": null, "low_alchemy": "12", "high_alchemy": "18", @@ -83091,6 +83102,7 @@ { "shop_price": "2000", "examine": "A mysterious ring that can fill the wearer with magical power.", + "requirements": "{1,40}-{6,65}", "durability": null, "low_alchemy": "40", "high_alchemy": "60", @@ -86907,7 +86919,7 @@ { "shop_price": "207", "ge_buy_limit": "100", - "examine": "X dose(s) of combat potion.", + "examine": "4 doses of combat potion.", "grand_exchange_price": "45", "durability": null, "name": "Combat potion(4)", @@ -86929,7 +86941,7 @@ { "shop_price": "207", "ge_buy_limit": "100", - "examine": "X dose(s) of combat potion.", + "examine": "3 doses of combat potion.", "grand_exchange_price": "25", "durability": null, "name": "Combat potion(3)", @@ -86951,7 +86963,7 @@ { "shop_price": "207", "ge_buy_limit": "100", - "examine": "X dose(s) of combat potion.", + "examine": "2 doses of combat potion.", "grand_exchange_price": "19", "durability": null, "name": "Combat potion(2)", @@ -86973,7 +86985,7 @@ { "shop_price": "207", "ge_buy_limit": "100", - "examine": "X dose(s) of combat potion.", + "examine": "1 dose of combat potion.", "grand_exchange_price": "72", "durability": null, "name": "Combat potion(1)", @@ -89069,7 +89081,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of hunter potion.", + "examine": "4 doses of hunter potion.", "grand_exchange_price": "566", "durability": null, "name": "Hunter potion(4)", @@ -89090,7 +89102,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of hunter potion.", + "examine": "3 doses of hunter potion.", "grand_exchange_price": "229", "durability": null, "name": "Hunter potion(3)", @@ -89111,7 +89123,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of hunter potion.", + "examine": "2 doses of hunter potion.", "grand_exchange_price": "159", "durability": null, "name": "Hunter potion(2)", @@ -89132,7 +89144,7 @@ }, { "ge_buy_limit": "100", - "examine": "X doses of hunter potion.", + "examine": "1 dose of hunter potion.", "grand_exchange_price": "148", "durability": null, "name": "Hunter potion(1)", @@ -104227,7 +104239,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of a fishy agility potion", + "examine": "2 doses of a fishy agility potion", "grand_exchange_price": "388", "durability": null, "name": "Agility mix(2)", @@ -104246,7 +104258,7 @@ }, { "ge_buy_limit": "1000", - "examine": "X doses of a fishy agility potion", + "examine": "1 dose of a fishy agility potion", "grand_exchange_price": "459", "durability": null, "name": "Agility mix(1)", @@ -106525,7 +106537,7 @@ "id": "11808" }, { - "examine": "X doses of goblin transmogrification potion.", + "examine": "4 doses of goblin transmogrification potion.", "durability": null, "name": "Goblin potion (4)", "low_alchemy": "5", @@ -106535,7 +106547,7 @@ "equipment_slot": "5" }, { - "examine": "X doses of goblin transmogrification potion.", + "examine": "3 doses of goblin transmogrification potion.", "durability": null, "name": "Goblin potion (3)", "low_alchemy": "5", @@ -106544,7 +106556,7 @@ "id": "11810" }, { - "examine": "X doses of goblin transmogrification potion.", + "examine": "2 doses of goblin transmogrification potion.", "durability": null, "name": "Goblin potion (2)", "low_alchemy": "5", @@ -106553,7 +106565,7 @@ "id": "11811" }, { - "examine": "X doses of goblin transmogrification potion.", + "examine": "1 dose of goblin transmogrification potion.", "durability": null, "name": "Goblin potion (1)", "low_alchemy": "5", @@ -110062,7 +110074,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Summoning potion.", + "examine": "4 doses of Summoning potion.", "grand_exchange_price": "4489", "durability": null, "name": "Summoning potion(4)", @@ -110084,7 +110096,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Summoning potion.", + "examine": "3 doses of Summoning potion.", "grand_exchange_price": "3320", "durability": null, "name": "Summoning potion(3)", @@ -110106,7 +110118,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Summoning potion.", + "examine": "2 doses of Summoning potion.", "grand_exchange_price": "1671", "durability": null, "name": "Summoning potion(2)", @@ -110128,7 +110140,7 @@ }, { "ge_buy_limit": "100", - "examine": "(X) doses of Summoning potion.", + "examine": "1 dose of Summoning potion.", "grand_exchange_price": "1576", "durability": null, "name": "Summoning potion(1)", @@ -133512,7 +133524,7 @@ }, { "shop_price": "150", - "examine": "(X) doses of Prayer restore potion.", + "examine": "3 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133528,7 +133540,7 @@ }, { "shop_price": "150", - "examine": "(X) doses of Prayer restore potion.", + "examine": "3 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133543,7 +133555,7 @@ }, { "shop_price": "120", - "examine": "(X) doses of Prayer restore potion.", + "examine": "4 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133559,7 +133571,7 @@ }, { "shop_price": "120", - "examine": "(X) doses of Prayer restore potion.", + "examine": "4 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133574,7 +133586,7 @@ }, { "shop_price": "90", - "examine": "(X) doses of Prayer restore potion.", + "examine": "3 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133590,7 +133602,7 @@ }, { "shop_price": "90", - "examine": "(X) doses of Prayer restore potion.", + "examine": "3 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133605,7 +133617,7 @@ }, { "shop_price": "60", - "examine": "(X) doses of Prayer restore potion.", + "examine": "2 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133621,7 +133633,7 @@ }, { "shop_price": "60", - "examine": "(X) doses of Prayer restore potion.", + "examine": "2 doses of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133636,7 +133648,7 @@ }, { "shop_price": "30", - "examine": "(X) doses of Prayer restore potion.", + "examine": "1 dose of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133652,7 +133664,7 @@ }, { "shop_price": "30", - "examine": "(X) doses of Prayer restore potion.", + "examine": "1 dose of Prayer restore potion.", "durability": null, "low_alchemy": "61", "high_alchemy": "91", @@ -133667,7 +133679,7 @@ }, { "shop_price": "150", - "examine": "X doses of energy potion.", + "examine": "4 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133683,7 +133695,7 @@ }, { "shop_price": "150", - "examine": "X doses of energy potion.", + "examine": "4 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133698,7 +133710,7 @@ }, { "shop_price": "120", - "examine": "X doses of energy potion.", + "examine": "4 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133714,7 +133726,7 @@ }, { "shop_price": "120", - "examine": "X doses of energy potion.", + "examine": "4 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133729,7 +133741,7 @@ }, { "shop_price": "90", - "examine": "X doses of energy potion.", + "examine": "3 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133745,7 +133757,7 @@ }, { "shop_price": "90", - "examine": "X doses of energy potion.", + "examine": "3 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133760,7 +133772,7 @@ }, { "shop_price": "60", - "examine": "X doses of energy potion.", + "examine": "2 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133776,7 +133788,7 @@ }, { "shop_price": "60", - "examine": "X doses of energy potion.", + "examine": "2 doses of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133791,7 +133803,7 @@ }, { "shop_price": "30", - "examine": "X doses of energy potion.", + "examine": "1 dose of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133807,7 +133819,7 @@ }, { "shop_price": "30", - "examine": "X doses of energy potion.", + "examine": "1 dose of energy potion.", "durability": null, "low_alchemy": "58", "high_alchemy": "87", @@ -133822,7 +133834,7 @@ }, { "shop_price": "150", - "examine": "X dose(s) of super Attack potion.", + "examine": "5 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133838,7 +133850,7 @@ }, { "shop_price": "150", - "examine": "X dose(s) of super Attack potion.", + "examine": "5 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133853,7 +133865,7 @@ }, { "shop_price": "120", - "examine": "X dose(s) of super Attack potion.", + "examine": "4 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133869,7 +133881,7 @@ }, { "shop_price": "120", - "examine": "X dose(s) of super Attack potion.", + "examine": "4 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133884,7 +133896,7 @@ }, { "shop_price": "90", - "examine": "X dose(s) of super Attack potion.", + "examine": "3 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133900,7 +133912,7 @@ }, { "shop_price": "90", - "examine": "X dose(s) of super Attack potion.", + "examine": "3 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133915,7 +133927,7 @@ }, { "shop_price": "60", - "examine": "X dose(s) of super Attack potion.", + "examine": "2 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133931,7 +133943,7 @@ }, { "shop_price": "60", - "examine": "X dose(s) of super Attack potion.", + "examine": "2 doses of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133946,7 +133958,7 @@ }, { "shop_price": "30", - "examine": "X dose(s) of super Attack potion.", + "examine": "1 dose of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133962,7 +133974,7 @@ }, { "shop_price": "30", - "examine": "X dose(s) of super Attack potion.", + "examine": "1 dose of super Attack potion.", "durability": null, "low_alchemy": "72", "high_alchemy": "108", @@ -133977,7 +133989,7 @@ }, { "shop_price": "150", - "examine": "X dose(s) of super Strength potion.", + "examine": "5 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -133993,7 +134005,7 @@ }, { "shop_price": "150", - "examine": "X dose(s) of super Strength potion.", + "examine": "5 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134008,7 +134020,7 @@ }, { "shop_price": "120", - "examine": "X dose(s) of super Strength potion.", + "examine": "4 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134024,7 +134036,7 @@ }, { "shop_price": "120", - "examine": "X dose(s) of super Strength potion.", + "examine": "4 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134039,7 +134051,7 @@ }, { "shop_price": "90", - "examine": "X dose(s) of super Strength potion.", + "examine": "3 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134055,7 +134067,7 @@ }, { "shop_price": "90", - "examine": "X dose(s) of super Strength potion.", + "examine": "3 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134070,7 +134082,7 @@ }, { "shop_price": "60", - "examine": "X dose(s) of super Strength potion.", + "examine": "2 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134086,7 +134098,7 @@ }, { "shop_price": "60", - "examine": "X dose(s) of super Strength potion.", + "examine": "2 doses of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134101,7 +134113,7 @@ }, { "shop_price": "30", - "examine": "X dose(s) of super Strength potion.", + "examine": "1 dose of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134117,7 +134129,7 @@ }, { "shop_price": "30", - "examine": "X dose(s) of super Strength potion.", + "examine": "1 dose of super Strength potion.", "durability": null, "low_alchemy": "88", "high_alchemy": "132", @@ -134148,7 +134160,7 @@ }, { "shop_price": "150", - "examine": "4 doses of ranging potion.", + "examine": "5 doses of ranging potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134194,7 +134206,7 @@ }, { "shop_price": "90", - "examine": "4 doses of ranging potion.", + "examine": "3 doses of ranging potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134210,7 +134222,7 @@ }, { "shop_price": "90", - "examine": "4 doses of ranging potion.", + "examine": "3 doses of ranging potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134225,7 +134237,7 @@ }, { "shop_price": "60", - "examine": "4 doses of ranging potion.", + "examine": "2 doses of ranging potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134241,7 +134253,7 @@ }, { "shop_price": "60", - "examine": "4 doses of ranging potion.", + "examine": "2 doses of ranging potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134256,7 +134268,7 @@ }, { "shop_price": "30", - "examine": "4 doses of ranging potion.", + "examine": "1 dose of ranging potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134272,7 +134284,7 @@ }, { "shop_price": "30", - "examine": "4 doses of ranging potion.", + "examine": "1 dose of ranging potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134287,7 +134299,7 @@ }, { "shop_price": "150", - "examine": "(x) doses of Defence Potion.", + "examine": "3 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134303,7 +134315,7 @@ }, { "shop_price": "150", - "examine": "(x) doses of Defence Potion.", + "examine": "3 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134318,7 +134330,7 @@ }, { "shop_price": "120", - "examine": "(x) doses of Defence Potion.", + "examine": "4 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134334,7 +134346,7 @@ }, { "shop_price": "120", - "examine": "(x) doses of Defence Potion.", + "examine": "4 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134349,7 +134361,7 @@ }, { "shop_price": "90", - "examine": "(x) doses of Defence Potion.", + "examine": "3 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134365,7 +134377,7 @@ }, { "shop_price": "90", - "examine": "(x) doses of Defence Potion.", + "examine": "3 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134380,7 +134392,7 @@ }, { "shop_price": "60", - "examine": "(x) doses of Defence Potion.", + "examine": "2 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134396,7 +134408,7 @@ }, { "shop_price": "60", - "examine": "(x) doses of Defence Potion.", + "examine": "2 doses of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134411,7 +134423,7 @@ }, { "shop_price": "30", - "examine": "(x) doses of Defence Potion.", + "examine": "1 dose of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134427,7 +134439,7 @@ }, { "shop_price": "30", - "examine": "(x) doses of Defence Potion.", + "examine": "1 dose of Defence Potion.", "durability": null, "low_alchemy": "352", "high_alchemy": "528", @@ -134458,7 +134470,7 @@ }, { "shop_price": "150", - "examine": "4 doses of Magic potion.", + "examine": "5 doses of Magic potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134504,7 +134516,7 @@ }, { "shop_price": "90", - "examine": "4 doses of Magic potion.", + "examine": "3 doses of Magic potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134520,7 +134532,7 @@ }, { "shop_price": "90", - "examine": "4 doses of Magic potion.", + "examine": "3 doses of Magic potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134535,7 +134547,7 @@ }, { "shop_price": "60", - "examine": "4 doses of Magic potion.", + "examine": "2 doses of Magic potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134551,7 +134563,7 @@ }, { "shop_price": "60", - "examine": "4 doses of Magic potion.", + "examine": "2 doses of Magic potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134566,7 +134578,7 @@ }, { "shop_price": "30", - "examine": "4 doses of Magic potion.", + "examine": "1 dose of Magic potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134582,7 +134594,7 @@ }, { "shop_price": "30", - "examine": "4 doses of Magic potion.", + "examine": "1 dose of Magic potion.", "durability": null, "low_alchemy": "224", "high_alchemy": "336", @@ -134597,7 +134609,7 @@ }, { "shop_price": "150", - "examine": "(X) doses of Summoning potion.", + "examine": "3 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134613,7 +134625,7 @@ }, { "shop_price": "150", - "examine": "(X) doses of Summoning potion.", + "examine": "3 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134628,7 +134640,7 @@ }, { "shop_price": "120", - "examine": "(X) doses of Summoning potion.", + "examine": "4 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134644,7 +134656,7 @@ }, { "shop_price": "120", - "examine": "(X) doses of Summoning potion.", + "examine": "4 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134659,7 +134671,7 @@ }, { "shop_price": "90", - "examine": "(X) doses of Summoning potion.", + "examine": "3 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134675,7 +134687,7 @@ }, { "shop_price": "90", - "examine": "(X) doses of Summoning potion.", + "examine": "3 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134690,7 +134702,7 @@ }, { "shop_price": "60", - "examine": "(X) doses of Summoning potion.", + "examine": "2 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134706,7 +134718,7 @@ }, { "shop_price": "60", - "examine": "(X) doses of Summoning potion.", + "examine": "2 doses of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134721,7 +134733,7 @@ }, { "shop_price": "30", - "examine": "(X) doses of Summoning potion.", + "examine": "1 dose of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -134737,7 +134749,7 @@ }, { "shop_price": "30", - "examine": "(X) doses of Summoning potion.", + "examine": "1 dose of Summoning potion.", "durability": null, "low_alchemy": "76", "high_alchemy": "114", @@ -137098,6 +137110,7 @@ { "shop_price": "65000", "examine": "These look pretty heavy, but very elite.", + "requirements": "{1,40}", "durability": null, "low_alchemy": "26000", "high_alchemy": "39000", @@ -137132,6 +137145,7 @@ { "shop_price": "64000", "examine": "Provides excellent protection, and is elite.", + "requirements": "{1,40}", "durability": null, "low_alchemy": "25600", "high_alchemy": "38400", @@ -137168,6 +137182,7 @@ "remove_head": "true", "shop_price": "35200", "examine": "A full face helmet, and elite.", + "requirements": "{1,40}", "durability": null, "low_alchemy": "14080", "high_alchemy": "21120", @@ -137215,6 +137230,7 @@ { "shop_price": "120000", "examine": "A robe worn by members of the Dagon'hai.", + "requirements": "{1,20}-{6,40}", "durability": null, "low_alchemy": "48000", "high_alchemy": "72000", @@ -137249,6 +137265,7 @@ { "shop_price": "15000", "examine": "A hat worn by members of the Dagon'hai.", + "requirements": "{1,20}-{6,40}", "durability": null, "low_alchemy": "6000", "high_alchemy": "9000", @@ -137282,6 +137299,7 @@ { "shop_price": "80000", "examine": "A robe worn by members of the Dagon'hai.", + "requirements": "{1,20}-{6,40}", "durability": null, "low_alchemy": "32000", "high_alchemy": "48000", diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json index b967e4c3e..9e245bd02 100644 --- a/Server/data/configs/npc_configs.json +++ b/Server/data/configs/npc_configs.json @@ -12335,13 +12335,13 @@ "defence_animation": "425", "death_animation": "836", "name": "Tyras guard", - "defence_level": "1", + "defence_level": "110", "safespot": null, - "lifepoints": "112", - "strength_level": "1", + "lifepoints": "110", + "strength_level": "105", "id": "1203", - "range_level": "1", - "attack_level": "1" + "range_level": "50", + "attack_level": "95" }, { "examine": "One of King Tyras's men.", @@ -16033,6 +16033,7 @@ "examine": "A spiky crawling critter. ", "melee_animation": "266", "range_animation": "266", + "poisonous": "true", "attack_speed": "4", "respawn_delay": "25", "defence_animation": "267", @@ -16053,6 +16054,7 @@ "examine": "A spiky crawling critter. ", "melee_animation": "266", "range_animation": "266", + "poisonous": "true", "attack_speed": "4", "respawn_delay": "25", "defence_animation": "267", @@ -16073,6 +16075,7 @@ "examine": "A spiky crawling critter. ", "melee_animation": "266", "range_animation": "266", + "poisonous": "true", "attack_speed": "4", "respawn_delay": "25", "defence_animation": "267", @@ -16253,7 +16256,7 @@ "defence_level": "107", "safespot": null, "lifepoints": "105", - "strength_level": "105", + "strength_level": "95", "id": "1610", "aggressive": "true", "bonuses": "0,0,0,0,0,20,20,0,20,20,0,0,0,0,0", @@ -18799,7 +18802,7 @@ "defence_level": "107", "safespot": null, "lifepoints": "105", - "strength_level": "105", + "strength_level": "95", "id": "1827", "aggressive": "true", "bonuses": "0,0,0,0,0,20,20,0,20,20,0,0,0,0,0", @@ -55952,7 +55955,7 @@ "defence_level": "107", "safespot": null, "lifepoints": "105", - "strength_level": "105", + "strength_level": "95", "id": "6389", "aggressive": "true", "bonuses": "0,0,0,0,0,20,20,0,20,20,0,0,0,0,0", diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json index 9f2a396c7..e95c306d1 100644 --- a/Server/data/configs/npc_spawns.json +++ b/Server/data/configs/npc_spawns.json @@ -1773,7 +1773,7 @@ }, { "npc_id": "666", - "loc_data": "{2819,3451,0,0,3}-{3158,3405,0,0,0}" + "loc_data": "{2819,3451,0,0,3}" }, { "npc_id": "670", @@ -5973,7 +5973,7 @@ }, { "npc_id": "3804", - "loc_data": "{3349,3793,0,0,0}-{3349,3793,0,0,4}-{3349,3793,0,0,4}" + "loc_data": "{3349,3793,0,0,0}" }, { "npc_id": "3806", @@ -9421,7 +9421,7 @@ }, { "npc_id": "7046", - "loc_data": "{2460,2925,0,0,4}-{3353,3810,0,0,0}-{3348,3812,0,0,4}-{3367,3801,0,0,4}" + "loc_data": "{2460,2925,0,0,4}-{3364,3800,0,0,4}-{3368,3811,0,0,4}-{3347,3814,0,0,4}-{3363,3816,0,0,4}" }, { "npc_id": "7047", diff --git a/Server/src/main/java/core/game/content/quest/members/lostcity/DramenStaffPlugin.java b/Server/src/main/java/core/game/content/quest/members/lostcity/DramenStaffPlugin.java index 6dba562c5..9b3e929e4 100644 --- a/Server/src/main/java/core/game/content/quest/members/lostcity/DramenStaffPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/lostcity/DramenStaffPlugin.java @@ -3,6 +3,7 @@ package core.game.content.quest.members.lostcity; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; import core.game.node.item.Item; import core.plugin.Plugin; @@ -38,9 +39,13 @@ public final class DramenStaffPlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { final Player player = event.getPlayer(); - if (player.getInventory().remove(DRAMEN_BRANCH)) { + if (player.getInventory().containsItem(DRAMEN_BRANCH) && player.getSkills().hasLevel(Skills.CRAFTING,31)) { + player.getInventory().remove(DRAMEN_BRANCH); player.getInventory().add(DRAMEN_STAFF); - player.getPacketDispatch().sendMessage("You carve the branch into a staff."); + player.getDialogueInterpreter().sendDialogue("You carve the branch into a staff."); + }else{ + player.getDialogueInterpreter().sendDialogue("You need a crafting level of 31 to do this."); + return false; } player.lock(1); return true; diff --git a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java index 869eef40c..a30ce39fc 100644 --- a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java @@ -4,6 +4,7 @@ import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.activity.ActivityManager; +import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.entity.skill.runecrafting.Altar; import core.game.interaction.NodeUsageEvent; @@ -194,14 +195,19 @@ public class WLBelowPlugin extends OptionHandler { return true; }*/ Item chaosItem = player.getInventory().containsItem(CHAOS_TALISMAN) ? CHAOS_TALISMAN : CHAOS_TIARA; - if (chaosItem != null && player.getInventory().remove(CHAOS_RUNES)) { - player.lock(5); - player.getInventory().remove(WhatLiesBelow.WAND); - player.getInventory().add(WhatLiesBelow.INFUSED_WAND); - player.animate(Animation.create(6104)); - player.getDialogueInterpreter().sendDialogue("The metal wand bursts into life and crackles with arcane", "power. This is a powerful instrument indeed!"); + if (player.getSkills().hasLevel(Skills.RUNECRAFTING,35)){ + if (chaosItem != null && player.getInventory().remove(CHAOS_RUNES)) { + player.lock(5); + player.getInventory().remove(WhatLiesBelow.WAND); + player.getInventory().add(WhatLiesBelow.INFUSED_WAND); + player.animate(Animation.create(6104)); + player.getDialogueInterpreter().sendDialogue("The metal wand bursts into life and crackles with arcane", "power. This is a powerful instrument indeed!"); + } + return true; + }else { + player.getDialogueInterpreter().sendDialogue("You need a Runecrafting level of 35 to make the infused wand."); + return false; } - return true; } } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpockets.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpockets.kt index a67052eb3..f2c5b8647 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpockets.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpockets.kt @@ -10,7 +10,7 @@ import rs09.game.content.global.WeightedItem import java.util.stream.IntStream enum class Pickpockets(val ids: IntArray, val requiredLevel: Int, val low: Double, val high: Double, val experience: Double, val stunDamageMin: Int, val stunDamageMax: Int, val stunTime: Int, val table: WeightBasedTable) { - MAN(intArrayOf(1, 2, 3, 4, 5, 6, 16, 24, 170, 3915), 1, 180.0, 240.0, 8.0, 1, 1,5, WeightBasedTable.create( + MAN(intArrayOf(1, 2, 3, 4, 5, 6, 16, 24, 170, 3915, 3226, 5924, 5923), 1, 180.0, 240.0, 8.0, 1, 1,5, WeightBasedTable.create( WeightedItem(Items.COINS_995,3,3,1.0,true) )), FARMER(intArrayOf(7, 1757, 1758), 10, 180.0, 240.0, 14.5, 1,1,5,WeightBasedTable.create( diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt index 71cfd61de..958a57299 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt @@ -98,7 +98,7 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){ /** * Lists the players currently online */ - define("players", Command.Privilege.STANDARD){ player, _ -> + define("players", Command.Privilege.MODERATOR){ player, _ -> val rights = player.rights.ordinal if (player!!.interfaceManager.isOpened && player.interfaceManager.opened.id != Components.QUESTJOURNAL_SCROLL_275 || player.locks.isMovementLocked || player.locks.isTeleportLocked) { reject(player, "Please finish what you're doing first.")