Merge pull request #61 from aaravrawal52/master

exit shop command

src/main/java/command/CommandType.java

@@ -10,6 +10,8 @@ public enum CommandType {
     INTERACT("(?i)\\h*(e)\\h*"),
     QUIT("(?i)\\h*(q|quit)\\h*"),
     HELP("(?i)\\h*(h|help)\\h*"),
+    EXIT("(?i)\\h*(exit)\\h*"), // New command: EXIT
+
     ERROR("");
     final String regExpression;
 

src/main/java/command/mapmove/ExitShop.java

@@ -0,0 +1,24 @@
+package command.mapmove;
+
+import command.Command;
+import map.BaseMap;
+import map.BattleInterface.BattleInterface;
+import map.ShopMap;
+
+import static map.BaseMap.storedMaps;
+import static map.MapGenerator.FIRST_MAP_IDENTITY;
+import static map.BaseMap.mapIndex;
+
+public class ExitShop extends Command {
+    public ExitShop() {
+        commandDescription = "RUN!";
+    }
+    @Override
+    public void execute(){
+        if(currentMap instanceof ShopMap) {
+            textBox.setNextNarration("You exited the shop!!");
+            BaseMap.currentMap = mapIndex.get(FIRST_MAP_IDENTITY);
+            currentMap = storedMaps.get(BaseMap.currentMap);
+        }
+    }
+}

src/main/java/parser/Parser.java

@@ -3,11 +3,7 @@
 import command.CommandType;
 import command.fight.FightingCommand;
 import command.fight.RunningCommand;
-import command.mapmove.InteractingCommand;
-import command.mapmove.MovingDownwardCommand;
-import command.mapmove.MovingForwardCommand;
-import command.mapmove.MovingLeftCommand;
-import command.mapmove.MovingRightCommand;
+import command.mapmove.*;
 import command.ErrorCommand;
 import command.HelpCommand;
 import command.QuitCommand;
@@ -20,6 +16,7 @@
 import static map.BaseMap.currentMap;
 import static map.BaseMap.mapIndex;
 import static map.MapGenerator.FIRST_MAP_IDENTITY;
+import static map.MapGenerator.SHOP;
 
 public class Parser {
 
@@ -46,6 +43,9 @@ public Command parseCommand(String userCommand) {
         case FIGHT:
             command = (currentMap != mapIndex.get(FIRST_MAP_IDENTITY)) ? new FightingCommand() : new ErrorCommand();
             break;
+        case EXIT:
+            command = (currentMap == mapIndex.get(SHOP)) ? new ExitShop() : new ErrorCommand();
+            break;
         case RUN:
             command = (currentMap != mapIndex.get(FIRST_MAP_IDENTITY)) ? new RunningCommand() : new ErrorCommand();
             break;