wip

CREDITS

@@ -0,0 +1 @@
+Palm tree: Warlock's Gauntlet artists - rAum, jackFlower, DrZoliparia, Neil2D (https://opengameart.org/content/top-down-foliage-collection)

resources/map1.tmx

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="112" height="64" tilewidth="5" tileheight="5" infinite="0" nextlayerid="3" nextobjectid="1">
+<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="112" height="64" tilewidth="5" tileheight="5" infinite="0" nextlayerid="7" nextobjectid="8">
  <tileset firstgid="1" source="terrain.tsx"/>
+ <tileset firstgid="2001" source="trees_64x64.tsx"/>
+ <tileset firstgid="2010" source="trees_32x32.tsx"/>
  <imagelayer id="2" name="background">
   <image source="map1bg.png" width="560" height="320"/>
  </imagelayer>
- <layer id="1" name="terrain" width="112" height="64">
+ <imagelayer id="6" name="roofs">
+  <image source="roofs.png" width="560" height="320"/>
+ </imagelayer>
+ <layer id="1" name="terrain" width="112" height="64" visible="0">
   <data encoding="csv">
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,4,4,4,4,4,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,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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,4,4,4,4,4,4,4,4,4,5,4,4,5,4,4,4,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,4,4,4,4,4,4,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,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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,4,4,4,4,4,4,4,4,4,5,4,4,5,4,4,4,
@@ -72,4 +77,92 @@
 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,4,7,7,7,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,4,4,4,4,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,4,4
 </data>
  </layer>
+ <layer id="3" name="decor" width="112" height="64">
+  <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,2010,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2010,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2010,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
+ <objectgroup id="4" name="interior">
+  <object id="2" x="29" y="112">
+   <polygon points="0,0 0,56 29.25,56 28.75,49.25 63.75,50 64,-5.5 37.5,-4.5 37.75,-0.25"/>
+  </object>
+  <object id="3" x="115.5" y="247.5">
+   <polygon points="0,0 15.25,71.75 181.75,40.75 159.25,-27.25"/>
+  </object>
+  <object id="4" x="230" y="223.5">
+   <polygon points="0,0 55,-14 50,-48.75 119.25,-56.5 139.25,54.5 12,80.25"/>
+  </object>
+  <object id="5" x="363.25" y="177">
+   <polygon points="0,0 67.75,-10.75 71.75,51.75 6.5,55.75"/>
+  </object>
+  <object id="6" x="435.75" y="171">
+   <polygon points="0,0 -0.5,93 75.25,92.75 73.75,-0.75"/>
+  </object>
+  <object id="7" x="275" y="9.75">
+   <polygon points="0,0 204,-6 202.75,82 -0.75,87"/>
+  </object>
+ </objectgroup>
 </map>

resources/trees_32x32.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.5" tiledversion="1.6.0" name="trees_32x32" tilewidth="32" tileheight="32" tilecount="100" columns="10">
+ <image source="trees_32x32.png" width="320" height="320"/>
+</tileset>

resources/trees_64x64.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.5" tiledversion="1.6.0" name="trees_64x64" tilewidth="64" tileheight="64" tilecount="9" columns="3">
+ <image source="trees_64x64.png" width="192" height="192"/>
+</tileset>

src/map/decor.rs

