mirror of
https://github.com/Klagarge/PokeHES.git
synced 2025-10-30 11:19:17 +00:00
Merge branch 'master' of https://github.com/Klagarge/PokeMudry
This commit is contained in:
@@ -28,6 +28,8 @@ public class ScreenBattle extends RenderingScreen{
|
||||
private Battle b = null;
|
||||
|
||||
|
||||
private boolean screenBattleOn = true;
|
||||
|
||||
@Override
|
||||
public void onInit() {
|
||||
//display the question
|
||||
@@ -89,6 +91,10 @@ public class ScreenBattle extends RenderingScreen{
|
||||
//TODO afficher le joueur
|
||||
}
|
||||
|
||||
public boolean getScreenBattleOn(){
|
||||
return screenBattleOn;
|
||||
}
|
||||
|
||||
public void manage(Controller c, Battle battle){
|
||||
if(PokeMudry.front_montant){
|
||||
System.out.println("manage: " + battle.getLineSpeech());
|
||||
@@ -98,6 +104,9 @@ public class ScreenBattle extends RenderingScreen{
|
||||
System.out.println("in");
|
||||
battle.readNextLine();
|
||||
}
|
||||
if (c.keyStatus.get(Input.Keys.ENTER)){
|
||||
screenBattleOn = battle.finish();
|
||||
}
|
||||
}
|
||||
|
||||
if(battle.getAttackOn() == true){
|
||||
|
||||
Reference in New Issue
Block a user