Merge branch 'master' into robert

.classpath

@@ -5,13 +5,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="lib/lwjgl.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="GameTest/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="lib/slick.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/Users/rvinluan/Documents/slick/javadoc/"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Zombies-Game/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="lib/slick.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -0,0 +1,5 @@
+/bin/robertv/*
+.DS_Store
+*.log 
+hs_err*
+

README

@@ -1 +0,0 @@
-grdsgrdgrdgfwaf

src/robertv/GameTest/Book.java

@@ -58,6 +58,7 @@ public boolean collisionTrue(Entity collider, ArrayList<Entity> elist) {
 		if(collider instanceof Zombie) {
 			elist.remove(this);
 			elist.remove(collider);
+			SimpleTest.ZombiesKilled++;
 			return true;
 		}
 		if(collider instanceof Bookshelf) {

src/robertv/GameTest/Entity.java

@@ -152,6 +152,9 @@ public  Entity collisionCheck(ArrayList<? extends Entity> checklist) {
 
 
 	public boolean collisionTrue(Entity en, ArrayList<Entity> elist) {
+		if (en instanceof Player){
+			System.out.println("Player collision detected.");
+		}
 		return false;
 	}
 }

src/robertv/GameTest/Player.java

@@ -21,6 +21,7 @@ public class Player extends Entity {
 
 	//private Book[] inventory;
 	private int ammo;
+	private int health;
 
 	public Player(Map m) {
 		xCoord = 16;
@@ -39,6 +40,8 @@ public Player(Map m) {
 
 		ammo = 0;
 		//inventory = new Book[10];
+
+		health = 100;
 	}
 
 	public int setFacing(int direction) {
@@ -66,6 +69,10 @@ public int getAmmo() {
 		return ammo;
 	}
 
+	public int getHealth() {
+		return health;
+	}
+
 
 	///*
 	public void startMoving(int direction) {
@@ -170,6 +177,7 @@ public void update() {
 	}
 
 	public  Entity collisionCheck(ArrayList<? extends Entity> checklist) {
+
 		Rectangle oldaabb = new Rectangle(0,0,0,0);
 		oldaabb.setBounds(aabb);
 		aabb.setBounds(aabb.getX()+(float)velocity.x, aabb.getY()-(float)velocity.y, aabb.getWidth(), aabb.getHeight());
@@ -220,5 +228,14 @@ public void render(int xp, int yp) {
 		}
 	}
 
-
+	@Override
+	public boolean collisionTrue(Entity en, ArrayList<Entity> elist) {
+		if (en instanceof Zombie){
+			health = health - 10;
+			System.out.println("Collision with zombie detected!");
+			return true;
+		}
+		System.out.println("player collision true reached!");
+		return false;
+	}
 }

src/robertv/GameTest/SimpleTest.java

@@ -2,6 +2,11 @@
 
 import java.util.*;
 import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontFormatException;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
 import org.newdawn.slick.BasicGame;
 import org.newdawn.slick.GameContainer;
@@ -42,16 +47,21 @@ public class SimpleTest extends BasicGame {
 
 	UnicodeFont ufont; //for printing info to the GUI
 
+	UnicodeFont uFont2; // For messages
+
 	Input keyboard;
 
 	/*
 	 * Scoring Variables
 	 */
 	int maxHeight;
+	public static int ZombiesKilled;
+	private final int SCORE_VAR_HEIGHT = 672-(4*32)+3;
 
     public SimpleTest() {
-        super("SimpleTest");
+        super("Zombies Game. SHOVE THIS BOOK UP YOUR ASS MUTHAFUCKA!!!!!111");
         frame = 0;
+        ZombiesKilled = 0;
     }
 
     @Override
@@ -76,11 +86,17 @@ public void init(GameContainer container) throws SlickException {
     	/*
     	 * for getting the GUI info to display
     	 */
-    	ufont = new UnicodeFont("/assets/Menlo.ttc", 20, false, false);
+    	ufont = new UnicodeFont("/assets/mensch.ttf", 22, false, false);
     	ufont.getEffects().add(new ColorEffect(java.awt.Color.BLACK));
     	ufont.addGlyphs("0123456789");
     	ufont.loadGlyphs();
 
+    	//For custom message test
+    	uFont2 = new UnicodeFont("/assets/mensch.ttf", 22, false, false);
+    	uFont2.getEffects().add(new ColorEffect(java.awt.Color.WHITE));
+    	uFont2.addGlyphs("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.'!");
+    	uFont2.loadGlyphs();
+
 
     	/*
     	 * set up the sprites
@@ -126,7 +142,9 @@ public void update(GameContainer container, int delta)
     	}
     }
 
-    ///*
+    /**
+     * This method captures key presses from the keyboard
+     */
     @Override
     public void keyPressed(int key, char c) {
     	switch (key) {
@@ -138,12 +156,14 @@ public void keyPressed(int key, char c) {
     	break;
     	case Input.KEY_RIGHT : rachel.startMoving(Player.WEST);
     	break;
+    	// 'A' key used for taking a book
     	case Input.KEY_A :
     		Bookshelf check = gameSpace.getSpecificShelf(rachel.xCoord - 1, rachel.yCoord, 0, 1);
     		if(rachel.isFacing(Player.NORTH) && (check != null)) {
     			rachel.takeBook(check);
     		}
     	break;
+    	// 'S' key used for throwing book
     	case Input.KEY_S :
     		rachel.fireBook(entities);
     	}
@@ -245,10 +265,12 @@ public void render(GameContainer container, Graphics g)
     	rachel.render(480, 336);
 
     	GUI.draw(0,672-(32*5));
-    	ufont.drawString(96+30, 672-(4*32)+5, ""+rachel.getAmmo());
-    	ufont.drawString((32*12)+30, 672-(4*32)+5, ""+ maxHeight);
+    	ufont.drawString(96+21, SCORE_VAR_HEIGHT, "" + rachel.getAmmo());
+    	ufont.drawString(96+101, SCORE_VAR_HEIGHT, "" + ZombiesKilled);
+    	ufont.drawString(96+180, SCORE_VAR_HEIGHT, "" + rachel.getHealth());
+    	ufont.drawString((32*12)+30, SCORE_VAR_HEIGHT, "" + maxHeight);
+    	uFont2.drawString(500, SCORE_VAR_HEIGHT, "Don't get hit.");
 
-
     	//check collisions
     	for(Entity e : entities) {
     		ArrayList<Bookshelf> colliders = gameSpace.getSurroundingShelves(e.yCoord, e.xCoord);