@@ -0,0 +1,61 @@
+use crate::map::util::extract_image_from_tileset;
+use ggez::graphics;
+use std::collections::HashMap;
+use std::path::Path;
+use tiled::{Image as TiledImage, Layer, Tileset};
+
+pub struct DecorTile {
+    pub tileset_i: usize, // Used to rely tileset/sprite_batch in Decor
+    pub tile_width: u32,
+    pub tile_height: u32,
+    pub relative_tile_width: f32,
+    pub relative_tile_height: f32,
+    pub tile_x: u32,
+    pub tile_y: u32,
+}
+
+impl DecorTile {
+    pub fn new(
+        tileset_i: usize, // Used to rely tileset/sprite_batch in Decor
+        tile_width: u32,
+        tile_height: u32,
+        relative_tile_width: f32,
+        relative_tile_height: f32,
+        tile_x: u32,
+        tile_y: u32,
+    ) -> Self {
+        Self {
+            tileset_i,
+            tile_width,
+            tile_height,
+            relative_tile_width,
+            relative_tile_height,
+            tile_x,
+            tile_y,
+        }
+    }
+}
+
+pub struct Decor {
+    pub layer: Layer,
+    pub tilesets: Vec<Tileset>,
+    pub images: Vec<TiledImage>,
+    // FIXME (u32, u32) -> GridPoint
+    pub tiles: HashMap<(u32, u32), DecorTile>,
+}
+
+impl Decor {
+    pub fn new(
+        layer: Layer,
+        tilesets: Vec<Tileset>,
+        images: Vec<TiledImage>,
+        tiles: HashMap<(u32, u32), DecorTile>,
+    ) -> Self {
+        Self {
+            layer,
+            tilesets,
+            images,
+            tiles,
+        }
+    }
+}

src/map/mod.rs

@@ -1,75 +1,32 @@
-pub mod tile;
-
-use crate::map::tile::Tile;
-use ggez::GameError;
-use ggez::GameResult;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::BufReader;
 use std::path::Path;
+
+use ggez::GameError;
+use ggez::GameResult;
 use tiled::{
-    parse_with_path, Image as TiledImage, Layer, LayerData, Map as TiledMap, Orientation,
-    PropertyValue, Tileset,
+    parse_with_path, Image as TiledImage, Image, ImageLayer, Layer, LayerData, Map as TiledMap,
+    Orientation, PropertyValue, Tileset,
 };
 
-fn get_tile_from_terrain_tileset_with_id(
-    terrain_tileset: &Tileset,
-    id: u32,
-    terrain_image_width: u32,
-    terrain_image_height: u32,
-) -> GameResult<Tile> {
-    for tile in terrain_tileset.tiles.iter() {
-        if tile.id == id - terrain_tileset.first_gid {
-            let str_id = match tile.properties.get("ID") {
-                None => {
-                    return GameResult::Err(GameError::ResourceLoadError(format!(
-                        "Tile {} have no ID property",
-                        id
-                    )))
-                }
-                Some(property_value) => match property_value {
-                    PropertyValue::StringValue(str_id) => str_id.clone(),
-                    _ => {
-                        return GameResult::Err(GameError::ResourceLoadError(format!(
-                            "Tile {} must have String ID property value",
-                            id
-                        )))
-                    }
-                },
-            };
-
-            let tile_width = terrain_tileset.tile_width;
-            let tile_height = terrain_tileset.tile_height;
-            let relative_tile_width = tile_width as f32 / terrain_image_width as f32;
-            let relative_tile_height = tile_height as f32 / terrain_image_height as f32;
-            let len_by_width = terrain_image_width / tile_width;
-            let tile_y = tile.id / len_by_width;
-            let tile_x = tile.id - (tile_y * len_by_width);
-
-            return GameResult::Ok(Tile::from_str_id(
-                &str_id,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            ));
-        }
-    }
+use crate::map::decor::{Decor, DecorTile};
+use crate::map::terrain::{Terrain, TerrainTile};
+use crate::map::util::{
+    extract_gids, extract_image_from_image_layer, extract_image_from_tileset, extract_layer,
+    extract_tileset, extract_tileset_images, extract_tilesets_containing_gids,
+    get_tileset_i_for_gid,
+};
 
-    return GameResult::Err(GameError::ResourceLoadError(format!(
-        "No tile with {} found",
-        id
-    )));
-}
+pub mod decor;
+pub mod terrain;
+pub mod util;
 
 pub struct Map {
     pub tiled_map: TiledMap,
     pub background_image: TiledImage,
-    pub terrain_image: TiledImage,
-    pub terrain_tileset: Tileset,
-    pub tiles: HashMap<(u32, u32), Tile>,
+    pub terrain: Terrain,
+    pub decor: Decor,
 }
 
 impl Map {
@@ -91,72 +48,30 @@ impl Map {
                 "Map must be orthogonal orientation".to_string(),
             ));
         }
