A loooooooot of refactoring to make the function calls easier and more consistant

refactor structures to pack everything in typedef struct Game
fix buggy access to converted map
2023-08-11 08:54:04 +02:00 · 2023-08-11 08:04:17 +02:00 · 2023-08-10 18:33:17 +02:00 · 2023-08-10 16:22:31 +02:00 · 2023-08-08 09:52:34 +02:00 · 2023-08-08 09:46:07 +02:00
25 changed files with 684 additions and 327 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -18,22 +18,6 @@ set(COLORMODE_cg EGA64)

 fxconv_declare_converters(assets/converters.py)

-add_custom_command(
-  COMMENT "Convert Tiled TMX map to usable JSON file"
-	COMMAND tiled --export-tileset json tilesetnpp.tsx tilesetnpp.json
-	COMMAND find | grep .*.tmx | sed 's/.tmx//g' | xargs -l bash -c 'tiled --export-map json $$0.tmx $$0.json'
-	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets/  
-
-  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level0.json"
-# if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
-  DEPENDS 	assets/converters.py
-		assets/tileset.png 
-		assets/tilesetnpp.tsx
-		assets/level0.tmx
-# if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
-  )
-
-
 set(SOURCES
  src/main.c
  src/map.c
@ -45,7 +29,7 @@ set(SOURCES
 )
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
 set(ASSETS
-  assets/level0.json
+  assets/WorldRPG.world
  # ...
 )

@ -80,7 +64,7 @@ set(ASSETS_fx_2b
  # ...
 )

-fxconv_declare_assets(${ASSETS} ${ASSETS_fx}  ${ASSETS_cg} ${ASSETS_fx_1b} ${ASSETS_fx_2b} ${ASSETS_cg_2b} ${ASSETS_cg_EGA64} WITH_METADATA)
+fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} ${ASSETS_fx_1b} ${ASSETS_fx_2b} ${ASSETS_cg_2b} ${ASSETS_cg_EGA64} WITH_METADATA)

 if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
  add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE_fx}} )
@ -137,4 +121,4 @@ elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
      NAME "Col RPG EGA" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
  endif()

-endif()
+endif()
--- a/README.md
+++ b/README.md
@ -13,7 +13,7 @@ A ce stade, on a déjà implémenté :
 - [x] Gestion des collisions
 - [x] Carte Multilayer (Background, Foreground + accessibilité / Dommages) avec transparence du calque Foreground
 - [x] Personnage
