From 4190a0d751a96863f4a0dae0dd26bff25702d72f Mon Sep 17 00:00:00 2001
From: Kellian Mirey <kellian.mirey.etu@univ-lille.fr>
Date: Thu, 5 Sep 2024 11:17:28 +0200
Subject: [PATCH] Patch healthbar
---
src/main/java/bitFight/Display.java | 6 ++++++
src/main/java/bitFight/Level.java | 4 ++--
src/main/java/bitFight/Main.java | 5 +++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/bitFight/Display.java b/src/main/java/bitFight/Display.java
index c5ff29b..2cf69ae 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 2c8f473..8139a41 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 bff4507..62817d7 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()) {
--
GitLab