diff --git a/src/main/java/bitFight/Display.java b/src/main/java/bitFight/Display.java index c5ff29bbdb829846119944919cba7211be465368..2cf69ae911e800cc694f3d99884e06a3a79085a2 100644 --- a/src/main/java/bitFight/Display.java +++ b/src/main/java/bitFight/Display.java @@ -70,4 +70,10 @@ public class Display { System.out.println(text); goToUserInput(); } + + public static void displayNewHealthBar(){ + setCursorPos(row,0); + level.displayLifePoints(); + goToUserInput(); + } } diff --git a/src/main/java/bitFight/Level.java b/src/main/java/bitFight/Level.java index 2c8f4732a742b6858e863e4bcfb606d599dcb4cf..8139a41adda2fe119c86b6333a8eea23aa72ee8c 100644 --- a/src/main/java/bitFight/Level.java +++ b/src/main/java/bitFight/Level.java @@ -89,7 +89,7 @@ public class Level{ } } System.out.print(" "); - System.err.println( (int) this.player.getCurrentHealth() + "/" + (int) this.player.getMaxHealth()); + System.err.println( (int) this.player.getCurrentHealth() + "/" + (int) this.player.getMaxHealth() + " "); System.out.print(Terminal.YELLOW+"\t current energy "+Terminal.RESET); for (int indice = 0; indice < (this.player.getCurrentEnergy())/2; indice ++){ System.out.print(Terminal.YELLOW +"▬"+ Terminal.RESET); @@ -100,7 +100,7 @@ public class Level{ public String displayPlayerHealth(){ - return (int )this.ennemy.getCurrentHealth() +" / " + (int) this.ennemy.getMaxHealth(); + return (int )this.player.getCurrentHealth() +" / " + (int) this.player.getMaxHealth(); } diff --git a/src/main/java/bitFight/Main.java b/src/main/java/bitFight/Main.java index bff4507c41078382791de978bcdd7384b2c9a5c4..62817d7e0ef1a1264c8f2a5224186414f9e152af 100644 --- a/src/main/java/bitFight/Main.java +++ b/src/main/java/bitFight/Main.java @@ -94,6 +94,7 @@ class Main { Display.clearDialogBox(); Attack randomEnemyAttack = Attack.values()[(int) rand.nextDouble()*Attack.values().length]; level.ennemyFaster(randomEnemyAttack); + Display.displayNewHealthBar(); timeBeforeAttack = LocalDateTime.now(); input.newInput(); } @@ -137,6 +138,10 @@ class Main { enemy.levelUp(); level.levelGoingUp(); level.displayEndOfLevel(); + } + if (player.isDead()){ + Display.clearScreen(); + level.defeat(); } if (player.isDead()) {