mirror of
				https://github.com/Klagarge/PokeHES.git
				synced 2025-11-04 05:09:18 +00:00 
			
		
		
		
	exterior done
This commit is contained in:
		@@ -17,6 +17,7 @@ public class Player extends Character{
 | 
			
		||||
	public Enemy lastEnemy = null;
 | 
			
		||||
	public boolean onEnemy = false;
 | 
			
		||||
	private static final int XP_MAX = 6000;
 | 
			
		||||
	public boolean onDoor;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
	 * Create a player
 | 
			
		||||
@@ -44,7 +45,7 @@ public class Player extends Character{
 | 
			
		||||
	 */
 | 
			
		||||
	public void manageEntity(ScreenMap sm, Controller c) {
 | 
			
		||||
 | 
			
		||||
		boolean onDoor = sm.isDoor(getPosition());
 | 
			
		||||
		onDoor = sm.isDoor(getPosition());
 | 
			
		||||
 | 
			
		||||
		// Do nothing if hero is already moving
 | 
			
		||||
		if (!isMoving()) {
 | 
			
		||||
@@ -91,8 +92,8 @@ public class Player extends Character{
 | 
			
		||||
 | 
			
		||||
			
 | 
			
		||||
			if(onDoor){
 | 
			
		||||
				long time = System.currentTimeMillis();
 | 
			
		||||
				while (System.currentTimeMillis()-time < Settings.SWITCH_MAP_TIME) { }
 | 
			
		||||
				//long time = System.currentTimeMillis();
 | 
			
		||||
				//while (System.currentTimeMillis()-time < Settings.SWITCH_MAP_TIME) { }
 | 
			
		||||
				String nMap = null;
 | 
			
		||||
				Integer x = null;
 | 
			
		||||
				Integer y = null;
 | 
			
		||||
 
 | 
			
		||||
@@ -21,6 +21,7 @@ public class PokeHES extends PortableApplication {
 | 
			
		||||
	private static Vector<Entity> entities = new Vector<>();
 | 
			
		||||
    private long beginTime;
 | 
			
		||||
    private long lastMesure;
 | 
			
		||||
    private long stairTime;
 | 
			
		||||
 | 
			
		||||
    public static boolean risingFront = false;
 | 
			
		||||
 | 
			
		||||
@@ -77,6 +78,11 @@ public class PokeHES extends PortableApplication {
 | 
			
		||||
            sp.p.removedPv(1);
 | 
			
		||||
            for (Enemy enemy : enemies) { enemy.recoveredTime++; }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        //if (sp.p.onDoor) {
 | 
			
		||||
        //    while (System.currentTimeMillis()-timeNow < Settings.SWITCH_MAP_TIME) { g.clear(); }
 | 
			
		||||
        //}
 | 
			
		||||
        
 | 
			
		||||
		
 | 
			
		||||
        if(onMapScreen) sp.p.manageEntity(sp.sm, controller);
 | 
			
		||||
        
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ public class Settings {
 | 
			
		||||
    public static final int PLAYERS = 1;
 | 
			
		||||
    public static final int TIME = 15; // number of minutes for kill all enemy // should be 10
 | 
			
		||||
    public static final int RECOVERED = 30; // number of seconds an enemy need for recovered
 | 
			
		||||
    public static final int SWITCH_MAP_TIME = 250; // Number of milliseconds the player wait for switch map
 | 
			
		||||
    public static final int SWITCH_MAP_TIME = 1000; // Number of milliseconds the player wait for switch map
 | 
			
		||||
 | 
			
		||||
    public static final int SIDE = 800; // Do not change // TODO resize possible
 | 
			
		||||
    
 | 
			
		||||
 
 | 
			
		||||
@@ -53,8 +53,7 @@ public class ScreenMap extends RenderingScreen{
 | 
			
		||||
		createMap("desert");
 | 
			
		||||
 | 
			
		||||
        createMap("SS");
 | 
			
		||||
        //createMap("RI");
 | 
			
		||||
        //createMap("RS");
 | 
			
		||||
        createMap("EXT");
 | 
			
		||||
        
 | 
			
		||||
        createMap("21RI");
 | 
			
		||||
        createMap("21RS");
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user