From b3b02c4f068a071475112bf2da5d1489962198f2 Mon Sep 17 00:00:00 2001 From: Fastium <79766552+Fastium@users.noreply.github.com> Date: Mon, 13 Jun 2022 21:54:05 +0200 Subject: [PATCH] change screenBattleOn --- src/Game/Battle.java | 10 +++++++--- src/Screen/ScreenPlayer.java | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) 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); }