From 5a5f4fc06afcee54df4561e8349af15fdb0b9415 Mon Sep 17 00:00:00 2001
From: jslightham <31053827+jslightham@users.noreply.github.com>
Date: Sun, 26 May 2019 23:22:51 -0400
Subject: [PATCH] transfer - locked rooms

---
 data/words.dat                                |  3 ++
 src/com/bayviewglen/zork/Entities/Player.java |  8 +++-
 src/com/bayviewglen/zork/Game.java            | 44 ++++++++++++-------
 src/com/bayviewglen/zork/Parser.java          | 12 +++--
 4 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/data/words.dat b/data/words.dat
index 03add56..73806dd 100644
--- a/data/words.dat
+++ b/data/words.dat
@@ -52,3 +52,6 @@ novel, item
 mop, item
 bucket, item
 towels, item
+open, verb
+i, verb
+unlock, verb
\ No newline at end of file
diff --git a/src/com/bayviewglen/zork/Entities/Player.java b/src/com/bayviewglen/zork/Entities/Player.java
index 695dac2..3f8611d 100644
--- a/src/com/bayviewglen/zork/Entities/Player.java
+++ b/src/com/bayviewglen/zork/Entities/Player.java
@@ -23,7 +23,13 @@ public class Player extends Entity{
 	}
 
 	public void removeFromInventory(Item item){
-		inventory.remove(item);
+		for(int i =0; i<inventory.size(); i++) {
+			if(item.equals(inventory.get(i))) {
+				inventory.remove(i);
+				return;
+			}
+		}
+		
 
 	}
 	
diff --git a/src/com/bayviewglen/zork/Game.java b/src/com/bayviewglen/zork/Game.java
index c6792e0..4cd983a 100644
--- a/src/com/bayviewglen/zork/Game.java
+++ b/src/com/bayviewglen/zork/Game.java
@@ -54,8 +54,8 @@ class Game {
 				// Read the Description
 				String roomDescription = roomScanner.nextLine();
 				room.setDescription(roomDescription.split(":")[1].replaceAll("<br>", "\n").trim());
-				// Read the Description
-				boolean locked = Boolean.parseBoolean(roomScanner.nextLine());
+				// Read the locked state
+				boolean locked = Boolean.parseBoolean(roomScanner.nextLine().split(":")[1].replaceAll("<br>", "\n").trim());
 				room.setLocked(locked);
 				// Read the Items
 				String items = roomScanner.nextLine();
@@ -168,7 +168,31 @@ class Game {
 		}
 		String commandWord = command.getCommandWord();
 		switch(commandWord) {
-			case "go": case "n": case "s": case "e": case "w": case "north": case "south": case "west": case "east": case "up": case "down": case "d": case "u":
+		case "open": case "unlock":
+			boolean hasLockPick = false;
+			for(int i =0; i<player.getInventory().size(); i++) {
+				if(player.getInventory().get(i).equals(new Lockpick())) {
+					hasLockPick = true;
+					break;
+				}
+			}
+			
+			if(command.hasDirection() && hasLockPick) {
+				Room nextRoom = currentRoom.nextRoom(command.getDirection());
+				if(nextRoom.getLocked()) {
+					nextRoom.setLocked(false);
+					player.removeFromInventory(new Lockpick());
+					System.out.println("With great effort, you unlocked the door!");
+				}else{
+					System.out.println("That door is already unlocked!");
+				}
+			}else if(!command.hasDirection()){
+				System.out.println("You must specify a direction!");
+			}else {
+				System.out.println("You need a lockpick!");
+			}
+			break;	
+		case "go": case "n": case "s": case "e": case "w": case "north": case "south": case "west": case "east": case "up": case "down": case "d": case "u":
 				goRoom(command);
 				break;
 			case "help":
@@ -244,20 +268,6 @@ class Game {
 					System.out.println("You have nothing on you. Try and find some items.");
 				}
 				break;
-			case "open": 
-				boolean hasLockpick = false;
-				for(int i =0; i<player.getInventory().size(); i++) {
-					if(player.getInventory().get(i).equals(new Lockpick())) {
-						hasLockpick = true;
-						player.removeFromInventory(new Lockpick());
-						break;
-					}
-				}
-				if(command.hasDirection()) {
-					Room nextRoom = currentRoom.nextRoom(command.getDirection());
-					nextRoom.setLocked(false);
-				}
-				break;
 			default:
 				return false;
 		}
diff --git a/src/com/bayviewglen/zork/Parser.java b/src/com/bayviewglen/zork/Parser.java
index 662d4f5..f0c34df 100644
--- a/src/com/bayviewglen/zork/Parser.java
+++ b/src/com/bayviewglen/zork/Parser.java
@@ -35,6 +35,7 @@ class Parser {
 		String verb = "";
 		String direction = "";
 		String item = "";
+		boolean open = false;
 		//String word2;
 		ArrayList<String> words = new ArrayList<String>();
 		ArrayList<String> otherWords = new ArrayList<String>();
@@ -50,6 +51,9 @@ class Parser {
 			words.add(tokenizer.nextToken());
 		}
 		for(int i=0; i<words.size(); i++) {
+			if(words.get(i).equals("open") || words.get(i).equals("unlock")) {
+				open = true;
+			}
 			if(CommandWords.isCommand(words.get(i))) {
 				verb = words.get(i);
 				if(CommandWords.isDirection(words.get(i))) {
@@ -57,14 +61,16 @@ class Parser {
 				}
 			}else if(CommandWords.isItem(words.get(i))){
 				item = words.get(i);
-			}
-			else {
+			}else{
 				otherWords.add(words.get(i));
 			}
 		}
 		//System.out.println(verb);
 		if (CommandWords.isCommand(verb))
-			return new Command(verb, otherWords, direction, item);
+			if(!open)
+				return new Command(verb, otherWords, direction, item);
+			else
+				return new Command("open", otherWords, direction, item);
 		else
 			return new Command(null, otherWords, direction, item);
 	}