Skip to content
Snippets Groups Projects
Commit c1f94e23 authored by Oscar Wiberg's avatar Oscar Wiberg
Browse files

skickas till meny när spelarens liv är slut

parent db23ebc3
No related branches found
No related tags found
1 merge request!1Testb
...@@ -21,8 +21,8 @@ public interface Constants { ...@@ -21,8 +21,8 @@ public interface Constants {
/* /*
* Define the size of the window * Define the size of the window
*/ */
final double screenWidth = 1000; final int screenWidth = 1000;
final double screenHeight = 500; final int screenHeight = 500;
// Player // Player
......
...@@ -50,7 +50,9 @@ public class Main extends Application { ...@@ -50,7 +50,9 @@ public class Main extends Application {
gameStage.setWidth(Constants.screenWidth); gameStage.setWidth(Constants.screenWidth);
gameStage.setHeight(Constants.screenHeight); gameStage.setHeight(Constants.screenHeight);
GameModel model = new GameModel(); GameModel model = new GameModel();
GameFrame frame = new GameFrame(model, 1000, 800); // GameFrame frame = new GameFrame(model, 1000, 800);
GameFrame frame = new GameFrame(model, Constants.screenWidth, Constants.screenHeight);
Scene gameScene = new Scene(frame); Scene gameScene = new Scene(frame);
final double targetFps = 50.0; final double targetFps = 50.0;
// Calculate frequency in nano seconds // Calculate frequency in nano seconds
......
...@@ -6,6 +6,7 @@ import javafx.scene.input.KeyCode; ...@@ -6,6 +6,7 @@ import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import javafx.scene.text.Text;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
...@@ -35,12 +36,14 @@ public class PlayState extends GameState { ...@@ -35,12 +36,14 @@ public class PlayState extends GameState {
* a way to make this more general and not duplicate variables? * a way to make this more general and not duplicate variables?
*/ */
private String informationText; private String informationText;
private String livesleft;
private Color bgColor; private Color bgColor;
private Color fontColor; private Color fontColor;
private boolean up = false; private boolean up = false;
private Player player; private Player player;
private Enemy enemy; private Enemy enemy;
private boolean collided = false; private boolean collided = false;
private MenuState menu;
/* Class only used for testing */ /* Class only used for testing */
...@@ -48,12 +51,15 @@ public class PlayState extends GameState { ...@@ -48,12 +51,15 @@ public class PlayState extends GameState {
public PlayState(GameModel model) { public PlayState(GameModel model) {
super(model); super(model);
informationText = "Press Escape To Return To The Menu"; informationText = "Press Escape \nTo Return To The Menu";
livesleft = "Lives left: ";
bgColor = Color.BEIGE; bgColor = Color.BEIGE;
fontColor = Color.BLUE; fontColor = Color.BLUE;
player = new Player(Constants.playerImg); player = new Player(Constants.playerImg);
enemy = new Enemy(Constants.enemyImg); enemy = new Enemy(Constants.enemyImg);
// menu = new MenuState(model);
} }
...@@ -66,13 +72,14 @@ public class PlayState extends GameState { ...@@ -66,13 +72,14 @@ public class PlayState extends GameState {
g.setFill(fontColor); g.setFill(fontColor);
g.setFont(new Font(30)); // Big letters g.setFont(new Font(30)); // Big letters
g.fillText(informationText, Constants.screenWidth / 3, Constants.screenHeight / 3); g.fillText(livesleft+player.getLives(), 0, 30);
g.fillText(informationText, Constants.screenWidth - 300, 30);
g.setStroke(Color.BLACK); g.setStroke(Color.BLACK);
g.setLineWidth(1); g.setLineWidth(1);
g.setLineDashes(2); g.setLineDashes(2);
g.strokeLine(Constants.screenWidth, 350, 0, 350); g.strokeLine(Constants.screenWidth, 350, 0, 350);
if (enemy.getEnemyX() < 0 - Constants.enemyWidth) { if (enemy.getEnemyX() < 0 - Constants.enemyWidth) {
enemy.setEnemyX(Constants.screenWidth); enemy.setEnemyX(Constants.screenWidth);
} }
...@@ -145,9 +152,13 @@ public class PlayState extends GameState { ...@@ -145,9 +152,13 @@ public class PlayState extends GameState {
// // System.out.println("helo"); // // System.out.println("helo");
if((player.getPlayerY() + 60) >= enemy.getEnemyY() ) { if((player.getPlayerY() + 60) >= enemy.getEnemyY() ) {
collided = true; collided = true;
System.out.println("fäk"); // System.out.println("fäk");
if (Integer.valueOf(player.getLives()) == 0) {
menu = new MenuState(model);
model.switchState(menu);
}
player.decreaseLives(); player.decreaseLives();
System.out.println(player.getLives()); // System.out.println(player.getLives());
} }
// System.out.println("slipped by enemy"); // System.out.println("slipped by enemy");
......
...@@ -52,8 +52,8 @@ public class Player { ...@@ -52,8 +52,8 @@ public class Player {
} }
public int getLives() { public String getLives() {
return this.lives; return Integer.toString(this.lives);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment