mirror of
				https://github.com/Klagarge/PokeHES.git
				synced 2025-10-31 03:39:16 +00:00 
			
		
		
		
	some maps and fix turn, display and new sprite
This commit is contained in:
		| @@ -16,6 +16,7 @@ import com.badlogic.gdx.maps.tiled.TmxMapLoader; | ||||
| import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; | ||||
| import com.badlogic.gdx.math.Vector2; | ||||
|  | ||||
| import Entity.Character; | ||||
| import Entity.Player; | ||||
| import ch.hevs.gdx2d.components.screen_management.RenderingScreen; | ||||
| import ch.hevs.gdx2d.lib.GdxGraphics; | ||||
| @@ -52,15 +53,28 @@ public class ScreenMap extends RenderingScreen{ | ||||
| 		createMap("test"); | ||||
| 		createMap("test_couloir"); | ||||
| 		createMap("desert"); | ||||
|  | ||||
|         createMap("SS"); | ||||
|         //createMap("RI"); | ||||
|         //createMap("RS"); | ||||
|          | ||||
|         createMap("21RI"); | ||||
|         createMap("21RS"); | ||||
|         createMap("21N2"); | ||||
|         createMap("21N3"); | ||||
|          | ||||
|         createMap("21N205"); | ||||
|         createMap("21N304"); | ||||
|         createMap("21N307"); | ||||
|         createMap("21N308"); | ||||
|  | ||||
|         //createMap("23RI"); | ||||
|         //createMap("23RS"); | ||||
|         createMap("23N1"); | ||||
|         //createMap("23N2"); | ||||
|          | ||||
|         //createMap("23N20"); | ||||
|         //createMap("23N215"); | ||||
|          | ||||
| 	} | ||||
|  | ||||
| @@ -69,11 +83,15 @@ public class ScreenMap extends RenderingScreen{ | ||||
|          | ||||
|         tiledLayer.clear(); | ||||
|          | ||||
|         // Get actual map of the player | ||||
|         try { map = player.getMap(); } catch (Exception e) {} | ||||
|  | ||||
| 		for (int i = 0; i < 50; i++) { | ||||
| 		// Get all layers on the current map | ||||
|         for (int i = 0; i < 50; i++) { | ||||
|             try { tiledLayer.add((TiledMapTileLayer) tMap.get(map).getLayers().get(i)); } catch (Exception e) { } | ||||
|         } | ||||
|  | ||||
|         // Get heigh and width of tiles and the size of the tiles | ||||
|         TiledMapTileLayer tl = tiledLayer.get(0); | ||||
|         width = tl.getWidth(); | ||||
|         tileWidth = (int) tl.getTileWidth(); | ||||
| @@ -82,14 +100,15 @@ public class ScreenMap extends RenderingScreen{ | ||||
|          | ||||
|         //System.out.println(width + " x " + height + " - " + tileWidth + " x " + tileHeight); | ||||
|          | ||||
| 		try { | ||||
| 		// Get all doors on the current map | ||||
|         try { | ||||
|             doors = tMap.get(map).getLayers().get("door").getObjects(); | ||||
| 		} catch (Exception e) {	doors = null; } | ||||
|          | ||||
| 		 | ||||
| 		// Render the tileMap | ||||
|         //g.zoom(zoom); | ||||
|         g.moveCamera(player.getPosition().x, player.getPosition().y, width * tileWidth, height * tileHeight); | ||||
|         g.zoom(zoom); | ||||
|         g.moveCamera((int)player.getPosition().x, (int)player.getPosition().y, width * tileWidth, height * tileHeight); | ||||
|  | ||||
| 		tMapRenderer.get(map).setView(g.getCamera()); | ||||
| 		tMapRenderer.get(map).render(); | ||||
| @@ -116,10 +135,11 @@ public class ScreenMap extends RenderingScreen{ | ||||
|  | ||||
|     public boolean isWalkable(Vector<TiledMapTile> tile) { | ||||
| 		if (tile == null) return false; | ||||
|         boolean walkable = false; | ||||
| 		if (tile.size() == 0) return false; | ||||
|         boolean walkable = true; | ||||
|         for (TiledMapTile tiledMapTile : tile) { | ||||
|             Object test = tiledMapTile.getProperties().get("walkable"); | ||||
|             walkable = Boolean.parseBoolean(test.toString()) ? true:walkable; | ||||
|             walkable = Boolean.parseBoolean(test.toString()) ? walkable:false; | ||||
|         } | ||||
|         return walkable; | ||||
| 	} | ||||
| @@ -160,7 +180,8 @@ public class ScreenMap extends RenderingScreen{ | ||||
| 				try { Door.nextMap = mapProperties.get("nextMap").toString(); } catch (Exception e) { } | ||||
| 				try { Door.nextX = Integer.parseInt(mapProperties.get("nextX").toString()); } catch (Exception e) { } | ||||
| 				try { Door.nextY = Integer.parseInt(mapProperties.get("nextY").toString()); } catch (Exception e) { } | ||||
| 				try { Door.nextDirection = Door.nextDirection.valueOf(mapProperties.get("nextDirection").toString()); } catch (Exception e) { } | ||||
|                 try { Door.nextDirection = Character.Direction.valueOf(mapProperties.get("nextDirection").toString()); } catch (Exception e) { } | ||||
| 				try { Door.changeDirection = Boolean.parseBoolean(mapProperties.get("changeDirection").toString()); } catch (Exception e) { } | ||||
| 			} | ||||
|         } | ||||
|          | ||||
| @@ -171,13 +192,15 @@ public class ScreenMap extends RenderingScreen{ | ||||
| 		public static String nextMap; | ||||
| 		public static Integer nextX; | ||||
| 		public static Integer nextY; | ||||
|         public static Player.Direction nextDirection; | ||||
|         public static Character.Direction nextDirection; | ||||
|         public static Boolean changeDirection; | ||||
|  | ||||
| 		public static void reset(){ | ||||
| 			nextMap = null; | ||||
| 			nextX = null; | ||||
| 			nextY = null; | ||||
|             nextDirection = null; | ||||
|             changeDirection = null; | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user