From 69d07000654a29877521b1cde733e403c6041902 Mon Sep 17 00:00:00 2001 From: Syndromeramo Date: Wed, 30 Jul 2025 12:23:21 -0500 Subject: [PATCH] Fixed Nettle Tea XP. Changed Nettle Tea boost from inauthentic run restore to authentic +2 Attack Boost. POH Items in this MR are no longer bankable, to avoid exploitation by Winter Storage. --- Server/data/configs/item_configs.json | 66 +++++++++++++++++++ .../content/data/consumables/Consumables.java | 12 ++-- .../global/skill/cooking/CookableItems.java | 2 +- 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index b9553778b..0d071ace8 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -70066,6 +70066,7 @@ "id": "7687" }, { + "bankable": "false", "examine": "The kettle is empty.", "durability": null, "name": "Kettle", @@ -70074,6 +70075,7 @@ "id": "7688" }, { + "bankable": "false", "durability": null, "name": "Kettle", "tradeable": "false", @@ -70081,6 +70083,7 @@ "id": "7689" }, { + "bankable": "false", "examine": "It's full of cold water.", "durability": null, "name": "Full kettle", @@ -70089,6 +70092,7 @@ "id": "7690" }, { + "bankable": "false", "examine": "It's full of boiling water.", "durability": null, "name": "Hot kettle", @@ -70097,6 +70101,7 @@ "id": "7691" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (4)", @@ -70106,6 +70111,7 @@ "id": "7692" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (4)", "tradeable": "false", @@ -70113,6 +70119,7 @@ "id": "7693" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (3)", @@ -70122,6 +70129,7 @@ "id": "7694" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (3)", "tradeable": "false", @@ -70129,6 +70137,7 @@ "id": "7695" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (2)", @@ -70138,6 +70147,7 @@ "id": "7696" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (2)", "tradeable": "false", @@ -70145,6 +70155,7 @@ "id": "7697" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (1)", @@ -70154,6 +70165,7 @@ "id": "7698" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (1)", "tradeable": "false", @@ -70161,6 +70173,7 @@ "id": "7699" }, { + "bankable": "false", "examine": "Add boiling water to make a tea.", "durability": null, "name": "Teapot with leaves", @@ -70170,6 +70183,7 @@ "id": "7700" }, { + "bankable": "false", "durability": null, "name": "Teapot with leaves", "tradeable": "false", @@ -70177,6 +70191,7 @@ "id": "7701" }, { + "bankable": "false", "examine": "This teapot is empty.", "durability": null, "name": "Teapot", @@ -70186,6 +70201,7 @@ "id": "7702" }, { + "bankable": "false", "durability": null, "name": "Teapot", "tradeable": "false", @@ -70193,6 +70209,7 @@ "id": "7703" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (4)", @@ -70202,6 +70219,7 @@ "id": "7704" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (4)", "tradeable": "false", @@ -70209,6 +70227,7 @@ "id": "7705" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (3)", @@ -70218,6 +70237,7 @@ "id": "7706" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (3)", "tradeable": "false", @@ -70225,6 +70245,7 @@ "id": "7707" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (2)", @@ -70234,6 +70255,7 @@ "id": "7708" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (2)", "tradeable": "false", @@ -70241,6 +70263,7 @@ "id": "7709" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (1)", @@ -70250,6 +70273,7 @@ "id": "7710" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (1)", "tradeable": "false", @@ -70257,6 +70281,7 @@ "id": "7711" }, { + "bankable": "false", "examine": "Add boiling water to make a tea.", "durability": null, "name": "Teapot with leaves", @@ -70266,6 +70291,7 @@ "id": "7712" }, { + "bankable": "false", "durability": null, "name": "Teapot with leaves", "tradeable": "false", @@ -70273,6 +70299,7 @@ "id": "7713" }, { + "bankable": "false", "examine": "This teapot is empty.", "durability": null, "name": "Teapot", @@ -70282,6 +70309,7 @@ "id": "7714" }, { + "bankable": "false", "durability": null, "name": "Teapot", "tradeable": "false", @@ -70289,6 +70317,7 @@ "id": "7715" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (4)", @@ -70298,6 +70327,7 @@ "id": "7716" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (4)", "tradeable": "false", @@ -70305,6 +70335,7 @@ "id": "7717" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (3)", @@ -70314,6 +70345,7 @@ "id": "7718" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (3)", "tradeable": "false", @@ -70321,6 +70353,7 @@ "id": "7719" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (2)", @@ -70330,6 +70363,7 @@ "id": "7720" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (2)", "tradeable": "false", @@ -70337,6 +70371,7 @@ "id": "7721" }, { + "bankable": "false", "examine": "I'd really like a nice cup of tea.", "durability": null, "name": "Pot of tea (1)", @@ -70346,6 +70381,7 @@ "id": "7722" }, { + "bankable": "false", "durability": null, "name": "Pot of tea (1)", "tradeable": "false", @@ -70353,6 +70389,7 @@ "id": "7723" }, { + "bankable": "false", "examine": "Add boiling water to make a tea.", "durability": null, "name": "Teapot with leaves", @@ -70362,6 +70399,7 @@ "id": "7724" }, { + "bankable": "false", "durability": null, "name": "Teapot with leaves", "tradeable": "false", @@ -70369,6 +70407,7 @@ "id": "7725" }, { + "bankable": "false", "examine": "This teapot is empty.", "durability": null, "name": "Teapot", @@ -70378,6 +70417,7 @@ "id": "7726" }, { + "bankable": "false", "durability": null, "name": "Teapot", "tradeable": "false", @@ -70385,6 +70425,7 @@ "id": "7727" }, { + "bankable": "false", "shop_price": "1", "examine": "An empty cup.", "grand_exchange_price": "7", @@ -70395,6 +70436,7 @@ "id": "7728" }, { + "bankable": "false", "durability": null, "name": "Empty cup", "tradeable": "false", @@ -70402,6 +70444,7 @@ "id": "7729" }, { + "bankable": "false", "shop_price": "10", "examine": "A nice cup of nettle tea.", "grand_exchange_price": "30", @@ -70413,6 +70456,7 @@ "id": "7730" }, { + "bankable": "false", "shop_price": "10", "examine": "A milky cup of nettle tea.", "grand_exchange_price": "30", @@ -70424,6 +70468,7 @@ "id": "7731" }, { + "bankable": "false", "examine": "A porcelain cup.", "durability": null, "name": "Porcelain cup", @@ -70432,6 +70477,7 @@ "id": "7732" }, { + "bankable": "false", "shop_price": "10", "examine": "Some nettle tea in a porcelain cup.", "grand_exchange_price": "30", @@ -70443,6 +70489,7 @@ "id": "7733" }, { + "bankable": "false", "shop_price": "10", "examine": "Some milky nettle tea in a porcelain cup.", "grand_exchange_price": "30", @@ -70454,6 +70501,7 @@ "id": "7734" }, { + "bankable": "false", "examine": "A porcelain cup.", "durability": null, "name": "Porcelain cup", @@ -70462,6 +70510,7 @@ "id": "7735" }, { + "bankable": "false", "shop_price": "10", "examine": "Some nettle tea in a porcelain cup.", "grand_exchange_price": "30", @@ -70473,6 +70522,7 @@ "id": "7736" }, { + "bankable": "false", "shop_price": "10", "examine": "Some milky nettle tea in a porcelain cup.", "grand_exchange_price": "30", @@ -70484,6 +70534,7 @@ "id": "7737" }, { + "bankable": "false", "examine": "Mmm, how about a nice cup of tea?", "durability": null, "name": "Tea leaves", @@ -70492,6 +70543,7 @@ "id": "7738" }, { + "bankable": "false", "durability": null, "name": "Tea leaves", "tradeable": "false", @@ -70499,6 +70551,7 @@ "id": "7739" }, { + "bankable": "false", "examine": "A glass of frothy ale.", "grand_exchange_price": "151", "durability": null, @@ -70509,6 +70562,7 @@ "id": "7740" }, { + "bankable": "false", "durability": null, "name": "Beer", "tradeable": "false", @@ -70516,6 +70570,7 @@ "id": "7741" }, { + "bankable": "false", "shop_price": "1", "examine": "I need to fill this with beer.", "grand_exchange_price": "25", @@ -70527,6 +70582,7 @@ "id": "7742" }, { + "bankable": "false", "durability": null, "name": "Beer glass", "tradeable": "false", @@ -70534,6 +70590,7 @@ "id": "7743" }, { + "bankable": "false", "shop_price": "3", "examine": "Probably the finest readily-available ale in Asgarnia.", "grand_exchange_price": "131", @@ -70544,6 +70601,7 @@ "id": "7744" }, { + "bankable": "false", "durability": null, "name": "Asgarnian ale", "tradeable": "false", @@ -70551,6 +70609,7 @@ "id": "7745" }, { + "bankable": "false", "shop_price": "2", "examine": "A glass of frothy ale.", "grand_exchange_price": "569", @@ -70561,6 +70620,7 @@ "id": "7746" }, { + "bankable": "false", "durability": null, "name": "Greenman's ale", "tradeable": "false", @@ -70568,6 +70628,7 @@ "id": "7747" }, { + "bankable": "false", "shop_price": "2", "examine": "A glass of bitter.", "grand_exchange_price": "523", @@ -70579,6 +70640,7 @@ "id": "7748" }, { + "bankable": "false", "durability": null, "name": "Dragon bitter", "tradeable": "false", @@ -70603,6 +70665,7 @@ "id": "7751" }, { + "bankable": "false", "shop_price": "2", "examine": "A glass of Cider", "grand_exchange_price": "1539", @@ -70614,6 +70677,7 @@ "id": "7752" }, { + "bankable": "false", "durability": null, "name": "Cider", "tradeable": "false", @@ -70621,6 +70685,7 @@ "id": "7753" }, { + "bankable": "false", "examine": "A fruity, full-bodied ale.", "grand_exchange_price": "2371", "durability": null, @@ -70630,6 +70695,7 @@ "id": "7754" }, { + "bankable": "false", "durability": null, "name": "Chef's delight", "tradeable": "false", diff --git a/Server/src/main/content/data/consumables/Consumables.java b/Server/src/main/content/data/consumables/Consumables.java index e16b6aa23..3385dd5cd 100644 --- a/Server/src/main/content/data/consumables/Consumables.java +++ b/Server/src/main/content/data/consumables/Consumables.java @@ -292,12 +292,12 @@ public enum Consumables { /** Tea */ CUP_OF_TEA(new Drink(new int[] {712, 1980}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 3, 0)), "Aaah, nothing like a nice cuppa tea!")), NETTLE_WATER(new Drink(new int[] {Items.NETTLE_WATER_4237, Items.BOWL_1923}, new HealingEffect((1)))), - CUP_OF_TEA_NETTLE(new Drink(new int[] {4242, 1980}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))), - CUP_OF_TEA_MILKY_NETTLE(new Drink(new int[] {4243, 1980}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))), - CUP_OF_TEA_NETTLE_PORCELAIN(new Drink(new int[] {4245, 4244}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))), - CUP_OF_TEA_MILKY_NETTLE_PORCELAIN(new Drink(new int[] {4246, 4244}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))), - NETTLE_TEA(new Drink(new int[] {4239, 1923}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))), - NETTLE_TEA_MILKY(new Drink(new int[] {4240, 1923}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))), + CUP_OF_TEA_NETTLE(new Drink(new int[] {4242, 1980}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 2, 0)))), + CUP_OF_TEA_MILKY_NETTLE(new Drink(new int[] {4243, 1980}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 2, 0)))), + CUP_OF_TEA_NETTLE_PORCELAIN(new Drink(new int[] {4245, 4244}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 2, 0)))), + CUP_OF_TEA_MILKY_NETTLE_PORCELAIN(new Drink(new int[] {4246, 4244}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 2, 0)))), + NETTLE_TEA(new Drink(new int[] {4239, 1923}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 2, 0)))), + NETTLE_TEA_MILKY(new Drink(new int[] {4240, 1923}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 2, 0)))), CUP_OF_TEA_CLAY(new Drink(new int[] {7730, 7728}, new SkillEffect(Skills.CONSTRUCTION, 1, 0), "You feel refreshed and ready for more building.")), CUP_OF_TEA_CLAY_MILKY(new Drink(new int[] {7731, 7728}, new SkillEffect(Skills.CONSTRUCTION, 1, 0), "You feel refreshed and ready for more building.")), CUP_OF_TEA_WHITE(new Drink(new int[] {7733, 7732}, new SkillEffect(Skills.CONSTRUCTION, 2, 0), "You feel refreshed and ready for more building.")), diff --git a/Server/src/main/content/global/skill/cooking/CookableItems.java b/Server/src/main/content/global/skill/cooking/CookableItems.java index cea0f356d..2c77f3acd 100644 --- a/Server/src/main/content/global/skill/cooking/CookableItems.java +++ b/Server/src/main/content/global/skill/cooking/CookableItems.java @@ -81,7 +81,7 @@ public enum CookableItems { // bowl foods BOWL_STEW(2003, 2001, 2005, 25, 117, 68, 392, 68, 392), BOWL_CURRY(2011, 2009, 2013, 60, 280, 38, 332, 38, 332), - BOWL_NETTLE(4239, 4237, 4239, 20, 52, 78, 412, 78, 412), + BOWL_NETTLE(4239, 4237, 4239, 20, 53, 78, 412, 78, 412), BOWL_EGG(7078, 7076, 7090, 13, 50, 0, 0, 90, 438), BOWL_ONION(7084, 1871, 7092, 43, 60, 36, 322, 36, 322), BOWL_MUSHROOM(7082, 7080, 7094, 46, 60, 16, 282, 16, 282),