diff --git a/src/states/PlayState.java b/src/states/PlayState.java index 5b6d6bf16795f276080ed86d4261582ebd2a5e72..601cd269172efbfc4008c6af52c0c3a8a0de5968 100644 --- a/src/states/PlayState.java +++ b/src/states/PlayState.java @@ -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 diff --git a/src/states/Player.java b/src/states/Player.java index a7dedc6ff74a9c303c256c34ce25a668a8bd4009..6a73a9639db46c1cede49ee75a7a604fe1b74b9e 100644 --- a/src/states/Player.java +++ b/src/states/Player.java @@ -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;