jslightham/Zork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some parser things

Browse Source
This commit is contained in:
Luca Carnegie
2019-05-28 23:28:34 -04:00
parent 5ba426b51b
commit 2d40e5954a
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/bayviewglen/zork/CommandWords.java
View File

@@ -47,7 +47,7 @@ class CommandWords {
return false;
}
}
// Check if given string is direction
// Check if given string is a direction
public static boolean isDirection(String aString) {
try {
return m_words.get(aString).equals("direction");

18
src/com/bayviewglen/zork/Game.java
View File

@@ -265,7 +265,7 @@ class Game {
if(nextRoom.getLocked()) {
nextRoom.setLocked(false);
player.removeFromInventory(new Lockpick());
System.out.println("With great effort, you unlocked the door!");
System.out.println("After a little bit of picking, a click is heard and the door opens slightly!");
}else{
System.out.println("That door is already unlocked!");
}
@@ -273,7 +273,7 @@ class Game {
System.out.println("There is no door there!");
}
}else if(!command.hasDirection()){
System.out.println("You must specify a direction!");
System.out.println("In what direction do you want to go in?");
}else {
System.out.println("What do you want to open the door with?");
}
@@ -311,19 +311,19 @@ class Game {
}
}
if(object.isConsumable() && hasItem) {
System.out.println("Yum!");
System.out.println("Nom Nom Nom...");
player.eat();
System.out.println("Your health is now " + player.getHealth() + "%");
System.out.println("Your health is now at " + player.getHealth() + "%");
player.removeFromInventory(object);
if(currentCombat != null)
currentCombat.setEnemyTurn();
}else if(object.isConsumable()) {
System.out.println("You do not have a " + command.getItem());
System.out.println("You don't have a " + command.getItem());
}else {
System.out.println("You cannot eat a " + command.getItem());
System.out.println("Sorry, you can't eat a " + command.getItem());
}
} catch(Exception e) {
System.out.println("You cannot eat a " + command.getItem());
System.out.println("Sorry, you can't eat a " + command.getItem());
}
}else {
System.out.println("Eat what?");
@@ -344,7 +344,7 @@ class Game {
currentRoom.removeItem(object);
System.out.println("Taken");
}else {
System.out.println("You cannot carry any more!");
System.out.println("You can't carry any more stuff!");
}
} catch(Exception e) {
@@ -466,6 +466,8 @@ class Game {
}
}
break;
case "read":
default:
return false;
}

4
src/com/bayviewglen/zork/Room.java
View File

@@ -176,9 +176,11 @@ class Room {
String returnString = "Exits:";
String curr = "";
Set keys = exits.keySet();
for (Iterator iter = keys.iterator(); iter.hasNext();)
for (Iterator iter = keys.iterator(); iter.hasNext();) {
curr = (String) iter.next();
returnString += " " + curr.substring(0,1).toUpperCase() + curr.substring(1);
}
return returnString;
}