mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2025-12-09 16:45:44 -07:00
Noted house items can no longer be taken out of the PoH.
House items are no longer tradable.
This commit is contained in:
Syndromeramo
parent
11bc398d2d
commit
646b866dbc
2 changed files with 61 additions and 97 deletions
|
|
@ -70069,13 +70069,14 @@
|
|||
"examine": "The kettle is empty.",
|
||||
"durability": null,
|
||||
"name": "Kettle",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7688"
|
||||
},
|
||||
{
|
||||
"durability": null,
|
||||
"name": "Kettle",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7689"
|
||||
},
|
||||
|
|
@ -70083,6 +70084,7 @@
|
|||
"examine": "It's full of cold water.",
|
||||
"durability": null,
|
||||
"name": "Full kettle",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7690"
|
||||
},
|
||||
|
|
@ -70090,6 +70092,7 @@
|
|||
"examine": "It's full of boiling water.",
|
||||
"durability": null,
|
||||
"name": "Hot kettle",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7691"
|
||||
},
|
||||
|
|
@ -70097,7 +70100,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (4)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7692"
|
||||
|
|
@ -70105,7 +70108,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (4)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7693"
|
||||
},
|
||||
|
|
@ -70113,7 +70116,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (3)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7694"
|
||||
|
|
@ -70121,7 +70124,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (3)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7695"
|
||||
},
|
||||
|
|
@ -70129,7 +70132,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (2)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7696"
|
||||
|
|
@ -70137,7 +70140,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (2)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7697"
|
||||
},
|
||||
|
|
@ -70145,7 +70148,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (1)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7698"
|
||||
|
|
@ -70153,7 +70156,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (1)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7699"
|
||||
},
|
||||
|
|
@ -70161,7 +70164,7 @@
|
|||
"examine": "Add boiling water to make a tea.",
|
||||
"durability": null,
|
||||
"name": "Teapot with leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7700"
|
||||
|
|
@ -70169,7 +70172,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Teapot with leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7701"
|
||||
},
|
||||
|
|
@ -70177,7 +70180,7 @@
|
|||
"examine": "This teapot is empty.",
|
||||
"durability": null,
|
||||
"name": "Teapot",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "0.4",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7702"
|
||||
|
|
@ -70185,7 +70188,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Teapot",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7703"
|
||||
},
|
||||
|
|
@ -70193,7 +70196,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (4)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7704"
|
||||
|
|
@ -70201,7 +70204,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (4)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7705"
|
||||
},
|
||||
|
|
@ -70209,7 +70212,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (3)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7706"
|
||||
|
|
@ -70217,7 +70220,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (3)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7707"
|
||||
},
|
||||
|
|
@ -70225,7 +70228,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (2)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7708"
|
||||
|
|
@ -70233,7 +70236,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (2)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7709"
|
||||
},
|
||||
|
|
@ -70241,7 +70244,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (1)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7710"
|
||||
|
|
@ -70249,7 +70252,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (1)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7711"
|
||||
},
|
||||
|
|
@ -70257,7 +70260,7 @@
|
|||
"examine": "Add boiling water to make a tea.",
|
||||
"durability": null,
|
||||
"name": "Teapot with leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7712"
|
||||
|
|
@ -70265,7 +70268,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Teapot with leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7713"
|
||||
},
|
||||
|
|
@ -70273,7 +70276,7 @@
|
|||
"examine": "This teapot is empty.",
|
||||
"durability": null,
|
||||
"name": "Teapot",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "0.4",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7714"
|
||||
|
|
@ -70281,7 +70284,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Teapot",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7715"
|
||||
},
|
||||
|
|
@ -70289,7 +70292,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (4)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7716"
|
||||
|
|
@ -70297,7 +70300,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (4)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7717"
|
||||
},
|
||||
|
|
@ -70305,7 +70308,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (3)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7718"
|
||||
|
|
@ -70313,7 +70316,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (3)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7719"
|
||||
},
|
||||
|
|
@ -70321,7 +70324,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (2)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7720"
|
||||
|
|
@ -70329,7 +70332,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (2)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7721"
|
||||
},
|
||||
|
|
@ -70337,7 +70340,7 @@
|
|||
"examine": "I'd really like a nice cup of tea.",
|
||||
"durability": null,
|
||||
"name": "Pot of tea (1)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7722"
|
||||
|
|
@ -70345,7 +70348,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Pot of tea (1)",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7723"
|
||||
},
|
||||
|
|
@ -70353,7 +70356,7 @@
|
|||
"examine": "Add boiling water to make a tea.",
|
||||
"durability": null,
|
||||
"name": "Teapot with leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1.5",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7724"
|
||||
|
|
@ -70361,7 +70364,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Teapot with leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7725"
|
||||
},
|
||||
|
|
@ -70369,7 +70372,7 @@
|
|||
"examine": "This teapot is empty.",
|
||||
"durability": null,
|
||||
"name": "Teapot",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "0.4",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7726"
|
||||
|
|
@ -70377,7 +70380,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Teapot",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7727"
|
||||
},
|
||||
|
|
@ -70387,14 +70390,14 @@
|
|||
"grand_exchange_price": "7",
|
||||
"durability": null,
|
||||
"name": "Empty cup",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7728"
|
||||
},
|
||||
{
|
||||
"durability": null,
|
||||
"name": "Empty cup",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7729"
|
||||
},
|
||||
|
|
@ -70424,6 +70427,7 @@
|
|||
"examine": "A porcelain cup.",
|
||||
"durability": null,
|
||||
"name": "Porcelain cup",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7732"
|
||||
},
|
||||
|
|
@ -70453,6 +70457,7 @@
|
|||
"examine": "A porcelain cup.",
|
||||
"durability": null,
|
||||
"name": "Porcelain cup",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7735"
|
||||
},
|
||||
|
|
@ -70482,14 +70487,14 @@
|
|||
"examine": "Mmm, how about a nice cup of tea?",
|
||||
"durability": null,
|
||||
"name": "Tea leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7738"
|
||||
},
|
||||
{
|
||||
"durability": null,
|
||||
"name": "Tea leaves",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7739"
|
||||
},
|
||||
|
|
@ -70498,7 +70503,7 @@
|
|||
"grand_exchange_price": "151",
|
||||
"durability": null,
|
||||
"name": "Beer",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7740"
|
||||
|
|
@ -70506,7 +70511,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Beer",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7741"
|
||||
},
|
||||
|
|
@ -70516,7 +70521,7 @@
|
|||
"grand_exchange_price": "25",
|
||||
"durability": null,
|
||||
"name": "Beer glass",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "0.05",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7742"
|
||||
|
|
@ -70524,7 +70529,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Beer glass",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7743"
|
||||
},
|
||||
|
|
@ -70534,14 +70539,14 @@
|
|||
"grand_exchange_price": "131",
|
||||
"durability": null,
|
||||
"name": "Asgarnian ale",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7744"
|
||||
},
|
||||
{
|
||||
"durability": null,
|
||||
"name": "Asgarnian ale",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7745"
|
||||
},
|
||||
|
|
@ -70551,14 +70556,14 @@
|
|||
"grand_exchange_price": "569",
|
||||
"durability": null,
|
||||
"name": "Greenman's ale",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7746"
|
||||
},
|
||||
{
|
||||
"durability": null,
|
||||
"name": "Greenman's ale",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7747"
|
||||
},
|
||||
|
|
@ -70568,7 +70573,7 @@
|
|||
"grand_exchange_price": "523",
|
||||
"durability": null,
|
||||
"name": "Dragon bitter",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7748"
|
||||
|
|
@ -70576,7 +70581,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Dragon bitter",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7749"
|
||||
},
|
||||
|
|
@ -70603,7 +70608,7 @@
|
|||
"grand_exchange_price": "1539",
|
||||
"durability": null,
|
||||
"name": "Cider",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"weight": "1",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7752"
|
||||
|
|
@ -70611,7 +70616,7 @@
|
|||
{
|
||||
"durability": null,
|
||||
"name": "Cider",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7753"
|
||||
},
|
||||
|
|
@ -70620,14 +70625,14 @@
|
|||
"grand_exchange_price": "2371",
|
||||
"durability": null,
|
||||
"name": "Chef's delight",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7754"
|
||||
},
|
||||
{
|
||||
"durability": null,
|
||||
"name": "Chef's delight",
|
||||
"tradeable": "true",
|
||||
"tradeable": "false",
|
||||
"archery_ticket_price": "0",
|
||||
"id": "7755"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -125,49 +125,8 @@ public final class HouseZone extends MapZone {
|
|||
return true;
|
||||
}
|
||||
|
||||
private final int[] itemsToRemove = {
|
||||
Items.POT_OF_TEA_4_7692,
|
||||
Items.POT_OF_TEA_3_7694,
|
||||
Items.POT_OF_TEA_2_7696,
|
||||
Items.POT_OF_TEA_1_7698,
|
||||
Items.POT_OF_TEA_4_7704,
|
||||
Items.POT_OF_TEA_3_7706,
|
||||
Items.POT_OF_TEA_2_7708,
|
||||
Items.POT_OF_TEA_1_7710,
|
||||
Items.POT_OF_TEA_4_7716,
|
||||
Items.POT_OF_TEA_3_7718,
|
||||
Items.POT_OF_TEA_2_7720,
|
||||
Items.POT_OF_TEA_1_7722,
|
||||
Items.TEAPOT_WITH_LEAVES_7700,
|
||||
Items.TEAPOT_WITH_LEAVES_7712,
|
||||
Items.TEAPOT_WITH_LEAVES_7724,
|
||||
Items.TEAPOT_7702,
|
||||
Items.TEAPOT_7714,
|
||||
Items.TEAPOT_7726,
|
||||
Items.EMPTY_CUP_7728,
|
||||
Items.CUP_OF_TEA_7730,
|
||||
Items.CUP_OF_TEA_7731,
|
||||
Items.PORCELAIN_CUP_7732,
|
||||
Items.CUP_OF_TEA_7733,
|
||||
Items.CUP_OF_TEA_7734,
|
||||
Items.PORCELAIN_CUP_7735,
|
||||
Items.CUP_OF_TEA_7736,
|
||||
Items.CUP_OF_TEA_7737,
|
||||
Items.KETTLE_7688,
|
||||
Items.FULL_KETTLE_7690,
|
||||
Items.HOT_KETTLE_7691,
|
||||
Items.TEA_LEAVES_7738,
|
||||
Items.BEER_GLASS_7742,
|
||||
Items.BEER_7740,
|
||||
Items.CIDER_7752,
|
||||
Items.ASGARNIAN_ALE_7744,
|
||||
Items.GREENMANS_ALE_7746,
|
||||
Items.DRAGON_BITTER_7748,
|
||||
Items.CHEFS_DELIGHT_7754
|
||||
};
|
||||
|
||||
private void remove_items(Player p) {
|
||||
for (int item : itemsToRemove) {
|
||||
for (int item = Items.KETTLE_7688; item <= Items.CHEFS_DELIGHT_7755; item++) {//Removes all PoH versions of tea and beer barrel-related items
|
||||
removeAll(p, item, Container.INVENTORY);
|
||||
removeAll(p, item, Container.BoB);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue