mirror of
				https://github.com/Klagarge/PokeHES.git
				synced 2025-11-03 20:59:17 +00:00 
			
		
		
		
	a
This commit is contained in:
		@@ -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();
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
@@ -20,7 +20,7 @@ public class ScreenPlayer {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void render(GdxGraphics g){
 | 
			
		||||
        sb.setEnemy(e);
 | 
			
		||||
        sb.displayEnemy(e);
 | 
			
		||||
        sm.setPlayer(p);
 | 
			
		||||
        screenManager.render(g);
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user