Merge pull request #129 from tannerlie/branch-change-package

Fix player inventory bug and change package name

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()) {

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;

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.");
     }
 }

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;
 

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;

src/main/java/map/PlayerInventory.java

@@ -39,6 +39,7 @@ public void addItems(Consumable item) {
         List<Item> filteredList = generalItems.stream().filter(x -> x.getName().equalsIgnoreCase(
                 item.getName())).collect(Collectors.toList());
         if (filteredList.isEmpty()) {
+            item.setQuantity(1);
             generalItems.add(item);
             return;
         }

src/main/java/map/BattleInterface/BattleInterface.java → src/main/java/map/battleinterface/BattleInterface.java

@@ -1,4 +1,4 @@
-package map.BattleInterface;
+package map.battleinterface;
 
 import interactable.Enemy;
 import interactable.InteractableEntity;