diff --git a/src/Game/Battle.java b/src/Game/Battle.java index 9de1486..a4c98c0 100644 --- a/src/Game/Battle.java +++ b/src/Game/Battle.java @@ -6,8 +6,7 @@ import Entity.Enemy; import Text.TextEnemy; public class Battle { - - private Enemy enemy; + TextEnemy textEnemy; private int lineSpeech; @@ -15,10 +14,11 @@ public class Battle { public int answer; private int winPoint; + + private boolean screenBattleOn = true; public Battle(Enemy enemy){ - this.enemy = enemy; textEnemy = new TextEnemy("enemi"); // should be enemy.name textEnemy.generateText(); @@ -78,6 +78,10 @@ public class Battle { public int getLineSpeech() { return lineSpeech; } + + public boolean getScreenBattle(){ + return screenBattleOn; + } } diff --git a/src/Screen/ScreenPlayer.java b/src/Screen/ScreenPlayer.java index 34df2f4..375bc3f 100644 --- a/src/Screen/ScreenPlayer.java +++ b/src/Screen/ScreenPlayer.java @@ -31,7 +31,6 @@ public class ScreenPlayer { } if(sb != null){ - sb.setEnemy(e); sb.setBattle(b); }