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

enemy flyttad till enemy class

parent 3464ea4f
No related branches found
No related tags found
1 merge request!1Testb
package states;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import constants.Constants;
import javafx.scene.image.Image;
public class Enemy {
private double enemyX = -100.00;
private double enemyY = 250.00;
private Image image;
public Enemy(String enemyImg) {
try {
image = new Image(new FileInputStream(enemyImg));
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
public void setEnemyX(double pos) {
this.enemyX = pos;
}
public Image getImage() {
return image;
}
public double getEnemyX() {
return enemyX;
}
public double getEnemyY() {
return enemyY;
}
}
......@@ -42,6 +42,7 @@ public class PlayState extends GameState {
private Double enemyPosY = 250.00;
private boolean up = false;
private Player player;
private Enemy enemy;
/* Class only used for testing */
......@@ -54,6 +55,8 @@ public class PlayState extends GameState {
fontColor = Color.BLUE;
player = new Player(Constants.playerImg);
enemy = new Enemy(Constants.enemyImg);
try {
obstacle = new Image(new FileInputStream(Constants.enemyImg));
......@@ -80,12 +83,17 @@ public class PlayState extends GameState {
g.setLineDashes(2);
g.strokeLine(Constants.screenWidth, 350, 0, 350);
if (enemyPosX < 0 - Constants.enemyWidth) {
enemyPosX = Constants.screenWidth;
// if (enemyPosX < 0 - Constants.enemyWidth) {
// enemyPosX = Constants.screenWidth;
// }
if (enemy.getEnemyX() < 0 - Constants.enemyWidth) {
enemy.setEnemyX(Constants.screenWidth);
}
g.drawImage(player.getImage(), player.getPlayerX(), player.getPlayerY(), Constants.playerWidth, Constants.playerHeight);
g.drawImage(obstacle, enemyPosX, enemyPosY, Constants.enemyWidth, Constants.enemyHeight);
// g.drawImage(obstacle, enemyPosX, enemyPosY, Constants.enemyWidth, Constants.enemyHeight);
g.drawImage(enemy.getImage(), enemy.getEnemyX(), enemy.getEnemyY(), Constants.enemyWidth, Constants.enemyHeight);
}
@Override
......@@ -106,7 +114,11 @@ public class PlayState extends GameState {
@Override
public void update() {
enemyPosX -= 10;
// enemyPosX -= 10;
enemy.setEnemyX(enemy.getEnemyX()-10);
if (up) {
......@@ -118,6 +130,10 @@ public class PlayState extends GameState {
}
}
public void checkCollision() {
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment