2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 00:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #230 from WizardJesse1/master

Browse Source 
Fix some incorrect messages
This commit is contained in:
Major
2016-02-15 17:30:18 +00:00
parent 0417939b56 fd855263a4
commit 710c8c70d0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/org/apollo/game/message/handler/EquipItemHandler.java
+3 -4
View File
@@ -67,6 +67,7 @@ public final class EquipItemHandler extends MessageHandler<ItemOptionMessage> {
int slotsRequired = weapon != null && shield != null ? 1 : 0; int slotsRequired = weapon != null && shield != null ? 1 : 0;
if (inventory.freeSlots() < slotsRequired) { if (inventory.freeSlots() < slotsRequired) {
player.sendMessage("You don't have enough free inventory space to do that.");
message.terminate(); message.terminate();
return; return;
} }
@@ -133,13 +134,11 @@ public final class EquipItemHandler extends MessageHandler<ItemOptionMessage> {
if (skills.getMaximumLevel(id) < requirement) { if (skills.getMaximumLevel(id) < requirement) {
String name = Skill.getName(id); String name = Skill.getName(id);
player.sendMessage("You need " + LanguageUtil.getIndefiniteArticle(name) + " " + name + " level of " + player.sendMessage("You are not a high enough level to use this item.");
requirement + " to equip this item."); player.sendMessage("You need to have " + LanguageUtil.getIndefiniteArticle(name) + " " + name.toLowerCase() + " level of " + requirement + "." );
return false; return false;
} }
} }
return true; return true;
} }
} }
game/src/main/org/apollo/game/model/inv/FullInventoryListener.java
+2 -2
View File
@@ -14,12 +14,12 @@ public final class FullInventoryListener extends InventoryAdapter {
/** /**
* The bank full message. * The bank full message.
*/ */
public static final String FULL_BANK_MESSAGE = "Not enough bank space."; public static final String FULL_BANK_MESSAGE = "You could not bank all your items.";
/** /**
* The inventory full message. * The inventory full message.
*/ */
public static final String FULL_INVENTORY_MESSAGE = "Not enough inventory space."; public static final String FULL_INVENTORY_MESSAGE = "You don't have enough inventory space.";
/** /**
* The message to send when the capacity has been exceeded. * The message to send when the capacity has been exceeded.