-        // FIXME BS NOW: manage correctly error
-        let background_image = match &(tiled_map.image_layers.first().unwrap()).image.as_ref() {
-            None => {
-                return GameResult::Err(GameError::ResourceLoadError(
-                    "No image layer found in map ".to_string(),
-                ))
-            }
-            Some(image) => image.clone(),
-        };
-
-        let terrain_tileset: Tileset = match tiled_map
-            .tilesets
-            .clone()
-            .into_iter()
-            .filter(|t| t.name == "terrain")
-            .collect::<Vec<Tileset>>()
-            .first()
-        {
-            None => {
-                return GameResult::Err(GameError::ResourceLoadError(
-                    "No terrain tileset found in map ".to_string(),
-                ))
-            }
-            Some(tileset) => tileset.clone(),
-        };
-
-        let terrain_image = {
-            match terrain_tileset.images.first() {
-                None => {
-                    return GameResult::Err(GameError::ResourceLoadError(
-                        "No terrain image found in terrain tileset".to_string(),
-                    ))
-                }
-                Some(terrain_image) => terrain_image.clone(),
-            }
-        };
 
-        let terrain_layer: Layer = match tiled_map
-            .layers
-            .clone()
-            .into_iter()
-            .filter(|l| l.name == "terrain")
-            .collect::<Vec<Layer>>()
-            .first()
-        {
-            None => {
-                return GameResult::Err(GameError::ResourceLoadError(
-                    "No terrain layer found in map ".to_string(),
-                ))
-            }
-            Some(layer) => layer.clone(),
-        };
+        // Background and roofs
+        let background_image = extract_image_from_image_layer(&tiled_map, "background")?;
+        let roofs_image = extract_image_from_image_layer(&tiled_map, "roofs")?;
+        // let roofs_layer = ...
 
-        let mut tiles: HashMap<(u32, u32), Tile> = HashMap::new();
+        // Terrain
+        let terrain_tileset: Tileset = extract_tileset(&tiled_map, "terrain")?;
+        let terrain_layer: Layer = extract_layer(&tiled_map, "terrain")?;
+        let terrain_image = extract_image_from_tileset(&terrain_tileset)?;
 
