new font

src/Screen/ScreenBattle.java

@@ -27,15 +27,11 @@ public class ScreenBattle extends RenderingScreen{
 
 	private Battle b = null;
 
-
-
-
     @Override
 	public void onInit() {
         //display the question
-		generateFont("resources/font/OptimusPrinceps.ttf", 40, Color.BLACK);
+		generateFont("resources/font/Ubuntu-Regular.ttf", 30, Color.BLACK);
 
-		
 	}
 
 
@@ -44,8 +40,6 @@ public class ScreenBattle extends RenderingScreen{
 		g.clear(Color.BLACK);
 
 		displayDialog(g);
-
-		//System.out.println("render: " + battle.getLineSpeech());
 	}
 
 	@Override
@@ -80,12 +74,8 @@ public class ScreenBattle extends RenderingScreen{
 		if(b.getLine() == null) return;
 		g.drawString(15, 245 ,b.getLine() , optimus40);
 
-
-
 	}
 
-
-
 	public void displayEnemy(Enemy e){
 		// TODO affficher l'enemi
   	}
@@ -98,43 +88,28 @@ public class ScreenBattle extends RenderingScreen{
 
 	public void manage(Controller c, Battle battle){
 		if(PokeMudry.front_montant){
- 	     	System.out.println("manage: " + battle.getLineSpeech());
-			
-
 
 			if( battle.getAttackOn() == false){
 				if (c.keyStatus.get(Input.Keys.SPACE)){
-					if(battle.getLineSpeech() == 4){
-						//dislpay the finish speech
-						battle.FinishSpeech();
-					}
-					else if(battle.getLineSpeech() > 4){
-						//return in the map
-						battle.screenBattleOn = battle.finish();
-					}
-					else{
-						//fix next line
-						battle.readNextLine();
-					}
-					
+					battle.action(-1);
 				}
 				if (c.keyStatus.get(Input.Keys.ENTER)){
-					battle.screenBattleOn = battle.finish();
+					battle.screenBattleOn = battle.screenBattleOn;
 				}
 			}
 
 			if(battle.getAttackOn() == true){
 				if (c.keyStatus.get(Input.Keys.NUM_1)){
-					battle.checkAnswer(1);
+					battle.action(1);
 				}
 				else if (c.keyStatus.get(Input.Keys.NUM_2)){
-					battle.checkAnswer(2);
+					battle.action(2);
 				}
 				else if (c.keyStatus.get(Input.Keys.NUM_3)){
-					battle.checkAnswer(3);
+					battle.action(3);
 				}
 				else if (c.keyStatus.get(Input.Keys.NUM_4)){
-					battle.checkAnswer(4);
+					battle.action(4);
 					
 				}
 			}