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

Kollisions logik, händer inget vid krock än

parent bab5ad12
No related branches found
No related tags found
1 merge request!1Testb
......@@ -37,9 +37,6 @@ public class PlayState extends GameState {
private String informationText;
private Color bgColor;
private Color fontColor;
private Image obstacle;
private Double enemyPosX = -100.00;
private Double enemyPosY = 250.00;
private boolean up = false;
private Player player;
private Enemy enemy;
......@@ -121,6 +118,17 @@ public class PlayState extends GameState {
public void checkCollision() {
if ((enemy.getEnemyX() <= (player.getPlayerX() + 80)) && (enemy.getEnemyX() > player.getPlayerX())) {
// System.out.println("helo");
if((player.getPlayerY() + 60) >= enemy.getEnemyY() ) {
System.out.println("fäk");
player.decreaseLives();
}
}
// rita upp från player samt enemy x och y kordinater + eller - höjd och bredd, då får vi spannen som enemy och player bilderna befinner sig i
// nästlade if satser, först kolla om enemy befinner sig i mitten av skärmen på players x position, sen kollar vi om players y är större än enemy
......
......@@ -37,8 +37,8 @@ public class Player {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
......@@ -53,12 +53,14 @@ public class Player {
public int getLives() {
return lives;
return this.lives;
}
public void setLives(int lives) {
this.lives = lives;
public void decreaseLives() {
this.lives--;
System.out.println(this.lives);
}
......@@ -71,30 +73,30 @@ public class Player {
return playerY;
}
public void jump() {
if (!down) {
playerY -= 10;
if (playerY <= 110) {
down = true;
if (!down) {
playerY -= 10;
if (playerY <= 110) {
down = true;
}
}
}
if (down) {
playerY += 10;
if (playerY == 265) {
down = false;
}
......@@ -102,7 +104,7 @@ public class Player {
}
}
public void setPlayerX(double playerX) {
this.playerX = playerX;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment