Added new entity type: Tree and Spruce Tree

First addition of trees- not yet solid
Minor Corrections of commenting

Author: redomar

res/sprite_sheet.png

@@ -4,6 +4,7 @@
 import com.redomar.game.entities.Dummy;
 import com.redomar.game.entities.Player;
 import com.redomar.game.entities.Vendor;
+import com.redomar.game.entities.trees.Spruce;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.gfx.SpriteSheet;
 import com.redomar.game.level.LevelHandler;
@@ -79,6 +80,7 @@ public class Game extends Canvas implements Runnable {
 	private Player player;
 	private Dummy dummy;                            // Dummy NPC follows the player around
 	private Vendor vendor;                          // Vendor NPC exhibits random movement and is only found on cutom_level
+	private Spruce spruce;							// Tree -- Spruce
 	private Font font = new Font();                 // Font object capable of displaying 2 fonts: Arial and Segoe UI
 	private String nowPlaying;
 	private boolean notActive = true;
@@ -215,6 +217,8 @@ public void setMap(String Map_str) {
 		setPlayer(new Player(level, 100, 100, input,
 			getJdata_UserName(), shirtCol, faceCol));
 		level.addEntity(player);
+		spruce = new Spruce(level, 70,170, 2 );
+		level.addEntity(spruce);
 	}
 
 	public static void setMap(int map) {
@@ -545,7 +549,7 @@ public void render() {
 	* whether it is running in developer mode, or if the application is closing.
 	*/
 	private void status(Graphics g, boolean TerminalMode, boolean TerminalQuit) {
-		if (TerminalMode == true) {                                                             // If running in developer mode
+		if (TerminalMode) {                                                             // If running in developer mode
 			g.setColor(Color.CYAN);
 			g.drawString("JavaGame Stats", 0, 10);                               // Display "JavaGame Stats" in cyan at the bottom left of the screen
 			g.drawString("FPS/TPS: " + fps + "/" + tps, 0, 25);                  // Display the FPS and TPS in cyan directly above "JavaGame Stats"
@@ -563,14 +567,16 @@ private void status(Graphics g, boolean TerminalMode, boolean TerminalQuit) {
 			g.setColor(Color.CYAN);
 			g.fillRect(getMouse().getX() - 12, getMouse().getY() - 12, 24, 24);
 		}
-		if (TerminalQuit == true) {                                                             // If the game is shutting off
-			g.setColor(Color.BLACK);
-			g.fillRect(0, 0, getWidth(), getHeight());                               // Make the screen fully black
-			g.setColor(Color.RED);
-			g.drawString("Shutting down the Game", (getWidth() / 2) - 70,           // Display "Shutting down the Game" in red in the middle of the screen
-				(getHeight() / 2) - 8);
-			g.dispose();                                                                    // Free up memory for graphics
+		// If the game is shutting off
+		if (!TerminalQuit) {
+			return;
 		}
+		g.setColor(Color.BLACK);
+		g.fillRect(0, 0, getWidth(), getHeight());                               // Make the screen fully black
+		g.setColor(Color.RED);
+		g.drawString("Shutting down the Game", (getWidth() / 2) - 70,           // Display "Shutting down the Game" in red in the middle of the screen
+			(getHeight() / 2) - 8);
+		g.dispose();                                                                    // Free up memory for graphics
 	}
 
 	public WindowHandler getWindow() {

src/com/redomar/game/Game.java

@@ -0,0 +1,103 @@
+package com.redomar.game.entities.trees;
+
+import com.redomar.game.gfx.Colours;
+import com.redomar.game.gfx.Screen;
+import com.redomar.game.level.LevelHandler;
+
+public class Spruce extends Tree {
+
+	/**
+	 * Spruce Tree by MOHAMED OMAR
+	 *
+	 */
+
+	//BIT MASK variables in Bits. Used to select bits by using comparing.
+	private final int BIT_MASK_MOVE_RIGHT = 0b0001;
+	private final int BIT_MASK_MOVE_UP_1 = 0b0010;
+	private final int BIT_MASK_MOVE_UP_2 = 0b0100;
+
+	private int scale;
+
+	/**
+	 * Spruce tree
+	 * @param level LevelHandler level which spruces spawns
+	 * @param x X co-ordinate
+	 * @param y Y co-ordinate
+	 * @param scale Size of tree
+	 */
+	public Spruce(LevelHandler level, double x, double y, int scale) {
+		super(level, x, y);
+		this.setX((int)x);
+		this.setY((int)y);
+		this.setName("Spruce_Tree");
+		this.setScale(scale);
+	}
+
+	@Override
+	public void tick() {
+
+	}
+
+	/**
+	 * This Renders the spruce tree
+	 *
+	 * Spruce is 3x2 on the sprite sheet
+	 *
+	 *      0    1
+	 *    +---------+
+	 * 6  |0100|0101|
+	 * 7  |0010|0011|
+	 * 8  |0000|0001|
+	 *    +---------+
+	 *
+	 * @param screen Screen to render on.
+	 */
+	public void render(Screen screen) {
+
+		//Spruce uses 6 tiles from sprite sheet.
+		int spruceSize = 0;
+
+		//This will go through a while loop for each 8*8 section of the spruce
+		while (spruceSize < 6){
+			int right = 0;
+			int up1 = 0;
+			int up2 = 0;
+			int tileX = 0;
+			int tileY = 4;
+
+
+			//BIT MASK for all the right sided sprites. comparing it to 0b0001 (last bit).
+			if ((spruceSize & BIT_MASK_MOVE_RIGHT) > 0){
+				//MOVE RIGHT
+				right = scale * 8;
+				tileX = tileX + 1;
+			}
+
+			//it will only move up 1 time if it does not move up twice.
+			if ((spruceSize & BIT_MASK_MOVE_UP_2) > 0){
+				//MOVE UP 2 TIMES
+				up2 = scale * 8;
+				tileY = tileY -2;
+			} else if ((spruceSize & BIT_MASK_MOVE_UP_1) > 0){
+				//MOVE UP ONCE
+				up1 = scale * 8;
+				tileY = tileY -1;
+			}
+
+			//rendering to game. Inline if statement ensures that tree trunk has a unique colour
+			screen.render((int)getX()+right,((int)getY() - up1) - up2*2,(tileY*32+tileX), Colours.get(-1,020,241, spruceSize > 0b0001? 251: 110), 0x00, scale);
+
+			spruceSize++;
+		}
+
+	}
+
+	//Some getters and setters
+	public int getScale() {
+		return scale;
+	}
+
+	public void setScale(int scale) {
+		this.scale = scale;
+	}
+}

src/com/redomar/game/entities/trees/Spruce.java

@@ -0,0 +1,31 @@
+package com.redomar.game.entities.trees;
+
+import com.redomar.game.entities.Entity;
+import com.redomar.game.level.LevelHandler;
+
+public abstract class Tree extends Entity {
+
+	private final LevelHandler level;
+	/**
+	 * Tree abstract class
+	 * 	-- Used by Spruce Class
+	 */
+
+	//Position variables
+	protected final double x;
+	protected final double y;
+
+	/**
+	 * Constructor for tree entities
+	 * @param level LevelHandler in which tree spawns
+	 * @param x X co-ordinate
+	 * @param y Y co-ordinate
+	 */
+	Tree(LevelHandler level, double x, double y) {
+		super(level);
+		this.level = level;
+		this.x = x;
+		this.y = y;
+	}
+
+}

src/com/redomar/game/entities/trees/Tree.java

@@ -33,6 +33,7 @@ public Screen(int width, int height, SpriteSheet sheet) {
 
 		setPixels(new int[width * height]);
 	}
+
 	public static int getMapWidthMask() {
 		return MAP_WIDTH_MASK;
 	}
@@ -45,7 +46,7 @@ public static int getMapWidthMask() {
 	 * @param yPos Y Postion of subject
 	 * @param tile tile location. e.g 7 * 32 + 1 is the oblong bullet on the 7th row 2nd colomn
 	 * @param colour Using established colouring nomanclature. i.e. use com.redomar.game.gfx.Colours
-	 * @param mirrorDir flip Direction: 0x00 first 0 flip verticle, second 0 flip horizontal. 0x01 horizontal
+	 * @param mirrorDir flip Direction: 0x01 flip verticle, 0x02 flip horizontal.
 	 * @param scale Scale
 	 */
 	public void render(int xPos, int yPos, int tile, int colour, int mirrorDir,

src/com/redomar/game/gfx/Screen.java

@@ -25,21 +25,13 @@ public class LevelHandler {
 	private byte[] tiles;
 	private int width;
 	private int height;
-	private List<Entity> entities = new ArrayList<Entity>();
-	private List<Entity> entities_p = new ArrayList<Entity>();
+	private List<Entity> entities;
+	private List<Entity> entities_p;
 	private String imagePath;
 	private BufferedImage image;
 	private Printing print;
 
-	private Comparator<Node> nodeSorter = new Comparator<Node>() {
-
-		public int compare(Node n0, Node n1) {
-			if(n1.fCost < n0.fCost) return +1;
-			if(n1.fCost > n0.fCost) return -1;
-			return 0;
-		}
-
-	};
+	private Comparator<Node> nodeSorter;
 
 	public LevelHandler(String imagePath) {
 
@@ -54,6 +46,17 @@ public LevelHandler(String imagePath) {
 		}
 
 		print = new Printing();
+		entities = new ArrayList<Entity>();
+		entities_p = new ArrayList<Entity>();
+		nodeSorter = new Comparator<Node>() {
+
+			public int compare(Node n0, Node n1) {
+				if(n1.fCost < n0.fCost) return +1;
+				if(n1.fCost > n0.fCost) return -1;
+				return 0;
+			}
+
+		};
 	}
 
 	private void loadLevelFromFile() {
@@ -73,13 +76,12 @@ private void loadTiles() {
 				getWidth());
 		for (int y = 0; y < getHeight(); y++) {
 			for (int x = 0; x < getWidth(); x++) {
-				tileCheck: for (Tile t : Tile.getTiles()) {
+				for (Tile t : Tile.getTiles())
 					if (t != null
 							&& t.getLevelColour() == tileColours[x + y * getWidth()]) {
 						this.tiles[x + y * getWidth()] = t.getId();
-						break tileCheck;
+						break;
 					}
-				}
 			}
 		}
 	}
@@ -191,12 +193,19 @@ public void addProjectileEntities(Entity entity) {
 		this.getProjectileEntities().add(entity);
 	}
 
+
+	/**
+	 * Removes the entity that is passed through
+	 * @param entity Specifies which entity needs to be removed
+	 */
 	public void removeEntity(Entity entity) {
-		this.entities.remove(entity);
+		if(entity == null) return;
 		print.print("Removed "+entity.getName()+" Entity", PrintTypes.LEVEL);
+		this.entities.remove(entity);
 		try {
 			Thread.sleep(100);
 		} catch (InterruptedException e) {
+			print.print("Interruption error: "+ e, PrintTypes.ERROR);
 			e.printStackTrace();
 		}
 	}