diff --git a/src/Main/PokeMudry.java b/src/Main/PokeMudry.java index 094fdbe..0ea5a6c 100644 --- a/src/Main/PokeMudry.java +++ b/src/Main/PokeMudry.java @@ -53,8 +53,8 @@ public class PokeMudry extends PortableApplication { public void onGraphicRender(GdxGraphics g) { g.clear(); sp.p.manageEntity(sp.sm, controller); + sp.sb.manage(controller); sp.render(g); - System.out.println(sp.screenManager.getActiveScreen().getClass()); //System.out.println(ScreenMap.class); for (Entity entity : entities) { @@ -64,7 +64,6 @@ public class PokeMudry extends PortableApplication { if (sp.p.frontOfEnemy && sp.screenManager.getActiveScreen().getClass().equals(ScreenMap.class)){ sp.e = sp.p.lastEnemy; - System.out.println("switch screen"); sp.screenManager.activateNextScreen(); g.resetCamera(); } diff --git a/src/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java index e2eb25b..7e52d76 100644 --- a/src/Screen/ScreenBattle.java +++ b/src/Screen/ScreenBattle.java @@ -25,10 +25,6 @@ public class ScreenBattle extends RenderingScreen{ private static int EDGE = 10; private static int HEIGHT_DIALOG = Settings.SIDE / 3; private static int WIDTH_DIALOG = Settings.SIDE - 2*EDGE; - private Enemy e; - - private boolean attackOn; - private int numAttack =0; private BitmapFont optimus40; @@ -62,6 +58,8 @@ public class ScreenBattle extends RenderingScreen{ displayDialog(g); + System.out.println(textEnemy.lines.get(lineSpeech).attackOn); + } @@ -92,16 +90,13 @@ public class ScreenBattle extends RenderingScreen{ g.drawString(15, 245 ,lineDialog , optimus40); } - public void setEnemy(Enemy e) { - this.e = e; - } public void displayEnemy(Enemy e){ - // stock his speech + // TODO affficher l'enemi } public void displayPlayer(Player p){ - //TODO afficher le joueur + //TODO afficher le joueur } public void readNextLine(){ @@ -113,6 +108,7 @@ public class ScreenBattle extends RenderingScreen{ public void manage(Controller c){ if (c.keyStatus.get(Input.Keys.SPACE)){ + if(textEnemy.lines.get(lineSpeech).attackOn == false){ readNextLine(); } @@ -136,7 +132,7 @@ public class ScreenBattle extends RenderingScreen{ } } if (c.keyStatus.get(Input.Keys.NUM_4)){ - if(textEnemy.lines.get(lineSpeech).attackOn == false){ + if(textEnemy.lines.get(lineSpeech).attackOn == true){ readNextLine(); answer = 4; } diff --git a/src/Screen/ScreenPlayer.java b/src/Screen/ScreenPlayer.java index a445491..7fb0dae 100644 --- a/src/Screen/ScreenPlayer.java +++ b/src/Screen/ScreenPlayer.java @@ -20,7 +20,7 @@ public class ScreenPlayer { } public void render(GdxGraphics g){ - sb.setEnemy(e); + sb.displayEnemy(e); sm.setPlayer(p); screenManager.render(g); }