Merge branch 'feature' into aside

Author: redomar

src/com/redomar/game/Game.java

@@ -86,6 +86,10 @@ public class Game extends Canvas implements Runnable {
 	private GameServer socketServer;
 	private Printing print = new Printing();
 
+	/**
+	 * @author Redomar
+	 * @version Alpha 1.7
+	 */
 	public Game() {
 		setMinimumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
 		setMaximumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));

src/com/redomar/game/entities/Dummy.java

@@ -20,12 +20,13 @@ public class Dummy extends Mob {
 	private static double speed = 0.75;
 	private List<Node> path = null;
 	private int time = 0;
+	private static int[] collisionBoders = {0, 7, 0, 7};
 
 	private Swim swim;
 
 	public Dummy(LevelHandler level, String name, int x, int y, int shirtCol,
 			int faceCol) {
-		super(level, "h", x, y, speed);
+		super(level, "h", x, y, speed, collisionBoders);
 		this.faceCol = faceCol;
 		this.shirtCol = shirtCol;
 		this.colour = Colours.get(-1, 111, shirtCol, faceCol);

src/com/redomar/game/entities/Mob.java

@@ -22,13 +22,21 @@ public abstract class Mob extends Entity {
 	protected boolean isMuddy = false;
 	protected boolean changeLevels = false;
 	protected int ticker;
-
-	public Mob(LevelHandler level, String name, int x, int y, double speed) {
+	/**
+	 * [0] Contains the <strong>xMin</strong><br>
+	 * [1] Contains the <strong>xMax</strong><br>
+	 * [2] Contains the <strong>yMin</strong><br>
+	 * [3] Contains the <strong>yMax
+	 */
+	protected int[] collisionBoders = new int[4];
+
+	public Mob(LevelHandler level, String name, int x, int y, double speed, int[] collisionBoders) {
 		super(level);
 		this.name = name;
 		this.setX(x);
 		this.setY(y);
 		this.speed = speed;
+		this.collisionBoders = collisionBoders;
 	}
 
 	public void move(double xa, double ya) {
@@ -90,10 +98,10 @@ public void move(double xa, double ya) {
 	}
 
 	public boolean hasCollided(double xa, double ya){
-		int xMin = 0;
-		int xMax = 7;
-		int yMin = 3;
-		int yMax = 7;
+		int xMin = collisionBoders[0];
+		int xMax = collisionBoders[1];
+		int yMin = collisionBoders[2];
+		int yMax = collisionBoders[3];
 
 		for (int x = xMin; x < xMax; x++) {
 			if (isSolid((int) xa, (int) ya, x, yMin)) {
@@ -169,13 +177,13 @@ protected void aStarMovementAI(int x, int y, int px, int py, double xa,
 		if(path != null) {
 			if(path.size() > 0){
 				Vector2i vector = path.get(path.size() - 1).tile;
-				if(x < vector.getX() << 3) xa++;
-				if(x > vector.getX() << 3) xa--;
-				if(y < vector.getY() << 3) ya++;
-				if(y > vector.getY() << 3) ya--;
+				if(x < vector.getX() << 3) xa =+ speed;
+				if(x > vector.getX() << 3) xa =- speed;
+				if(y < vector.getY() << 3) ya =+ speed;
+				if(y > vector.getY() << 3) ya =- speed;
+				moveMob(xa, ya, mob);
 			}
 		}
-		moveMob(xa, ya, mob);
 	}
 
 	protected void followMovementAI(int x, int y, int px, int py, double xa,

src/com/redomar/game/entities/Player.java

@@ -24,12 +24,13 @@ public class Player extends Mob {
 	private String userName;
 	private boolean[] swimType;
 	private int[] swimColour;
+	private static int[] collisionBoders = {-2, 8, 0, 7};
 
 	public static String guestPlayerName = customeName.setName("Player ");
 
 	public Player(LevelHandler level, int x, int y, InputHandler input,
 			String userName,  int shirtCol,	int faceCol) {
-		super(level, "Player", x, y, speed);
+		super(level, "Player", x, y, speed, collisionBoders);
 		this.input = input;
 		this.userName = userName;
 		this.faceCol = faceCol;

src/com/redomar/game/level/LevelHandler.java

@@ -237,7 +237,7 @@ public List<Node> findPath(Vector2i start, Vector2i goal){
 				if(at == null) continue;
 				if(at.isSolid()) continue;
 				Vector2i a = new Vector2i(x + xi, y + yi);
-				double gCost = current.gCost + getDistance(current.tile, a);
+				double gCost = current.gCost + (getDistance(current.tile, a) == 1 ? 1 : 0.95);
 				double hCost = getDistance(a, goal);
 				Node node = new Node(a, current, gCost, hCost);
 				if(isVectorInList(closedList, a) && gCost >= node.gCost) continue;

src/com/redomar/game/menu/Menu.java

@@ -112,7 +112,9 @@ private void render() {
 		if (isGameOver()) {
 			g.drawString("GAME OVER... What will you do now?", 35, 30);
 		} else {
-			String name = (Game.getJdata_UserName().length() >= 1) ? WordUtils.capitalizeFully(Game.getJdata_UserName()).toString() : "Player";
+			String name = (Game.getJdata_UserName().length() >= 1) ? WordUtils
+					.capitalizeFully(Game.getJdata_UserName()).toString()
+					: "Player";
 			g.drawString("Welcome to JavaGame " + name, 35, 30);
 		}
 		g.drawLine(10, (HEIGHT * 3), 10, 10);
@@ -188,41 +190,44 @@ public static void play() {
 			splash.setProgress(92, "Aquring data: Multiplayer");
 			Thread.sleep(125);
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-			String multiMsg = "Sorry but multiplayer has been disabled on this version.\nIf you would like multiplayer checkout Alpha 1.6"; 
-			JOptionPane.showMessageDialog(Game.getGame(), multiMsg, "Multiplayer Warning", JOptionPane.WARNING_MESSAGE);
-			//Game.setJdata_Host(JOptionPane.showConfirmDialog(Game.getGame(), "Do you want to be the HOST?"));
+			String multiMsg = "Sorry but multiplayer has been disabled on this version.\nIf you would like multiplayer checkout Alpha 1.6";
+			JOptionPane.showMessageDialog(Game.getGame(), multiMsg,
+					"Multiplayer Warning", JOptionPane.WARNING_MESSAGE);
+			// Game.setJdata_Host(JOptionPane.showConfirmDialog(Game.getGame(),
+			// "Do you want to be the HOST?"));
 			Game.setJdata_Host(1);
-			if (Game.getJdata_Host() != 1) { //Game.getJdata_Host() == 1
+			if (Game.getJdata_Host() != 1) { // Game.getJdata_Host() == 1
 				Game.setJdata_IP(JOptionPane.showInputDialog(Game.getGame(),
 						"Enter the name \nleave blank for local"));
 			}
 			Thread.sleep(125);
 			splash.setProgress(94, "Aquring data: Username");
+			String s = JOptionPane.showInputDialog(Game.getGame(),
+					"Enter a name");
+			if (s != null) {
+				Game.setJdata_UserName(s);
+			}
 			Thread.sleep(125);
-			splash.setProgress(95, "Initalizing as Server:Host");
-			Game.setJdata_UserName(JOptionPane.showInputDialog(Game.getGame(),
-					"Enter a name"));
-			Thread.sleep(250);
 			splash.setProgress(96, "Collecting Player Data");
-			Object[] options = { "African", "Caucasian"};
+			Object[] options = { "African", "Caucasian" };
 			int n = JOptionPane.showOptionDialog(frame,
-					"Choose a race for the charater to be",
-					"Choose a race", JOptionPane.YES_NO_OPTION,
-					JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
-			if(n == 0){
+					"Choose a race for the charater to be", "Choose a race",
+					JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,
+					null, options, options[0]);
+			if (n == 0) {
 				Game.setAternateColsR(true);
-			}else{
+			} else {
 				Game.setAternateColsR(false);
 			}
 			Thread.sleep(250);
-			Object[] options1 = { "Orange", "Black"};
+			Object[] options1 = { "Orange", "Black" };
 			int n1 = JOptionPane.showOptionDialog(frame,
 					"Which Colour do you want the shirt to be?",
 					"Choose a shirt Colour", JOptionPane.YES_NO_OPTION,
 					JOptionPane.QUESTION_MESSAGE, null, options1, options1[0]);
-			if(n1 == 0){
+			if (n1 == 0) {
 				Game.setAternateColsS(true);
-			}else{
+			} else {
 				Game.setAternateColsS(false);
 			}
 			splash.setProgress(97, "Connecting as" + Game.getJdata_UserName());