- [ ] Dialogues
+- [x] Dialogues (sauts de lignes et mots plus grands que l'écran pas supportés)
 - [ ] Fontes de caractères
 - [ ] Interaction
 - [ ] NPC
@ -21,11 +21,11 @@ A ce stade, on a déjà implémenté :

 ## Crédits

-Les tiles sont issues de Game Boy Top-down RPG Fantasy Tileset (FREE)
-"Background Assets by Gumpy Function (gumpyfunction.itch.io)"
+Les tiles sont issues de Game Boy Top-down RPG Fantasy Tileset (FREE)  
+"Background Assets by Gumpy Function (gumpyfunction.itch.io)"  
 [Tiles Background Assets by Gumpy Function](https://gumpyfunction.itch.io/game-boy-rpg-fantasy-tileset-free)

 Converties en niveau de gris avec Gimp

-Une version 1-bit (N&B) implémentée par Shadow15510
-Une version couleur CG implémentée par Fcalva
+Une version 1-bit (N&B) à été réalisée par Shadow15510  
+Et une version couleur CG à été réalisée par Fcalva
--- a/assets-cg/font.png
+++ b/assets-cg/font.png
--- a/(backup)/tileset2b_CG.png
+++ b/(backup)/tileset2b_CG.png
--- a/(backup)/tilesetEGA64_CG_bak.png
+++ b/(backup)/tilesetEGA64_CG_bak.png
--- a/assets/WorldRPG.world
+++ b/assets/WorldRPG.world
@ -0,0 +1,34 @@
+{
+    "maps": [
+        {
+            "fileName": "level0.tmx",
+            "height": 192,
+            "width": 384,
+            "x": 0,
+            "y": 0
+        },
+        {
+            "fileName": "level1.tmx",
+            "height": 192,
+            "width": 384,
+            "x": 384,
+            "y": 0
+        },
+        {
+            "fileName": "level2.tmx",
+            "height": 192,
+            "width": 384,
+            "x": 0,
+            "y": 192
+        },
+        {
+            "fileName": "level3.tmx",
+            "height": 192,
+            "width": 384,
+            "x": 384,
+            "y": 192
+        }
+    ],
+    "onlyShowAdjacentMaps": false,
+    "type": "world"
+}
--- a/assets/converters.py
+++ b/assets/converters.py
@ -3,15 +3,77 @@ import fxconv
 import json
 import pathlib
 import csv
+import os

 def convert(input, output, params, target):
 	if params["custom-type"] == "map":
-		convert_map(input, output, params, target)
+		#convert_map(input, output, params, target)
+		#return 0
+		return 1
+	elif params["custom-type"] == "world":
+		convert_world(input, output, params, target)
 		return 0
 	else:
 		return 1

-def convert_map(input, output, params, target):
+
+
+def convert_world(input, output, params, target):
+	print( "WE ARE COMPUTING THE WORLD", input )
+
+	data = json.load(open(input, "r"))
+	nbMaps = ["fileName" in i for i in data["maps"]].count(True)
+	print( "We have to treat ", nbMaps, " maps")
+	print( "So let's go ... ")
+	
+	structWorld = fxconv.Structure()
+	
+	for i in range(nbMaps):
+
+		nameMap = data["maps"][i]["fileName"].replace(".tmx","")
+		nameMapFree = nameMap.split("/")[-1]
+		#count the number of "back" (cd ..) to locate the map on the computer
+		nbRetour = nameMap.count("..")+1
+		#create the map absolute path 		
+	
+		
+		nameTMX = "/".join(input.split("/")[:-nbRetour]) + "/" + nameMap + ".tmx"
+		nameJSON = "/".join(input.split("/")[:-nbRetour]) + "/" + nameMap + ".json"
+		
+		commandline = 'tiled --export-map json ' + nameTMX + ' ' + nameJSON
+		print( "TILED COMMAND LINE FOR MAPS : ", commandline )
+		os.system( commandline )
+		
+
+		mapPath = "/".join(input.split("/")[:-nbRetour]) + "/" + nameMap + ".json"		
+		print("Map ", i , " name : ", mapPath )	
+		
+		xmin = data["maps"][i]["x"]
+		print( "xmin = ", xmin )
+
+		ymin = data["maps"][i]["y"]
+		print( "ymin = ", ymin )
+
+		xmax = data["maps"][i]["x"] + data["maps"][i]["width"]
+		print( "xmax = ", xmax )
+
+		ymax = data["maps"][i]["y"] + data["maps"][i]["height"]
+		print( "ymax = ", ymax )
+
+		map = convert_map( mapPath, output, params, target, xmin, ymin, xmax, ymax)
+		print( "Map = ", map )
+		structWorld += fxconv.ptr( map )
+
+	structWorld += fxconv.u32(0)
+
+	#generate !
+	fxconv.elf(structWorld, output, "_" + params["name"], **target)
+
+
+
+
+def convert_map(input, output, params, target, xmin, ymin, xmax, ymax):
+	print( "WE ARE COMPUTING THE MAP : ", input )
 	data = json.load(open(input, "r"))

 	#find the tileset in use. it's a relative path (like ../tileset.tsx)
@ -22,9 +84,14 @@ def convert_map(input, output, params, target):
 	#count the number of "back" (cd ..) to locate the tileset on the computer
 	nbRetour = nameTileset.count("..")+1
 	#create the tileset absolute path 
-	tilesetPath = "/".join(input.split("/")[:-nbRetour]) + "/" + nameTileset + ".json"
+	tilesetTSX  = "/".join(input.split("/")[:-nbRetour]) + "/" + nameTileset + ".tsx"
+	tilesetJSON = "/".join(input.split("/")[:-nbRetour]) + "/" + nameTileset + ".json"
+	
+	commandline = 'tiled --export-tileset json ' + tilesetTSX + ' ' + tilesetJSON
+	print( "TILED COMMAND LINE FOR TILESET : ", commandline )
+	os.system( commandline )

-	tileset = open(tilesetPath, "r")
+	tileset = open(tilesetJSON, "r")
 	data_tileset = json.load(tileset)
 	tileset_size = data_tileset.get("columns")
 	tileset.close()
@ -40,30 +107,81 @@ def convert_map(input, output, params, target):
 	nbTilelayer = ["data" in i for i in data["layers"]].count(True) - 1
 	print( nbTilelayer)

+	#index of the various layers (may change from one map to another)
+	layer_walkable = 0
+	layer_foreground = 0
+	layer_background = 0
+
+	#create the structure of the map
 	structMap = fxconv.Structure()

-	structMap += fxconv.u32(w) + fxconv.u32(h) + fxconv.u32(nbTilelayer)
+	structMap += fxconv.u16(w) + fxconv.u16(h) + fxconv.u16(nbTilelayer)
+	structMap += fxconv.u16(tileset_size)
+
+	structMap += fxconv.u16(xmin) + fxconv.u16(ymin) + fxconv.u16(xmax) + fxconv.u16(ymax)
+
 	structMap += fxconv.ref(f"img_{nameTilesetFree}")
-	structMap += fxconv.u32(tileset_size)
+
+
+	#extraction of the data contained in the layer "Walkable" of the map
+	for i in range(nbTilelayer+1):
+		datavalid = data["layers"][i]
+		if datavalid["name"]=="Walkable":
+			layer_walkable = i
+			print( "Walkable Tile Data in layer : ", layer_walkable)
+			break
+		elif i==nbTilelayer:
+			printf( "ERROR : No Walkable layer data !!!" )

 	walk_data = bytes()
-	layer = data["layers"][nbTilelayer]
+	layer = data["layers"][layer_walkable]
 	for tile in layer["data"]:
-		if tile == 0: walk_data += fxconv.u16(tile)
-		else : walk_data += fxconv.u16(tile-indexWalkable)
-
+		#print( tile )
+		if tile == 0: walk_data += fxconv.u8(tile)			#if walkable_data = 0 then it is a blanck cell so nothing to change
+		else : walk_data += fxconv.u8(tile-indexWalkable)	#if !=0 than we need to shift the tile number by considering the first tileID (given by indexwalkable)
 	structMap += fxconv.ptr(walk_data)

-	#generate the array of tiles from the layer
-	for i in range(nbTilelayer):
-		print(i)
-		layer_data = bytes()
-		layer = data["layers"][i]
-		for tile in layer["data"]:
-				layer_data += fxconv.u16(tile-1)

-		structMap += fxconv.ptr(layer_data)
+
+	#extraction of the data contained in the layer "Background" and "Foreground" of the map
+
+
+	#import the Background layer of the map	
+	for i in range(nbTilelayer+1):
+		datavalid = data["layers"][i]
+		if datavalid["name"]=="Background":
+			layer_background = i
+			print( "Background Tile Data in layer : ", layer_background)
+			break
+		elif i==nbTilelayer:
+			printf( "ERROR : No Background layer data !!!" )
+
+	layer_data = bytes()
+	layer = data["layers"][layer_background]
+	for tile in layer["data"]:
+		layer_data += fxconv.u16(tile-1)
+	structMap += fxconv.ptr(layer_data)
+
+
+
+	#import the foreground layer of the map
+	for i in range(nbTilelayer+1):
+		datavalid = data["layers"][i]
+		if datavalid["name"]=="Foreground":
+			layer_foreground = i
+			print( "Foreground Tile Data in layer : ", layer_foreground)
+			break
+		elif i==nbTilelayer:
+			printf( "ERROR : No Foreground layer data !!!" )
+
+	layer_data = bytes()
+	layer = data["layers"][layer_foreground]
+	for tile in layer["data"]:
+		layer_data += fxconv.u16(tile-1)
+	structMap += fxconv.ptr(layer_data)

 	#generate !
-	fxconv.elf(structMap, output, "_" + params["name"], **target)
+	#fxconv.elf(structMap, output, "_" + params["name"], **target)
+
+	return structMap

--- a/assets/fxconv-metadata.txt
+++ b/assets/fxconv-metadata.txt
@ -1,3 +1,8 @@
-*.json:
-  custom-type: map
-  name_regex: (.*)\.json map_\1
+# *.json:
+#   custom-type: map
+#   name_regex: (.*)\.json map_\1
+
+
+*.world:
+  custom-type: world
+  name: worldRPG
--- a/assets/level0.tmx
+++ b/assets/level0.tmx
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="5" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="6" nextobjectid="4">
 <editorsettings>
-  <export target="level0_walkable.json" format="json"/>
+  <export target="level0.json" format="json"/>
 </editorsettings>
 <tileset firstgid="1" source="tilesetnpp.tsx"/>
 <tileset firstgid="409" source="Walkable.tsx"/>
@ -14,7 +14,7 @@
 257,2,2,385,2,2,385,2,265,266,2,2,208,209,352,353,257,2,2,2,2,2,2,297,298,299,300,2,2,2,2,25,26,27,27,97,98,99,98,99,100,26,26,27,28,131,2,2,
 281,176,2,2,2,2,2,385,289,290,2,2,232,233,376,377,281,2,326,2,154,153,190,2,2,2,2,2,2,2,2,49,2,2,2,121,59,60,60,61,124,2,2,2,52,132,2,2,
 2,2,2,2,2,385,2,2,265,266,2,385,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,73,2,2,2,145,83,84,84,85,148,2,2,2,76,132,2,2,
-2,2,2,2,326,2,385,2,265,266,2,2,2,2,214,215,2,2,2,2,2,2,190,2,2,2,2,2,2,385,2,49,404,405,2,169,107,108,108,109,172,2,402,403,76,132,2,2,
+2,2,2,2,326,2,385,2,265,266,2,2,2,2,2,2,2,2,2,2,2,2,190,2,2,2,2,2,2,385,2,49,404,405,2,169,107,108,108,109,172,2,402,403,76,132,2,2,
 2,2,2,2,2,2,2,2,289,290,2,258,259,260,238,239,260,260,261,262,262,263,264,2,2,2,2,2,2,2,385,49,134,135,2,2,2,2,2,2,2,2,134,135,52,132,297,298,
 2,2,2,2,2,2,2,2,265,266,2,282,283,284,285,285,285,285,285,285,286,287,288,297,298,299,300,2,117,118,2,73,373,2,217,2,190,373,373,190,2,219,2,373,76,132,2,2,
 297,298,299,300,2,2,2,2,290,2,2,306,307,308,309,308,309,308,309,310,310,311,312,131,2,339,340,2,134,135,2,97,98,99,99,98,99,2,2,98,98,99,98,99,100,132,2,2,
@ -42,7 +42,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,0,130,129,166,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,
 0,0,0,0,278,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,273,274,275,276,0,356,357,0,0,0,0,0,0,0,0,354,355,0,0,225,226,
 201,202,203,204,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,225,226,227,228,0,0,0,0,0,380,381,0,0,0,0,0,0,0,0,378,379,0,0,249,250,
-225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,
+225,226,227,228,0,0,0,0,0,0,0,0,0,0,214,215,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,
 249,250,251,252,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,93,94,0,0,0,0,0,0,166,0,0,166,0,0,0,0,0,0,0,0,
 273,274,275,276,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,203,
 0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,227,
@ -57,11 +57,11 @@
 274,275,276,201,202,203,204,257,0,0,0,257,0,0,0,0,257,0,0,0,257,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,
 0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,225,226,227,
-202,203,204,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,201,202,204,249,250,251,252,201,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,249,250,251,
-226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,228,273,274,275,276,225,227,228,201,202,203,204,201,202,203,204,0,201,202,203,204,249,250,251,252,273,274,275
+202,203,204,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,249,250,251,
+226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,0,0,201,202,203,204,201,202,203,204,0,0,0,0,0,249,250,251,252,273,274,275
 </data>
 </layer>
- <layer id="3" name="Walkable" width="48" height="24" visible="0">
+ <layer id="3" name="Walkable" width="48" height="24">
  <data encoding="csv">
 0,0,410,410,0,0,0,0,410,410,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,410,410,410,410,0,410,410,
 410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,410,410,
@ -70,15 +70,15 @@
 410,0,0,0,0,0,0,0,0,0,0,0,410,411,411,411,410,0,0,0,0,0,0,0,410,410,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,
 410,0,0,0,0,0,0,0,0,0,0,0,411,411,411,411,410,0,410,0,410,410,410,0,0,0,0,0,0,0,0,410,0,0,0,410,410,410,410,410,410,0,0,0,410,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,410,0,0,0,410,410,410,410,410,410,0,0,0,410,0,0,0,
-0,0,0,0,410,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,410,410,410,0,410,410,0,0,410,410,0,410,410,410,0,0,0,
+0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,410,410,410,0,410,410,0,0,410,410,0,410,410,410,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,410,
 0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,410,410,0,0,410,410,0,410,0,0,0,0,410,0,0,410,0,0,0,0,410,0,0,0,
 0,410,410,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,0,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,410,410,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,410,410,0,0,0,
 0,0,0,0,0,410,410,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,0,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,410,410,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,0,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,0,0,410,410,410,
-0,0,0,0,412,412,412,412,412,0,0,410,410,410,410,410,0,0,410,410,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,
-410,410,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,410,0,0,0,410,410,0,0,0,0,0,0,410,0,0,0,410,
+0,0,0,0,412,412,412,412,412,0,0,410,410,410,410,410,0,0,410,410,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,410,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,410,0,0,0,410,410,0,0,0,0,0,0,410,0,0,0,0,
 0,0,0,0,412,412,412,412,412,0,0,410,410,0,0,0,0,0,0,0,0,0,410,410,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,
 0,0,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,
@ -89,4 +89,12 @@
 0,0,0,0,410,410,0,410,410,410,410,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0
 </data>
 </layer>
+ <objectgroup id="4" name="ExtraData">
+  <object id="1" name="PlayerStart" x="52" y="44">
+   <point/>
+  </object>
+  <object id="2" name="PNJ1" x="132" y="148">
+   <point/>
+  </object>
+ </objectgroup>
 </map>
--- a/assets/level0_bak.tmx
+++ b/assets/level0_bak.tmx
@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="4" nextobjectid="1">
- <tileset firstgid="1" source="tilesetnpp.tsx"/>
- <layer id="1" name="Background" width="48" height="24">
-  <data encoding="csv">
-257,297,298,299,300,257,386,297,298,299,300,2,2,2,2,2,257,337,338,225,226,227,228,201,202,203,204,273,274,275,276,249,250,251,252,297,298,299,93,94,2,345,346,347,348,2,337,338,
-253,205,229,205,229,280,179,180,179,156,156,156,158,157,179,180,253,361,362,249,250,251,252,225,226,227,228,297,298,299,300,273,274,275,276,25,26,27,117,118,28,369,370,371,372,2,361,362,
-301,125,126,127,128,2,385,303,350,351,303,2,2,2,350,351,301,2,386,273,274,275,276,249,250,251,252,201,202,203,204,297,298,299,300,49,9,10,134,135,52,393,394,395,396,337,338,2,
-325,149,150,151,152,2,2,327,374,375,327,2,184,185,374,375,325,387,279,297,298,299,300,273,274,275,276,225,226,227,228,2,2,2,2,73,33,34,74,219,76,2,2,2,2,361,362,2,
-257,2,2,385,2,2,385,2,265,266,2,2,208,209,352,353,257,2,302,2,130,129,166,297,298,299,300,249,250,251,252,25,26,27,27,97,98,99,98,99,100,26,26,27,28,131,201,202,
-281,176,2,2,278,2,2,385,289,290,2,2,232,233,376,377,281,2,326,2,154,153,190,201,202,203,204,273,274,275,276,49,356,357,2,121,59,60,60,61,124,2,354,355,52,132,225,226,
-201,202,203,204,302,385,2,2,265,266,2,385,2,2,2,2,2,2,2,2,2,2,166,225,226,227,228,297,298,299,300,73,380,381,2,145,83,84,84,85,148,2,378,379,76,132,249,250,
-225,226,227,228,326,2,385,2,265,266,2,2,2,2,214,215,2,2,2,2,2,2,190,249,250,251,252,2,2,385,2,49,404,405,2,169,107,108,108,109,172,2,402,403,76,132,273,274,
-249,250,251,252,201,202,203,204,289,290,2,258,259,260,238,239,260,260,261,262,262,263,264,273,274,275,276,2,93,94,385,49,134,135,2,2,166,2,2,166,2,2,134,135,52,132,297,298,
-273,274,275,276,225,226,227,228,265,266,2,282,283,284,285,285,285,285,285,285,286,287,288,297,298,299,300,2,117,118,2,73,373,2,217,2,190,373,373,190,2,219,2,373,76,132,201,203,
-297,298,299,300,249,250,251,252,290,2,2,306,307,308,309,308,309,308,309,310,310,311,312,131,2,339,340,2,134,135,2,97,98,99,99,98,99,2,2,98,98,99,98,99,100,132,225,227,
-202,203,204,386,273,274,275,276,2,2,2,330,331,332,333,332,333,332,333,334,334,335,336,132,2,363,364,2,2,2,2,121,122,122,122,123,124,81,82,121,122,123,122,123,124,132,249,251,
-226,227,228,386,297,298,299,300,2,290,2,162,163,164,165,162,163,164,165,162,163,164,165,132,2,201,202,203,204,2,2,145,146,146,146,147,148,57,58,145,146,147,146,147,148,132,273,275,
-250,251,252,2,2,2,2,2,2,2,2,86,87,88,89,186,187,188,189,86,87,88,89,132,385,225,226,227,228,2,2,169,170,170,170,171,172,81,82,169,170,171,14,15,27,26,27,27,
-274,275,276,2,270,271,271,271,272,2,2,110,111,112,113,210,211,212,213,110,111,112,113,133,2,249,250,251,252,2,2,303,2,2,2,136,137,290,265,265,266,266,38,39,2,2,2,51,
-298,299,300,2,294,1,1,1,296,2,2,136,137,2,2,234,290,265,237,2,2,2,339,340,385,273,274,275,276,2,2,327,2,2,2,160,161,386,266,289,290,265,62,63,73,74,75,75,
-202,203,204,2,294,1,1,1,296,2,2,160,161,265,266,266,265,266,290,2,2,2,363,364,2,297,298,299,300,2,2,2,2,2,2,2,2,266,290,2,2,2,398,399,97,98,99,99,
-226,227,228,2,318,319,319,319,320,2,386,266,266,289,290,265,266,241,265,266,266,265,266,241,385,2,2,2,241,265,266,266,265,386,265,266,266,265,266,2,2,2,206,207,121,122,123,123,
-250,251,252,2,2,2,2,2,2,385,289,290,386,265,265,2,2,241,289,290,265,266,290,266,265,266,266,386,266,289,290,265,266,290,289,385,265,266,290,2,2,2,230,231,145,146,147,147,
-274,275,276,201,202,203,204,257,2,2,2,257,2,265,386,2,257,2,2,2,257,2,241,241,289,290,265,266,290,241,2,2,2,2,2,2,21,22,23,24,2,2,254,255,169,170,171,171,
-298,299,300,225,226,227,228,253,205,229,205,253,2,290,265,2,253,205,229,205,253,201,202,203,204,2,2,2,2,2,2,2,2,2,2,2,45,46,47,48,2,2,2,2,2,201,202,203,
-2,2,386,249,250,251,252,345,346,347,348,277,2,265,266,2,301,386,2,2,2,225,226,227,228,2,2,2,2,2,2,2,2,2,339,340,69,70,71,72,387,201,202,203,204,225,226,227,
-202,203,204,273,274,275,276,369,370,371,372,301,2,289,290,2,325,387,201,202,204,249,250,251,252,201,203,204,2,2,2,2,387,2,363,364,2,2,2,2,2,225,226,227,228,249,250,251,
-226,227,228,297,298,299,300,393,394,395,396,325,2,265,266,2,301,386,225,226,228,273,274,275,276,225,227,228,201,202,203,204,201,202,203,204,387,201,202,203,204,249,250,251,252,273,274,275
-</data>
- </layer>
- <layer id="2" name="Foreground" width="48" height="24">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
-</map>
--- a/assets/level0_bak2.tmx
+++ b/assets/level0_bak2.tmx
@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="5" nextobjectid="1">
- <editorsettings>
-  <export target="level0_walkable.json" format="json"/>
- </editorsettings>
- <tileset firstgid="1" source="tilesetnpp.tsx"/>
- <tileset firstgid="409" source="Walkable.tsx"/>
- <layer id="1" name="Background" width="48" height="24">
-  <data encoding="csv">
-257,297,298,299,300,257,386,297,298,299,300,2,2,2,2,2,257,337,338,225,226,227,228,201,202,203,204,273,274,275,276,249,250,251,252,297,298,299,93,94,2,345,346,347,348,2,337,338,
-253,205,229,205,229,280,179,180,179,156,156,156,158,157,179,180,253,361,362,249,250,251,252,225,226,227,228,297,298,299,300,273,274,275,276,25,26,27,117,118,28,369,370,371,372,2,361,362,
-301,125,126,127,128,2,385,303,350,351,303,2,2,2,350,351,301,2,386,273,274,275,276,249,250,251,252,201,202,203,204,297,298,299,300,49,9,10,134,135,52,393,394,395,396,337,338,2,
-325,149,150,151,152,2,2,327,374,375,327,2,184,185,374,375,325,387,279,297,298,299,300,273,274,275,276,225,226,227,228,2,2,2,2,73,33,34,74,219,76,2,2,2,2,361,362,2,
-257,2,2,385,2,2,385,2,265,266,2,2,208,209,352,353,257,2,302,2,130,129,166,297,298,299,300,249,250,251,252,25,26,27,27,97,98,99,98,99,100,26,26,27,28,131,201,202,
-281,176,2,2,278,2,2,385,289,290,2,2,232,233,376,377,281,2,326,2,154,153,190,201,202,203,204,273,274,275,276,49,356,357,2,121,59,60,60,61,124,2,354,355,52,132,225,226,
-201,202,203,204,302,385,2,2,265,266,2,385,2,2,2,2,2,2,2,2,2,2,166,225,226,227,228,297,298,299,300,73,380,381,2,145,83,84,84,85,148,2,378,379,76,132,249,250,
-225,226,227,228,326,2,385,2,265,266,2,2,2,2,214,215,2,2,2,2,2,2,190,249,250,251,252,2,2,385,2,49,404,405,2,169,107,108,108,109,172,2,402,403,76,132,273,274,
-249,250,251,252,201,202,203,204,289,290,2,258,259,260,238,239,260,260,261,262,262,263,264,273,274,275,276,2,93,94,385,49,134,135,2,2,166,2,2,166,2,2,134,135,52,132,297,298,
-273,274,275,276,225,226,227,228,265,266,2,282,283,284,285,285,285,285,285,285,286,287,288,297,298,299,300,2,117,118,2,73,373,2,217,2,190,373,373,190,2,219,2,373,76,132,201,203,
-297,298,299,300,249,250,251,252,290,2,2,306,307,308,309,308,309,308,309,310,310,311,312,131,2,339,340,2,134,135,2,97,98,99,99,98,99,2,2,98,98,99,98,99,100,132,225,227,
-202,203,204,386,273,274,275,276,2,2,2,330,331,332,333,332,333,332,333,334,334,335,336,132,2,363,364,2,2,2,2,121,122,122,122,123,124,81,82,121,122,123,122,123,124,132,249,251,
-226,227,228,386,297,298,299,300,2,290,2,162,163,164,165,162,163,164,165,162,163,164,165,132,2,201,202,203,204,2,2,145,146,146,146,147,148,57,58,145,146,147,146,147,148,132,273,275,
-250,251,252,2,2,2,2,2,2,2,2,86,87,88,89,186,187,188,189,86,87,88,89,132,385,225,226,227,228,2,2,169,170,170,170,171,172,81,82,169,170,171,14,15,27,26,27,27,
-274,275,276,2,270,271,271,271,272,2,2,110,111,112,113,210,211,212,213,110,111,112,113,133,2,249,250,251,252,2,2,303,2,2,2,136,137,290,265,265,266,266,38,39,2,2,2,51,
-298,299,300,2,294,1,1,1,296,2,2,136,137,2,2,234,290,265,237,2,2,2,339,340,385,273,274,275,276,2,2,327,2,2,2,160,161,386,266,289,290,265,62,63,73,74,75,75,
-202,203,204,2,294,1,1,1,296,2,2,160,161,265,266,266,265,266,290,2,2,2,363,364,2,297,298,299,300,2,2,2,2,2,2,2,2,266,290,2,2,2,398,399,97,98,99,99,
-226,227,228,2,318,319,319,319,320,2,386,266,266,289,290,265,266,241,265,266,266,265,266,241,385,2,2,2,241,265,266,266,265,386,265,266,266,265,266,2,2,2,206,207,121,122,123,123,
-250,251,252,2,2,2,2,2,2,385,289,290,386,265,265,2,2,241,289,290,265,266,290,266,265,266,266,386,266,289,290,265,266,290,289,385,265,266,290,2,2,2,230,231,145,146,147,147,
-274,275,276,201,202,203,204,257,2,2,2,257,2,265,386,2,257,2,2,2,257,2,241,241,289,290,265,266,290,241,2,2,2,2,2,2,21,22,23,24,2,2,254,255,169,170,171,171,
-298,299,300,225,226,227,228,253,205,229,205,253,2,290,265,2,253,205,229,205,253,201,202,203,204,2,2,2,2,2,2,2,2,2,2,2,45,46,47,48,2,2,2,2,2,201,202,203,
-2,2,386,249,250,251,252,345,346,347,348,277,2,265,266,2,301,386,2,2,2,225,226,227,228,2,2,2,2,2,2,2,2,2,339,340,69,70,71,72,387,201,202,203,204,225,226,227,
-202,203,204,273,274,275,276,369,370,371,372,301,2,289,290,2,325,387,201,202,204,249,250,251,252,201,203,204,2,2,2,2,387,2,363,364,2,2,2,2,2,225,226,227,228,249,250,251,
-226,227,228,297,298,299,300,393,394,395,396,325,2,265,266,2,301,386,225,226,228,273,274,275,276,225,227,228,201,202,203,204,201,202,203,204,387,201,202,203,204,249,250,251,252,273,274,275
-</data>
- </layer>
- <layer id="2" name="Foreground" width="48" height="24">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="3" name="Walkable" width="48" height="24">
-  <data encoding="csv">
-410,0,410,410,0,410,0,0,410,410,0,0,0,0,0,0,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,410,410,410,410,0,410,410,
-410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,410,410,
-410,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,410,0,0,0,0,410,410,410,410,410,410,410,0,
-410,410,410,410,410,0,0,410,410,410,410,0,0,0,410,410,410,410,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,410,410,0,
-410,0,0,0,0,0,0,0,0,0,0,0,410,0,411,411,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,
-410,0,0,0,0,0,0,0,0,0,0,0,0,0,411,411,0,0,410,0,410,410,410,0,0,0,0,0,0,0,0,410,0,0,0,410,410,410,410,410,410,0,0,0,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,410,0,0,0,410,410,410,410,410,410,0,0,0,410,0,0,0,
-0,0,0,0,410,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,410,410,410,0,410,410,0,0,410,410,0,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,410,
-0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,410,410,0,0,410,410,0,410,0,0,0,0,410,0,0,410,0,0,0,0,410,0,0,0,
-0,410,410,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,0,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,410,410,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,0,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,0,0,0,0,0,0,0,0,410,410,410,410,410,410,0,0,410,410,410,410,0,0,410,410,410,
-0,0,0,0,412,412,412,412,412,0,0,410,410,410,410,410,0,0,410,410,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,
-410,410,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,410,0,0,0,410,410,0,0,0,0,0,0,410,0,0,0,410,
-0,0,0,0,412,412,412,412,412,0,0,410,410,0,0,0,0,0,0,0,0,0,410,410,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,
-0,0,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,
-0,0,0,0,0,0,0,410,0,0,0,410,0,0,0,0,410,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,0,0,410,410,410,410,410,410,
-410,410,0,0,0,0,0,410,410,410,410,410,0,0,0,0,410,410,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,410,410,410,410,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,410,410,410,410,410,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,410,410,0,410,410,410,410,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
-</map>
--- a/assets/level1.tmx
+++ b/assets/level1.tmx
@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="4" nextobjectid="1">
+ <tileset firstgid="1" source="tilesetnpp.tsx"/>
+ <tileset firstgid="411" source="Walkable.tsx"/>
+ <layer id="1" name="Background" width="48" height="24">
+  <data encoding="csv">
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,
+2,2,2,2,316,316,272,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,
+2,2,2,317,1,1,291,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,270,271,271,316,316,271,316,316,2,2,2,2,270,271,
+2,2,317,1,1,1,1,316,316,316,315,316,316,272,2,2,2,2,2,2,2,2,270,316,271,271,316,316,316,316,271,271,271,317,1,1,1,1,1,1,1,1,315,316,315,316,317,1,
+299,300,1,1,1,1,1,1,1,1,1,1,1,315,2,297,298,299,300,2,270,316,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+2,293,1,1,1,1,1,1,1,1,1,1,1,1,272,2,2,2,2,270,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,267,268,269,1,1,1,1,1,1,1,1,1,1,
+2,2,269,1,1,1,1,1,1,319,319,269,1,1,1,316,271,316,271,317,1,1,1,1,319,319,319,268,268,319,319,319,268,319,320,2,2,318,319,320,268,269,1,1,1,1,1,1,
+2,2,2,269,1,1,1,1,320,2,2,2,269,1,1,1,1,1,1,1,1,1,267,2,2,2,2,2,2,2,2,2,2,2,2,2,2,219,2,2,2,318,319,320,269,1,1,1,
+2,2,2,2,319,268,319,320,2,2,2,2,318,319,269,1,1,1,1,1,1,267,2,2,2,2,313,265,242,266,241,219,314,313,242,241,289,314,219,2,2,2,2,2,2,269,1,1,
+27,26,27,26,27,28,2,2,2,2,2,2,2,2,318,319,319,268,268,319,319,320,2,2,2,219,2,2,2,2,266,241,289,290,266,265,290,313,266,297,298,299,300,2,2,318,319,320,
+2,50,51,51,99,100,132,2,2,2,2,2,2,2,2,2,2,2,2,314,265,2,2,2,2,313,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,74,75,76,16,17,133,2,2,2,2,2,2,2,2,2,2,2,241,219,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+98,98,99,100,40,41,290,314,297,298,299,300,2,2,2,2,2,219,219,289,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,
+121,122,123,124,64,65,265,289,313,289,241,265,219,2,2,2,2,290,314,2,2,2,2,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+145,146,147,148,132,2,2,2,2,2,2,314,314,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,
+169,170,171,172,133,2,2,2,2,2,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,385,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,385,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,345,346,347,348,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,385,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,369,370,371,372,297,298,299,300,2,2,2,2,2,
+2,2,2,2,2,2,2,297,298,299,300,2,2,2,2,2,2,2,2,2,2,385,2,2,2,2,2,2,2,2,2,2,2,2,2,393,394,395,396,2,2,2,2,2,297,298,299,300,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,297,298,299,300,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+</data>
+ </layer>
+ <layer id="2" name="Foreground" width="48" height="24">
+  <data encoding="csv">
+0,0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,
+0,0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,201,202,203,204,0,0,0,0,0,225,226,227,228,0,0,0,0,201,202,203,204,0,
+0,0,0,0,249,250,251,252,0,201,202,203,204,0,0,0,0,0,0,225,226,227,228,0,0,0,225,226,227,228,0,201,202,203,204,249,250,251,252,0,0,0,0,225,226,227,228,0,
+0,0,0,0,273,274,275,276,0,225,226,227,228,0,0,0,0,0,0,249,250,251,252,0,0,0,249,250,251,252,0,225,226,227,228,273,274,275,276,0,0,0,0,249,250,251,252,0,
+203,204,0,0,0,0,0,0,0,249,250,251,252,0,0,201,202,203,204,273,274,275,276,0,0,0,273,274,275,276,0,249,250,251,252,0,0,0,0,0,0,0,0,273,274,275,276,0,
+227,228,0,0,0,0,0,0,0,273,274,275,276,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,
+251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,0,
+227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,0,
+251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,
+275,276,0,0,0,0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,201,202,203,204,0,
+0,0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,225,226,227,228,0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,
+0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,249,250,251,252,0,225,226,227,228,0,0,0,0,0,201,202,203,204,0,0,0,0,249,250,251,252,0,
+0,0,0,0,0,0,0,0,273,274,275,276,0,201,202,203,204,0,0,0,0,273,274,275,276,0,249,250,251,252,201,202,203,204,0,225,226,227,228,0,0,0,0,273,274,275,276,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,273,274,275,276,225,226,227,228,0,249,250,251,252,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,201,202,203,204,0,0,0,0,0,249,250,251,252,0,273,274,275,276,201,202,203,204,0,0,0,0,0,
+0,0,0,0,0,0,0,201,202,203,204,0,0,273,274,275,276,0,0,0,0,225,226,227,228,0,0,0,0,0,273,274,275,276,0,0,0,0,0,225,226,227,228,0,201,202,203,204,
+0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,201,202,203,204,201,202,203,204,0,0,0,0,0,249,250,251,252,0,225,226,227,228,
+204,0,0,201,202,203,204,249,250,251,252,201,202,203,204,0,0,0,0,0,0,273,274,275,276,0,225,226,227,228,225,226,227,228,0,0,0,0,0,273,274,275,276,0,249,250,251,252,
+228,0,0,225,226,227,228,273,274,275,276,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,249,250,251,252,0,0,0,0,0,0,0,0,0,0,273,274,275,276,
+252,0,0,249,250,251,252,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+276,0,0,273,274,275,276,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Walkable" width="48" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,
+0,0,0,414,414,414,414,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,414,414,414,414,414,414,414,414,0,0,0,0,414,414,
+0,0,414,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+412,414,414,414,414,414,414,414,414,414,414,414,414,414,0,0,412,412,0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,0,0,414,414,414,414,414,414,414,414,414,414,414,
+0,0,0,414,414,414,414,414,414,0,0,0,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,
+0,0,0,0,414,414,414,414,0,0,0,0,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,
+412,412,412,412,412,412,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,414,414,414,
+0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,
+412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,
+412,412,412,412,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,412,412,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,412,412,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+</map>
--- a/assets/level2.tmx
+++ b/assets/level2.tmx
@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="4" nextobjectid="1">
+ <tileset firstgid="1" source="tilesetnpp.tsx"/>
+ <tileset firstgid="411" source="Walkable.tsx"/>
+ <layer id="1" name="Background" width="48" height="24">
+  <data encoding="csv">
+2,2,2,2,386,2,2,2,2,2,2,325,2,290,265,2,349,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,
+2,2,2,2,2,386,2,2,2,2,2,277,2,386,266,2,349,385,385,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,2,2,
+298,299,300,2,2,2,2,385,385,2,2,301,2,266,290,2,349,2,385,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,386,2,2,256,2,265,266,2,257,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,297,298,299,258,259,262,330,333,333,336,262,263,264,2,2,2,
+2,2,2,2,2,2,2,2,386,386,2,281,2,266,290,2,280,2,2,2,2,2,2,2,2,2,386,2,2,2,2,2,2,2,2,283,283,3,91,87,88,92,3,312,288,2,385,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,290,266,2,2,2,385,2,297,298,299,300,2,2,2,2,2,2,2,9,10,2,2,283,283,3,115,111,112,113,3,312,312,131,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,386,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,33,34,385,2,283,283,3,114,114,115,114,3,312,312,132,385,2,
+2,386,2,2,2,2,2,2,2,2,2,2,2,313,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,288,132,2,2,
+2,2,2,297,298,299,300,2,345,346,347,348,2,265,266,2,2,149,150,151,152,149,150,151,152,149,150,151,152,149,150,151,152,2,2,282,283,3,3,3,3,3,3,287,288,132,2,2,
+2,2,2,2,2,2,2,386,369,370,371,372,2,266,290,2,2,2,2,2,2,385,2,2,2,2,385,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,312,132,2,2,
+2,2,2,2,2,2,386,2,393,394,395,396,2,290,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,288,132,2,2,
+2,2,2,2,2,385,2,2,2,2,2,2,2,386,313,2,2,149,149,150,151,149,150,151,152,149,150,151,152,149,150,151,152,2,2,282,330,308,308,308,308,308,308,311,312,132,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,2,2,2,385,2,2,385,2,2,2,2,2,2,330,331,331,331,331,331,331,331,331,336,132,2,2,
+2,297,298,299,300,2,2,2,2,2,2,2,2,265,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,90,91,92,162,163,164,165,90,91,92,132,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,149,150,151,152,149,150,151,152,149,150,151,152,149,150,151,152,2,2,114,115,116,186,187,188,189,114,115,116,132,2,2,
+2,385,386,386,2,2,2,2,2,2,2,2,2,313,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,110,113,110,210,211,212,213,113,110,113,133,2,2,
+2,385,2,2,2,2,2,2,2,2,2,2,2,290,265,2,2,2,2,2,2,2,2,386,2,2,2,2,385,2,2,2,2,2,2,2,2,2,234,290,265,237,2,2,2,2,385,2,
+2,2,2,2,2,2,297,298,299,300,2,2,2,386,266,2,2,2,2,2,2,2,2,386,386,2,2,2,2,2,2,2,2,2,2,2,160,161,386,386,266,2,2,2,2,385,385,2,
+2,386,386,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,386,386,2,2,2,2,266,266,265,266,266,265,386,265,266,266,265,266,266,265,386,265,266,266,265,266,266,265,386,265,266,266,265,266,265,266,266,265,386,265,266,
+2,345,346,347,348,2,2,2,2,2,2,385,2,266,290,289,290,265,266,290,289,385,265,289,290,265,266,290,289,385,265,266,290,265,266,290,289,385,265,266,290,289,290,265,266,290,289,385,
+2,369,370,371,372,2,2,2,2,2,2,2,2,2,2,2,2,386,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,393,394,395,396,2,2,2,385,2,2,2,2,2,2,2,2,2,385,2,2,2,2,2,2,2,385,385,385,2,2,2,386,2,2,2,2,2,385,2,2,385,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,386,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+</data>
+ </layer>
+ <layer id="2" name="Foreground" width="48" height="24">
+  <data encoding="csv">
+250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,297,298,299,300,0,0,0,225,226,227,228,225,226,227,228,0,0,0,0,0,273,274,275,276,0,0,0,
+274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,249,250,251,252,249,250,251,252,0,0,258,259,263,264,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,273,274,275,276,273,274,275,276,0,0,282,3,3,288,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,125,126,127,128,125,126,127,128,125,126,127,128,125,126,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,125,125,126,127,125,126,127,128,125,126,127,128,125,126,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,201,202,203,204,0,0,0,0,0,0,0,125,126,127,128,125,126,127,128,125,126,127,128,125,126,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Walkable" width="48" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,
+412,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,412,412,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,412,412,0,0,412,412,412,412,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+</map>
--- a/assets/level3.tmx
+++ b/assets/level3.tmx
@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="4" nextobjectid="1">
+ <tileset firstgid="1" source="tilesetnpp.tsx"/>
+ <tileset firstgid="411" source="Walkable.tsx"/>
+ <layer id="1" name="Background" width="48" height="24">
+  <data encoding="csv">
+300,2,2,297,298,299,300,2,2,2,2,297,298,299,300,2,2,2,2,2,2,339,340,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,385,385,2,2,363,364,2,2,2,2,387,2,2,386,2,2,386,2,258,259,260,261,261,261,261,262,263,264,2,339,340,
+281,179,180,181,179,180,179,181,179,180,179,180,179,180,281,2,2,2,2,2,2,2,2,2,2,2,2,2,385,2,2,2,2,2,2,282,283,284,285,285,285,285,286,287,288,2,363,364,
+325,386,385,386,266,386,386,386,385,265,386,386,385,386,325,2,258,259,260,261,261,261,261,261,262,263,264,2,2,2,2,2,2,2,2,306,307,308,309,309,309,309,310,311,312,131,2,2,
+277,385,385,386,290,386,385,386,386,266,386,385,386,386,277,2,282,283,284,285,285,285,285,285,286,287,288,2,2,2,2,2,2,2,2,330,331,332,333,333,333,333,334,335,336,132,2,2,
+301,386,386,385,314,386,386,385,386,290,386,386,385,386,301,2,306,307,308,309,309,309,309,309,310,311,312,131,2,2,2,2,2,2,2,162,163,164,162,163,164,165,163,164,165,132,2,2,
+325,313,290,265,313,265,241,290,313,314,290,241,313,290,325,2,330,331,332,333,333,333,333,333,334,335,336,132,2,2,2,2,2,2,2,86,87,88,186,187,188,189,90,91,92,132,2,2,
+349,2,2,2,2,2,2,2,2,2,2,2,2,2,349,2,162,163,164,162,163,164,165,162,163,164,165,132,2,297,298,299,300,2,2,110,111,112,210,211,212,213,114,115,116,133,2,2,
+387,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,86,87,88,186,187,188,189,86,87,88,92,132,2,2,2,2,2,385,2,2,2,2,2,265,266,2,2,2,2,2,2,2,
+2,2,258,259,260,261,261,262,263,264,2,21,22,23,24,2,110,111,112,210,211,212,213,110,111,112,116,133,386,241,241,313,241,313,266,265,266,266,265,289,290,2,160,161,385,2,2,387,
+2,2,282,283,284,285,285,286,287,288,2,45,46,47,48,2,2,2,2,2,265,266,2,2,2,2,2,313,290,265,313,265,313,266,290,289,290,265,266,313,314,2,2,2,2,2,2,2,
+2,2,306,307,308,309,309,310,311,312,131,69,70,71,72,2,266,265,266,266,265,386,160,161,2,386,2,265,265,266,241,2,258,259,260,261,261,262,263,264,2,2,2,2,2,2,2,2,
+386,2,330,331,332,333,333,334,335,336,132,2,2,2,2,266,290,289,290,265,266,290,266,265,266,266,265,289,289,290,386,2,282,283,284,285,285,286,287,288,2,2,2,2,2,2,2,2,
+2,2,162,163,165,162,163,163,165,165,132,2,313,290,265,313,265,2,2,2,2,2,290,289,290,265,266,313,313,314,241,2,306,307,308,309,309,310,311,312,131,2,2,2,2,2,2,2,
+2,2,86,87,88,186,187,188,189,92,132,2,265,266,266,2,258,259,260,261,261,261,261,261,261,262,263,264,2,265,266,2,330,331,332,333,333,334,335,336,132,2,2,2,2,2,2,2,
+2,2,110,111,112,210,211,212,213,116,133,2,289,290,2,2,282,283,284,285,285,285,285,285,285,286,287,288,2,289,290,2,162,163,164,162,163,164,165,165,132,2,2,297,298,299,300,2,
+2,2,2,2,2,2,265,266,2,2,2,386,313,314,2,2,306,307,308,309,309,309,309,309,309,310,311,312,131,241,265,2,86,87,88,186,187,188,189,92,132,2,2,2,2,2,2,2,
+2,2,2,386,2,2,289,290,160,161,2,2,265,266,2,2,330,331,332,333,333,333,333,333,333,334,335,336,132,266,266,2,110,111,112,210,211,212,213,116,133,2,2,2,2,2,386,2,
+2,2,2,2,2,2,313,314,289,265,266,290,289,290,2,2,162,163,164,165,162,163,164,162,163,163,165,165,132,265,266,241,2,2,2,2,265,266,2,2,2,2,2,2,2,2,386,2,
+265,266,266,265,386,313,265,266,265,266,313,314,313,314,266,2,86,87,88,90,90,87,88,186,187,188,189,92,132,289,289,290,266,265,266,266,289,290,2,160,161,2,21,22,23,24,2,2,
+289,290,265,266,290,2,2,2,2,2,2,2,266,265,266,2,110,111,112,114,114,111,112,210,211,212,213,116,133,241,313,314,290,289,290,265,313,314,2,386,2,2,45,46,47,48,2,2,
+2,2,2,2,2,2,2,2,2,386,2,2,2,265,266,2,2,2,2,2,2,2,2,2,265,266,2,2,2,2,345,346,347,348,2,339,340,2,2,2,2,2,69,70,71,72,2,2,
+2,297,298,299,300,2,2,339,340,2,2,2,2,289,290,266,265,266,266,265,386,265,266,266,289,290,2,160,161,2,369,370,371,372,2,363,364,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,386,2,2,363,364,2,2,2,2,313,314,290,289,290,265,266,290,289,290,265,313,314,2,2,385,2,393,394,395,396,2,2,2,2,2,2,2,387,2,2,2,386,2,2
+</data>
+ </layer>
+ <layer id="2" name="Foreground" width="48" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+257,0,0,0,0,0,0,0,0,0,0,0,0,0,257,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,0,0,
+0,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Walkable" width="48" height="24">
+  <data encoding="csv">
+0,0,0,0,412,412,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,412,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,412,412,
+412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,412,412,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,412,412,412,412,412,412,412,412,412,412,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,412,412,412,412,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,412,412,0,0,0,412,412,412,412,0,0,412,412,412,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,412,412,412,412,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,412,412,412,412,412,412,412,412,0,412,412,412,412,0,412,412,412,412,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,412,
+0,0,412,0,0,0,0,0,0,412,0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,412,0,0,0,0,0,0,412,0,412,412,412,412,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,0,0,0,0,0,0,0,0,
+0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,
+0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,
+0,0,412,0,0,412,412,412,412,412,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,
+0,0,412,412,412,412,0,0,412,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,412,412,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,412,412,412,0,0,412,412,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,412,412,0,412,412,412,412,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,412,412,0,0,0,0,0,412,412,412,412,0,0,
+0,0,412,412,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,412,412,412,412,0,412,412,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,412,0,0,0,0,0,0
+</data>
+ </layer>
+</map>
--- a/8
+++ b/8
@ -0,0 +1,8 @@
+cd assets
+rm -f *.json
+cd ..
+rm -r build-cg
+rm -r build-fx
+rm *.g1a
+rm *.g3a
+
--- a/src/config.h
+++ b/src/config.h
@ -8,4 +8,21 @@

 #define USB_FEATURE 0

+#define DEBUGMODE 1
+
+#ifdef FXCG50
+    #define T_HEIGHT 16
+    #define T_WIDTH  16
+#else
+    #define T_HEIGHT 8
+    #define T_WIDTH  8
+#endif
+
+#ifdef FXCG50
+    #define PXSIZE   2
+#else
+    #define PXSIZE   1
+#endif
+
+
 #endif
--- a/src/game.c
+++ b/src/game.c
@ -12,9 +12,9 @@ void game_logic(Game *game) {

 void draw(Game *game) {
    /* Draw everything. */
-    render_map_by_layer(&game->player, game->map_level, BACKGROUND);
-    player_draw(&game->player);
-    render_map_by_layer(&game->player, game->map_level, FOREGROUND);
+    render_map_by_layer(game, BACKGROUND);
+    player_draw(game);
+    render_map_by_layer(game, FOREGROUND);
 }

 /* Key management */
@ -32,14 +32,20 @@ void get_inputs(Game *game) {
    if(keydown(KEY_EXIT)) game->exittoOS = true;

    /* Player actions - Prototypes in player.h and implementation in player.c */
-    if(keydown(KEY_LEFT))  player_move(game->map_level, &game->player, D_LEFT);
-    if(keydown(KEY_RIGHT)) player_move(game->map_level, &game->player, D_RIGHT);
-    if(keydown(KEY_UP))    player_move(game->map_level, &game->player, D_UP);
-    if(keydown(KEY_DOWN))  player_move(game->map_level, &game->player, D_DOWN);
-    if(keydown(KEY_SHIFT)) player_action(&game->player);
+    if(keydown(KEY_LEFT))  player_move(game, D_LEFT);
+    if(keydown(KEY_RIGHT)) player_move(game, D_RIGHT);
+    if(keydown(KEY_UP))    player_move(game, D_UP);
+    if(keydown(KEY_DOWN))  player_move(game, D_DOWN);
+    if(keydown(KEY_SHIFT)) player_action(game);
+
+    /* Display Debug Information on screen */
+#if DEBUGMODE
+    if(keydown(KEY_F1))    game->debug_map = !game->debug_map;
+    if(keydown(KEY_F2))    game->debug_player = !game->debug_player;    
+#endif
+

    /* if USB is enabled - keybinding for screencapture */
-
 #if USB_FEATURE

    if(keydown(KEY_7)) game->screenshot = true;
--- a/src/game.h
+++ b/src/game.h
@ -1,8 +1,61 @@
 #ifndef GAME_H
 #define GAME_H

-#include "mapstruct.h"
-#include "player.h"
+#include <gint/display.h>
+
+
+
+/* The direction where the player is going to. */
+typedef enum {
+    D_UP,
+    D_DOWN,
+    D_LEFT,
+    D_RIGHT
+} Direction;
+
+typedef enum {
+    P_LEFTUP = -1,
+    P_CENTER = 0,
+    P_RIGHTDOWN = 1
+} Checkpos;
+
+
+
+/* Struct that define player parameters */
+typedef struct {
+    int x, y; /* The position of the player */
+    unsigned int px, py; /* The position of the player on screen */
+    unsigned short int life; /* How many lives the player still has between 0
+                              * and 100. */
+    char speed; /* The speed of the movement of the player. */
+} Player;
+
+
+
+typedef struct {
+    /* width, height and the number of layer of the map */
+    uint16_t w, h;
+    uint16_t nblayers;
+    uint16_t tileset_size;
+
+    uint16_t xmin;
+    uint16_t ymin;
+    uint16_t xmax;
+    uint16_t ymax;
+
+    /* the tileset to use */
+    bopti_image_t *tileset;
+
+    /* contain the properties of the tiles */
+    /* this is given by the layer Walkable of the map in Tiled */
+    
+    uint8_t *walkable;
+
+    /* list of all the tiles */
+    uint16_t *layers[];
+} Map;
+
+

 /* This struct will contain all the data of the game. It will make it possible
 * to pass it to the NPCs to let them interact with the player and the rest of
@ -19,6 +72,10 @@ typedef struct {
    bool record;
    /* How many ms the frame already took. */
    long int frame_duration;
+
+    /* variables used for debuging */
+    bool debug_player;
+    bool debug_map;
 } Game;

 /* (Mibi88) TODO: Describe what this function is doing. */
--- a/src/main.c
+++ b/src/main.c
@ -26,12 +26,18 @@

 extern bopti_image_t player_face_img;

+extern Map *worldRPG[];
+
+
 /* Game data (defined in "game.h")*/
 Game game = {
-    &map_level0,
+    NULL,
    {10*PXSIZE, 48*PXSIZE, 0, 0, 100, SPEED},
    false, false, false, 0
-};
+
+    /* debug variables*/
+    , true, true
+}; 

 /* screen capture management code */

@ -87,6 +93,9 @@ int main(void) {
    }
    timer_start(timer);

+    game.map_level = worldRPG[0];
+
+
    #if USB_FEATURE
        usb_interface_t const *interfaces[] = {&usb_ff_bulk, NULL};
        usb_open(interfaces, GINT_CALL_NULL);
@ -99,10 +108,14 @@ int main(void) {
        dgray(DGRAY_ON);
    #endif

+/*
    showtext_dialog(&game, &player_face_img, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet.", true, true);
-    int in = showtext_dialog_ask(&game, &player_face_img, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet.", true, false, "Lorem\0ipsum", 2, 0);
-    if(in) showtext_dialog(&game, &player_face_img, "You choosed ipsum", false, true);
+    int in = showtext_dialog_ask(&game, &player_face_img, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet.", true, false, "Lorem\0Ipsum\0Dolor", 3, 0);
+    if(in==2) showtext_dialog(&game, &player_face_img, "You choosed Dolor", false, true);
+    else if(in==1) showtext_dialog(&game, &player_face_img, "You choosed Ipsum", false, true);
    else showtext_dialog(&game, &player_face_img, "You choosed Lorem", false, true);
+*/
+
    do{
        /* clear screen */
        dclear(C_WHITE);
@ -110,6 +123,24 @@ int main(void) {
        /* render the map */
        draw(&game);

+        #if DEBUGMODE && FXCG50
+            if (game.debug_map)
+            {
+                dfont( NULL );
+                drect( 5, 5,390, 55, C_WHITE );
+                dprint( 10, 10, C_RED, "Map[%d] : Xmn %d Ymn %d Xmx %d Ymx %d", 0, worldRPG[0]->xmin, worldRPG[0]->ymin, worldRPG[0]->xmax, worldRPG[0]->ymax );
+                dprint( 10, 20, C_RED, "Map[%d] : Xmn %d Ymn %d Xmx %d Ymx %d", 1, worldRPG[1]->xmin, worldRPG[1]->ymin, worldRPG[1]->xmax, worldRPG[1]->ymax );
+                dprint( 10, 30, C_RED, "Map[%d] : Xmn %d Ymn %d Xmx %d Ymx %d", 2, worldRPG[2]->xmin, worldRPG[2]->ymin, worldRPG[2]->xmax, worldRPG[2]->ymax );
+                dprint( 10, 40, C_RED, "Map[%d] : Xmn %d Ymn %d Xmx %d Ymx %d", 3, worldRPG[3]->xmin, worldRPG[3]->ymin, worldRPG[3]->xmax, worldRPG[3]->ymax );
+            }
+            if (game.debug_player)
+            {
+                dfont( NULL );
+                drect( 5, 55,390, 75, C_WHITE );
+                dprint( 10, 60, C_BLUE, "X= %d - Y= %d", game.player.x, game.player.y );
+            }
+        #endif
+
        /* start the logic of the game */
        game_logic(&game);

--- a/src/map.c
+++ b/src/map.c
@ -1,8 +1,14 @@
 #include "map.h"
+#include "config.h"
+#include "game.h"

 #include <gint/display.h>

-void render_map(Player *player, Map *map_level) {
+void render_map(Game *game) {
+
+    Map *map_level = game->map_level;
+    Player *player = &game->player;
+
    /* for all Layer (2 in the current configuration: Background is layer 0 and
     * foreground is layer 1 ) */
    /* x and y will contain the position in the loop. */
@ -94,7 +100,11 @@ void render_map(Player *player, Map *map_level) {
    }
 }

-void render_map_by_layer(Player *player, Map *map_level, int layer) {
+void render_map_by_layer(Game *game, int layer) {
+    
+    Map *map_level = game->map_level;
+    Player *player = &game->player;
+
    /* for all Layer (2 in the current configuration: Background is layer 0 and
     * foreground is layer 1 ) */
    /* x and y will contain the position in the loop. */
@ -180,14 +190,18 @@ void render_map_by_layer(Player *player, Map *map_level, int layer) {
    }
 }

-short int get_tile(Map *map_level, int x, int y, int l) {
+short int get_tile(Game *game, int x, int y, int l) {
+    
+    Map *map_level = game->map_level;
    /* Get the tile at (x, y) on layer l. Returns the tile ID or MAP_OUTSIDE if
     * she's not found. */
    return x>=0 && x < map_level->w && y>=0 && y < map_level->h ?
        map_level->layers[l][y * map_level->w + x] : MAP_OUTSIDE;
 }

-short int get_walkable(Map *map_level, int x, int y) {
+short int get_walkable(Game *game, int x, int y) {
+    
+    Map *map_level = game->map_level;
    /* Get the tile at (x, y). Returns the tile ID or MAP_OUTSIDE if she's not
     * found. */
    return x>=0 && x < map_level->w && y>=0 && y < map_level->h ?
--- a/src/map.h
+++ b/src/map.h
@ -2,41 +2,35 @@
 #define MAP_H


-#ifdef FXCG50
-    #define T_HEIGHT 16
-    #define T_WIDTH  16
-#else
-    #define T_HEIGHT 8
-    #define T_WIDTH  8
-#endif
-
-#ifdef FXCG50
-    #define PXSIZE   2
-#else
-    #define PXSIZE   1
-#endif
-
 #define BACKGROUND 0
 #define FOREGROUND 1

 #define MAP_OUTSIDE -2 /* Returned by get_tile_at_pos if the point is outside of
                        * the map. */

-#include "mapstruct.h"
+#include "game.h"
 #include "player.h"

+
+
+/* Structure 'Map' has been moved to game.h */
+/* to avoid circular references between map.h, game.h and player.h */
+/* only methods propotypes are now in dedicated header files */
+
+
+
 /* Draws the map map on the entire screen to be viewed by the player player. */
-void render_map(Player *player, Map *map_level);
+void render_map(Game *game);

 /* Draws the map layer on the entire screen to be viewed by the player player.
 */
-void render_map_by_layer(Player *player, Map *map_level, int layer);
+void render_map_by_layer(Game *game, int layer);

 /* Get the tile at (x, y) of the map map. If the tile is located outside of the
 * screen, MAP_OUTSIDE is returned. */
-short int get_tile(Map *map_level, int x, int y, int l);
+short int get_tile(Game *game, int x, int y, int l);

 /* Returns what is in the walkable layer at (x, y). */
-short int get_walkable(Map *map_level, int x, int y);
+short int get_walkable(Game *game, int x, int y);

 #endif
--- a/src/mapdata.h
+++ b/src/mapdata.h
@ -1,7 +1,10 @@
 #ifndef MAPDATA_H
 #define MAPDATA_H

-extern Map map_level0;
+#include <stdint.h>
+#include "game.h"
+
+extern Map *worldRPG[];

 #endif

--- a/src/mapstruct.h
+++ b/src/mapstruct.h
@ -1,38 +0,0 @@
-#ifndef MAPSTRUCT_H
-#define MAPSTRUCT_H
-
-#include <gint/display.h>
-
-
-
-typedef struct {
-    /* the ID of the tile, as per tiled configuration, first is ID=0, then line
-     * by line, each line left to right, +1 at each tile.*/
-    int tileID;
-    /* maximum speed on that tile for the player */
-    /* Note : Speed = 0 means that the tile is not walkable */
-    int speed;
-} Tile_Data;
-
-
-typedef struct {
-    /* width, height and the number of layer of the map */
-    int w, h, nblayers;
-
-    /* the tileset to use */
-    bopti_image_t *tileset;
-    int tileset_size;
-
-    /* contain the properties of the tiles */
-    /* this is given by the layer Walkable of the map in Tiled 
-    */
-    short *walkable;
-
-    /* list of all the tiles */
-    short *layers[];
-
-
-} Map;
-
-
-#endif
--- a/src/player.c
+++ b/src/player.c
@ -1,5 +1,6 @@
 #include "player.h"
 #include "map.h"
+#include "config.h"
 #include <gint/display.h>

 const char one_px_mov[8] = {
@ -25,23 +26,28 @@ const char damage_taken_walkable[WALKABLE_TILE_MAX] = {

 extern bopti_image_t demo_player_img;

-void player_draw(Player *player) {
+
+void player_draw(Game *game) {
+    Player *player = &game->player;
    dimage(player->px-P_WIDTH/2, player->py-P_HEIGHT/2, &demo_player_img);
 }

-void player_move(Map *map_level, Player *player, Direction direction) {
+void player_move(Game *game, Direction direction) {  
+    Player *player = &game->player;
+
    /* How this player movement will modify the player x and y. */
    char dx, dy;
    /* If the player will collide with a hard tile or if the will go outside of
     * the map. */
-    if(player_collision(map_level, player, direction, P_CENTER)){
+    if(player_collision(game, direction, P_CENTER)){
        /* If the will collide with the center of the player. */
        dx = one_px_mov[direction*2]*player->speed;
        dy = one_px_mov[direction*2+1]*player->speed;
-        player_fix_position(player, dx, dy);
-    }else{
-        if(player_collision(map_level, player, direction, P_RIGHTDOWN) ||
-           player_collision(map_level, player, direction, P_LEFTUP)){
+        player_fix_position(game, dx, dy);
+    }
+    else{
+        if(player_collision(game, direction, P_RIGHTDOWN) ||
+           player_collision(game, direction, P_LEFTUP)){
            /* If the will collide with the edges of the player. */
            /* I fix his position so he won't be partially in the tile. */
            /* I invert dx and dy to fix the axis where he is not moving on. */
@ -49,7 +55,7 @@ void player_move(Map *map_level, Player *player, Direction direction) {
             */
            dx = one_px_mov[direction*2]*player->speed;
            dy = one_px_mov[direction*2+1]*player->speed;
-            player_fix_position(player, dx==0, dy==0);
+            player_fix_position(game, dx==0, dy==0);
        }
        /* If he won't collide with the center, so I just move him normally */
        dx = one_px_mov[direction*2]*player->speed;
@ -59,12 +65,15 @@ void player_move(Map *map_level, Player *player, Direction direction) {
    }
 }

-void player_action(Player *player) {
-    /**/
+void player_action(Game *game) {
+    /* TODO */
 }

-bool player_collision(Map *map_level, Player *player, Direction direction,
-                      Checkpos nomov_axis_check) {
+bool player_collision(Game *game, Direction direction,
+                      Checkpos nomov_axis_check) {   
+
+    Player *player = &game->player;
+
    /* Where is the tile where he will go to from his position. */
    char dx = one_px_mov[direction*2];
    char dy = one_px_mov[direction*2+1];
@ -83,7 +92,7 @@ bool player_collision(Map *map_level, Player *player, Direction direction,
    else player_tile_x = player_tile_x/T_WIDTH;
    if(player_tile_y < 0) player_tile_y = player_tile_y/T_HEIGHT-1;
    else player_tile_y = player_tile_y/T_HEIGHT;
-    int on_walkable = get_walkable(map_level, player_tile_x, player_tile_y);
+    int on_walkable = get_walkable(game, player_tile_x, player_tile_y);
    int speed = on_walkable >= 0 && on_walkable < WALKABLE_TILE_MAX ?
                          walkable_speed[on_walkable] : 0;
    /* if he's on a hard tile */
@ -94,14 +103,19 @@ bool player_collision(Map *map_level, Player *player, Direction direction,
    return false; /* He won't collide with a hard tile. */
 }

-void player_fix_position(Player *player, bool fix_x, bool fix_y) {
+void player_fix_position(Game *game, bool fix_x, bool fix_y) {
+
+    Player *player = &game->player;
    /* I fix his poition on x or/and on y if y need to, so that he won't be over
     * the hard tile that he collided with. */
    if(fix_x) player->x = player->x/T_WIDTH*T_WIDTH+P_WIDTH/2;
    if(fix_y) player->y = player->y/T_HEIGHT*T_HEIGHT+P_HEIGHT/2;
 }

-void player_damage(Player *player, int amount) {
+void player_damage(Game *game, int amount) {
+
+    Player *player = &game->player;
+    
    player->life-=amount;
    /* TODO: Let the player dye if life < 1. */
 };
--- a/src/player.h
+++ b/src/player.h
@ -10,56 +10,43 @@
    #define P_HEIGHT 8
 #endif

-/* SPEED should NOT be 8 or bigger: it this may cause bugs when handling
+/* SPEED should NOT be 8 or bigger: it may cause bugs when handling
 * collisions! */
 #define SPEED PXSIZE*2

 #include <stdbool.h>

-#include "mapstruct.h"
+#include "game.h"
 #include "memory.h"

-/* The direction where the player is going to. */
-typedef enum {
-    D_UP,
-    D_DOWN,
-    D_LEFT,
-    D_RIGHT
-} Direction;

-typedef enum {
-    P_LEFTUP = -1,
-    P_CENTER = 0,
-    P_RIGHTDOWN = 1
-} Checkpos;
+/* Structure 'Player' has been moved to game.h */
+/* to avoid circular references between map.h, game.h and player.h */
+/* only methods propotypes are now in dedicated header files */

-/* Struct that define player parameters */
-typedef struct {
-    int x, y; /* The position of the player */
-    unsigned int px, py; /* The position of the player on screen */
-    unsigned short int life; /* How many lives the player still has between 0
-                              * and 100. */
-    char speed; /* The speed of the movement of the player. */
-} Player;

 /* Draws the player player. This function should be called after drawing the
 * map! */
-void player_draw(Player *player);
+void player_draw(Game *game);

 /* Move the player player in the direction direction. */
-void player_move(Map *map_level, Player *player, Direction direction);
+void player_move(Game *game, Direction direction);

 /* (Mibi88) TODO: Describe this function please, I've no idea what she's for! */
-void player_action(Player *player);
+void player_action(Game *game);

 /* Check if the player is in collision with the map or a NPC. Checkpos is used
 * to check the axis where the player is not moving. */
-bool player_collision(Map *map_level, Player *player, Direction direction,
+bool player_collision(Game *game, Direction direction,
                      Checkpos nomov_axis_check);

 /* Fix the position of the player so that he's not a bit inside of a hard block
 * after a collision. */
-void player_fix_position(Player *player, bool fix_x, bool fix_y);
+void player_fix_position(Game *game, bool fix_x, bool fix_y);
+
+
+/* Apply damage to player */
+void player_damage(Game *game, int amount);

 #endif
Author	SHA1	Message	Date
Sylvain PILLOT	e012e5a428	A loooooooot of refactoring to make the function calls easier and more consistant	2023-08-11 08:54:04 +02:00
Sylvain PILLOT	1bf630dfcb	refactor structures to pack everything in typedef struct Game	2023-08-11 08:04:17 +02:00
Lephenixnoir	fe2492b7de	fix buggy access to converted map	2023-08-10 18:33:17 +02:00
Sylvain PILLOT	16a198bc64	try to find the source of the bug (need to get map data correctly filled) in map with converter.py	2023-08-10 16:22:31 +02:00
Sylvain PILLOT	d84fd7f886	Cleaned CMakeLists.txt	2023-08-08 09:52:34 +02:00
Sylvain PILLOT	53b0ddf750	converter.py correctly reads and treat maps in world file (importation into data structure in C files not fully working yet	2023-08-08 09:46:07 +02:00
Sylvain PILLOT	7d04e62848	corrected maps + start implementing world with multiple maps	2023-08-03 21:55:51 +02:00
Sylvain PILLOT	f805cf7b16	added map level3.tmx	2023-08-03 08:11:39 +02:00
Sylvain PILLOT	5e0612f7ec	corrected maps level1.tmx and level2.tmx to get correct split per layer	2023-08-02 19:37:29 +02:00
Sylvain PILLOT	d3684acaed	clean mapstruct.h from useless structures	2023-08-01 22:39:21 +02:00
Sylvain PILLOT	e0e4140c9b	Made map importation from tmx a bit cleaner + map structure slightly lighter	2023-08-01 22:26:59 +02:00
mibi88	5a1ba659a7	Added some line jumps & some improvements	2023-07-20 13:34:13 +02:00
mibi88	dd39c30be9	Mise à jour de 'README.md'	2023-07-20 13:32:37 +02:00
mibi88	6f4ff02f51	I'll merge that, if newline support and/or support for words that don't fit in the screen is needed, I'll make another PR. Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/25	2023-07-20 13:26:28 +02:00