diff --git a/Server/src/main/content/data/consumables/Consumables.java b/Server/src/main/content/data/consumables/Consumables.java index 31a22a6e0..7fc446f1c 100644 --- a/Server/src/main/content/data/consumables/Consumables.java +++ b/Server/src/main/content/data/consumables/Consumables.java @@ -110,7 +110,7 @@ public enum Consumables { MINT_CAKE(new Food(new int[] {9475}, new EnergyEffect(50))), /** Vegetables */ - POTATO(new Food(new int[] {1942}, new HealingEffect(1))), + POTATO(new Food(new int[] {1942}, new HealingEffect(1), "You eat the potato. Yuck!")), BAKED_POTATO(new Food(new int[] {6701}, new HealingEffect(2))), SPICY_SAUCE(new Food(new int[] {7072, 1923}, new HealingEffect(2))), CHILLI_CON_CARNE(new Food(new int[] {7062, 1923}, new HealingEffect(5))), @@ -153,10 +153,10 @@ public enum Consumables { PINEAPPLE_CHUNKS(new Food(new int[] {2116}, new HealingEffect(2))), PINEAPPLE_RING(new Food(new int[] {2118}, new HealingEffect(2))), DWELLBERRIES(new Food(new int[] {2126}, new HealingEffect(2))), - JANGERBERRIES(new Food(new int[] {247}, new MultiEffect(new SkillEffect(Skills.ATTACK, 2, 0), new SkillEffect(Skills.STRENGTH, 1, 0), new PrayerEffect(1, 0), new SkillEffect(Skills.DEFENCE, -1, 0)))), + JANGERBERRIES(new Food(new int[] {247}, new MultiEffect(new SkillEffect(Skills.ATTACK, 2, 0), new SkillEffect(Skills.STRENGTH, 1, 0), new PrayerEffect(1, 0), new SkillEffect(Skills.DEFENCE, -1, 0)), "You eat the jangerberries.", "They taste very bitter.")), STRAWBERRY(new Food(new int[] {5504}, new MultiEffect(new HealingEffect(1), new PercentageHealthEffect(6)))), TOMATO(new Food(new int[] {1982}, new HealingEffect(2))), - WATERMELON(new FakeConsumable(5982, new String[] {"Try using a knife to slice it into pieces."})), + WATERMELON(new FakeConsumable(5982, new String[] {"You can't eat it whole; maybe you should cut it up."})), WATERMELON_SLICE(new Food(new int[] {5984}, new PercentageHealthEffect(5))), LEMON(new Food(new int[] {2102}, new HealingEffect(2))), LEMON_CHUNKS(new Food(new int[] {2104}, new HealingEffect(2))), diff --git a/Server/src/main/content/global/handlers/item/EmptyOptionListener.kt b/Server/src/main/content/global/handlers/item/EmptyOptionListener.kt index f82728e7f..12771ec0b 100644 --- a/Server/src/main/content/global/handlers/item/EmptyOptionListener.kt +++ b/Server/src/main/content/global/handlers/item/EmptyOptionListener.kt @@ -37,7 +37,7 @@ class EmptyOptionListener : InteractionListener { BONE_MEAL(Items.BONEMEAL_4255, Items.EMPTY_POT_1931, "You empty the pot of crushed bones."), BUCKET_OF_SAND(Items.BUCKET_OF_SAND_1783, Items.BUCKET_1925, "You empty the contents of the bucket onto the floor.", Sounds.SAND_BUCKET_2584), BUCKET_OF_MILK(Items.BUCKET_OF_MILK_1927, Items.BUCKET_1925, "You empty the contents of the bucket onto the floor.", Sounds.LIQUID_2401), - BUCKET_OF_WATER(Items.BUCKET_OF_WATER_1929, Items.BUCKET_1925, "You empty the contents of the bucket onto the floor.", Sounds.LIQUID_2401), + BUCKET_OF_WATER(Items.BUCKET_OF_WATER_1929, Items.BUCKET_1925, "You empty the contents of the bucket on the floor.", Sounds.LIQUID_2401), BUCKET_OF_COMPOST(Items.COMPOST_6032, Items.BUCKET_1925, "You empty the bucket of compost."), BUCKET_OF_SUPERCOMPOST(Items.SUPERCOMPOST_6034, Items.BUCKET_1925, "You empty the bucket of supercompost."), BUCKET_OF_SLIME(Items.BUCKET_OF_SLIME_4286, Items.BUCKET_1925, "You empty the contents of the bucket on the floor.", Sounds.LIQUID_2401), diff --git a/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt b/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt index 01fd85be6..aea9c4ba9 100644 --- a/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt +++ b/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt @@ -8,7 +8,6 @@ import core.game.world.map.Location import org.json.simple.JSONObject import org.rs09.consts.Items import core.ServerStore -import core.ServerStore.Companion.getBoolean import core.ServerStore.Companion.getInt import core.game.interaction.IntType import core.game.interaction.InteractionListener @@ -24,7 +23,11 @@ class ExplorersRingPlugin : InteractionListener { on(RINGS, IntType.ITEM, "run-replenish"){ player, node -> val charges = getStoreFile().getInt(player.username.toLowerCase() + ":run") if (charges >= getRingLevel(node.id)) { - sendMessage(player,"You have used all the charges you can for one day.") + sendDialogue(player,"Your ring appears to have no more run energy recharges left for today.") + return@on true + } + if (player.settings.runEnergy == 100.0) { + sendMessage(player, "You are fully rested. You do not need to use the ring's power for the moment.") return@on true } player.settings.updateRunEnergy(-50.0) @@ -50,7 +53,7 @@ class ExplorersRingPlugin : InteractionListener { sendMessage(player, "You have used up all of your charges for the day.") return@on true } - sendDialogue(player, "Choose the item you wish to convert to coins.") + sendDialogue(player, "Choose the item that you wish to convert to coins.") addDialogueAction (player) {_,_ -> sendItemSelect (player, "Choose") { slot, optionIndex -> val item = player.inventory[slot] diff --git a/Server/src/main/core/game/consumable/Potion.java b/Server/src/main/core/game/consumable/Potion.java index d7614266c..60afb00c3 100644 --- a/Server/src/main/core/game/consumable/Potion.java +++ b/Server/src/main/core/game/consumable/Potion.java @@ -56,9 +56,9 @@ public class Potion extends Drink { final int dosesLeft = ids.length - consumedDoses; player.getPacketDispatch().sendMessage("You drink some of your " + getFormattedName(item) + "."); if (dosesLeft > 1) { - player.getPacketDispatch().sendMessage("You have " + dosesLeft + " doses of your potion left."); + player.getPacketDispatch().sendMessage("You have " + dosesLeft + " doses of potion left."); } else if (dosesLeft == 1) { - player.getPacketDispatch().sendMessage("You have 1 dose of your potion left."); + player.getPacketDispatch().sendMessage("You have 1 dose of potion left."); } else { player.getPacketDispatch().sendMessage("You have finished your potion."); } diff --git a/Server/src/main/core/game/ge/GrandExchangeRecords.kt b/Server/src/main/core/game/ge/GrandExchangeRecords.kt index c6533c17d..63aa20848 100644 --- a/Server/src/main/core/game/ge/GrandExchangeRecords.kt +++ b/Server/src/main/core/game/ge/GrandExchangeRecords.kt @@ -212,7 +212,7 @@ class GrandExchangeRecords(private val player: Player? = null) : PersistPlayer, } } if (updated) { - sendMessage(player!!, "You have items from the Grand Exchange waiting in your collection box.") + sendMessage(player!!, "You have items waiting in your Grand Exchange collection box!") playJingle(player, 284) } }