mirror of
				https://github.com/Klagarge/PokeHES.git
				synced 2025-11-04 05:09:18 +00:00 
			
		
		
		
	@@ -18,7 +18,7 @@ public class Battle {
 | 
			
		||||
    public int xpPlayer;
 | 
			
		||||
 | 
			
		||||
    public boolean screenBattleOn = true;
 | 
			
		||||
   
 | 
			
		||||
 | 
			
		||||
    public Battle(Enemy e){
 | 
			
		||||
        if(e != null){
 | 
			
		||||
            textEnemy = new TextEnemy(e);  
 | 
			
		||||
 
 | 
			
		||||
@@ -69,7 +69,7 @@ public class PokeMudry extends PortableApplication {
 | 
			
		||||
        boolean onEndScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenEnd.class);
 | 
			
		||||
 | 
			
		||||
        long timeNow = System.currentTimeMillis();
 | 
			
		||||
        if((timeNow-lastMesure) >= 1000 && !onEndScreen){ // one second
 | 
			
		||||
        if((timeNow-lastMesure) >= 1000 && !onEndScreen){ // one second during the game
 | 
			
		||||
            lastMesure = timeNow;
 | 
			
		||||
            sp.p.removedPv(1);
 | 
			
		||||
            for (Enemy enemy : enemies) { enemy.recoveredTime++; }
 | 
			
		||||
 
 | 
			
		||||
@@ -6,16 +6,28 @@ public class ManagerOfScreen extends ScreenManager{
 | 
			
		||||
    ManagerOfScreen(){
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Get the current screen map
 | 
			
		||||
     * @return the current screen map
 | 
			
		||||
     */
 | 
			
		||||
    public ScreenMap getScreenMap(){
 | 
			
		||||
        this.activateScreen(0);
 | 
			
		||||
        return (ScreenMap)this.getActiveScreen();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Get the current screen battle
 | 
			
		||||
     * @return the current screen battle
 | 
			
		||||
     */
 | 
			
		||||
    public ScreenBattle getScreenBattle(){
 | 
			
		||||
        this.activateScreen(1);
 | 
			
		||||
        return (ScreenBattle)this.getActiveScreen();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Get the current end screen
 | 
			
		||||
     * @return the current end screen
 | 
			
		||||
     */
 | 
			
		||||
    public ScreenEnd getScreenEnd(){
 | 
			
		||||
        this.activateScreen(2);
 | 
			
		||||
        return (ScreenEnd) this.getActiveScreen();
 | 
			
		||||
 
 | 
			
		||||
@@ -47,7 +47,7 @@ public class ScreenMap extends RenderingScreen{
 | 
			
		||||
 | 
			
		||||
        try { map = player.getMap(); } catch (Exception e) {}
 | 
			
		||||
 | 
			
		||||
		// create map
 | 
			
		||||
		// create all map
 | 
			
		||||
		createMap("test");
 | 
			
		||||
		createMap("test_couloir");
 | 
			
		||||
		createMap("desert");
 | 
			
		||||
@@ -150,6 +150,11 @@ public class ScreenMap extends RenderingScreen{
 | 
			
		||||
        return speed;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Check if the position is a door and if yes, get and save all settings for change map
 | 
			
		||||
     * @param position The position to be tested
 | 
			
		||||
     * @return true if it's a door
 | 
			
		||||
     */
 | 
			
		||||
    public boolean isDoor(Vector2 position) {
 | 
			
		||||
		if (doors == null) return false;
 | 
			
		||||
        boolean onDoor = false;
 | 
			
		||||
 
 | 
			
		||||
@@ -17,10 +17,9 @@ public class ScreenPlayer {
 | 
			
		||||
    public void init(){
 | 
			
		||||
 | 
			
		||||
        // One player by ScreenPlayer
 | 
			
		||||
        //p = new Player(8, 15, "desert");
 | 
			
		||||
        p = new Player(4, 2, "21RI");
 | 
			
		||||
 | 
			
		||||
        e = new Enemy("enemy", 0, 0, "desert", 50, "enemy");
 | 
			
		||||
        e = new Enemy("enemy", 0, 0, "21RI", 50, "enemy");
 | 
			
		||||
        b = new Battle(e);
 | 
			
		||||
 | 
			
		||||
        // Create both type of screen and record for reuse
 | 
			
		||||
@@ -31,7 +30,6 @@ public class ScreenPlayer {
 | 
			
		||||
        se = screenManager.getScreenEnd();
 | 
			
		||||
        sm = screenManager.getScreenMap();
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void render(GdxGraphics g){
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user