From a8610d790bcd334f5eca27c87e2065ece683fa6a Mon Sep 17 00:00:00 2001
From: Lucy Veron <lucymveron@gmail.com>
Date: Sat, 22 Jun 2019 14:07:56 +0200
Subject: added animated tiles with attributes

---
 resources/map.tmx     |  76 ++++++++++++++++++++++++++++++++++++++++----------
 resources/tileset.png | Bin 11611 -> 9673 bytes
 resources/tileset.tsx |  16 +++++++++--
 3 files changed, 76 insertions(+), 16 deletions(-)

(limited to 'resources')

diff --git a/resources/map.tmx b/resources/map.tmx
index aa9a7b3..bbc808e 100644
--- a/resources/map.tmx
+++ b/resources/map.tmx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="1">
- <tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="25" columns="5">
-  <image source="tileset.png" width="80" height="80"/>
+<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="1">
+ <tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
+  <image source="tileset.png" width="160" height="80"/>
  </tileset>
  <layer id="1" name="Ground" width="20" height="20">
   <data encoding="csv">
@@ -14,7 +14,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-1,1,1,1,1,1,2,2,2,2,2,2,2,2,1,1,2,2,2,2,
+1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 1,1,1,1,1,1,1,1,2,2,2,2,1,1,1,1,1,1,2,2,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -30,19 +30,19 @@
  <layer id="2" name="Greenery" 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,
-6,7,6,7,6,7,6,7,0,0,0,0,0,6,7,6,7,6,7,6,
 11,12,11,12,11,12,11,12,0,0,0,0,0,11,12,11,12,11,12,11,
-16,17,16,17,16,17,16,17,0,0,0,0,0,16,17,16,17,16,17,16,
 21,22,21,22,21,22,21,22,0,0,0,0,0,21,22,21,22,21,22,21,
+31,32,31,32,31,32,31,32,0,0,0,0,0,31,32,31,32,31,32,31,
+41,42,41,42,41,42,41,42,0,0,0,0,0,41,42,41,42,41,42,41,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,9,10,18,19,0,0,0,0,0,0,0,0,
-0,0,0,0,0,10,0,0,0,0,23,24,0,0,0,0,0,9,10,0,
+0,0,0,0,0,0,0,0,14,0,33,34,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,43,44,0,0,0,0,0,14,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,8,8,0,0,0,0,8,0,0,0,0,
-0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,
+0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,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,13,13,0,0,0,0,13,0,0,0,0,
+0,0,0,0,0,0,0,0,0,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,
@@ -51,7 +51,7 @@
 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="Ground-Angled" width="20" height="20">
+ <layer id="3" name="Ground-Alpha" 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,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -62,7 +62,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 2684354564,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,2684354564,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2684354564,0,0,0,0,0,0,0,3221225476,2,2,2,0,0,0,
+0,0,0,0,0,2684354564,0,0,0,0,0,0,0,3221225476,0,0,0,0,0,0,
 0,0,0,0,0,0,0,2684354564,0,0,0,0,4,0,0,0,0,2684354564,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354564,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -73,6 +73,54 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="5" name="People" 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,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,35,0,0,2147483683,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,45,3758096429,3758096419,2147483693,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="4" name="Flames" 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,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,15,25,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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 8e6fe47..01261d0 100644
Binary files a/resources/tileset.png and b/resources/tileset.png differ
diff --git a/resources/tileset.tsx b/resources/tileset.tsx
index 97644fc..2c43505 100644
--- a/resources/tileset.tsx
+++ b/resources/tileset.tsx
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.2" tiledversion="1.2.3" name="tileset" tilewidth="16" tileheight="16" tilecount="25" columns="5">
- <image source="tileset.png" width="80" height="80"/>
+<tileset version="1.2" tiledversion="1.2.3" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
+ <image source="tileset.png" width="160" height="80"/>
+ <tile id="14">
+  <properties>
+   <property name="animated" value="flame"/>
+   <property name="keyframe" type="int" value="0"/>
+  </properties>
+ </tile>
+ <tile id="24">
+  <properties>
+   <property name="animated" value="flame"/>
+   <property name="keyframe" type="int" value="1"/>
+  </properties>
+ </tile>
 </tileset>
-- 
cgit v1.2.3


From 99c6e61a2b8fe66dcef7eada525f6fbdd7a2cd00 Mon Sep 17 00:00:00 2001
From: Lucy Veron <lucymveron@gmail.com>
Date: Sat, 22 Jun 2019 14:11:08 +0200
Subject: added animated tiles with attributes

---
 resources/tileset.tsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'resources')

diff --git a/resources/tileset.tsx b/resources/tileset.tsx
index 2c43505..1747cbc 100644
--- a/resources/tileset.tsx
+++ b/resources/tileset.tsx
@@ -4,12 +4,14 @@
  <tile id="14">
   <properties>
    <property name="animated" value="flame"/>
+   <property name="delay" type="int" value="100"/>
    <property name="keyframe" type="int" value="0"/>
   </properties>
  </tile>
  <tile id="24">
   <properties>
    <property name="animated" value="flame"/>
+   <property name="delay" type="int" value="100"/>
    <property name="keyframe" type="int" value="1"/>
   </properties>
  </tile>
-- 
cgit v1.2.3


From cccfb66c7c58bf464252e942ef2b742b41ece19e Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Sat, 22 Jun 2019 10:11:18 -0500
Subject: now draw at the tile level

---
 resources/tileset.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'resources')

diff --git a/resources/tileset.tsx b/resources/tileset.tsx
index 1747cbc..2672ec2 100644
--- a/resources/tileset.tsx
+++ b/resources/tileset.tsx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.2" tiledversion="1.2.3" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
+<tileset version="1.2" tiledversion="1.2.1" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
  <image source="tileset.png" width="160" height="80"/>
  <tile id="14">
   <properties>
-   <property name="animated" value="flame"/>
    <property name="delay" type="int" value="100"/>
+   <property name="entity" value="flame"/>
    <property name="keyframe" type="int" value="0"/>
   </properties>
  </tile>
  <tile id="24">
   <properties>
-   <property name="animated" value="flame"/>
    <property name="delay" type="int" value="100"/>
+   <property name="entity" value="flame"/>
    <property name="keyframe" type="int" value="1"/>
   </properties>
  </tile>
-- 
cgit v1.2.3