-        match terrain_layer.tiles {
+        let mut terrain_tiles: HashMap<(u32, u32), TerrainTile> = HashMap::new();
+        match &terrain_layer.tiles {
             LayerData::Finite(layer_tiles) => {
                 for (x, tiles_row) in layer_tiles.iter().enumerate() {
                     for (y, layer_tile) in tiles_row.iter().enumerate() {
-                        let tile = get_tile_from_terrain_tileset_with_id(
+                        // FIXME BS NOW: et si gid = 0 ?
+                        let tile = terrain::get_tile_from_terrain_tileset_with_id(
                             &terrain_tileset,
                             layer_tile.gid,
                             terrain_image.width as u32,
                             terrain_image.height as u32,
                         )?;
-                        tiles.insert((y as u32, x as u32), tile);
+                        terrain_tiles.insert((y as u32, x as u32), tile);
                     }
                 }
             }
@@ -167,12 +82,67 @@ impl Map {
             }
         }
 
+        let terrain = Terrain::new(terrain_tileset, terrain_layer, terrain_image, terrain_tiles);
+
+        // Decor
+        let mut decor_tiles: HashMap<(u32, u32), DecorTile> = HashMap::new();
+        let decor_layer: Layer = extract_layer(&tiled_map, "decor")?;
+        let decor_tile_gids = extract_gids(&decor_layer)?;
+        let decor_tilesets: Vec<Tileset> =
+            extract_tilesets_containing_gids(&tiled_map, decor_tile_gids);
+        let decor_images: Vec<TiledImage> = extract_tileset_images(&decor_tilesets)?;
+
+        match &decor_layer.tiles {
+            LayerData::Finite(layer_tiles) => {
+                for (x, tiles_row) in layer_tiles.iter().enumerate() {
+                    for (y, layer_tile) in tiles_row.iter().enumerate() {
+                        if layer_tile.gid == 0 {
+                            continue;
+                        }
+
+                        let tileset_i = get_tileset_i_for_gid(layer_tile.gid, &decor_tilesets)
+                            .expect("gid must be find");
+                        let tileset = decor_tilesets
+                            .get(tileset_i)
+                            .expect("Decor tileset must be here");
+                        let image = decor_images.get(tileset_i).expect("Image must exist");
+
+                        let tiled_tile_id = layer_tile.gid - tileset.first_gid;
+                        let tile_width = tileset.tile_width;
+                        let tile_height = tileset.tile_height;
+                        let relative_tile_width = tile_width as f32 / image.width as f32;
+                        let relative_tile_height = tile_height as f32 / image.height as f32;
+                        let len_by_width = image.width as u32 / tile_width;
+                        let tile_y = tiled_tile_id / len_by_width;
+                        let tile_x = tiled_tile_id - (tile_y * len_by_width);
+
+                        let tile = DecorTile::new(
+                            tileset_i,
+                            tile_width,
+                            tile_height,
+                            relative_tile_width,
+                            relative_tile_height,
+                            tile_x,
+                            tile_y,
+                        );
+                        decor_tiles.insert((y as u32, x as u32), tile);
+                    }
+                }
+            }
+            LayerData::Infinite(_) => {
+                return GameResult::Err(GameError::ResourceLoadError(
+                    "Decor layer must be finite".to_string(),
+                ))
+            }
+        }
+
+        let decor = Decor::new(decor_layer, decor_tilesets, decor_images, decor_tiles);
+
         GameResult::Ok(Map {
             tiled_map: tiled_map.clone(),
             background_image: background_image.clone(),
-            terrain_image,
-            terrain_tileset,
-            tiles,
+            terrain,
+            decor,
         })
     }
 }

src/map/terrain.rs

