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

Spara score mellan omgångar, ingen logik i scoren ännu

parent ba7d9e30
No related branches found
No related tags found
1 merge request!1Testb
167
\ No newline at end of file
package states;
public class FlyingEnemy extends Enemy{
public FlyingEnemy(String enemyImg) {
super(enemyImg);
}
}
package states; package states;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Scanner; import java.util.Scanner;
public class HighScore { public class HighScore {
public void saveScore(int score) { public void saveScore(int score) {
if (score > getHighScore()) { if (score > getHighScore()) {
try { try {
FileWriter writer = new FileWriter("src/HighScore.txt"); FileWriter writer = new FileWriter("src/HighScore.txt");
writer.write(""); writer.write("");
writer.write(Integer.toString(score)); writer.write(Integer.toString(score));
writer.close(); writer.close();
} catch (IOException ioe) { } catch (IOException ioe) {
ioe.printStackTrace(); ioe.printStackTrace();
}
} }
} }
public int getHighScore() { }
int highScore = 0;
try { public int getHighScore() {
File highScoreTxtFile = new File("src/HighScore.txt"); int highScore = 0;
Scanner myReader = new Scanner(highScoreTxtFile);
while (myReader.hasNextLine()) {
String data = myReader.nextLine();
highScore = Integer.parseInt(data);
}
myReader.close();
} catch (FileNotFoundException e) {
System.out.println("File not found.");
e.printStackTrace();
}
return highScore; try {
File highScoreTxtFile = new File("src/HighScore.txt");
Scanner myReader = new Scanner(highScoreTxtFile);
while (myReader.hasNextLine()) {
String data = myReader.nextLine();
highScore = Integer.parseInt(data);
}
myReader.close();
} catch (FileNotFoundException e) {
System.out.println("File not found.");
e.printStackTrace();
} }
return highScore;
} }
}
...@@ -47,7 +47,7 @@ public class PlayState extends GameState { ...@@ -47,7 +47,7 @@ public class PlayState extends GameState {
private boolean gameOver = false; private boolean gameOver = false;
private MenuState menu; private MenuState menu;
private HighScore score = new HighScore(); private HighScore score = new HighScore();
// private int clearedEnemies; private int clearedEnemies;
private String scoreText; private String scoreText;
...@@ -61,7 +61,7 @@ public class PlayState extends GameState { ...@@ -61,7 +61,7 @@ public class PlayState extends GameState {
gameOverText = "GAMEOVER\n" + informationText; gameOverText = "GAMEOVER\n" + informationText;
bgColor = Color.BEIGE; bgColor = Color.BEIGE;
fontColor = Color.BLUE; fontColor = Color.BLUE;
scoreText = "Highscore: "; scoreText = "Highscore: " + Integer.toString(score.getHighScore());
// + Integer.toString(score.getHighScore()); // + Integer.toString(score.getHighScore());
player = new Player(Constants.playerImg); player = new Player(Constants.playerImg);
...@@ -131,7 +131,8 @@ public class PlayState extends GameState { ...@@ -131,7 +131,8 @@ public class PlayState extends GameState {
if (!gameOver) { if (!gameOver) {
if ((enemy.getEnemyX() <= (player.getPlayerX() + 80)) && (enemy.getEnemyX() > player.getPlayerX())) { if ((enemy.getEnemyX() <= (player.getPlayerX() + 80)) && (enemy.getEnemyX() > player.getPlayerX())) {
if (!collided && enemy.getEnemyX() > player.getPlayerX()) { // if (!collided && enemy.getEnemyX() > player.getPlayerX()) {
if (!collided) {
checkCollision(); checkCollision();
} }
// clearedEnemies ++; // clearedEnemies ++;
...@@ -139,6 +140,8 @@ public class PlayState extends GameState { ...@@ -139,6 +140,8 @@ public class PlayState extends GameState {
if (collided && enemy.getEnemyX() < player.getPlayerX()) { if (collided && enemy.getEnemyX() < player.getPlayerX()) {
collided = false; collided = false;
} else if (!collided && enemy.getEnemyX() < player.getPlayerX()) {
clearedEnemies ++;
} }
...@@ -174,11 +177,11 @@ public class PlayState extends GameState { ...@@ -174,11 +177,11 @@ public class PlayState extends GameState {
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) { if (Integer.valueOf(player.getLives()) == 1) {
// menu = new MenuState(model); // menu = new MenuState(model);
// model.switchState(menu); // model.switchState(menu);
gameOver = true; gameOver = true;
// score.saveScore(clearedEnemies); score.saveScore(clearedEnemies);
} }
player.decreaseLives(); player.decreaseLives();
...@@ -190,6 +193,7 @@ public class PlayState extends GameState { ...@@ -190,6 +193,7 @@ public class PlayState extends GameState {
// } // }
// clearedEnemies ++;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment