From 71db6116e43d2c1233cfbc4e8f6cdaa079a3667e Mon Sep 17 00:00:00 2001
From: Lucy Veron <lucymveron@gmail.com>
Date: Sun, 16 Jun 2019 17:09:42 +0200
Subject: Added layers to map, new tree

---
 resources/map.tmx     |  32 ++++++++++++++++++++++++++++----
 resources/tileset.png | Bin 669 -> 2006 bytes
 resources/tileset.tsx |   4 ++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/resources/map.tmx b/resources/map.tmx
index ac97e2c..99d8f4b 100644
--- a/resources/map.tmx
+++ b/resources/map.tmx
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="3" columns="3">
-  <image source="tileset.png" width="48" height="16"/>
+<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
+ <tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="15" columns="3">
+  <image source="tileset.png" width="48" height="80"/>
  </tileset>
- <layer id="1" name="Tile Layer 1" width="20" height="20">
+ <layer id="1" name="Ground" width="20" height="20">
   <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,
@@ -25,6 +25,30 @@
 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,3,3,
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+</data>
+ </layer>
+ <layer id="2" name="Trees" width="20" height="20">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+4,5,4,5,4,5,4,5,0,0,0,0,0,4,5,4,5,4,5,4,
+7,8,7,8,7,8,7,8,0,0,0,0,0,7,8,7,8,7,8,7,
+10,11,10,11,10,11,10,11,0,0,0,0,0,10,11,10,11,10,11,10,
+13,14,13,14,13,14,13,14,0,0,0,0,0,13,14,13,14,13,14,13,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
diff --git a/resources/tileset.png b/resources/tileset.png
index 681f505..042f4c4 100644
Binary files a/resources/tileset.png and b/resources/tileset.png differ
diff --git a/resources/tileset.tsx b/resources/tileset.tsx
index d3f1cf4..651dc84 100644
--- a/resources/tileset.tsx
+++ b/resources/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.2" tiledversion="1.2.1" name="tileset" tilewidth="16" tileheight="16" tilecount="3" columns="3">
- <image source="tileset.png" width="48" height="16"/>
+<tileset version="1.2" tiledversion="1.2.3" name="tileset" tilewidth="16" tileheight="16" tilecount="15" columns="3">
+ <image source="tileset.png" width="48" height="80"/>
 </tileset>
-- 
cgit v1.2.3