Improved Interface

src/model/InfoPanel.java

@@ -13,6 +13,8 @@ import resources.image.Images.ImageType;
 public class InfoPanel {
 	private PlayState play;
 	private Player player1, player2;
+	
+	private int OFFSET = 610;
 		
 	public InfoPanel(Player p1, Player p2, PlayState play){
 		player1 = p1;
@@ -22,33 +24,42 @@ public class InfoPanel {
 	
 	public void paint(Graphics2D g2d)
 	{
-		g2d.setColor(Color.black);
-		g2d.setFont(new Font("Century Schoolbook L", Font.ROMAN_BASELINE, 27));
 		g2d.setColor(Color.red);
-		g2d.fillRect(70, 605, (int) (680*((double)play.getTimeleft()/play.getCurrentLevel().getTime())), 20);
+		g2d.fillRect(200, OFFSET, (int) (400*((double)play.getTimeleft()/play.getCurrentLevel().getTime())), 20);
+		
 		g2d.setColor(Color.black);
+		g2d.setFont(new Font("Century Schoolbook L", Font.ROMAN_BASELINE, 22));
+		g2d.drawRect(200, OFFSET, 400, 20);
 
 		//Player 1
-		g2d.drawString(player1.getName(), 70, 648);
-		g2d.drawString(player1.getScore() + " xp", 70, 673);
-		for(int i = 0; i < player1.getHealth(); i++){
-			g2d.drawImage(Images.getImage(ImageType.HEARTH), null, 68+i*24,680);
+		g2d.drawLine(35, OFFSET, 35, Window.HEIGHT);
+		g2d.drawString(player1.getName(), 40, OFFSET + 5 + g2d.getFont().getSize());
+		g2d.drawString(player1.getScore() + " xp", 40, OFFSET + 5 + g2d.getFont().getSize()*2+5);
+		for(int i = 0; i < player1.getHealth(); i++)
+		{
+			g2d.drawImage(Images.getImage(ImageType.HEARTH), null, 5, OFFSET + (30*i));
 		}
-		g2d.drawString("<Powerups>", 70, 720);
+		g2d.drawLine(35, OFFSET + g2d.getFont().getSize()*3, 200, OFFSET + g2d.getFont().getSize()*3);
+		g2d.drawString("<Powerups>", 40, OFFSET + g2d.getFont().getSize()*4);
 		
 		//Chat
-		g2d.drawLine(230, 600, 230, Window.HEIGHT);
-		g2d.drawString("hi!", 240, 630);
-		g2d.drawString("hello!", 460, 670);
-		g2d.drawLine(540, 600, 540, Window.HEIGHT);
+		g2d.drawLine(200, OFFSET, 200, Window.HEIGHT);
+		g2d.drawString("[" + player1.getName().toUpperCase() + "] > Hi!", 210, OFFSET + 50);
+		g2d.drawString("[" + player2.getName().toUpperCase() + "] > Hello", 210, OFFSET + 50 + g2d.getFont().getSize());
+		g2d.drawString("[" + player1.getName().toUpperCase() + "] > How are you?", 210, OFFSET + 50 + g2d.getFont().getSize()*2);
+		g2d.drawString("[" + player2.getName().toUpperCase() + "] > Good :D", 210, OFFSET + 50 + g2d.getFont().getSize()*3);
+		g2d.drawLine(600, OFFSET, 600, Window.HEIGHT);
+
 		
-		//Player 2
-		g2d.drawString(player2.getName(),560, 648);
-		g2d.drawString(player2.getScore() + " xp", 560, 673);
-		for(int i = 0; i < player2.getHealth(); i++){
-			g2d.drawImage(Images.getImage(ImageType.HEARTH), null, 558+i*24,680);
+		g2d.drawLine(Window.WIDTH - 35, OFFSET, Window.WIDTH - 35, Window.HEIGHT);
+		g2d.drawString(player2.getName(), Window.WIDTH - 40 - player2.getName().length()*15, OFFSET + 5 + g2d.getFont().getSize());
+		g2d.drawString(player2.getScore() + " xp", Window.WIDTH - 40 - ((player2.getScore() + " ").length() +3)*15, OFFSET + 5 + g2d.getFont().getSize()*2+5);
+		for(int i = 0; i < player2.getHealth(); i++)
+		{
+			g2d.drawImage(Images.getImage(ImageType.HEARTH), null, Window.WIDTH - 30, OFFSET + (30*i));
 		}
-		g2d.drawString("<Powerups>", 560, 720);
+		g2d.drawLine(Window.WIDTH - 35, OFFSET + g2d.getFont().getSize()*3, Window.WIDTH - 200, OFFSET + g2d.getFont().getSize()*3);
+		g2d.drawString("<Powerups>", Window.WIDTH - 40 - 140, OFFSET + g2d.getFont().getSize()*4);
 	}
 	
 }