Merge branch 'alt'

Author: redomar

src/com/redomar/game/Game.java

@@ -47,6 +47,9 @@ public class Game extends Canvas implements Runnable {
 	private static boolean changeLevel = false;
 	private static boolean npc = false;
 	private static int map = 0;
+	private static int shirtCol;
+	private static int faceCol;
+	private static boolean[] alternateCols = new boolean[2];
 
 	private static JFrame frame;
 
@@ -126,8 +129,20 @@ public void init() {
 
 	public void setMap(String Map_str) {
 		setLevel(new LevelHandler(Map_str));
+		if(alternateCols[0]){
+			Game.setShirtCol(240);
+		}
+		if(!alternateCols[0]){
+			Game.setShirtCol(111);
+		}
+		if(alternateCols[1]){
+			Game.setFaceCol(310);
+		}
+		if(!alternateCols[1]){
+			Game.setFaceCol(543);
+		}
 		setPlayer(new PlayerMP(getLevel(), 100, 100, input,
-				getJdata_UserName(), null, -1));
+				getJdata_UserName(), null, -1, shirtCol, faceCol));
 		level.addEntity(player);
 	}
 
@@ -467,4 +482,36 @@ public static String getGameVersion() {
 		return game_Version;
 	}
 
+	public static int getShirtCol() {
+		return shirtCol;
+	}
+
+	public static void setShirtCol(int shirtCol) {
+		Game.shirtCol = shirtCol;
+	}
+
+	public static int getFaceCol() {
+		return faceCol;
+	}
+
+	public static void setFaceCol(int faceCol) {
+		Game.faceCol = faceCol;
+	}
+
+	public static boolean[] getAlternateCols() {
+		return alternateCols;
+	}
+
+	public static void setAlternateCols(boolean[] alternateCols) {
+		Game.alternateCols = alternateCols;
+	}
+	
+	public static void setAternateColsR(boolean alternateCols){
+		Game.alternateCols[1] = alternateCols;
+	}
+	
+	public static void setAternateColsS(boolean alternateCols){
+		Game.alternateCols[0] = alternateCols;
+	}
+
 }

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

@@ -16,7 +16,7 @@ public class Player extends Mob {
 	private static Name customeName = new Name();
 	private Swim swim;
 
-	private int colour = Colours.get(-1, 111, 240, 310);
+	private int colour, shirtCol, faceCol;
 	private int tickCount = 0;
 	private String userName;
 	private boolean[] swimType;
@@ -25,10 +25,13 @@ public class Player extends Mob {
 	public static String guestPlayerName = customeName.setName("Player ");
 
 	public Player(LevelHandler level, int x, int y, InputHandler input,
-			String userName) {
+			String userName,  int shirtCol,	int faceCol) {
 		super(level, "Player", x, y, 1);
 		this.input = input;
 		this.userName = userName;
+		this.faceCol = faceCol;
+		this.shirtCol = shirtCol;
+		this.colour = Colours.get(-1, 111, shirtCol, faceCol);
 	}
 
 	public void tick() {
@@ -110,7 +113,7 @@ public void render(Screen screen) {
 			int waterColour = 0;
 			yOffset += 4;
 
-			colour = Colours.get(-1, 111, -1, 310);
+			colour = Colours.get(-1, 111, -1, faceCol);
 
 			if (tickCount % 60 < 15) {
 				waterColour = Colours.get(-1, -1, swimColour[0], -1);
@@ -141,7 +144,7 @@ public void render(Screen screen) {
 			screen.render((xOffset + modifier - (modifier * flipBottom)),
 					(yOffset + modifier), ((xTile + 1) + (yTile + 1) * 32),
 					colour, flipBottom, scale);
-			colour = Colours.get(-1, 111, 240, 310);
+			colour = Colours.get(-1, 111, shirtCol, faceCol);
 			;
 		}
 

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

@@ -11,15 +11,15 @@ public class PlayerMP extends Player {
 	public int port;
 
 	public PlayerMP(LevelHandler level, int x, int y, InputHandler input,
-			String userName, InetAddress ipAddress, int port) {
-		super(level, x, y, input, userName);
+			String userName, InetAddress ipAddress, int port, int shirtCol, int faceCol) {
+		super(level, x, y, input, userName, shirtCol, faceCol);
 		this.ipAddess = ipAddress;
 		this.port = port;
 	}
 
 	public PlayerMP(LevelHandler level, int x, int y, String userName,
-			InetAddress ipAddress, int port) {
-		super(level, x, y, null, userName);
+			InetAddress ipAddress, int port, int shirtCol, int faceCol) {
+		super(level, x, y, null, userName, shirtCol, faceCol);
 		this.ipAddess = ipAddress;
 		this.port = port;
 	}

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

@@ -194,11 +194,34 @@ public static void play() {
 						"Enter the name \nleave blank for local"));
 			}
 			Thread.sleep(125);
-			splash.setProgress(95, "Aquring data: Username");
+			splash.setProgress(94, "Aquring data: Username");
 			Thread.sleep(125);
-			splash.setProgress(96, "Initalizing as Server:Host");
+			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"};
+			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){
+				Game.setAternateColsR(true);
+			}else{
+				Game.setAternateColsR(false);
+			}
+			Thread.sleep(250);
+			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){
+				Game.setAternateColsS(true);
+			}else{
+				Game.setAternateColsS(false);
+			}
 			splash.setProgress(97, "Connecting as" + Game.getJdata_UserName());
 			Thread.sleep(250);
 			splash.splashOff();

src/com/redomar/game/net/GameClient.java

@@ -81,7 +81,7 @@ private void handleLogin(Packet00Login packet, InetAddress address, int port) {
 		print.print("[" + address.getHostAddress() + ":" + port + "] "
 				+ packet.getUsername() + " has joined...", PrintTypes.NETWORK);
 		PlayerMP player = new PlayerMP(Game.getLevel(), packet.getX(),
-				packet.getY(), packet.getUsername(), address, port);
+				packet.getY(), packet.getUsername(), address, port, Game.getShirtCol(), Game.getFaceCol());
 		Game.getLevel().addEntity(player);
 	}
 

src/com/redomar/game/net/GameServer.java

@@ -69,7 +69,7 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 					+ "] " + ((Packet00Login) packet).getUsername()
 					+ " has connected...", PrintTypes.SERVER);
 			PlayerMP player = new PlayerMP(Game.getLevel(), 10, 10,
-					((Packet00Login) packet).getUsername(), address, port);
+					((Packet00Login) packet).getUsername(), address, port, Game.getShirtCol(), Game.getFaceCol());
 			this.addConnection(player, (Packet00Login) packet);
 			break;
 		case DISCONNECT: