From 7d04e62848ae50e8c7f87fafe956ea5bb9848553 Mon Sep 17 00:00:00 2001
From: SlyVTT <pillot.sylvain@gmail.com>
Date: Thu, 3 Aug 2023 21:55:51 +0200
Subject: [PATCH] corrected maps + start implementing world with multiple maps

---
 CMakeLists.txt     |   9 ++++
 assets-cg/font.png | Bin 1205 -> 16882 bytes
 assets/level0.tmx  |  15 +++++--
 assets/level1.tmx  |  45 ++++++++++----------
 assets/level2.tmx  |  94 ++++++++++++++++++++---------------------
 assets/level3.tmx  | 102 ++++++++++++++++++++++-----------------------
 src/config.h       |  16 +++++++
 src/map.c          |   1 +
 src/map.h          |  14 -------
 src/mapdata.h      |   3 ++
 src/mapstruct.h    |  19 +++++++++
 src/player.c       |   2 +
 12 files changed, 179 insertions(+), 141 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d36cab6..3b2875c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,17 @@ add_custom_command(
 	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets/  
 
   OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level0.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level1.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level2.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level3.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
+    assets/level1.tmx
+    assets/level2.tmx
+    assets/level3.tmx
 # if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
   )
 
@@ -46,6 +52,9 @@ set(SOURCES
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
 set(ASSETS
   assets/level0.json
+  assets/level1.json
+  assets/level2.json
+  assets/level3.json
   # ...
 )
 
diff --git a/assets-cg/font.png b/assets-cg/font.png
index 1b1622c91839afc5568547605878ec71630b0220..73c724448cd4fec6e35243e777851e890a625acc 100644
GIT binary patch
literal 16882
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
Y3c6@2Gd%LXt#SY<F?rD%VZ)&R1IPZyDF6Tf

delta 1187
zcmZWnZB)`{9MxGf9cjz3Y^J9?R+?p-I%9^E`JSXvVq#{d2#RUGg@Nv0QD>`A+R#!^
z^oZyo6;_6pO0KhIt0Xf71QnOgS45LH3nts2^>NR)=lt$-pZmM_YADtMyW1YXnv$r{
z!zYVt)U_k%$^DQpdSZ!Z$@qI_^$*T{+#NH2+(lm#rksUNo%;GU*QsT(Yc)AkN<&gd
z%{+VqEL2O|V*7rhauG4!;$hVOQ+Yq$MyA;q;v~vJx^6=KW_5jN|Do*xkhsY8HvhY7
z1wZS&0Di;0D<IP$C)?{ot*`P0#?Aix#v7E7ti^&idnCQ}A2A}Vm)@OrGi##$HltI!
z;qp2TfkzM_p%*|_2YV-2zPO48&bGR4+IeoK{tA?fO$0{{4)&C}-U8pJhqnh1ZH1`S
zFBp7@&yqM+x7H%9{Xw7;qdFiDh>JuP=Qce+PyKk#yqs!AE5!ksii5-zYB!NmH9a45
zSK+TO=oMxsA&Rp;eBaa8_SZ*_;nAHm?I@ODjv&{Led)+Jll~BqXCb<rvvx2|_8F(L
z>uLiVA3lkzF=fQ%izij;@PQp$xt-@cKEXO3%gP{b&hV@Xpxn%=pY0UVAL>U47OiDA
zI+$!?_dxeM(QprXK?T<?k<iiUK(202g*+Gs`4e=Z&suSjCcWr5%ub_eN(TGLXM&_M
zcwtIH6|pned1Rl1J=bnYl#V!|Q8&`^G~Pfuk-p66EI`Bs&(g~e)}niqbpO>;0_f5x
zuuX*8^&TK5!4L#XV#*kNlk|5`$9P>-7GErXR*k7d@_^(1dPN-`S;oS-JT?j0tjGaz
zGg>Q{j8Ly!1G5^n#sK+J!-5}1^0s}RUUt0Y03r`Av;`R_9o}4GHOhPqt;T+K|4S7I
z&w>-OWrmaBtl%44K*ImPQhgw`x41x2y`rF8%YLbKQS;U9h6FpW^7y*Vud51H`a7UT
z(_X}Z-Hp>^Pp<Ji#B+-AGzv<+=Q2Fj*ld`Y(}&*F^ca1v|80W51G`|z2=No_{N%%?
zwp|ahGsf#&7=H8ZiY#t)_Sgv*6gsk0h;nrWMwu@NV=bKTew8!1NO8~#39$66uQu%4
zBc<_OZm=WbTdj!oZ4snPeWVL(u-(xP*lD=hyJ+3Zl=EmMV5x14dwt8{-tvg#WuwG3
zxsvOS9f03i{Rxwl!>)N!_^2ymwH9d$;tJJ14aJn;6dfk>)tioB@3(FoJP-_YD5Nuf
z`LmhZ{)6N+7gHt#Q$<bvHKZM6-ZY+-cE3%fme%?xj<S`w3bQ4g)@ST$jOFWJz!q}@
zz*31`C}Wt~Qk=m#m#(@|C?c0UCko}v=Ms6ui(CCob6~JmvADoPYBADuu(brmX^q$6
z6*D-%P~@u-4EyO>r^7vjZdJfBzBS0Z@HxJ)tnrC*gM`Y%QA1YtGuwEl6T}{R2;UlX
z6;@4=I-+^xFj0reJ9mppjvb()%y8u;8}P0Fq9}c)Vi1=2u`AHDux!U{p3oVHvF+x?
v)Rd)_<3UIFWs3V9L6+3LZlbS-7?x1ogJfw6{l=VGEAT{x9Sh}!oW1%lDEeiS

diff --git a/assets/level0.tmx b/assets/level0.tmx
index d182d19..0fd416f 100644
--- a/assets/level0.tmx
+++ b/assets/level0.tmx
@@ -1,11 +1,10 @@
 <?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"/>
- <tileset firstgid="413" source="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
  <layer id="1" name="Background" width="48" height="24">
   <data encoding="csv">
 2,297,298,299,300,2,386,297,298,299,300,2,2,2,2,2,2,337,338,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,2,2,2,345,346,347,348,2,337,338,
@@ -62,7 +61,7 @@
 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,
@@ -90,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>
diff --git a/assets/level1.tmx b/assets/level1.tmx
index d2f7a30..9fd42bb 100644
--- a/assets/level1.tmx
+++ b/assets/level1.tmx
@@ -1,8 +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="4" nextobjectid="1">
- <tileset firstgid="1" source="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
- <tileset firstgid="409" source="../../Collab_RPG_Fcalva4/assets/Walkable.tsx"/>
- <tileset firstgid="413" source="Walkable.tsx"/>
+ <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,
@@ -59,32 +58,32 @@
 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" visible="0">
+ <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,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,410,410,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,
-0,0,0,416,416,416,416,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,416,416,416,416,416,416,416,416,0,0,0,0,416,416,
-0,0,416,416,416,416,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,
-414,416,416,416,416,416,416,416,416,416,416,416,416,416,0,0,410,410,0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,
-0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,0,0,0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,
-0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,0,0,416,416,416,416,416,416,416,416,416,416,416,
-0,0,0,416,416,416,416,416,416,0,0,0,416,416,416,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,416,416,416,416,416,416,
-0,0,0,0,416,416,416,416,0,0,0,0,416,416,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,416,416,
-410,410,410,410,410,410,0,0,0,0,0,0,0,0,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,416,416,416,
-0,0,0,0,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,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,410,410,0,0,0,0,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,0,0,0,414,414,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,410,410,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,410,410,0,0,0,0,0,0,0,0,0,0,
-410,410,410,410,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,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,410,410,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,0,414,414,0,0,0,0,0,0,
-0,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,0,0,0,0,0,0,0,0,0,410,410,410,0,0,0,0,0,0,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,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,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>
diff --git a/assets/level2.tmx b/assets/level2.tmx
index 31132d1..0d65f1f 100644
--- a/assets/level2.tmx
+++ b/assets/level2.tmx
@@ -1,41 +1,39 @@
 <?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="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
- <tileset firstgid="409" source="../../Collab_RPG_Fcalva4/assets/Walkable.tsx"/>
- <tileset firstgid="413" source="Walkable.tsx"/>
- <tileset firstgid="417" source="tilesetnpp.tsx"/>
+ <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,802,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,802,2,2,2,2,2,277,2,386,266,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,297,298,299,300,2,2,2,
-714,715,716,2,2,2,2,2,2,2,2,301,2,266,290,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,2,2,2,
-2,2,2,2,2,2,2,2,2,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,2,2,2,281,2,266,290,2,280,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,283,283,3,91,87,88,92,3,312,288,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,290,266,2,2,2,2,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,2,2,283,283,3,114,114,115,114,3,312,312,132,2,2,
-2,2,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,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,802,369,370,371,372,2,266,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,312,132,2,2,
-2,2,2,2,2,2,802,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,2,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,2,2,2,2,2,2,2,2,2,2,330,331,331,331,331,331,331,331,331,336,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,2,802,802,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,2,2,2,2,2,2,2,2,2,2,2,2,290,265,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,234,290,265,237,2,2,2,2,2,2,
-2,2,2,2,2,2,297,298,299,300,2,2,2,386,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,160,161,802,386,266,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,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,802,802,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,2,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,802,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,802,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,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">
-666,667,668,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,
-690,691,692,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,
+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,
@@ -60,31 +58,31 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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" visible="0">
+ <layer id="3" name="Walkable" width="48" height="24">
   <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,
-0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,414,414,0,0,0,0,
-414,414,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,414,414,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,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,414,414,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,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,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,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,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,414,414,0,0,414,414,414,414,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,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,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,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,410,410,410,410,410,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,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,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,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,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,0,0,0,0,0,0,0,0,410,410,410,410,410,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,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,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,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,0,0,410,410,410,410,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,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,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,0,0,0,0,414,414,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,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,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>
diff --git a/assets/level3.tmx b/assets/level3.tmx
index 8a30759..f260e15 100644
--- a/assets/level3.tmx
+++ b/assets/level3.tmx
@@ -1,35 +1,33 @@
 <?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="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
- <tileset firstgid="409" source="../../Collab_RPG_Fcalva4/assets/Walkable.tsx"/>
- <tileset firstgid="413" source="Walkable.tsx"/>
- <tileset firstgid="417" source="tilesetnpp.tsx"/>
+ <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,418,418,713,714,715,716,418,418,418,418,713,714,715,716,418,418,418,418,418,418,339,340,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,
-2,418,418,418,418,418,418,418,418,418,418,418,418,418,2,418,418,385,385,418,418,363,364,418,418,418,418,387,418,418,386,418,418,386,418,258,259,260,261,261,261,261,262,263,264,418,339,340,
-281,179,180,181,179,180,179,181,179,180,179,180,179,180,281,418,418,418,418,418,418,418,418,418,418,418,418,418,385,418,418,418,418,418,418,282,283,284,285,285,285,285,286,287,288,418,363,364,
-325,386,385,386,266,386,386,386,385,265,386,386,385,386,325,418,258,259,260,261,261,261,261,261,262,263,264,418,418,418,418,418,418,418,418,306,307,308,309,309,309,309,310,311,312,131,418,418,
-277,385,385,386,290,386,385,386,386,266,386,385,386,386,277,418,282,283,284,285,285,285,285,285,286,287,288,418,418,418,418,418,418,418,418,330,331,332,333,333,333,333,334,335,336,132,418,418,
-301,386,386,385,314,386,386,385,386,290,386,386,385,386,301,418,306,307,308,309,309,309,309,309,310,311,312,131,418,418,418,418,418,418,418,162,163,164,162,163,164,165,163,164,165,132,418,418,
-325,313,290,265,313,265,241,290,313,314,290,241,313,290,325,418,330,331,332,333,333,333,333,333,334,335,336,132,418,418,418,418,418,418,418,86,87,88,186,187,188,189,90,91,92,132,418,418,
-349,418,2,2,2,2,2,2,2,2,418,418,418,418,349,418,162,163,164,162,163,164,165,162,163,164,165,132,418,297,298,299,300,418,418,110,111,112,210,211,212,213,114,115,116,133,418,418,
-387,418,2,2,2,2,2,2,2,2,418,418,418,418,418,418,86,87,88,186,187,188,189,86,87,88,92,132,418,418,418,418,418,385,418,418,418,418,418,265,266,418,418,418,418,418,418,418,
-418,418,258,259,260,261,261,262,263,264,418,21,22,23,24,418,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,418,160,161,385,418,418,387,
-418,418,282,283,284,285,285,286,287,288,418,45,46,47,48,418,418,418,418,418,265,266,418,418,418,418,418,313,290,265,313,265,313,266,290,289,290,265,266,313,314,418,418,418,418,418,418,418,
-418,418,306,307,308,309,309,310,311,312,131,69,70,71,72,418,266,265,266,266,265,386,160,161,418,386,418,265,265,266,241,418,258,259,260,261,261,262,263,264,418,418,418,418,418,418,418,418,
-386,418,330,331,332,333,333,334,335,336,132,418,418,418,418,266,290,289,290,265,266,290,266,265,266,266,265,289,289,290,386,418,282,283,284,285,285,286,287,288,418,418,418,418,418,418,418,418,
-418,418,162,163,165,162,163,163,165,165,132,418,313,290,265,313,265,418,418,418,418,418,290,289,290,265,266,313,313,314,241,418,306,307,308,309,309,310,311,312,131,418,418,418,418,418,418,418,
-418,418,86,87,88,186,187,188,189,92,132,418,265,266,266,418,258,259,260,261,261,261,261,261,261,262,263,264,418,265,266,418,330,331,332,333,333,334,335,336,132,418,418,418,418,418,418,418,
-418,418,110,111,112,210,211,212,213,116,133,418,289,290,418,418,282,283,284,285,285,285,285,285,285,286,287,288,418,289,290,418,162,163,164,162,163,164,165,165,132,418,418,297,298,299,300,418,
-418,418,418,418,418,418,265,266,418,418,418,386,313,314,418,418,306,307,308,309,309,309,309,309,309,310,311,312,131,241,265,418,86,87,88,186,187,188,189,92,132,418,418,418,418,418,418,418,
-418,418,418,386,418,418,289,290,160,161,418,418,265,266,418,418,330,331,332,333,333,333,333,333,333,334,335,336,132,266,266,418,110,111,112,210,211,212,213,116,133,418,418,418,418,418,386,418,
-418,418,418,418,418,418,313,314,289,265,266,290,289,290,418,418,162,163,164,165,162,163,164,162,163,163,165,165,132,265,266,241,418,418,418,418,265,266,418,418,418,418,418,418,418,418,386,418,
-265,266,266,265,386,313,265,266,265,266,313,314,313,314,266,418,86,87,88,90,90,87,88,186,187,188,189,92,132,289,289,290,266,265,266,266,289,290,418,160,161,418,21,22,23,24,418,418,
-289,290,265,266,290,418,418,418,418,418,418,418,266,265,266,418,110,111,112,114,114,111,112,210,211,212,213,116,133,241,313,314,290,289,290,265,313,314,418,386,418,418,45,46,47,48,418,418,
-418,418,418,418,418,418,418,418,418,386,418,418,418,265,266,418,418,418,418,418,418,418,418,418,265,266,418,418,418,418,345,346,347,348,418,339,340,418,418,418,418,418,69,70,71,72,418,418,
-418,297,298,299,300,418,418,339,340,418,418,2,2,289,290,266,265,266,266,265,386,265,266,266,289,290,418,160,161,418,369,370,371,372,418,363,364,418,418,418,418,418,418,418,418,418,418,418,
-418,418,418,418,386,418,418,363,364,418,418,418,418,313,314,290,289,290,265,266,290,289,290,265,313,314,418,418,385,418,393,394,395,396,418,418,418,418,418,418,418,387,418,418,418,386,418,418
+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">
@@ -62,30 +60,30 @@
  </layer>
  <layer id="3" name="Walkable" width="48" height="24">
   <data encoding="csv">
-0,0,0,0,414,414,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,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,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,0,0,0,0,414,0,0,0,0,0,0,0,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,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,414,414,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,414,414,414,414,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,414,414,0,0,0,414,414,414,414,0,0,414,414,414,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,414,414,414,414,0,0,0,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,414,414,414,414,414,0,414,414,414,414,0,414,414,414,414,0,0,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,414,
-0,0,414,0,0,0,0,0,0,414,0,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,0,0,0,0,0,0,0,0,0,0,
-0,0,414,0,0,0,0,0,0,414,0,414,414,414,414,0,0,0,0,0,0,0,414,414,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,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,
-0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,
-0,0,414,0,0,414,414,414,414,414,0,0,0,0,0,0,414,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,
-0,0,414,414,414,414,0,0,414,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,414,414,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,414,0,0,414,414,414,414,414,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,414,414,414,414,0,0,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,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,414,414,0,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,414,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,414,414,414,414,0,414,414,0,0,0,0,0,414,414,414,414,0,0,
-0,0,414,414,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,414,414,414,414,0,414,414,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,414,0,0,0,0,0,0,0,414,0,0,0,0,0,0
+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>
diff --git a/src/config.h b/src/config.h
index c434419..ea1b966 100644
--- a/src/config.h
+++ b/src/config.h
@@ -8,4 +8,20 @@
 
 #define USB_FEATURE 0
 
+
+#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
diff --git a/src/map.c b/src/map.c
index dbd0ea5..977c7c0 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,4 +1,5 @@
 #include "map.h"
+#include "config.h"
 
 #include <gint/display.h>
 
diff --git a/src/map.h b/src/map.h
index 37d3eef..3b3de33 100644
--- a/src/map.h
+++ b/src/map.h
@@ -2,20 +2,6 @@
 #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
 
diff --git a/src/mapdata.h b/src/mapdata.h
index 5af7705..e1ae6a5 100644
--- a/src/mapdata.h
+++ b/src/mapdata.h
@@ -2,6 +2,9 @@
 #define MAPDATA_H
 
 extern Map map_level0;
+extern Map map_level1;
+extern Map map_level2;
+extern Map map_level3;
 
 #endif
 
diff --git a/src/mapstruct.h b/src/mapstruct.h
index 56fe1c3..7ac7d9a 100644
--- a/src/mapstruct.h
+++ b/src/mapstruct.h
@@ -26,4 +26,23 @@ typedef struct {
 } Map;
 
 
+
+typedef struct {
+
+    /* numberof maps in the world */
+    uint16_t nbmaps;
+
+    /* table of coordinates for each map, each is a table of nbmaps elements */
+    /* area of map N is given by (xmin[N], ymin[N]) --> (xmax[N], ymax[N]) */
+    uint16_t *xmin;
+    uint16_t *ymin;
+    uint16_t *xmax;
+    uint16_t *ymax;
+
+    /* pointer to the currentmap*/
+    Map *currentmap; 
+
+} World;
+
+
 #endif
diff --git a/src/player.c b/src/player.c
index 22057da..b466f56 100644
--- 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] = {
@@ -27,6 +28,7 @@ extern bopti_image_t demo_player_img;
 
 void player_draw(Player *player) {
     dimage(player->px-P_WIDTH/2, player->py-P_HEIGHT/2, &demo_player_img);
+    dprint( 10, 10, C_RED, "X= %d - Y= %d", player->x, player->y );
 }
 
 void player_move(Map *map_level, Player *player, Direction direction) {