diff --git a/src/main/java/bitFight/Attack.java b/src/main/java/bitFight/Attack.java index d551dfd321d51145a2407649f9350d3b1754da91..d0c8e785be359d10ce01231c2e2d1f19b2d756cd 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 5d47f5c96155f82bd4434c39f6a31042d05225ce..c5ff29bbdb829846119944919cba7211be465368 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 97abb664a2bc11af16253b20a2ef2ec179b2723d..5a1d94b2c3f887902acdb84b1e05f1c34bf8d854 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 5271d2340a908b7f1baba108d7ff6f87619fcb2a..fdb8007c1e8ff4635940dd773d521ed47a9b4f3a 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 f596246cd92ce21358e3ea9c04d2355fa08f5cc3..2d3ff10f273338709151ed5f174fa8495d5147c3 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;