shavingcream blindness

data/enemies.dat

@@ -1,4 +1,4 @@
-Enemy Name: Henry_Pellatt
+Enemy Name: Henry Pellatt
 Description: The owner of the Castle 
 Starting Room: Circle Room
 Damage Given: 25

data/rooms.dat

@@ -3,7 +3,7 @@ Room Description: You are in a circular room. The windows to the east are covere
 Locked: false
 Boarded: false
 Items:Lockpick,Milk
-Riddler: "Hello there. My name is Kevin and I am Sir Pellatt's butler. I understand that my master<comma><br>Sir Pellatt has wrongfully imprisoned you. If you answer my riddle<comma> I can give you something to<br>help you with your escape - nothing comes for free you know!", "What goes moo?", "Cows", ShavingCream
+Riddler: "Hello there. My name is Kevin and I am Sir Pellatt's butler. I understand that my master<comma><br>Sir Pellatt has wrongfully imprisoned you. If you answer my riddle<comma> I can give you something to<br>help you with your escape - nothing comes for free you know!", "What goes moo?", "Cows", Shavingcream
 Exit Rooms: W-Apple Hallway
 
 Room name: Apple Hallway

data/synonyms.dat

@@ -44,4 +44,7 @@ swallow, eat
 absorb, eat
 drink, eat
 i, inventory
-
+henry, henrypellatt
+pellatt, henrypellatt
+shaving, shavingcream
+cream, shavingcream

src/com/bayviewglen/zork/Combat.java

@@ -3,15 +3,17 @@ package com.bayviewglen.zork;
 import java.lang.reflect.Constructor;
 
 import com.bayviewglen.zork.Entities.Entity;
+import com.bayviewglen.zork.Entities.Player;
 import com.bayviewglen.zork.Entities.Enemies.Enemy;
 import com.bayviewglen.zork.Items.Item;
+import com.bayviewglen.zork.Items.Shavingcream;
 
 public class Combat {
-	private Entity player;
+	private Player player;
 	private Enemy enemy;
 	// if turn is 0 it is player's turn, if 1 it is enemy's turn
 	private int turn; 
-	public Combat(Entity player, Enemy enemy) {
+	public Combat(Player player, Enemy enemy) {
 		this.player = player;
 		this.enemy = enemy;
 	}
@@ -25,7 +27,12 @@ public class Combat {
 			object = (Item) ctor.newInstance();
 			
 			double rand = Math.random();
-			if(rand<0.1) {
+			if(object.equals(new Shavingcream())) {
+				System.out.println("You blinded " + enemy.getName());
+				player.removeFromInventory(new Shavingcream());
+				enemy.setBlinded(true);
+			}
+			else if(rand<0.1) {
 				System.out.println("You missed!");
 				
 				
@@ -51,7 +58,15 @@ public class Combat {
 	
 	public double enemyAttack() {
 		double rand = Math.random();
-		if(rand<0.1) {
+		if(enemy.getBlinded()) {
+			if(rand <0.4) {
+				System.out.println(enemy.getName() + " is no longer blinded!");
+				enemy.setBlinded(false);
+			}
+			else
+				System.out.println(enemy.getName() + " is blinded!");
+		}
+		else if(rand<0.1) {
 			System.out.println(enemy.getName() + " missed!");
 		}else if(rand < 0.15) {
 			player.setHealth(player.getHealth()-enemy.getDamage()*1.5);

src/com/bayviewglen/zork/Entities/Enemies/Enemy.java

@@ -7,15 +7,18 @@ public class Enemy extends Entity{
 	private String name;
 	private String description;
 	private String room;
+	private boolean blinded;
 	
 	public Enemy(){
 		super(100.0, 100.0); 
 		damageGiven = 10; 
+		blinded = false;
 	}
 	
 	public Enemy(int damageGiven){
 		super(100.0, 100.0); 
 		this.damageGiven = damageGiven; 
+		blinded = false;
 	}
 	
 	public void setName(String name) {
@@ -45,4 +48,10 @@ public class Enemy extends Entity{
 	public int getDamage() {
 		return this.damageGiven;
 	}
+	public boolean getBlinded() {
+		return blinded;
+	}
+	public void setBlinded(boolean blinded) {
+		this.blinded = blinded;
+	}
 }

src/com/bayviewglen/zork/Game.java

@@ -502,7 +502,7 @@ class Game {
 							if(command.hasItem()) {
 								boolean has = false;
 								for(Item i : player.getInventory()) {
-									if(i.getName().toLowerCase().equals(command.getItem())) {
+									if(i.getName().toLowerCase().replaceAll("\\s+","").equals(command.getItem())) {
 										has = true;
 									}
 								}
@@ -525,7 +525,7 @@ class Game {
 					if(command.hasItem()) {
 						boolean has = false;
 						for(Item i : player.getInventory()) {
-							if(i.getName().toLowerCase().equals(command.getItem())) {
+							if(i.getName().toLowerCase().replaceAll("\\s+","").equals(command.getItem())) {
 								has = true;
 							}
 						}

src/com/bayviewglen/zork/Items/Shavingcream.java

@@ -1,7 +1,7 @@
 package com.bayviewglen.zork.Items;
-public class ShavingCream extends Item{
+public class Shavingcream extends Item{
 	
-	public ShavingCream(){
+	public Shavingcream(){
 		super(16, "Shaving Cream", "A can of shaving cream with foam still around the edge of the nozzle", false, 10, 1);
 	}