* Launcher can shoot two new types of snowballs.

[supertux.git] / data / images / tiles.strf

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index ea64971..f8efc30 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -68,7 +68,17 @@
       2134 2135 0 0
 
       2019 2140 2141 2142
-      2020 0 0 0 0
+      2020 2178  0 0 
+
+      2155 2156 2157 0
+      2163 2164 2165 0
+      2158 2159 2154 0
+      2160 2161 2162 0
+
+     2166 2167 2168 2169
+     2170 2171 2172 2173
+     2174 2175 2176 2177
+     
     )
   )
   (tilegroup
@@ -268,7 +278,7 @@
   )
   (tilegroup
     (name "Block")
-    (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 44 83 84 102 140 103 104 105 112 128 1311)
+    (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 44 83 84 102 140 103 104 105 112 128 1311 2153)
   )
   (tilegroup
     (name "Background")
@@ -309,9 +319,11 @@
     (tiles
       53   55   1744 0
       54   56   1745 0
-      57   58   0    0
-      59   60   0    0
-      1742 1743)
+      57   58   2085 2086
+      59   60   2087 2088
+      1742 1743 2089 2090
+      2143 2144 2145 0
+      2146 2147 2148 0)
   )
   (tilegroup
     (name "Pole")
@@ -319,8 +331,8 @@
       1348 1720 1719 1718
       79   80   1347 1722
       1349 1717 1721 0
-      2001 2002 0    0
-      2003 2004 0    0
+      2001 2002 2149 2150
+      2003 2004 2151 2152
     )
   )
   (tilegroup
@@ -550,9 +562,6 @@
     )
   )
   (tile
-    (id 0)
-  )
-  (tile
     (id 1)
     (images
       "tiles/auxiliary/notile.png"
@@ -853,26 +862,16 @@
     (data 1)
     (anim-fps 2)
   )
-  (tile
-    (id 27)
-    (images
-      "tiles/blocks/block1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 28)
-    (images
-      "tiles/blocks/block2.png"
+  (tiles
+    (width 3)
+    (height 1)
+    (ids
+      27 28 29
     )
-    (solid #t)
-  )
-  (tile
-    (id 29)
-    (images
-      "tiles/blocks/block3.png"
+    (attributes
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/blocks/block_horiz.png")
   )
   ; Yes the numbering is extremly odd, backward compatiblity...
   (tiles
@@ -1609,10 +1608,10 @@
   (tile
     (id 175)
     (images
-      "tiles/waterfall/trans1-1-1.png"
-      "tiles/waterfall/trans1-1-2.png"
-      "tiles/waterfall/trans1-1-3.png"
-      "tiles/waterfall/trans1-1-4.png"
+      (region "tiles/waterfall/trans-1.png" 0 128 32 32)
+      (region "tiles/waterfall/trans-2.png" 0 128 32 32)
+      (region "tiles/waterfall/trans-3.png" 0 128 32 32)
+      (region "tiles/waterfall/trans-4.png" 0 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1620,10 +1619,10 @@
   (tile
     (id 176)
     (images
-      "tiles/waterfall/trans1-2-1.png"
-      "tiles/waterfall/trans1-2-2.png"
-      "tiles/waterfall/trans1-2-3.png"
-      "tiles/waterfall/trans1-2-4.png"
+      (region "tiles/waterfall/trans-1.png" 32 128 32 32)
+      (region "tiles/waterfall/trans-2.png" 32 128 32 32)
+      (region "tiles/waterfall/trans-3.png" 32 128 32 32)
+      (region "tiles/waterfall/trans-4.png" 32 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1631,10 +1630,10 @@
   (tile
     (id 177)
     (images
-      "tiles/waterfall/trans1-3-1.png"
-      "tiles/waterfall/trans1-3-2.png"
-      "tiles/waterfall/trans1-3-3.png"
-      "tiles/waterfall/trans1-3-4.png"
+      (region "tiles/waterfall/trans-1.png" 64 128 32 32)
+      (region "tiles/waterfall/trans-2.png" 64 128 32 32)
+      (region "tiles/waterfall/trans-3.png" 64 128 32 32)
+      (region "tiles/waterfall/trans-4.png" 64 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1642,10 +1641,10 @@
   (tile
     (id 178)
     (images
-      "tiles/waterfall/trans1-4-1.png"
-      "tiles/waterfall/trans1-4-2.png"
-      "tiles/waterfall/trans1-4-3.png"
-      "tiles/waterfall/trans1-4-4.png"
+      (region "tiles/waterfall/trans-1.png" 96 128 32 32)
+      (region "tiles/waterfall/trans-2.png" 96 128 32 32)
+      (region "tiles/waterfall/trans-3.png" 96 128 32 32)
+      (region "tiles/waterfall/trans-4.png" 96 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1653,10 +1652,10 @@
   (tile
     (id 179)
     (images
-      "tiles/waterfall/trans2-1-1.png"
-      "tiles/waterfall/trans2-1-2.png"
-      "tiles/waterfall/trans2-1-3.png"
-      "tiles/waterfall/trans2-1-4.png"
+      (region "tiles/waterfall/trans-1.png" 0 96 32 32)
+      (region "tiles/waterfall/trans-2.png" 0 96 32 32)
+      (region "tiles/waterfall/trans-3.png" 0 96 32 32)
+      (region "tiles/waterfall/trans-4.png" 0 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1664,10 +1663,10 @@
   (tile
     (id 180)
     (images
-      "tiles/waterfall/trans2-2-1.png"
-      "tiles/waterfall/trans2-2-2.png"
-      "tiles/waterfall/trans2-2-3.png"
-      "tiles/waterfall/trans2-2-4.png"
+      (region "tiles/waterfall/trans-1.png" 32 96 32 32)
+      (region "tiles/waterfall/trans-2.png" 32 96 32 32)
+      (region "tiles/waterfall/trans-3.png" 32 96 32 32)
+      (region "tiles/waterfall/trans-4.png" 32 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1675,10 +1674,10 @@
   (tile
     (id 181)
     (images
-      "tiles/waterfall/trans2-3-1.png"
-      "tiles/waterfall/trans2-3-2.png"
-      "tiles/waterfall/trans2-3-3.png"
-      "tiles/waterfall/trans2-3-4.png"
+      (region "tiles/waterfall/trans-1.png" 64 96 32 32)
+      (region "tiles/waterfall/trans-2.png" 64 96 32 32)
+      (region "tiles/waterfall/trans-3.png" 64 96 32 32)
+      (region "tiles/waterfall/trans-4.png" 64 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1686,10 +1685,10 @@
   (tile
     (id 182)
     (images
-      "tiles/waterfall/trans2-4-1.png"
-      "tiles/waterfall/trans2-4-2.png"
-      "tiles/waterfall/trans2-4-3.png"
-      "tiles/waterfall/trans2-4-4.png"
+      (region "tiles/waterfall/trans-1.png" 96 96 32 32)
+      (region "tiles/waterfall/trans-2.png" 96 96 32 32)
+      (region "tiles/waterfall/trans-3.png" 96 96 32 32)
+      (region "tiles/waterfall/trans-4.png" 96 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1697,10 +1696,10 @@
   (tile
     (id 183)
     (images
-      "tiles/waterfall/trans3-1-1.png"
-      "tiles/waterfall/trans3-1-2.png"
-      "tiles/waterfall/trans3-1-3.png"
-      "tiles/waterfall/trans3-1-4.png"
+      (region "tiles/waterfall/trans-1.png" 0 64 32 32)
+      (region "tiles/waterfall/trans-2.png" 0 64 32 32)
+      (region "tiles/waterfall/trans-3.png" 0 64 32 32)
+      (region "tiles/waterfall/trans-4.png" 0 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1708,10 +1707,10 @@
   (tile
     (id 184)
     (images
-      "tiles/waterfall/trans3-2-1.png"
-      "tiles/waterfall/trans3-2-2.png"
-      "tiles/waterfall/trans3-2-3.png"
-      "tiles/waterfall/trans3-2-4.png"
+      (region "tiles/waterfall/trans-1.png" 32 64 32 32)
+      (region "tiles/waterfall/trans-2.png" 32 64 32 32)
+      (region "tiles/waterfall/trans-3.png" 32 64 32 32)
+      (region "tiles/waterfall/trans-4.png" 32 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1719,10 +1718,10 @@
   (tile
     (id 185)
     (images
-      "tiles/waterfall/trans3-3-1.png"
-      "tiles/waterfall/trans3-3-2.png"
-      "tiles/waterfall/trans3-3-3.png"
-      "tiles/waterfall/trans3-3-4.png"
+      (region "tiles/waterfall/trans-1.png" 64 64 32 32)
+      (region "tiles/waterfall/trans-2.png" 64 64 32 32)
+      (region "tiles/waterfall/trans-3.png" 64 64 32 32)
+      (region "tiles/waterfall/trans-4.png" 64 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1730,10 +1729,10 @@
   (tile
     (id 186)
     (images
-      "tiles/waterfall/trans3-4-1.png"
-      "tiles/waterfall/trans3-4-2.png"
-      "tiles/waterfall/trans3-4-3.png"
-      "tiles/waterfall/trans3-4-4.png"
+      (region "tiles/waterfall/trans-1.png" 96 64 32 32)
+      (region "tiles/waterfall/trans-2.png" 96 64 32 32)
+      (region "tiles/waterfall/trans-3.png" 96 64 32 32)
+      (region "tiles/waterfall/trans-4.png" 96 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1741,10 +1740,10 @@
   (tile
     (id 187)
     (images
-      "tiles/waterfall/trans4-1-1.png"
-      "tiles/waterfall/trans4-1-2.png"
-      "tiles/waterfall/trans4-1-3.png"
-      "tiles/waterfall/trans4-1-4.png"
+      (region "tiles/waterfall/trans-1.png" 0 32 32 32)
+      (region "tiles/waterfall/trans-2.png" 0 32 32 32)
+      (region "tiles/waterfall/trans-3.png" 0 32 32 32)
+      (region "tiles/waterfall/trans-4.png" 0 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1752,10 +1751,10 @@
   (tile
     (id 188)
     (images
-      "tiles/waterfall/trans4-2-1.png"
-      "tiles/waterfall/trans4-2-2.png"
-      "tiles/waterfall/trans4-2-3.png"
-      "tiles/waterfall/trans4-2-4.png"
+      (region "tiles/waterfall/trans-1.png" 32 32 32 32)
+      (region "tiles/waterfall/trans-2.png" 32 32 32 32)
+      (region "tiles/waterfall/trans-3.png" 32 32 32 32)
+      (region "tiles/waterfall/trans-4.png" 32 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1763,10 +1762,10 @@
   (tile
     (id 189)
     (images
-      "tiles/waterfall/trans4-3-1.png"
-      "tiles/waterfall/trans4-3-2.png"
-      "tiles/waterfall/trans4-3-3.png"
-      "tiles/waterfall/trans4-3-4.png"
+      (region "tiles/waterfall/trans-1.png" 64 32 32 32)
+      (region "tiles/waterfall/trans-2.png" 64 32 32 32)
+      (region "tiles/waterfall/trans-3.png" 64 32 32 32)
+      (region "tiles/waterfall/trans-4.png" 64 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1774,10 +1773,10 @@
   (tile
     (id 190)
     (images
-      "tiles/waterfall/trans4-4-1.png"
-      "tiles/waterfall/trans4-4-2.png"
-      "tiles/waterfall/trans4-4-3.png"
-      "tiles/waterfall/trans4-4-4.png"
+      (region "tiles/waterfall/trans-1.png" 96 32 32 32)
+      (region "tiles/waterfall/trans-2.png" 96 32 32 32)
+      (region "tiles/waterfall/trans-3.png" 96 32 32 32)
+      (region "tiles/waterfall/trans-4.png" 96 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1785,10 +1784,10 @@
   (tile
     (id 191)
     (images
-      "tiles/waterfall/trans5-1-1.png"
-      "tiles/waterfall/trans5-1-2.png"
-      "tiles/waterfall/trans5-1-3.png"
-      "tiles/waterfall/trans5-1-4.png"
+      (region "tiles/waterfall/trans-1.png" 0 0 32 32)
+      (region "tiles/waterfall/trans-2.png" 0 0 32 32)
+      (region "tiles/waterfall/trans-3.png" 0 0 32 32)
+      (region "tiles/waterfall/trans-4.png" 0 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1796,10 +1795,10 @@
   (tile
     (id 192)
     (images
-      "tiles/waterfall/trans5-2-1.png"
-      "tiles/waterfall/trans5-2-2.png"
-      "tiles/waterfall/trans5-2-3.png"
-      "tiles/waterfall/trans5-2-4.png"
+      (region "tiles/waterfall/trans-1.png" 32 0 32 32)
+      (region "tiles/waterfall/trans-2.png" 32 0 32 32)
+      (region "tiles/waterfall/trans-3.png" 32 0 32 32)
+      (region "tiles/waterfall/trans-4.png" 32 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1807,10 +1806,10 @@
   (tile
     (id 193)
     (images
-      "tiles/waterfall/trans5-3-1.png"
-      "tiles/waterfall/trans5-3-2.png"
-      "tiles/waterfall/trans5-3-3.png"
-      "tiles/waterfall/trans5-3-4.png"
+      (region "tiles/waterfall/trans-1.png" 64 0 32 32)
+      (region "tiles/waterfall/trans-2.png" 64 0 32 32)
+      (region "tiles/waterfall/trans-3.png" 64 0 32 32)
+      (region "tiles/waterfall/trans-4.png" 64 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1818,10 +1817,10 @@
   (tile
     (id 194)
     (images
-      "tiles/waterfall/trans5-4-1.png"
-      "tiles/waterfall/trans5-4-2.png"
-      "tiles/waterfall/trans5-4-3.png"
-      "tiles/waterfall/trans5-4-4.png"
+      (region "tiles/waterfall/trans-1.png" 96 0 32 32)
+      (region "tiles/waterfall/trans-2.png" 96 0 32 32)
+      (region "tiles/waterfall/trans-3.png" 96 0 32 32)
+      (region "tiles/waterfall/trans-4.png" 96 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1898,34 +1897,28 @@
     (water #t)
     (anim-fps 10)
   )
-  (tile
-    (id 211)
-    (images
-      "tiles/blocks/block1b.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 212)
-    (images
-      "tiles/blocks/block2b.png"
+  (tiles
+    (width 1)
+    (height 3)
+    (ids
+      211
+      212
+      213
     )
-    (solid #t)
-  )
-  (tile
-    (id 213)
-    (images
-      "tiles/blocks/block3b.png"
+    (attributes
+      1
+      1
+      1
     )
-    (solid #t)
+    (image "tiles/blocks/block_vert.png")
   )
   (tile
     (id 275)
     (images
-      "tiles/waterfall/waterfall1-1-1.png"
-      "tiles/waterfall/waterfall1-1-2.png"
-      "tiles/waterfall/waterfall1-1-3.png"
-      "tiles/waterfall/waterfall1-1-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 0 128 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 0 128 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 0 128 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 0 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1933,10 +1926,10 @@
   (tile
     (id 276)
     (images
-      "tiles/waterfall/waterfall1-2-1.png"
-      "tiles/waterfall/waterfall1-2-2.png"
-      "tiles/waterfall/waterfall1-2-3.png"
-      "tiles/waterfall/waterfall1-2-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 32 128 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 32 128 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 32 128 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 32 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1944,10 +1937,10 @@
   (tile
     (id 277)
     (images
-      "tiles/waterfall/waterfall1-3-1.png"
-      "tiles/waterfall/waterfall1-3-2.png"
-      "tiles/waterfall/waterfall1-3-3.png"
-      "tiles/waterfall/waterfall1-3-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 64 128 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 64 128 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 64 128 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 64 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1955,10 +1948,10 @@
   (tile
     (id 278)
     (images
-      "tiles/waterfall/waterfall1-4-1.png"
-      "tiles/waterfall/waterfall1-4-2.png"
-      "tiles/waterfall/waterfall1-4-3.png"
-      "tiles/waterfall/waterfall1-4-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 96 128 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 96 128 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 96 128 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 96 128 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1966,10 +1959,10 @@
   (tile
     (id 279)
     (images
-      "tiles/waterfall/waterfall2-1-1.png"
-      "tiles/waterfall/waterfall2-1-2.png"
-      "tiles/waterfall/waterfall2-1-3.png"
-      "tiles/waterfall/waterfall2-1-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 0 96 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 0 96 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 0 96 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 0 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1977,10 +1970,10 @@
   (tile
     (id 280)
     (images
-      "tiles/waterfall/waterfall2-2-1.png"
-      "tiles/waterfall/waterfall2-2-2.png"
-      "tiles/waterfall/waterfall2-2-3.png"
-      "tiles/waterfall/waterfall2-2-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 32 96 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 32 96 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 32 96 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 32 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1988,10 +1981,10 @@
   (tile
     (id 281)
     (images
-      "tiles/waterfall/waterfall2-3-1.png"
-      "tiles/waterfall/waterfall2-3-2.png"
-      "tiles/waterfall/waterfall2-3-3.png"
-      "tiles/waterfall/waterfall2-3-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 64 96 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 64 96 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 64 96 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 64 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -1999,10 +1992,10 @@
   (tile
     (id 282)
     (images
-      "tiles/waterfall/waterfall2-4-1.png"
-      "tiles/waterfall/waterfall2-4-2.png"
-      "tiles/waterfall/waterfall2-4-3.png"
-      "tiles/waterfall/waterfall2-4-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 96 96 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 96 96 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 96 96 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 96 96 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2010,10 +2003,10 @@
   (tile
     (id 283)
     (images
-      "tiles/waterfall/waterfall3-1-1.png"
-      "tiles/waterfall/waterfall3-1-2.png"
-      "tiles/waterfall/waterfall3-1-3.png"
-      "tiles/waterfall/waterfall3-1-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 0 64 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 0 64 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 0 64 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 0 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2021,10 +2014,10 @@
   (tile
     (id 284)
     (images
-      "tiles/waterfall/waterfall3-2-1.png"
-      "tiles/waterfall/waterfall3-2-2.png"
-      "tiles/waterfall/waterfall3-2-3.png"
-      "tiles/waterfall/waterfall3-2-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 32 64 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 32 64 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 32 64 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 32 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2032,10 +2025,10 @@
   (tile
     (id 285)
     (images
-      "tiles/waterfall/waterfall3-3-1.png"
-      "tiles/waterfall/waterfall3-3-2.png"
-      "tiles/waterfall/waterfall3-3-3.png"
-      "tiles/waterfall/waterfall3-3-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 64 64 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 64 64 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 64 64 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 64 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2043,10 +2036,10 @@
   (tile
     (id 286)
     (images
-      "tiles/waterfall/waterfall3-4-1.png"
-      "tiles/waterfall/waterfall3-4-2.png"
-      "tiles/waterfall/waterfall3-4-3.png"
-      "tiles/waterfall/waterfall3-4-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 96 64 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 96 64 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 96 64 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 96 64 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2054,10 +2047,10 @@
   (tile
     (id 287)
     (images
-      "tiles/waterfall/waterfall4-1-1.png"
-      "tiles/waterfall/waterfall4-1-2.png"
-      "tiles/waterfall/waterfall4-1-3.png"
-      "tiles/waterfall/waterfall4-1-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 0 32 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 0 32 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 0 32 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 0 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2065,10 +2058,10 @@
   (tile
     (id 288)
     (images
-      "tiles/waterfall/waterfall4-2-1.png"
-      "tiles/waterfall/waterfall4-2-2.png"
-      "tiles/waterfall/waterfall4-2-3.png"
-      "tiles/waterfall/waterfall4-2-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 32 32 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 32 32 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 32 32 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 32 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2076,10 +2069,10 @@
   (tile
     (id 289)
     (images
-      "tiles/waterfall/waterfall4-3-1.png"
-      "tiles/waterfall/waterfall4-3-2.png"
-      "tiles/waterfall/waterfall4-3-3.png"
-      "tiles/waterfall/waterfall4-3-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 64 32 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 64 32 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 64 32 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 64 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2087,10 +2080,10 @@
   (tile
     (id 290)
     (images
-      "tiles/waterfall/waterfall4-4-1.png"
-      "tiles/waterfall/waterfall4-4-2.png"
-      "tiles/waterfall/waterfall4-4-3.png"
-      "tiles/waterfall/waterfall4-4-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 96 32 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 96 32 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 96 32 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 96 32 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2098,10 +2091,10 @@
   (tile
     (id 291)
     (images
-      "tiles/waterfall/waterfall5-1-1.png"
-      "tiles/waterfall/waterfall5-1-2.png"
-      "tiles/waterfall/waterfall5-1-3.png"
-      "tiles/waterfall/waterfall5-1-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 0 0 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 0 0 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 0 0 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 0 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2109,10 +2102,10 @@
   (tile
     (id 292)
     (images
-      "tiles/waterfall/waterfall5-2-1.png"
-      "tiles/waterfall/waterfall5-2-2.png"
-      "tiles/waterfall/waterfall5-2-3.png"
-      "tiles/waterfall/waterfall5-2-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 32 0 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 32 0 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 32 0 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 32 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2120,10 +2113,10 @@
   (tile
     (id 293)
     (images
-      "tiles/waterfall/waterfall5-3-1.png"
-      "tiles/waterfall/waterfall5-3-2.png"
-      "tiles/waterfall/waterfall5-3-3.png"
-      "tiles/waterfall/waterfall5-3-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 64 0 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 64 0 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 64 0 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 64 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2131,10 +2124,10 @@
   (tile
     (id 294)
     (images
-      "tiles/waterfall/waterfall5-4-1.png"
-      "tiles/waterfall/waterfall5-4-2.png"
-      "tiles/waterfall/waterfall5-4-3.png"
-      "tiles/waterfall/waterfall5-4-4.png"
+      (region "tiles/waterfall/waterfall-1.png" 96 0 32 32)
+      (region "tiles/waterfall/waterfall-2.png" 96 0 32 32)
+      (region "tiles/waterfall/waterfall-3.png" 96 0 32 32)
+      (region "tiles/waterfall/waterfall-4.png" 96 0 32 32)
     )
     (water #t)
     (anim-fps 10)
@@ -2269,47 +2262,18 @@
     )
     (image "tiles/doodads/liane.png")
   )
-  (tile
-    (id 337)
-    (images
-      "tiles/blocks/rock_plate1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 338)
-    (images
-      "tiles/blocks/rock_plate2.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 339)
-    (images
-      "tiles/blocks/rock_plate3.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 340)
-    (images
-      "tiles/blocks/rock_plate_cracked1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 341)
-    (images
-      "tiles/blocks/rock_plate_cracked2.png"
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      337 338 339
+      340 341 342
     )
-    (solid #t)
-  )
-  (tile
-    (id 342)
-    (images
-      "tiles/blocks/rock_plate_cracked3.png"
+    (attributes
+      1 1 1
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/blocks/rock_plate.png")
   )
 
   ; experimental unisolid tile
@@ -5568,20 +5532,38 @@
     )
     (image "tiles/castle/stonewindow.png")
   )
+  
+  (tile
+    (id 1517)
+    (images
+        "tiles/castle/walltorch/flame-0.png"
+        "tiles/castle/walltorch/flame-0.png"
+        "tiles/castle/walltorch/flame-1.png"
+        "tiles/castle/walltorch/flame-1.png"
+        "tiles/castle/walltorch/flame-2.png"
+        "tiles/castle/walltorch/flame-2.png"
+        "tiles/castle/walltorch/flame-3.png"
+        "tiles/castle/walltorch/flame-3.png"        
+        "tiles/castle/walltorch/flame-4.png"
+        "tiles/castle/walltorch/flame-4.png"        
+        "tiles/castle/walltorch/flame-5.png" 
+        "tiles/castle/walltorch/flame-5.png"
+        "tiles/castle/walltorch/flame-6.png"
+        "tiles/castle/walltorch/flame-6.png"
+    )
+    (anim-fps 10)
+  )
   (tiles
     (width 1)
-    (height 2)
+    (height 1)
     (ids
-      1517
       1518
     )
     (attributes
       0
-      0
     )
-    (image "tiles/castle/walltorch.png")
+    (image "tiles/castle/walltorch/flame-base-0.png")
   )
-
   (tiles
     (width 4)
     (height 3)
@@ -6886,5 +6868,69 @@
     )
   )
 
-;; next-id: 2143
+  (tiles
+    (width  3)
+    (height 2)
+    (ids 2143 2144 2145
+         2146 2147 2148
+    )
+    (attributes
+     1 1 1
+     1 1 1
+    )
+    (image "tiles/pipe/blueh.png")
+  )
+
+  (tiles
+    (width 2)
+    (height 2)
+    (ids 
+      2149 2150
+      2151 2152
+    )
+    (attributes
+      0 0
+      0 0
+    )
+    (image "tiles/pole/bend.png")
+  )
+   
+  (tile
+    (id 2153)
+    (unisolid #t)
+    (editor-images "tiles/auxiliary/invisible-unisolid-editor.png")
+  )
+
+
+  (tiles
+    (width  6)
+    (height 2)
+    (ids
+     2158 2159 2154 2155 2156 2157
+     2160 2161 2162 2163 2164 2165)
+    (attributes
+     0 0 0 3 3 3
+     0 0 0 0 0 0)
+    (image "tiles/snow/air.png"))
+
+
+  (tiles
+    (width  4)
+    (height 3)
+    (ids
+     2166 2167 2168 2169
+     2170 2171 2172 2173
+     2174 2175 2176 2177)
+    (attributes
+     3 3 3 3
+     0 0 0 0
+     0 0 0 0)
+    (image "tiles/snow/unisolid3.png"))
+
+  (tile
+    (id 2178)
+    (images
+      "tiles/snow/spike.png"))
+
+;; next-id: 2179
 )