mirror of
https://github.com/Klagarge/PokeHES.git
synced 2024-11-26 19:13:27 +00:00
fonctionniert
This commit is contained in:
parent
47b86dd6c8
commit
2d2095a65a
@ -19,6 +19,7 @@ public class Controller {
|
||||
keyStatus.put(Input.Keys.NUM_3, false);
|
||||
keyStatus.put(Input.Keys.NUM_4, false);
|
||||
keyStatus.put(Input.Keys.SPACE, false);
|
||||
keyStatus.put(Input.Keys.ENTER, false);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -31,8 +31,10 @@ public class Battle {
|
||||
|
||||
public void readNextLine(){
|
||||
//change line
|
||||
lineSpeech++;
|
||||
|
||||
System.out.println(textEnemy.lines.size());
|
||||
if(lineSpeech < textEnemy.lines.size()-1){
|
||||
lineSpeech++;
|
||||
}
|
||||
}
|
||||
|
||||
//check the choice answer
|
||||
@ -66,6 +68,11 @@ public class Battle {
|
||||
|
||||
}
|
||||
|
||||
|
||||
public boolean finish(){
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean getAttackOn(){
|
||||
return textEnemy.lines.get(lineSpeech).attackOn;
|
||||
}
|
||||
|
@ -71,6 +71,12 @@ public class PokeMudry extends PortableApplication {
|
||||
|
||||
if(onBattleScreen) sp.sb.manage(controller, sp.b);
|
||||
|
||||
|
||||
if(!sp.sb.getScreenBattleOn() && onBattleScreen){
|
||||
sp.p.onEnemy = false;
|
||||
sp.sm = sp.screenManager.getScreenMap();
|
||||
}
|
||||
|
||||
// Graphics render
|
||||
sp.render(g);
|
||||
for (Entity entity : entities) {
|
||||
|
@ -31,6 +31,8 @@ public class ScreenBattle extends RenderingScreen{
|
||||
private Enemy enemy;
|
||||
|
||||
|
||||
private boolean screenBattleOn = true;
|
||||
|
||||
@Override
|
||||
public void onInit() {
|
||||
//display the question
|
||||
@ -94,6 +96,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());
|
||||
@ -103,6 +109,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){
|
||||
|
@ -21,6 +21,7 @@ public class ScreenPlayer {
|
||||
// Create both type of screen and record for reuse
|
||||
screenManager.registerScreen(ScreenMap.class);
|
||||
screenManager.registerScreen(ScreenBattle.class);
|
||||
sb = screenManager.getScreenBattle();
|
||||
sm = screenManager.getScreenMap();
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user