@@ -0,0 +1,190 @@
+use std::collections::HashMap;
+
+use ggez::{GameError, GameResult};
+use tiled::{Image as TiledImage, Layer, PropertyValue, Tileset};
+
+pub enum TerrainTileId {
+    ShortGrass,
+    MiddleGrass,
+    HighGrass,
+    Dirt,
+    Mud,
+    Concrete,
+    BrickWall,
+}
+
+pub struct TerrainTile {
+    pub id: TerrainTileId,
+    pub tile_width: u32,
+    pub tile_height: u32,
+    pub relative_tile_width: f32,
+    pub relative_tile_height: f32,
+    pub tile_x: u32,
+    pub tile_y: u32,
+    pub opacity: f32,
+}
+
+impl TerrainTile {
+    pub fn from_str_id(
+        id: &str,
+        tile_width: u32,
+        tile_height: u32,
+        relative_tile_width: f32,
+        relative_tile_height: f32,
+        tile_x: u32,
+        tile_y: u32,
+    ) -> Self {
+        match id {
+            "ShortGrass" => Self {
+                id: TerrainTileId::ShortGrass,
+                opacity: 0.0,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            },
+            "MiddleGrass" => Self {
+                id: TerrainTileId::MiddleGrass,
+                opacity: 0.1,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            },
+            "HighGrass" => Self {
+                id: TerrainTileId::HighGrass,
+                opacity: 0.2,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            },
+            "Dirt" => Self {
+                id: TerrainTileId::Dirt,
+                opacity: 0.0,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            },
+            "Mud" => Self {
+                id: TerrainTileId::Mud,
+                opacity: 0.1,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            },
+            "Concrete" => Self {
+                id: TerrainTileId::Concrete,
+                opacity: 0.0,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            },
+            "BrickWall" => Self {
+                id: TerrainTileId::BrickWall,
+                opacity: 1.0,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            },
+            &_ => {
+                // FIXME BS NOW: manage errors
+                panic!("Unknown tile id {}", id)
+            }
+        }
+    }
+}
+
+pub struct Terrain {
+    pub tileset: Tileset,
+    pub layer: Layer,
+    pub image: TiledImage,
+    // FIXME (u32, u32) -> GridPoint
+    pub tiles: HashMap<(u32, u32), TerrainTile>,
+}
+
+impl Terrain {
+    pub fn new(
+        tileset: Tileset,
+        layer: Layer,
+        image: TiledImage,
+        tiles: HashMap<(u32, u32), TerrainTile>,
+    ) -> Self {
+        Self {
+            tileset,
+            layer,
+            image,
+            tiles,
+        }
+    }
+}
+
+pub fn get_tile_from_terrain_tileset_with_id(
+    terrain_tileset: &Tileset,
+    id: u32,
+    terrain_image_width: u32,
+    terrain_image_height: u32,
+) -> GameResult<TerrainTile> {
+    for tile in terrain_tileset.tiles.iter() {
+        if tile.id == id - terrain_tileset.first_gid {
+            let str_id = match tile.properties.get("ID") {
+                None => {
+                    return GameResult::Err(GameError::ResourceLoadError(format!(
+                        "Tile {} have no ID property",
+                        id
+                    )))
+                }
+                Some(property_value) => match property_value {
+                    PropertyValue::StringValue(str_id) => str_id.clone(),
+                    _ => {
+                        return GameResult::Err(GameError::ResourceLoadError(format!(
+                            "Tile {} must have String ID property value",
+                            id
+                        )))
+                    }
+                },
+            };
+
+            let tile_width = terrain_tileset.tile_width;
+            let tile_height = terrain_tileset.tile_height;
+            let relative_tile_width = tile_width as f32 / terrain_image_width as f32;
+            let relative_tile_height = tile_height as f32 / terrain_image_height as f32;
+            let len_by_width = terrain_image_width / tile_width;
+            let tile_y = tile.id / len_by_width;
+            let tile_x = tile.id - (tile_y * len_by_width);
+
+            return GameResult::Ok(TerrainTile::from_str_id(
+                &str_id,
+                tile_width,
+                tile_height,
+                relative_tile_width,
+                relative_tile_height,
+                tile_x,
+                tile_y,
+            ));
+        }
+    }
+
+    return GameResult::Err(GameError::ResourceLoadError(format!(
+        "No tile with {} found",
+        id
+    )));
+}

src/map/tile.rs

@@ -1,109 +0,0 @@
-pub enum TileId {
-    ShortGrass,
-    MiddleGrass,
-    HighGrass,
-    Dirt,
-    Mud,
-    Concrete,
-    BrickWall,
-}
-
-pub struct Tile {
-    pub id: TileId,
-    pub tile_width: u32,
-    pub tile_height: u32,
-    pub relative_tile_width: f32,
-    pub relative_tile_height: f32,
-    pub tile_x: u32,
-    pub tile_y: u32,
-    pub opacity: f32,
-}
-
-impl Tile {
-    pub fn from_str_id(
-        id: &str,
-        tile_width: u32,
-        tile_height: u32,
-        relative_tile_width: f32,
-        relative_tile_height: f32,
-        tile_x: u32,
-        tile_y: u32,
-    ) -> Self {
-        match id {
-            "ShortGrass" => Self {
-                id: TileId::ShortGrass,
-                opacity: 0.0,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            },
-            "MiddleGrass" => Self {
-                id: TileId::MiddleGrass,
-                opacity: 0.1,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            },
-            "HighGrass" => Self {
-                id: TileId::HighGrass,
-                opacity: 0.2,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            },
-            "Dirt" => Self {
-                id: TileId::Dirt,
-                opacity: 0.0,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            },
-            "Mud" => Self {
-                id: TileId::Mud,
-                opacity: 0.1,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            },
-            "Concrete" => Self {
-                id: TileId::Concrete,
-                opacity: 0.0,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            },
-            "BrickWall" => Self {
-                id: TileId::BrickWall,
-                opacity: 1.0,
-                tile_width,
-                tile_height,
-                relative_tile_width,
-                relative_tile_height,
-                tile_x,
-                tile_y,
-            },
-            &_ => {
-                // FIXME BS NOW: manage errors
-                panic!("Unknown tile id {}", id)
-            }
-        }
-    }
-}

