From 262d8db0148b8fb496f7ddb9f3d84aa825a8d913 Mon Sep 17 00:00:00 2001
From: Kellian Mirey <kellian.mirey.etu@univ-lille.fr>
Date: Thu, 5 Sep 2024 10:50:09 +0200
Subject: [PATCH] Implemented Health bar
---
src/main/java/bitFight/Attack.java | 1 -
src/main/java/bitFight/Display.java | 12 +++++++++---
src/main/java/bitFight/Level.java | 5 +++--
src/main/java/bitFight/Main.java | 2 ++
src/test/java/bitFight/MenuTest.java | 1 +
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/bitFight/Attack.java b/src/main/java/bitFight/Attack.java
index d551dfd..d0c8e78 100644
--- a/src/main/java/bitFight/Attack.java
+++ b/src/main/java/bitFight/Attack.java
@@ -2,7 +2,6 @@ package bitFight;
import java.time.Duration;
import java.time.LocalDateTime;
-import java.util.ArrayList;
public enum Attack implements Action {
PUNCH(10, "punch", ActionHeight.HIGH, 10),
diff --git a/src/main/java/bitFight/Display.java b/src/main/java/bitFight/Display.java
index 5d47f5c..c5ff29b 100644
--- a/src/main/java/bitFight/Display.java
+++ b/src/main/java/bitFight/Display.java
@@ -7,8 +7,13 @@ import java.io.InputStreamReader;
public class Display {
+ public static Level level;
public static int row = 1;
+ public Display(Level l){
+ this.level = l;
+ }
+
public static void clearScreen() {
System.out.print("\033[H\033[2J");
}
@@ -31,15 +36,16 @@ public class Display {
}
public static void goToDialogBox(){
- setCursorPos(1,0);
+ setCursorPos(row+6,0);
//System.out.flush();
}
public static void clearDialogBox(){
clearScreen();
- setCursorPos(row, 0);
printDialogBox();
+ setCursorPos(row,0);
+ level.displayLifePoints();
goToDialogBox();
}
@@ -50,7 +56,7 @@ public class Display {
dialogBox = loadTextFile("assets/DialogBox.text");
} catch (IOException e) {
// TODO Auto-generated catch block
- e.printStackTrace();
+ e.getMessage();
}
System.out.println(dialogBox);
}
diff --git a/src/main/java/bitFight/Level.java b/src/main/java/bitFight/Level.java
index 97abb66..5a1d94b 100644
--- a/src/main/java/bitFight/Level.java
+++ b/src/main/java/bitFight/Level.java
@@ -75,9 +75,10 @@ public class Level{
// affiche la jauge de vie
- public void displayLifePoints (){
+ public void displayLifePoints (){
System.err.println();
- System.out.println("\t \t " +this.player.getName());
+ System.out.println("Player " + this.player.getName());
+ System.out.println();
System.out.print(Terminal.GREEN+" \t current health "+Terminal.RESET);
for (int indice = 0; indice < ((this.player.getCurrentHealth()/this.player.getMaxHealth())*100)/2; indice ++){
System.out.print(Terminal.GREEN+ "▬"+ Terminal.RESET);
diff --git a/src/main/java/bitFight/Main.java b/src/main/java/bitFight/Main.java
index 5271d23..fdb8007 100644
--- a/src/main/java/bitFight/Main.java
+++ b/src/main/java/bitFight/Main.java
@@ -20,6 +20,8 @@ class Main {
Level level = new Level(1, player, enemy);
GameData gamedata = Save.loadObject("res/gamedata");
+ Display display = new Display(level);
+
if (gamedata != null) {
player = gamedata.getPlayer();
level = gamedata.getLevelReached();
diff --git a/src/test/java/bitFight/MenuTest.java b/src/test/java/bitFight/MenuTest.java
index f596246..2d3ff10 100644
--- a/src/test/java/bitFight/MenuTest.java
+++ b/src/test/java/bitFight/MenuTest.java
@@ -1,3 +1,4 @@
+
package bitFight;
import java.io.IOException;
--
GitLab