diff --git a/src/main/java/com/comandante/creeper/Items/ItemType.java b/src/main/java/com/comandante/creeper/Items/ItemType.java index c52a735c0bc4c7ff98d7f5ab62fb65e9e35b700b..e65f7484422ccf95db7f69180ca7566d85f07bed 100644 --- a/src/main/java/com/comandante/creeper/Items/ItemType.java +++ b/src/main/java/com/comandante/creeper/Items/ItemType.java @@ -14,19 +14,19 @@ public enum ItemType { 0, 60), BEER(2, "beer", - "a dented can of" + CYAN + " beer" + RESET + ".", - "a" + CYAN + " beer" + RESET + " lies on the ground.", + "a dented can of" + CYAN + " beer" + RESET, + "a" + CYAN + " cold beer" + RESET + " is here, waiting to be drank.", "This beer looks sketch but you'll probably drink it anyways.", false, 0, 60), - BOOK(3, "beer", - "a" + MAGENTA + " leather book" + RESET + ".", - "a" + MAGENTA + " well used book" + RESET + " with what looks like a leather back rests here.", - "A book written in a foreign language. Doesn't matter as you can't read.", - false, - 0, - 60); + BOOK(3, "beer", // FLAGS + "a" + MAGENTA + " leather book" + RESET + ".", //SHORT + "a" + MAGENTA + " well used book" + RESET + " with what looks like a leather back rests here.", // RESTING + "A book written in a foreign language. Doesn't matter as you can't read.", // INSPECT + false, // DISPOSABLE + 0, // USES + 60); // TICK private final Integer itemTypeCode; private final String itemShortName; diff --git a/src/main/java/com/comandante/creeper/Items/ItemUseHandler.java b/src/main/java/com/comandante/creeper/Items/ItemUseHandler.java index 824fd8e2767d08379cc95a3cc60b794a18b92938..65d0f3cf7a545834dfa2127b6ba40657e9437df0 100644 --- a/src/main/java/com/comandante/creeper/Items/ItemUseHandler.java +++ b/src/main/java/com/comandante/creeper/Items/ItemUseHandler.java @@ -27,7 +27,7 @@ public class ItemUseHandler { } private void processBeer() { - writeToPlayer("You drink a cold [coors light] and feel better because of it."); + writeToPlayer("Y"); } private void processBook() { diff --git a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java b/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java index 83264389b0a3b4d067f18bada56bb47d1f1f59b6..7c259f6560f8ac9fa45d289c75200859597f19e7 100644 --- a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java +++ b/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java @@ -34,8 +34,7 @@ public class InventoryCommand extends Command { ArrayList<String> inventory = new ArrayList<String>(Arrays.asList(playerMetadata.getInventory())); Player player = getGameManager().getPlayerManager().getPlayer(getPlayerId()); StringBuilder sb = new StringBuilder(); - sb.append(CYAN); - sb.append("----Inventory-----\r\n"); + sb.append("You are carrying:\r\n"); sb.append(RESET); for (String inventoryId: inventory) { Item item = getGameManager().getEntityManager().getItemEntity(inventoryId); @@ -52,6 +51,7 @@ public class InventoryCommand extends Command { } sb.append("\r\n"); } + sb.append("\r\n"); commandWrite(sb.toString()); } }