src/map/util.rs

@@ -0,0 +1,142 @@
+use core::option::Option::{None, Some};
+use ggez::error::{GameError, GameResult};
+use ggez::GameError::GamepadError;
+use tiled::{Image as TiledImage, Layer, LayerData, Map as TiledMap, Tile as TiledTile, Tileset};
+
+pub fn extract_image_from_image_layer(
+    tiled_map: &TiledMap,
+    layer_name: &str,
+) -> GameResult<TiledImage> {
+    for image_layer in tiled_map.image_layers.iter() {
+        if image_layer.name == layer_name {
+            return match &image_layer.image {
+                None => GameResult::Err(GameError::ResourceLoadError(format!(
+                    "No image in image layer {}",
+                    layer_name
+                ))),
+                Some(image) => GameResult::Ok(image.clone()),
+            };
+        }
+    }
+
+    return GameResult::Err(GameError::ResourceLoadError(format!(
+        "Image layer {} not found in map ",
+        layer_name
+    )));
+}
+
+pub fn extract_image_from_tileset(tileset: &Tileset) -> GameResult<TiledImage> {
+    match tileset.images.first() {
+        None => {
+            return GameResult::Err(GameError::ResourceLoadError(
+                "No image found in givenn tileset".to_string(),
+            ))
+        }
+        Some(terrain_image) => GameResult::Ok(terrain_image.clone()),
+    }
+}
+
+pub fn extract_tileset(tiled_map: &TiledMap, tileset_name: &str) -> GameResult<Tileset> {
+    match tiled_map
+        .tilesets
+        .clone()
+        .into_iter()
+        .filter(|t| t.name == tileset_name)
+        .collect::<Vec<Tileset>>()
+        .first()
+    {
+        None => {
+            return GameResult::Err(GameError::ResourceLoadError(format!(
+                "No tileset {} found in map ",
+                tileset_name
+            )))
+        }
+        Some(tileset) => GameResult::Ok(tileset.clone()),
+    }
+}
+
+pub fn extract_layer(tiled_map: &TiledMap, layer_name: &str) -> GameResult<Layer> {
+    match tiled_map
+        .layers
+        .clone()
+        .into_iter()
+        .filter(|l| l.name == layer_name)
+        .collect::<Vec<Layer>>()
+        .first()
+    {
+        None => {
+            return GameResult::Err(GameError::ResourceLoadError(format!(
+                "No {} layer found in map",
+                layer_name
+            )))
+        }
+        Some(layer) => GameResult::Ok(layer.clone()),
+    }
+}
+
+pub fn extract_gids(layer: &Layer) -> GameResult<Vec<u32>> {
+    let mut gids: Vec<u32> = vec![];
+
+    match &layer.tiles {
+        LayerData::Finite(layer_tiles) => {
+            for (x, tiles_row) in layer_tiles.iter().enumerate() {
+                for (y, layer_tile) in tiles_row.iter().enumerate() {
+                    if !gids.contains(&layer_tile.gid) {
+                        gids.push(layer_tile.gid);
+                    }
+                }
+            }
+        }
+        LayerData::Infinite(_) => {
+            return GameResult::Err(GameError::ResourceLoadError(
+                "Layer must be finite".to_string(),
+            ))
+        }
+    }
+
+    GameResult::Ok(gids)
+}
+
+pub fn get_tileset_i_for_gid(gid: u32, tilesets: &Vec<Tileset>) -> GameResult<usize> {
+    for (i, tileset) in tilesets.iter().enumerate() {
+        if gid >= tileset.first_gid && gid < tileset.first_gid + tileset.tilecount.unwrap() {
+            return GameResult::Ok(i);
+        }
+    }
+
+    return GameResult::Err(GameError::ResourceLoadError(format!(
+        "gid {} not found for given tilesets",
+        gid
+    )));
+}
+
+pub fn extract_tilesets_containing_gids(
+    tiled_map: &TiledMap,
+    decor_tile_gids: Vec<u32>,
+) -> Vec<Tileset> {
+    let mut tilesets: Vec<Tileset> = vec![];
+
+    for tileset in tiled_map.tilesets.iter() {
+        for decor_tile_gid in &decor_tile_gids {
+            if *decor_tile_gid >= tileset.first_gid
+                && *decor_tile_gid < tileset.first_gid + tileset.tilecount.unwrap()
+            {
+                if !tilesets.contains(&tileset) {
+                    tilesets.push(tileset.clone());
+                }
+            }
+        }
+    }
+
+    tilesets
+}
+
+pub fn extract_tileset_images(tilesets: &Vec<Tileset>) -> GameResult<Vec<TiledImage>> {
+    let mut images: Vec<TiledImage> = vec![];
+
+    for tileset in tilesets.iter() {
+        images.push(extract_image_from_tileset(tileset)?)
+    }
+
+    GameResult::Ok(images)
+}

