Skip to content

Commit 4cbb6c7

Browse files
committed
fix messages for bone burying & cookedmeat eating
1 parent ed3b5f1 commit 4cbb6c7

2 files changed

Lines changed: 24 additions & 36 deletions

File tree

server/plugins/com/openrsc/server/plugins/authentic/itemactions/Eating.java

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -103,55 +103,41 @@ public void onOpInv(final Player player, Integer invIndex, final Item item, fina
103103
mes("You eat the " + item.getDef(player.getWorld()).getName().toLowerCase());
104104
say(player, null, "Ow! I nearly broke a tooth!");
105105
player.message("You feel strangely heavier and more tired");
106-
} else if (id == ItemId.EQUA_LEAVES.id())
106+
} else if (id == ItemId.EQUA_LEAVES.id()) {
107107
player.playerServerMessage(MessageType.QUEST, "You eat the leaves..chewy but tasty");
108-
109-
else if (id == ItemId.DWELLBERRIES.id())
108+
} else if (id == ItemId.DWELLBERRIES.id()) {
110109
player.playerServerMessage(MessageType.QUEST, "You eat the berrys..quite tasty");
111-
112-
else if (id == ItemId.LEMON.id())
110+
} else if (id == ItemId.LEMON.id()) {
113111
player.playerServerMessage(MessageType.QUEST, "You eat the lemon ..it's very sour");
114-
115-
else if (id == ItemId.LEMON_SLICES.id())
112+
} else if (id == ItemId.LEMON_SLICES.id()) {
116113
player.playerServerMessage(MessageType.QUEST, "You eat the lemon slices ..they're very sour");
117-
118-
else if (id == ItemId.DICED_LEMON.id())
114+
} else if (id == ItemId.DICED_LEMON.id()) {
119115
player.playerServerMessage(MessageType.QUEST, "You eat the lemon cubes ..they're very sour");
120-
121-
else if (id == ItemId.LIME.id())
116+
} else if (id == ItemId.LIME.id()) {
122117
player.playerServerMessage(MessageType.QUEST, "You eat the lime ..it's quite sour");
123-
124-
else if (id == ItemId.LIME_SLICES.id() || id == ItemId.LIME_CHUNKS.id())
118+
} else if (id == ItemId.LIME_SLICES.id() || id == ItemId.LIME_CHUNKS.id()) {
125119
player.playerServerMessage(MessageType.QUEST, "You eat the " + item.getDef(player.getWorld()).getName().toLowerCase() + "..they're quite sour");
126-
127-
else if (id == ItemId.GRAPEFRUIT.id())
120+
} else if (id == ItemId.GRAPEFRUIT.id()) {
128121
player.playerServerMessage(MessageType.QUEST, "You eat the grapefruit ...it's somewhat bitter");
129-
130-
else if (id == ItemId.GRAPEFRUIT_SLICES.id())
122+
} else if (id == ItemId.GRAPEFRUIT_SLICES.id()) {
131123
player.playerServerMessage(MessageType.QUEST, "You eat the grapefruit slices ...they're somewhat bitter");
132-
133-
else if (id == ItemId.DICED_GRAPEFRUIT.id())
124+
} else if (id == ItemId.DICED_GRAPEFRUIT.id()) {
134125
player.playerServerMessage(MessageType.QUEST, "You eat the grapefruit cubes ...they're somewhat bitter");
135-
136-
else if (id == ItemId.ORANGE.id())
126+
} else if (id == ItemId.ORANGE.id()) {
137127
player.playerServerMessage(MessageType.QUEST, "You eat the orange ...yum");
138-
139-
else if (id == ItemId.ORANGE_SLICES.id())
128+
} else if (id == ItemId.ORANGE_SLICES.id()) {
140129
player.playerServerMessage(MessageType.QUEST, "You eat the orange slices ...yum");
141-
142-
else if (id == ItemId.DICED_ORANGE.id())
130+
} else if (id == ItemId.DICED_ORANGE.id()) {
143131
player.playerServerMessage(MessageType.QUEST, "You eat the orange cubes ...yum");
144-
145-
else if (id == ItemId.FRESH_PINEAPPLE.id())
132+
} else if (id == ItemId.FRESH_PINEAPPLE.id()) {
146133
player.playerServerMessage(MessageType.QUEST, "You eat the pineapple ...yum");
147-
148-
else if (id == ItemId.PINEAPPLE_CHUNKS.id())
134+
} else if (id == ItemId.PINEAPPLE_CHUNKS.id()) {
149135
player.playerServerMessage(MessageType.QUEST, "You eat the pineapple chunks ..yum");
150-
151-
else if (id == ItemId.CREAM.id())
136+
} else if (id == ItemId.CREAM.id()) {
152137
player.playerServerMessage(MessageType.QUEST, "You eat the cream..you get some on your nose");
153-
154-
else if (id == ItemId.GNOMEBOWL.id()) {
138+
} else if (id == ItemId.COOKEDMEAT.id()) {
139+
player.playerServerMessage(MessageType.QUEST, "You eat the meat");
140+
} else if (id == ItemId.GNOMEBOWL.id()) {
155141
player.playerServerMessage(MessageType.QUEST, "You eat the gnome bowl");
156142
player.message("it's pretty tastless");
157143
resetGnomeCooking(player);
@@ -216,8 +202,9 @@ else if (id == ItemId.GNOMEBOWL.id()) {
216202
delay(3);
217203
say(player, null, "yuck");
218204
player.message("it's rotten, you spit it out");
219-
} else
205+
} else {
220206
player.playerServerMessage(MessageType.QUEST, "You eat the " + item.getDef(player.getWorld()).getName().toLowerCase());
207+
}
221208

222209
final boolean heals = player.getSkills().getLevel(Skill.HITS.id()) < player.getSkills().getMaxStat(Skill.HITS.id());
223210
if (heals) {

server/plugins/com/openrsc/server/plugins/authentic/misc/Bones.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.openrsc.server.plugins.RuneScript;
1010
import com.openrsc.server.plugins.triggers.OpInvTrigger;
1111
import com.openrsc.server.plugins.triggers.UseInvTrigger;
12+
import com.openrsc.server.util.rsc.MessageType;
1213

1314
import java.util.Optional;
1415

@@ -48,9 +49,9 @@ private void buryBones(Player player, Item item) {
4849
player.getCarriedItems().getInventory().getLastIndexById(item.getCatalogId(), Optional.of(false)));
4950
if(toRemove == null) return;
5051

51-
player.message("You dig a hole in the ground");
52+
player.playerServerMessage(MessageType.QUEST, "you dig a hole in the ground");
5253
delay();
53-
player.message("You bury the " + item.getDef(player.getWorld()).getName().toLowerCase());
54+
player.playerServerMessage(MessageType.QUEST, "You bury the bones");
5455
if (player.getCarriedItems().remove(toRemove) != -1) {
5556
giveBonesExperience(player, item);
5657
}

0 commit comments

Comments
 (0)