Fixed parser, added items starting in rooms, moved item room storage

src/com/bayviewglen/zork/CommandWords.java

@@ -1,74 +1,78 @@
-package com.bayviewglen.zork;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Scanner;
-
-/*
- * Author:  Michael Kolling.
- * Version: 1.0
- * Date:    July 1999
- * 
- * This class holds an enumeration of all command words known to the game.
- * It is used to recognise commands as they are typed in.
- *
- * This class is part of the "Zork" game.
- */
-class CommandWords {
-	// a constant array that holds all valid command words
-	private static HashMap<String, String> m_words = new HashMap<String, String>();;
-	/**
-	 * Constructor - initialise the command words.
-	 */
-	public CommandWords() {
-		// Import words from words.dat into HashMap
-		try {
-			Scanner in = new Scanner(new File("data/words.dat"));
-			while(in.hasNext()){
-				String text = in.nextLine();
-				String[] textarr = text.split(",");
-				m_words.put(textarr[0], textarr[1].substring(1));
-			}
-            in.close();
-		}catch (Exception e) {
-                  e.printStackTrace();
-		}	
-	}
-
-	/**
-	 * Check whether a given String is a valid command word. Return true if it
-	 * is, false if it isn't.
-	 **/
-	// Check if given string is verb or direction
-	public static boolean isCommand(String aString) {
-		try {
-			return (m_words.get(aString).equals("verb") || m_words.get(aString).equals("direction"));
-		}catch(Exception e) {
-			return false;
-		}
-	}
-	// Check if given string is direction
-	public static boolean isDirection(String aString) {
-		return m_words.get(aString).equals("direction");
-	}
-
-	public static boolean isItem(String aString){
-		try {
-		return m_words.get(aString).equals("item");
-		} catch(Exception e) {
-			return false;
-		}
-	}
-
-	/*
-	 * Print all valid commands to System.out.
-	 */
-	public void showAll() {
-		for (String i : m_words.keySet()) {
-			if(m_words.get(i).equals("verb")){
-				System.out.print(i + "  ");
-			}
-		}
-		System.out.println();
-	}
+package com.bayviewglen.zork;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Scanner;
+
+/*
+ * Author:  Michael Kolling.
+ * Version: 1.0
+ * Date:    July 1999
+ * 
+ * This class holds an enumeration of all command words known to the game.
+ * It is used to recognise commands as they are typed in.
+ *
+ * This class is part of the "Zork" game.
+ */
+class CommandWords {
+	// a constant array that holds all valid command words
+	private static HashMap<String, String> m_words = new HashMap<String, String>();;
+	/**
+	 * Constructor - initialise the command words.
+	 */
+	public CommandWords() {
+		// Import words from words.dat into HashMap
+		try {
+			Scanner in = new Scanner(new File("data/words.dat"));
+			while(in.hasNext()){
+				String text = in.nextLine();
+				String[] textarr = text.split(",");
+				m_words.put(textarr[0], textarr[1].substring(1));
+			}
+            in.close();
+		}catch (Exception e) {
+                  e.printStackTrace();
+		}	
+	}
+
+	/**
+	 * Check whether a given String is a valid command word. Return true if it
+	 * is, false if it isn't.
+	 **/
+	// Check if given string is verb or direction
+	public static boolean isCommand(String aString) {
+		try {
+			return (m_words.get(aString).equals("verb") || m_words.get(aString).equals("direction"));
+		}catch(Exception e) {
+			return false;
+		}
+	}
+	// Check if given string is direction
+	public static boolean isDirection(String aString) {
+		try {
+		return m_words.get(aString).equals("direction");
+		}catch(Exception e) {
+			return false;
+		}
+	}
+
+	public static boolean isItem(String aString){
+		try {
+		return m_words.get(aString).equals("item");
+		} catch(Exception e) {
+			return false;
+		}
+	}
+
+	/*
+	 * Print all valid commands to System.out.
+	 */
+	public void showAll() {
+		for (String i : m_words.keySet()) {
+			if(m_words.get(i).equals("verb")){
+				System.out.print(i + "  ");
+			}
+		}
+		System.out.println();
+	}
 }