src/physics/util.rs

@@ -4,8 +4,8 @@ use crate::{ScenePoint, WindowPoint};
 
 pub fn grid_position_from_scene_point(position: &ScenePoint, map: &Map) -> GridPoint {
     GridPoint::new(
-        (position.x / map.terrain_tileset.tile_width as f32) as i32,
-        (position.y / map.terrain_tileset.tile_height as f32) as i32,
+        (position.x / map.terrain.tileset.tile_width as f32) as i32,
+        (position.y / map.terrain.tileset.tile_height as f32) as i32,
     )
 }
 

src/scene/main.rs

@@ -95,7 +95,7 @@ impl MainState {
         let ui_image = graphics::Image::new(ctx, "/ui.png")?;
         let ui_batch = graphics::spritebatch::SpriteBatch::new(ui_image);
 
-        let terrain_image = graphics::Image::new(ctx, format!("/{}", map.terrain_image.source))?;
+        let terrain_image = graphics::Image::new(ctx, format!("/{}", map.terrain.image.source))?;
         let mut debug_terrain_batch = graphics::spritebatch::SpriteBatch::new(terrain_image);
         debug_terrain_batch = scene::util::update_terrain_batch(debug_terrain_batch, &map);
         let debug_terrain_opacity_mesh_builder =

src/scene/util.rs

@@ -9,7 +9,7 @@ pub fn update_terrain_batch(
     map: &Map,
 ) -> graphics::spritebatch::SpriteBatch {
     terrain_batch.clear();
-    for ((grid_x, grid_y), tile) in map.tiles.iter() {
+    for ((grid_x, grid_y), tile) in map.terrain.tiles.iter() {
         // FIXME pre compute these data ?
         let src_x = tile.tile_x as f32 * tile.relative_tile_width;
         let src_y = tile.tile_y as f32 * tile.relative_tile_height;
@@ -32,7 +32,7 @@ pub fn update_terrain_batch(
 
 pub fn create_debug_terrain_opacity_mesh_builder(map: &Map) -> GameResult<MeshBuilder> {
     let mut debug_terrain_opacity_mesh = MeshBuilder::new();
-    for ((grid_x, grid_y), tile) in map.tiles.iter() {
+    for ((grid_x, grid_y), tile) in map.terrain.tiles.iter() {
         let dest_x = *grid_x as f32 * tile.tile_width as f32;
         let dest_y = *grid_y as f32 * tile.tile_height as f32;
         let color_modifier = 0.6 * tile.opacity;