From c266e9ecaa94b7e71b74d2342add8d0914d8f952 Mon Sep 17 00:00:00 2001 From: Trident101 Date: Fri, 2 Jun 2023 04:46:33 +0000 Subject: [PATCH] Barbarian super restore mix now consumable --- .gitignore | 1 + Server/data/configs/item_configs.json | 32 +++++++++---------- .../content/data/consumables/Consumables.java | 1 + 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 1c0e35d65..e1cc944e2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ gradle **/*.swo build/kotlin/sessions/ **/*.iml +Server/hasRan.txt diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index eb7238ac8..6e0d43d76 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -98373,7 +98373,7 @@ "examine": "One/Two doses of fishy super energy potion.", "grand_exchange_price": "1062", "durability": null, - "name": "Sup. energy mix(2)", + "name": "Super energy mix(2)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98383,7 +98383,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "1062", "durability": null, - "name": "Sup. energy mix(2)", + "name": "Super energy mix(2)", "tradeable": "true", "archery_ticket_price": "0", "id": "11482" @@ -98393,7 +98393,7 @@ "examine": "One/Two doses of fishy super energy potion.", "grand_exchange_price": "562", "durability": null, - "name": "Sup. energy mix(1)", + "name": "Super energy mix(1)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98403,7 +98403,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "562", "durability": null, - "name": "Sup. energy mix(1)", + "name": "Super energy mix(1)", "tradeable": "true", "archery_ticket_price": "0", "id": "11484" @@ -98413,7 +98413,7 @@ "examine": "One/Two doses of fishy Super strength potion.", "grand_exchange_price": "955", "durability": null, - "name": "Sup. str. mix(2)", + "name": "Super strength mix(2)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98423,7 +98423,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "955", "durability": null, - "name": "Sup. str. mix(2)", + "name": "Super strength mix(2)", "tradeable": "true", "archery_ticket_price": "0", "id": "11486" @@ -98433,7 +98433,7 @@ "examine": "One/Two doses of fishy Super strength potion.", "grand_exchange_price": "1040", "durability": null, - "name": "Sup. str. mix(1)", + "name": "Super strength mix(1)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98443,7 +98443,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "1040", "durability": null, - "name": "Sup. str. mix(1)", + "name": "Super strength mix(1)", "tradeable": "true", "archery_ticket_price": "0", "id": "11488" @@ -98493,7 +98493,7 @@ "examine": "One/Two doses of fishy super restore potion.", "grand_exchange_price": "3670", "durability": null, - "name": "Sup. restore mix(2)", + "name": "Super restore mix(2)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98503,7 +98503,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "3670", "durability": null, - "name": "Sup. restore mix(2)", + "name": "Super restore mix(2)", "tradeable": "true", "archery_ticket_price": "0", "id": "11494" @@ -98513,7 +98513,7 @@ "examine": "One/Two doses of fishy super restore potion.", "grand_exchange_price": "3104", "durability": null, - "name": "Sup. restore mix(1)", + "name": "Super restore mix(1)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98523,7 +98523,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "3104", "durability": null, - "name": "Sup. restore mix(1)", + "name": "Super restore mix(1)", "tradeable": "true", "archery_ticket_price": "0", "id": "11496" @@ -98533,7 +98533,7 @@ "examine": "One/two doses of fishy super defence potion", "grand_exchange_price": "38", "durability": null, - "name": "Sup. def. mix(2)", + "name": "Super defence mix(2)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98543,7 +98543,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "38", "durability": null, - "name": "Sup. def. mix(2)", + "name": "Super defence mix(2)", "tradeable": "true", "archery_ticket_price": "0", "id": "11498" @@ -98553,7 +98553,7 @@ "examine": "One/two doses of fishy super defence potion", "grand_exchange_price": "66", "durability": null, - "name": "Sup. def. mix(1)", + "name": "Super defence mix(1)", "tradeable": "true", "archery_ticket_price": "0", "weight": "0.1", @@ -98563,7 +98563,7 @@ "ge_buy_limit": "1000", "grand_exchange_price": "66", "durability": null, - "name": "Sup. def. mix(1)", + "name": "Super defence mix(1)", "tradeable": "true", "archery_ticket_price": "0", "id": "11500" diff --git a/Server/src/main/content/data/consumables/Consumables.java b/Server/src/main/content/data/consumables/Consumables.java index 08d755c3b..bfdb73eb7 100644 --- a/Server/src/main/content/data/consumables/Consumables.java +++ b/Server/src/main/content/data/consumables/Consumables.java @@ -345,6 +345,7 @@ public enum Consumables { RELIC_MIX(new BarbarianMix(new int[] {11437, 11439}, new MultiEffect(new RemoveStateEffect("disease"), new SetAttributeEffect("disease:immunity", 300), new HealingEffect(3)))), STR_MIX(new BarbarianMix(new int[] {11443, 11441}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0.1), new HealingEffect(3)))), RESTO_MIX(new BarbarianMix(new int[] {11449, 11451}, new MultiEffect(new RestoreEffect(10, 0.3), new HealingEffect(3)))), + SUPER_RESTO_MIX(new BarbarianMix(new int [] {11493, 11495}, new MultiEffect(new RestoreEffect(8,0.25), new PrayerEffect(8, 0.25), new SummoningEffect(8, 0.25), new HealingEffect(6)))), ENERGY_MIX(new BarbarianMix(new int[] {11453, 11455}, new MultiEffect(new EnergyEffect(10), new HealingEffect(6)))), DEF_MIX(new BarbarianMix(new int[] {11457, 11459}, new MultiEffect(new SkillEffect(Skills.DEFENCE, 3, 0.1), new HealingEffect(6)))), AGIL_MIX(new BarbarianMix(new int[] {11461, 11463}, new MultiEffect(new SkillEffect(Skills.AGILITY, 3, 0), new HealingEffect(6)))),