diff --git a/src/main/java/command/fight/FightingCommand.java b/src/main/java/command/fight/FightingCommand.java index 4311cf8bad..f25862eb4c 100644 --- a/src/main/java/command/fight/FightingCommand.java +++ b/src/main/java/command/fight/FightingCommand.java @@ -23,7 +23,7 @@ public void execute() { @Override public void execute(Scanner in) throws FileNotFoundException { - if (currentMapForCommand instanceof map.BattleInterface.BattleInterface) { + if (currentMapForCommand instanceof map.battleinterface.BattleInterface) { currentMapForCommand.enableFight(in); BaseMap.currentMap = mapIndex.get(FIRST_MAP_IDENTITY); if (currentMapForCommand.getEntityDeath()) { diff --git a/src/main/java/command/fight/RunningCommand.java b/src/main/java/command/fight/RunningCommand.java index d2aa667d3b..49442f3f88 100644 --- a/src/main/java/command/fight/RunningCommand.java +++ b/src/main/java/command/fight/RunningCommand.java @@ -2,7 +2,7 @@ import command.Command; import map.BaseMap; -import map.BattleInterface.BattleInterface; +import map.battleinterface.BattleInterface; import map.ShopMap; import static map.BaseMap.storedMaps; diff --git a/src/main/java/command/inventory/OpenInventoryCommand.java b/src/main/java/command/inventory/OpenInventoryCommand.java index 546a04d5ab..96f2891a51 100644 --- a/src/main/java/command/inventory/OpenInventoryCommand.java +++ b/src/main/java/command/inventory/OpenInventoryCommand.java @@ -14,7 +14,7 @@ public OpenInventoryCommand() { @Override public void execute() { BaseMap.currentMap = mapIndex.get(INVENTORY_IDENTITY); - textBox.setNextNarration("Here's your inventory! You can use an item by keying in [use] followed by it's " + - "index with a space between them."); + textBox.setNextNarration("Here's your inventory! You can use an item by keying in [use] followed by it's \n" + + "index with a space between them. Alternatively, enter [close] to close your inventory."); } } diff --git a/src/main/java/command/mapmove/InteractingCommand.java b/src/main/java/command/mapmove/InteractingCommand.java index aab2efaacb..000e4686e5 100644 --- a/src/main/java/command/mapmove/InteractingCommand.java +++ b/src/main/java/command/mapmove/InteractingCommand.java @@ -9,7 +9,7 @@ import interactable.enemies.Goblin; import map.BaseMap; import map.ShopMap; -import map.BattleInterface.BattleInterface; +import map.battleinterface.BattleInterface; import java.util.Objects; diff --git a/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java b/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java index f436b96026..63938e79d9 100644 --- a/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java +++ b/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java @@ -9,7 +9,7 @@ import map.BaseMap; import map.ShopMap; import map.PlayerInventory; -import map.BattleInterface.BattleInterface; +import map.battleinterface.BattleInterface; import parser.Parser; import textbox.PlayerStatus; import textbox.TextBox; diff --git a/src/main/java/map/PlayerInventory.java b/src/main/java/map/PlayerInventory.java index 0e18c44fe7..1873a6b9fa 100644 --- a/src/main/java/map/PlayerInventory.java +++ b/src/main/java/map/PlayerInventory.java @@ -39,6 +39,7 @@ public void addItems(Consumable item) { List filteredList = generalItems.stream().filter(x -> x.getName().equalsIgnoreCase( item.getName())).collect(Collectors.toList()); if (filteredList.isEmpty()) { + item.setQuantity(1); generalItems.add(item); return; } diff --git a/src/main/java/map/BattleInterface/BattleInterface.java b/src/main/java/map/battleinterface/BattleInterface.java similarity index 99% rename from src/main/java/map/BattleInterface/BattleInterface.java rename to src/main/java/map/battleinterface/BattleInterface.java index 75bba40708..b460f25f54 100644 --- a/src/main/java/map/BattleInterface/BattleInterface.java +++ b/src/main/java/map/battleinterface/BattleInterface.java @@ -1,4 +1,4 @@ -package map.BattleInterface; +package map.battleinterface; import interactable.Enemy; import interactable.InteractableEntity;