#316: Added mathnerd314's trampoline sign and added it to Bouncy Coils level

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 5885a0b..abb4ebe 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -1,5 +1,75 @@
+;; -*- scheme -*-
+;; This file contains the mapping from tile-ids to image files as well
+;; as the tile properties (unisolid, solid, ice, water, etc.). Since
+;; it is important that the tile-ids don't change once created and
+;; used in a level some care has to be taken when editing this file,
+;; otherwise the levels would be rendered unusable.
+;;
+;; Some notes on editing this file:
+;;  - tile-ids must be unique
+;;  - the tile definition with the largest id should always be at the
+;;    bottom of the file
+;;  - when creating a new tile definition take the greatest current id
+;;    and increment it by one
+;;  - the meaning of the values in (attributes ...) can be seen in
+;;    src/tile.cpp, unisolid is 3 not 2
 (supertux-tiles
   (tilegroup
+    (name "Test")
+    (tiles
+     2203 2204 2205 0
+     2206 2207 2208 0
+     2209 2210 2211 0))
+
+  (tilegroup
+   (name "Castle BG Stones")
+   (tiles
+      2380 2381 2382 2383
+      2212 2213 2214 2215
+      2224 2225 2226 2227
+      2236 2237 2238 2239
+      2248 2249 2250 2251
+      2260 2261 2262 2263
+      2272 2273 2274 2275
+      2284 2285 2286 2287
+      2296 2297 2298 2299
+      2308 2309 2310 2311
+      2320 2321 2322 2323
+      2332 2333 2334 2335
+      2344 2345 2346 2347
+      2312 2313 2314 2315
+      2324 2325 2326 2327
+      2336 2337 2338 2339
+      2348 2349 2350 2351
+      2356 2357 2358 2359
+      2368 2369 2370 2371
+      2360 2361 2362 2363
+      2372 2373 2374 2375
+      2364 2365 2366 2367
+      2376 2377 2378 2379
+      2264 2265 2266 2267
+      2276 2277 2278 2279
+      2288 2289 2290 2291
+      2300 2301 2302 2303
+      2268 2269 2270 2271
+      2280 2281 2282 2283
+      2292 2293 2294 2295
+      2304 2305 2306 2307
+      2316 2317 2318 2319
+      2328 2329 2330 2331
+      2340 2341 2342 2343
+      2352 2353 2354 2355
+      2216 2217 2218 2219
+      2228 2229 2230 2231
+      2240 2241 2242 2243
+      2252 2253 2254 2255
+      2220 2221 2222 2223
+      2232 2233 2234 2235
+      2244 2245 2246 2247
+      2256 2257 2258 2259
+))
+
+  (tilegroup
     (name "Snow")
     (tiles
       7    8    9    202
@@ -9,7 +79,7 @@
       30   31   114  113
       21   22   19   203
       20   23   207  208
-      115  116  0    0
+      115  116  214  0
       117  118  0    0
       122  209  123  0
       124  210  125  0
@@ -17,155 +87,279 @@
       33   32   34   1741
       35   37   39   1740
       38   36   43   1739
-      40   41   42   0
-      119  121  120  0
-      1539)
+      40   41   42   1815
+      119  121  120  1816
+      1539 0    0    0
+      0    1826 1827 0
+      1829 1830 1831 1832
+      1833 1834 1835 1836
+      1837 1838 1843 1844
+      1839 1840 1845 1846
+      1841 1842 1847 1848
+      0    0    1849 1850
+
+      2050 2051 2060 2061 
+      2055 2056 2065 2066 
+      2052 2053 2054 0
+      2057 2058 2059 0
+      2062 2063 2064 0
+         0 2067 2068 2069
+         0 2072 2073 2074
+      2075 2079 2076    0
+      2077 2073 2078    0 
+      
+      2070 2071    0    0
+
+      2085 2086 0 0
+      2087 2088 0 0
+      2089 2090 0 0
+      
+      2121 2122 2123 0
+      2126 2127 2128 0
+      2131 2132 2133 0
+      
+      2124 2125 0 0
+      2129 2130 0 0
+      2134 2135 0 0
+
+      2019 2140 2141 2142
+      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
+
+     2185 2186 2180 2181
+     2193 2194 2188 2189 
+     2197 2187 2195 2196 
+
+     2182 2183 2184 2179
+     2190 2191 2192 2201 
+     2198 2199 2200 2202 
+
+2384 2385 2386 2396
+2387 2388 2389 2397
+2390 2391 2392 2398
+2393 2394 2395 2399
+    )
   )
   (tilegroup
     (name "Snow (Paralax Background)")
-    (tiles 149  160  151 158
-           152  153  154 159
-           155  156  157 0
-           161  162  163 170
-           164  165  166 171
-           167  168  169 1343
-           0    0    0   1342 )
+    (tiles
+      149  160  151 158
+      152  153  154 159
+      155  156  157 0
+      161  162  163 170
+      164  165  166 171
+      167  168  169 1343
+      0    0    0   1342)
   )
   (tilegroup
     (name "Forest (Foreground)")
-    (tiles 1000 1001 1002 1003
-           1004 1005 1006 1007
-           1008 1009 1010 1011
-           1012 1013 1014 1015
-           1016 1017 1018 1019
-           1723 1724 1725 1726
-           0    1060 1061 0
-           1063 1064 1065 1066
-           1067 1068 1069 1070
-           1045 1046 1051 1052
-           1047 1048 1053 1054
-           1049 1050 1055 1056
-           1042 1043 1057 1058
-           1034 1035 1029 1030
-           1040 1041 1031 1032
-           1036 1037 0    1038
-           1020 1021 1022 1044
-           1023 1024 1025 1033
-           1026 1027 1028 1039
-           1351 0    313  314
-           1352 0    315  316
-           1353 1357 317  318
-           1354 0    319  320
-           1358 1359 1360 0
-           1361 1362 1363 0
-           1364 1365 1366 0
-           1569 1570 1571 1572
-           1573 1574 1737 1738
-           1533 1534 1535 0
-           1536 1537 1538
-           )
+    (tiles
+      1000 1001 1002 1003
+      1004 1005 1006 1007
+      1008 1009 1010 1011
+      1012 1013 1014 1015
+      1016 1017 1018 1019
+      1723 1724 1725 1726
+      1817 1013 1014 1820
+      1819 0    0    0
+      1818 0    0    0
+      0    1060 1061 0
+      1063 1064 1065 1066
+      1067 1068 1069 1070
+      1045 1046 1051 1052
+      1047 1048 1053 1054
+      1049 1050 1055 1056
+      1042 1043 1057 1058
+      1034 1035 1029 1030
+      1040 1041 1031 1032
+      1036 1037 1737 1038
+      1020 1021 1022 1044
+      1023 1024 1025 1033
+      1026 1027 1028 1039
+      1738 1357 313  314
+      1569 1571 315  316
+      1573 1570 317  318
+      1572 1574 319  320
+      1358 1359 1360 0
+      1361 1362 1363 0
+      1364 1365 1366 0
+      1533 1534 1535 0
+      1536 1537 1538 0
+      1996 1997 0    0
+      1972 1976 1980 1984
+      1973 1977 1981 1985
+      1974 1978 1982 1986
+      1975 1979 1983 1987
+      2005 1351 2010 0
+      2006 1352 2011 0
+      2007 1353 2012 0
+      2008 1354 2013 0
+      2009 1821 2014 0
+    )
+  )
+
+(tilegroup
+    (name "Forest (Underground)")
+    (tiles
+      1860 1861 1862 1863
+      1864 1865 1866 1867
+      1868 1869 1870 1871
+      1872 1873 1874 1875
+      1876 1877 1879 1880
+      0    1890 1891 0
+      1892 1893 1894 1895
+      1896 1897 1898 1899
+      1900 1901 1902 1903
+      1904 1905 1906 1907
+      1908 1909 1910 1911
+      1912 1913 1914 1915
+      1916 1917 1918 1919
+      1920 1921 1922 1923
+      1924 1925 1926 1927
+      1928 1929 1930 1931
+      1932 1933 1934 1935
+      1936 1937 1938 1939
+      1940 1941 1942 1943
+      1944 1945 1946 1947
+      1948 1949 1950 1951
+      1952 1953 1954 1955
+      1956 1957 1958 1959
+      1960 1961 1962 1963
+      1964 1965 1966 1967
+      1968 1969 1970 1971
+    )
   )
   (tilegroup
     (name "Forest (Background)")
     (tiles
-       0    0    1073 1074
-       0    0    1081 1082
-       0    1088 1089 1090
-       1095 1096 1097 1098
-       1103 1104 1105 1106
-       1111 1112 1113 1114
-       1119 1120 1121 1122
-       1127 1128 1129 1130
-       0    1136 1137 1138
-       1143 1144 1145 1146
-       0    1152 1153 1154
-       1159 1160 1161 1162
-       1075 0    0    0
-       1083 1084 0    0
-       1091 1092 1093 0
-       1099 1100 1101 0
-       1107 1108 1109 1110
-       1115 1116 1117 1118
-       1123 1124 1125 1126
-       1131 1132 1133 1134
-       1139 1140 1141 0
-       1147 1148 0    0
-       1155 1156 0    0
-       1163 1164 0    0
-       0    1168 1169 1170
-       0    1174 1175 1176
-       1179 1180 1181 1182
-       1185 1186 1187 1188
-       1191 1192 1193 1194
-       1197 1198 1199 1200
-       1203 1204 1205 1206
-       1209 1210 1211 1212
-       0    0    1219 1220
-       0    0    1225 1226
-       0    0    1217 1218
-       0    0    1223 1224
-       0    1228 1229 1230
-       0    1234 1235 1236
-       1177 0    0    0
-       1183 0    0    0
-       1189 1190 0    0
-       1195 1196 0    0
-       1201 1202 0    0
-       1207 1208 0    0
-       1213 1214 0    0
-       0    1240 1241 1242
-       1243 1244 1245 1246
-       1247 1248 1249 1250
-       1251 1252 1253 1254
-       1255 1256 1257 1258
-       1259 1260 1261 1262
-       1263 1264 1265 1266
-       1267 1268 1269 1270
-       1271 1272 1273 1274
-       1275 1276 1277 1278
-       1279 1280 1281 1282
-       1283 1284 1285 1286
-       1287 1288 1303 1304
-       1289 1290 1305 1306
-       1291 1292 1307 1308
-       1293 1294 1309 1310
-       1295 1296 0    0
-       1297 1298 0    0
-       1299 1300 0    0
-       1301 1302 0    0
-       402  403  404  405
-       406  407  408  409
-       410  411  412  413
-       414  415  416  417
-       418  419  420  421
-       422  423  424  425
-       426  427  428  429
-       430  431  432  433
-       434  435  436  437
-       438  439  440  441
-       442  443  444  445
-       446  447  448  449
-       450  451  452  453
-       454  455  456  457
-       323  324  322  360
-       325  326  0    0
-       327  328  0    0
-       329  330  0    0
-       0    0    1746 1747
-       1760 1761 1748 1749
-       0    0    1750 1751
-       1752 1753 0    0
-       1754 1755 1756 1757
-       1758 1759 0    0    
+      0    0    1073 1074
+      0    0    1081 1082
+      0    1088 1089 1090
+      1095 1096 1097 1098
+      1103 1104 1105 1106
+      1111 1112 1113 1114
+      1119 1120 1121 1122
+      1127 1128 1129 1130
+      0    1136 1137 1138
+      1143 1144 1145 1146
+      0    1152 1153 1154
+      1159 1160 1161 1162
+      1075 0    0    0
+      1083 1084 0    0
+      1091 1092 1093 0
+      1099 1100 1101 0
+      1107 1108 1109 1110
+      1115 1116 1117 1118
+      1123 1124 1125 1126
+      1131 1132 1133 1134
+      1139 1140 1141 0
+      1147 1148 0    0
+      1155 1156 0    0
+      1163 1164 0    0
+      0    1168 1169 1170
+      0    1174 1175 1176
+      1179 1180 1181 1182
+      1185 1186 1187 1188
+      1191 1192 1193 1194
+      1197 1198 1199 1200
+      1203 1204 1205 1206
+      1209 1210 1211 1212
+      0    2045 1219 1220
+      0    2046 1225 1226
+      0    0    1217 1218
+      0    0    1223 1224
+      0    1228 1229 1230
+      0    1234 1235 1236
+      1177 0    0    0
+      1183 0    0    0
+      1189 1190 0    0
+      1195 1196 0    0
+      1201 1202 0    0
+      1207 1208 0    0
+      1213 1214 0    0
+      0    1240 1241 1242
+      1243 1244 1245 1246
+      1247 1248 1249 1250
+      1251 1252 1253 1254
+      1255 1256 1257 1258
+      1259 1260 1261 1262
+      1263 1264 1265 1266
+      1267 1268 1269 1270
+      1271 1272 1273 1274
+      1275 1276 1277 1278
+      1279 1280 1281 1282
+      1283 1284 1285 1286
+      1287 1288 1303 1304
+      1289 1290 1305 1306
+      1291 1292 1307 1308
+      1293 1294 1309 1310
+      1295 1296 0    0
+      1297 1298 0    0
+      1299 1300 0    0
+      1301 1302 0    0
+      402  403  404  405
+      406  407  408  409
+      410  411  412  413
+      414  415  416  417
+      418  419  420  421
+      422  423  424  425
+      426  427  428  429
+      430  431  432  433
+      434  435  436  437
+      438  439  440  441
+      442  443  444  445
+      446  447  448  449
+      450  451  452  453
+      454  455  456  457
+      323  324  322  360
+      325  326  0    0
+      327  328  0    0
+      329  330  0    0
+      0    0    1746 1747
+      1760 1761 1748 1749
+      0    0    1750 1751
+      1752 1753 0    0
+      1754 1755 1756 1757
+      1758 1759 0    0
     )
   )
   (tilegroup
+    (name "Ghost forest")
+    (tiles
+      1423 1424 1425 1426
+      1427 1428 1429 1430
+      1431 1432 1433 1434
+      1435 1436 1437 1438
+      1439 1440 1441 1442
+      0    1443 1444 0
+      1445 1446 1447 1448
+      1449 1450 1451 1452)
+  )
+  (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")
-    (tiles 106 107 108 24 109 110 111 25 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101)
+    (tiles
+      106  107  108  24
+      109  110  111  25
+      85   86   87   88
+      89   90   91   92
+      93   94   95   96
+      97   98   99   100
+      1321 1322 1323 1324
+      1325 1326 1327 1328
+      1329 1330 1331 1332
+      1333 1334 1335 1336)
   )
   (tilegroup
     (name "Points")
@@ -173,73 +367,84 @@
   )
   (tilegroup
     (name "Misc")
-    (tiles 76   201  174  130
-           75   200  173  129
-           295  296  297  298
-           81   126  127  0
-           1355 1809 1812 0
-           1356 1810 1813 0
-           1411 1811 1814 0
-         )
+    (tiles
+      76   201  174  130
+      75   200  173  129
+      295  296  297  298
+      81   126  127  2047
+      1355 1809 1812 2048
+      1356 1810 1813 2049
+      1411 1811 1814 0
+      1988 1989 0    0
+      1990 1991 0    0
+      1992 1993 0    0
+      1994 1995 0    0
+    )
   )
   (tilegroup
     (name "Pipe")
-    (tiles 53   55   1744 0
-           54   56   1745 0
-           57   58   0    0
-           59   60   0    0
-           1742 1743)
+    (tiles
+      53   55   1744 0
+      54   56   1745 0
+      57   58   2085 2086
+      59   60   2087 2088
+      1742 1743 2089 2090
+      2143 2144 2145 0
+      2146 2147 2148 0)
   )
   (tilegroup
     (name "Pole")
-    (tiles 1348 1720 1719 1718
-           79   80   1347 1722
-           1349 1717 1721
-           )
+    (tiles
+      1348 1720 1719 1718
+      79   80   1347 1722
+      1349 1717 1721 0
+      2001 2002 2149 2150
+      2003 2004 2151 2152
+    )
   )
   (tilegroup
     (name "Stone Brick Walls")
-    (tiles 64   65   66   67
-           68   69   0    0
-           0    1367 1368 1369
-           1370 1371 1372 1373
-           1374 1375 1376 1377
-           1378 1379 1380 0
-           1381 1382 1383 1384
-           1385 1386 1387 1388
-           1389 1390 1391 1392
-           1393 1394 1395 1396
-           0    1397 1398 1399
-           1400 1401 1402 1403
-           1404 1405 1406 1407
-           1408 1409 1410 0
-           0    0    0    1355
-           0    0    0    1356
-           0    0    0    1411
-           1412 1413 1414 1415
-           1416 1417 1419 0
-           0    1418 1420 0
-           1467 1468 1469 1470
-           1471 1472 1473 1474
-           1476 1477 1478 0
-           1479 1480 1481 1482
-           1486 1487 1488 1489
-           1493 1494 1495 1496
-           1500 1501 1502 1503
-           1507 1508 1509 1510
-           1483 1484 1485 1568
-           1490 1491 1492 1517
-           1497 1498 1499 1518
-           1504 1505 1506 0
-           1511 1512 0    0
-           1513 1514 0    0
-           1515 1516 0    0   
-           1762 1763 0    0
-           1764 1765 0    0
-           1766 1767 0    0
-           1768 1769 0    0
-           1770 1771 0    0
-           1772 1773 0    0)
+    (tiles
+      64   65   66   67
+      68   69   321  0
+      0    1367 1368 1369
+      1370 1371 1372 1373
+      1374 1375 1376 1377
+      1378 1379 1380 0
+      1381 1382 1383 1384
+      1385 1386 1387 1388
+      1389 1390 1391 1392
+      1393 1394 1395 1396
+      0    1397 1398 1399
+      1400 1401 1402 1403
+      1404 1405 1406 1407
+      1408 1409 1410 0
+      1412 1413 1414 1415
+      1416 1417 1419 0
+      0    1418 1420 0
+      1467 1468 1469 1470
+      1471 1472 1473 1474
+      1476 1477 1478 0
+      1479 1480 1481 1482
+      1486 1487 1488 1489
+      1493 1494 1495 1496
+      1500 1501 1502 1503
+      1507 1508 1509 1510
+      1483 1484 1485 1568
+      1490 1491 1492 1517
+      1497 1498 1499 1518
+      1504 1505 1506 0
+      1511 1512 0    0
+      1513 1514 0    0
+      1515 1516 0    0
+      1762 1763 1355 0
+      1764 1765 1356 0
+      1766 1767 1411 0
+      1768 1769 0    0
+      1770 1771 0    0
+      1772 1773 0    0
+      337  338  339  0
+      340  341  342)
   )
   (tilegroup
     (name "Signs")
@@ -255,7 +460,9 @@
       1624 1625 1628 1629
       1626 1627 1630 1631
       1727 1728 1731 1732
-      1729 1730 1733 1734)
+      1729 1730 1733 1734
+      1822 1823 2400 2401
+      1824 1825 2402 2403)
   )
   (tilegroup
     (name "Jungle")
@@ -268,32 +475,41 @@
     )
   )
   (tilegroup
-    (name "Slopes")
-    (tiles 400 401)
-  )
-  (tilegroup
     (name "Waterfall-trans")
-    (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194)
+    (tiles
+      191 192 193 194
+      187 188 189 190
+      183 184 185 186
+      179 180 181 182
+      175 176 177 178)
   )
   (tilegroup
     (name "Waterfall")
-    (tiles 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294)
+    (tiles
+      291 292 293 294
+      287 288 289 290
+      283 284 285 286
+      279 280 281 282
+      275 276 277 278)
   )
   (tilegroup
     (name "Waterfall-edgecloud")
-    (tiles 195 0   196 0
-           197 198 199)
+    (tiles
+      195 0   196 0
+      197 198 199)
   )
   (tilegroup
     (name "Icebridge")
-    (tiles 1551 1540 1541 1545
-           1549 1543 1544 1542
-           0    1547 1548 1546
-           0    0    0    1550)
+    (tiles
+      1551 1540 1541 1545
+      1549 1543 1544 1542
+      0    1547 1548 1546
+      0    0    0    1550)
   )
   (tilegroup
     (name "LavaFlow")
     (tiles
+      2136 2137 2138 2139    
       1711 1707 1701 1714
       1709 1710 1712 1715
       1708 0    1716 1704
@@ -301,39 +517,116 @@
       1706 0    1713)
   )
   (tilegroup
-    (name "Exit Tree")
-    (tiles 0    1633 1634 0
-           1639 1640 1641 1642
-           1646 1647 1648 1649
-           1653 1654 1655 1656
-           1660 1661 1662 1663
-           1667 1735 1669 1670
-           1674 1736 1676 1677
-           1664 1665 0    0
-           1671 1672 1673 0
-           1678 1679 1680 0
-           1650 1651 1652 1668
-           1657 1658 1659 1675
-           0    0    1666 0
-           1643 1644 1645
-           )
+    (name "Exits")
+    (tiles
+      0    1633 1634 0
+      1639 1640 1641 1642
+      1646 1647 1648 1649
+      1653 1654 1655 1656
+      1660 1661 1662 1663
+      1667 1735 1669 1670
+      1674 1736 1676 1677
+      1664 1665 0    0
+      1671 1672 1673 0
+      1678 1679 1680 0
+      1650 1651 1652 1668
+      1657 1658 1659 1675
+      0    0    1666 0
+      1643 1644 1645 0
+      1998 1999 2000 0
+      2023 2024 2025 0
+      2026 2027 2028 0
+      2029 2030 2031 0
+      0    0    0    0
+      126  0    0    0
+      0    0    0    0
+      0    0    0    0
+      0    0    0    0
+      0    0    0    0
+      0    0    0    0
+      127  0    0    0
+      0    0    0    0
+      0    0    0    0
+      0    0    0    0
+      0    0    0    0
+      0    0    0    0
+    )
   )
  (tilegroup
     (name "Castle")
-    (tiles 1519 1520 1521 1522
-           1523 1524 1525 1526
-           1527 1528 1529 1530
+    (tiles
+      1519 1520 1521 1522
+      1523 1524 1525 1526
+      1527 1528 1529 1530
+      1779 1780 1781 1783
+      1784 1785 1786 1788
+      1789 1790 1791 1793
+      1794 1795 1796 1798
+      1782 1804 1805 0
+      1787 1797 1792 0
+      1799 1800
+    )
+  )
+        
+(tilegroup
+ (name "Castle (snow)")
+ (tiles
+ 2091 2092 2093 0
+ 2096 2097 2098 0
+ 2101 2102 2103 0
+ 2106 2107 2108 0
+ 2111 2112 2113 0
+ 2116 2117 2118 0
 
-        1779 1780 1781 1783 
-        1784 1785 1786 1788 
-        1789 1790 1791 1793 
-        1794 1795 1796 1798 
-        1782 1804 1805 0 
-        1787 1797 1792 0 
-           )
+ 2094 2095 0 0
+ 2099 2100 0 0
+ 2104 2105 0 0
+ 2109 2110 0 0
+ 2114 2115 0 0
+ 2119 2120 0 0
+))
+
+  (tilegroup
+    (name "Cave background")
+    (tiles
+      70 0 0 0
+      0  0 0 0
+      0  0 0 0
+      0  0 0 0
+      71 0 0 0
+      0  0 0 0
+      0  0 0 0
+      0  0 0 0
+      72 0 0 0
+      0  0 0 0
+      0  0 0 0
+      0  0 0 0
+      73 0 0 0
+      0  0 0 0
+      0  0 0 0
+      0  0 0 0
+      74 0 0 0
+      0  0 0 0
+      0  0 0 0
+      0  0 0 0
+    )
   )
-  (tile
-    (id 0)
+  (tilegroup
+    (name "Lightmap")
+    (tiles
+      2032 2033 2034 2035
+      2036 2037    0 2038
+      2039    0    0 2040
+      2035 2041 2042 2032
+    )
+  )
+  (tilegroup
+    (name "Unisolid")
+    (tiles
+      2043 2044    0  359
+      1760 1761 1748 1749
+      1754 1755 1756 1757
+    )
   )
   (tile
     (id 1)
@@ -345,343 +638,422 @@
   (tiles
     (width 3)
     (height 4)
-    (ids  7  8  9
-          13 14 15
-          10 11 12
-          16 17 18)
-    (attributes 0 0 0
-                1 1 1
-                1 1 1
-                0 0 0)
-    (image "tiles/snow/convex.png")
-  )
-  (tiles
-    (width 2)
-    (height 3)
-    (ids 30 31
-         21 22
-         20 23)
-    (attributes 1 1
-                1 1
-                1 1)
-    (image "tiles/snow/concave.png")
-  )
-  (tiles
-    (width 2)
-    (height 3)
-    (ids 115 116
-         117 118
-         19 1539)
-    (attributes 1 1
-                1 1
-                1 1)
-    (image "tiles/snow/variants.png")
-  )
-  (tiles
-    (width 2)
-    (height 5)
     (ids
-         114 113
-         207 208
-         202 203
-         204 206
-         205 205
+      7  8  9
+      13 14 15
+      10 11 12
+      16 17 18
     )
     (attributes
-         1 1
-         1 1
-         0 1
-         1 1
-         1 1
+      0 0 0
+      1 1 1
+      1 1 1
+      0 0 0
     )
-    (image "tiles/snow/special.png")
-  )
-  (tiles
-    (width 3)
-    (height 3)
-    (ids 122 209 123
-         124 210 125
-         1345 1346 1344)
-    (attributes 3 3 3
-                0 1 0
-                0 0 0)
-    (image "tiles/snow/background.png")
+    (image "tiles/snow/convex.png")
   )
   (tile
-    (id 24)
+    (id 1826)
     (images
-      "tiles/doodads/grass1.png"
+      (region "tiles/snow/convex.png" 128 0 32 32)
     )
   )
   (tile
-    (id 25)
+    (id 1827)
     (images
-      "tiles/doodads/grass2.png"
+      (region "tiles/snow/convex.png" 160 0 32 32)
     )
   )
   (tile
-    (id 26)
+    (id 1829)
     (images
-      "objects/bonus_block/full-0.png"
-      "objects/bonus_block/full-1.png"
-      "objects/bonus_block/full-2.png"
-      "objects/bonus_block/full-3.png"
-      "objects/bonus_block/full-4.png"
-      "objects/bonus_block/full-3.png"
-      "objects/bonus_block/full-2.png"
-      "objects/bonus_block/full-1.png"
-      "objects/bonus_block/full-0.png"
-      "objects/bonus_block/full-0.png"
-      "objects/bonus_block/full-0.png"
+      (region "tiles/snow/convex.png" 96 32 32 32)
     )
     (solid #t)
-    (fullbox #t)
-    (next-tile 84)
-    (data 1)
-    (anim-fps 2)
+    (slope-type 18)
+    (data 18)
   )
   (tile
-    (id 27)
+    (id 1830)
     (images
-      "tiles/blocks/block1.png"
+      (region "tiles/snow/convex.png" 128 32 32 32)
     )
     (solid #t)
+    (slope-type 34)
+    (data 34)
   )
   (tile
-    (id 28)
+    (id 1831)
     (images
-      "tiles/blocks/block2.png"
+      (region "tiles/snow/convex.png" 160 32 32 32)
     )
     (solid #t)
+    (slope-type 32)
+    (data 32)
   )
   (tile
-    (id 29)
+    (id 1832)
     (images
-      "tiles/blocks/block3.png"
+      (region "tiles/snow/convex.png" 192 32 32 32)
     )
     (solid #t)
+    (slope-type 16)
+    (data 16)
   )
   (tile
-    (id 32)
-    (images
-      "tiles/darksnow/darksnow1.png"
-    )
-  )
-  (tile
-    (id 33)
+    (id 1833)
     (images
-      "tiles/darksnow/darksnow2.png"
+      (region "tiles/snow/convex.png" 96 64 32 32)
     )
+    (solid #t)
   )
   (tile
-    (id 34)
+    (id 1834)
     (images
-      "tiles/darksnow/darksnow3.png"
+      (region "tiles/snow/convex.png" 128 64 32 32)
     )
+    (solid #t)
   )
   (tile
-    (id 35)
+    (id 1835)
     (images
-      "tiles/darksnow/darksnow4.png"
+      (region "tiles/snow/convex.png" 160 64 32 32)
     )
     (solid #t)
   )
   (tile
-    (id 36)
+    (id 1836)
     (images
-      "tiles/darksnow/darksnow5.png"
+      (region "tiles/snow/convex.png" 192 64 32 32)
     )
     (solid #t)
   )
   (tile
-    (id 37)
+    (id 1837)
     (images
-      "tiles/darksnow/darksnow6.png"
+      (region "tiles/snow/convex.png" 224 0 32 32)
     )
-    (solid #t)
   )
   (tile
-    (id 38)
+    (id 1838)
     (images
-      "tiles/darksnow/darksnow7.png"
+      (region "tiles/snow/convex.png" 256 0 32 32)
     )
-    (solid #t)
   )
   (tile
-    (id 39)
+    (id 1839)
     (images
-      "tiles/darksnow/darksnow8.png"
+      (region "tiles/snow/convex.png" 224 32 32 32)
     )
     (solid #t)
+    (slope-type 2)
+    (data 2)
   )
   (tile
-    (id 40)
+    (id 1840)
     (images
-      "tiles/darksnow/darksnow9.png"
+      (region "tiles/snow/convex.png" 256 32 32 32)
     )
     (solid #t)
+    (slope-type 0)
   )
   (tile
-    (id 41)
+    (id 1841)
     (images
-      "tiles/darksnow/darksnow10.png"
+      (region "tiles/snow/convex.png" 224 64 32 32)
     )
     (solid #t)
   )
   (tile
-    (id 42)
+    (id 1842)
     (images
-      "tiles/darksnow/darksnow11.png"
+      (region "tiles/snow/convex.png" 256 64 32 32)
     )
     (solid #t)
   )
   (tile
-    (id 43)
+    (id 1843)
     (images
-      "tiles/darksnow/darksnow12.png"
+      (region "tiles/snow/convex.png" 288 0 32 32)
     )
-    (solid #t)
   )
   (tile
-    (id 44)
+    (id 1844)
     (images
-      "objects/coin/coin-0.png"
-      "objects/coin/coin-1.png"
-      "objects/coin/coin-2.png"
-      "objects/coin/coin-3.png"
-      "objects/coin/coin-4.png"
-      "objects/coin/coin-5.png"
-      "objects/coin/coin-6.png"
-      "objects/coin/coin-7.png"
+      (region "tiles/snow/convex.png" 320 0 32 32)
     )
-    (coin #t)
-    (anim-fps 10)
   )
   (tile
-    (id 47)
+    (id 1845)
     (images
-      "tiles/blocks/block4.png"
+      (region "tiles/snow/convex.png" 288 32 32 32)
     )
-    (solid #t)
+    (slope-type 66)
+    (data 66)
   )
   (tile
-    (id 48)
+    (id 1846)
     (images
-      "tiles/blocks/block5.png"
+      (region "tiles/snow/convex.png" 320 32 32 32)
     )
-    (solid #t)
+    (slope-type 48)
+    (data 48)
   )
   (tile
-    (id 49)
+    (id 1847)
     (images
-      "tiles/blocks/block6.png"
+      (region "tiles/snow/convex.png" 288 64 32 32)
     )
     (solid #t)
+    (slope-type 50)
+    (data 50)
   )
   (tile
-    (id 50)
+    (id 1848)
     (images
-      "tiles/blocks/block7.png"
+      (region "tiles/snow/convex.png" 320 64 32 32)
     )
     (solid #t)
+    (slope-type 64)
+    (data 64)
   )
   (tile
-    (id 51)
+    (id 1849)
     (images
-      "tiles/blocks/block8.png"
+      (region "tiles/snow/convex.png" 288 96 32 32)
     )
     (solid #t)
   )
   (tile
-    (id 52)
+    (id 1850)
     (images
-      "tiles/blocks/block9.png"
+      (region "tiles/snow/convex.png" 320 96 32 32)
     )
     (solid #t)
   )
-  (tile
-    (id 53)
-    (images
-      "tiles/pipe/pipe1.png"
+  (tiles
+    (width 2)
+    (height 3)
+    (ids
+      30 31
+      21 22
+      20 23
     )
-    (solid #t)
+    (attributes
+      1 1
+      1 1
+      1 1
+    )
+    (image "tiles/snow/concave.png")
   )
-  (tile
-    (id 54)
-    (images
-      "tiles/pipe/pipe2.png"
+  (tiles
+    (width 2)
+    (height 3)
+    (ids
+      115 116
+      117 118
+      19 1539
     )
-    (solid #t)
+    (attributes
+      1 1
+      1 1
+      1 1
+    )
+    (image "tiles/snow/variants.png")
   )
-  (tile
-    (id 55)
-    (images
-      "tiles/pipe/pipe3.png"
+  (tiles
+    (width 2)
+    (height 5)
+    (ids
+      114 113
+      207 208
+      202 203
+      204 206
+      214 205
     )
-    (solid #t)
+    (attributes
+      1 1
+      1 1
+      0 1
+      1 1
+      1 1
+    )
+    (image "tiles/snow/special.png")
   )
-  (tile
-    (id 56)
-    (images
-      "tiles/pipe/pipe4.png"
+  (tiles
+    (width 3)
+    (height 3)
+    (ids
+      122  209  123
+      124  210  125
+      1345 1346 1344
     )
-    (solid #t)
+    (attributes
+      3 3 3
+      0 1 0
+      0 0 0
+    )
+    (image "tiles/snow/background.png")
   )
   (tile
-    (id 57)
+    (id 24)
     (images
-      "tiles/pipe/pipe5.png"
+      "tiles/doodads/grass1.png"
     )
-    (solid #t)
-    (unisolid #t)
   )
   (tile
-    (id 58)
+    (id 25)
     (images
-      "tiles/pipe/pipe6.png"
+      "tiles/doodads/grass2.png"
     )
-    (solid #t)
-    (unisolid #t)
   )
   (tile
-    (id 59)
+    ; dupe of tile 83, this one will be removed.
+    (id 26)
     (images
-      "tiles/pipe/pipe7.png"
+      "objects/bonus_block/full-0.png"
+      "objects/bonus_block/full-1.png"
+      "objects/bonus_block/full-2.png"
+      "objects/bonus_block/full-3.png"
+      "objects/bonus_block/full-4.png"
+      "objects/bonus_block/full-3.png"
+      "objects/bonus_block/full-2.png"
+      "objects/bonus_block/full-1.png"
+      "objects/bonus_block/full-0.png"
+      "objects/bonus_block/full-0.png"
+      "objects/bonus_block/full-0.png"
     )
     (solid #t)
+    (fullbox #t)
+    (next-tile 84)
+    (data 1)
+    (anim-fps 2)
   )
-  (tile
-    (id 60)
-    (images
-      "tiles/pipe/pipe8.png"
+  (tiles
+    (width 3)
+    (height 1)
+    (ids
+      27 28 29
     )
-    (solid #t)
+    (attributes
+      1 1 1
+    )
+    (image "tiles/blocks/block_horiz.png")
   )
-  (tile
-    (id 61)
-    (images
-      "tiles/blocks/block10.png"
+  ; Yes, the numbering is extremely odd, backwards compatibility...
+  (tiles
+    (width 3)
+    (height 4)
+    (ids
+      33 32 34
+      35 37 39
+      38 36 43
+      40 41 42
     )
-    (solid #t)
+    (attributes
+      0 0 0
+      1 1 1
+      1 1 1
+      1 1 1
+    )
+    (image "tiles/darksnow/convex.png")
   )
   (tile
-    (id 62)
+    (id 44)
     (images
-      "tiles/blocks/block11.png"
+      "objects/coin/coin-0.png"
+      "objects/coin/coin-1.png"
+      "objects/coin/coin-2.png"
+      "objects/coin/coin-3.png"
+      "objects/coin/coin-4.png"
+      "objects/coin/coin-5.png"
+      "objects/coin/coin-6.png"
+      "objects/coin/coin-7.png"
     )
-    (solid #t)
+    (coin #t)
+    (anim-fps 10)
   )
   (tile
-    (id 63)
+    (id 47)
     (images
-      "tiles/background/backgroundtile1.png"
+      "tiles/blocks/block4.png"
     )
     (solid #t)
   )
   (tile
-    (id 64)
+    (id 48)
     (images
-      "tiles/castle/grey.png"
+      "tiles/blocks/block5.png"
+    )
+    (solid #t)
+  )
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      50 49
+      51 52
+    )
+    (attributes
+      1 1
+      1 1
+    )
+    (image "tiles/blocks/bigblock.png")
+  )
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      53 55 1744
+      54 56 1745
+    )
+    (attributes
+      1 1 1
+      1 1 1
+    )
+    (image "tiles/pipe/pipeh.png")
+  )
+  (tiles
+    (width 2)
+    (height 3)
+    (ids
+      57   58
+      59   60
+      1742 1743
+    )
+    (attributes
+      1 1
+      1 1
+      1 1
+    )
+    (image "tiles/pipe/pipev.png")
+  )
+  (tile
+    (id 61)
+    (images
+      "tiles/blocks/block10.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 62)
+    (images
+      "tiles/blocks/block11.png"
+    )
+    (solid #t)
+  )
+  (tile
+    ; dupe of tile 70, this one will be removed.
+    (id 63)
+    (images
+      "tiles/background/backgroundtile1.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 64)
+    (images
+      "tiles/castle/grey.png"
     )
     (solid #t)
   )
@@ -721,6 +1093,7 @@
     (solid #t)
   )
   (tile
+    ; dupe of tile 63, this one will be kept.
     (id 70)
     (images
       "tiles/background/backgroundtile1.png"
@@ -788,17 +1161,24 @@
     (solid #t)
     (brick #t)
   )
-  (tile
-    (id 79)
-    (images
-      "tiles/pole/vert.png"
+  (tiles
+    (width 1)
+    (height 5)
+    (ids
+      80
+      1349
+      79
+      1348
+      1347
     )
-  )
-  (tile
-    (id 80)
-    (images
-      "tiles/pole/vert_tp.png"
+    (attributes
+      0
+      0
+      0
+      0
+      0
     )
+    (image "tiles/pole/vert.png")
   )
   (tile
     (id 81)
@@ -809,6 +1189,7 @@
     (anim-fps 10)
   )
   (tile
+    ; dupe of tile 26, this one will be kept.
     (id 83)
     (images
       "objects/bonus_block/full-0.png"
@@ -836,106 +1217,38 @@
     )
     (solid #t)
   )
-  (tile
-    (id 85)
-    (images
-      "tiles/background/cloud-00.png"
-    )
-  )
-  (tile
-    (id 86)
-    (images
-      "tiles/background/cloud-01.png"
-    )
-  )
-  (tile
-    (id 87)
-    (images
-      "tiles/background/cloud-02.png"
-    )
-  )
-  (tile
-    (id 88)
-    (images
-      "tiles/background/cloud-03.png"
-    )
-  )
-  (tile
-    (id 89)
-    (images
-      "tiles/background/cloud-10.png"
-    )
-  )
-  (tile
-    (id 90)
-    (images
-      "tiles/background/cloud-11.png"
-    )
-  )
-  (tile
-    (id 91)
-    (images
-      "tiles/background/cloud-12.png"
-    )
-  )
-  (tile
-    (id 92)
-    (images
-      "tiles/background/cloud-13.png"
-    )
-  )
-  (tile
-    (id 93)
-    (images
-      "tiles/background/bkgd-00.png"
-    )
-  )
-  (tile
-    (id 94)
-    (images
-      "tiles/background/bkgd-01.png"
-    )
-  )
-  (tile
-    (id 95)
-    (images
-      "tiles/background/bkgd-02.png"
-    )
-  )
-  (tile
-    (id 96)
-    (images
-      "tiles/background/bkgd-03.png"
-    )
-  )
-  (tile
-    (id 97)
-    (images
-      "tiles/background/bkgd-10.png"
+  (tiles
+    (width 4)
+    (height 2)
+    (ids
+      85 86 87 88
+      89 90 91 92
     )
-  )
-  (tile
-    (id 98)
-    (images
-      "tiles/background/bkgd-11.png"
+    (attributes
+      0 0 0 0
+      0 0 0 0
     )
+    (image "tiles/background/cloud.png")
   )
-  (tile
-    (id 99)
-    (images
-      "tiles/background/bkgd-12.png"
+  (tiles
+    ; 93 is a dupe of tile 101, 93 will be kept.
+    (width 4)
+    (height 2)
+    (ids
+      93 94 95 96
+      97 98 99 100
     )
-  )
-  (tile
-    (id 100)
-    (images
-      "tiles/background/bkgd-13.png"
+    (attributes
+      0 0 0 0
+      0 0 0 0
     )
+    (image "tiles/background/bkgd.png")
   )
   (tile
+    ; dupe of tile 93, this one will be removed.
     (id 101)
     (images
-      "tiles/background/bkgd-00.png"
+      (region "tiles/background/bkgd.png" 0 0 32 32)
     )
   )
   (tile
@@ -987,54 +1300,35 @@
     (images
       "tiles/blocks/brick0.png"
     )
+    (editor-images "tiles/blocks/brick0_full.png")
     (solid #t)
     (brick #t)
-    (data 84)
+    (data 1)
+    (next-tile 84)
   )
   (tile
     (id 105)
     (images
       "tiles/blocks/brick1.png"
     )
+    (editor-images "tiles/blocks/brick1_full.png")
     (solid #t)
     (brick #t)
-    (data 84)
-  )
-  (tile
-    (id 106)
-    (images
-      "tiles/background/background1.png"
-    )
-  )
-  (tile
-    (id 107)
-    (images
-      "tiles/background/background2.png"
-    )
-  )
-  (tile
-    (id 108)
-    (images
-      "tiles/background/background3.png"
-    )
-  )
-  (tile
-    (id 109)
-    (images
-      "tiles/background/background4.png"
-    )
+    (data 1)
+    (next-tile 84)
   )
-  (tile
-    (id 110)
-    (images
-      "tiles/background/background5.png"
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      106 107 108
+      109 110 111
     )
-  )
-  (tile
-    (id 111)
-    (images
-      "tiles/background/background6.png"
+    (attributes
+      0 0 0
+      0 0 0
     )
+    (image "tiles/background/background.png")
   )
   (tile
     (id 112)
@@ -1043,26 +1337,16 @@
     (next-tile 84)
     (editor-images "objects/bonus_block/bonus-invisible.png")
   )
-  (tile
-    (id 119)
-    (images
-      "tiles/darksnow/darksnow13.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 120)
-    (images
-      "tiles/darksnow/darksnow14.png"
+  (tiles
+    (width 3)
+    (height 1)
+    (ids
+      119 121 120
     )
-    (solid #t)
-  )
-  (tile
-    (id 121)
-    (images
-      "tiles/darksnow/darksnow15.png"
+    (attributes
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/darksnow/low.png")
   )
   (tile
     (id 126)
@@ -1151,25 +1435,32 @@
     (goal #t)
     (editor-images "tiles/auxiliary/endseq.png")
   )
+  ; For compatibility with 0.1.x levels, use tile to 1809-1814 instead
   (tile
     (id 134)
     (images
-      "tiles/doodads/nolok1.png"
+      (region "tiles/doodads/nolok-statue.png" 0 0 32 96)
     )
   )
+  ; For compatibility with 0.1.x levels, use tile to 1809-1814 instead
   (tile
     (id 135)
     (images
-      "tiles/doodads/nolok2.png"
+      (region "tiles/doodads/nolok-statue.png" 32 0 32 96)
     )
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 136 137
-         138 139)
-    (attributes 0 0 0 0)
+    (ids
+      136 137
+      138 139
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/run.png")
   )
 
@@ -1199,9 +1490,14 @@
   (tiles
     (width 2)
     (height 2)
-    (ids 141 142
-         143 144)
-    (attributes 0 0 0 0)
+    (ids
+      141 142
+      143 144
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/right.png")
   )
 
@@ -1360,6 +1656,7 @@
     )
     (water #t)
     (hurts #t)
+    (fire #t)
     (anim-fps 10)
   )
   (tile
@@ -1372,15 +1669,16 @@
     )
     (water #t)
     (hurts #t)
+    (fire #t)
     (anim-fps 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)
@@ -1388,10 +1686,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)
@@ -1399,10 +1697,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)
@@ -1410,10 +1708,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)
@@ -1421,10 +1719,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)
@@ -1432,10 +1730,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)
@@ -1443,10 +1741,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)
@@ -1454,10 +1752,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)
@@ -1465,10 +1763,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)
@@ -1476,10 +1774,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)
@@ -1487,10 +1785,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)
@@ -1498,10 +1796,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)
@@ -1509,10 +1807,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)
@@ -1520,10 +1818,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)
@@ -1531,10 +1829,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)
@@ -1542,10 +1840,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)
@@ -1553,10 +1851,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)
@@ -1564,10 +1862,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)
@@ -1575,10 +1873,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)
@@ -1586,10 +1884,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)
@@ -1666,34 +1964,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)
@@ -1701,10 +1993,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)
@@ -1712,10 +2004,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)
@@ -1723,10 +2015,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)
@@ -1734,10 +2026,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)
@@ -1745,10 +2037,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)
@@ -1756,10 +2048,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)
@@ -1767,10 +2059,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)
@@ -1778,10 +2070,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)
@@ -1789,10 +2081,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)
@@ -1800,10 +2092,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)
@@ -1811,10 +2103,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)
@@ -1822,10 +2114,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)
@@ -1833,10 +2125,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)
@@ -1844,10 +2136,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)
@@ -1855,10 +2147,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)
@@ -1866,10 +2158,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)
@@ -1877,10 +2169,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)
@@ -1888,10 +2180,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)
@@ -1899,10 +2191,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)
@@ -1939,19 +2231,27 @@
   (tiles
     (width 3)
     (height 3)
-    (ids  301 302 303
-          304 305 306
-          307 308 309)
-    (attributes 0 0 0
-                1 1 1
-                1 1 1)
+    (ids
+      301 302 303
+      304 305 306
+      307 308 309
+    )
+    (attributes
+      0 0 0
+      1 1 1
+      1 1 1
+    )
     (image "tiles/jungle/convex.png")
   )
   (tiles
     (width 2)
     (height 1)
-    (ids  311 310)
-    (attributes 1 1)
+    (ids
+      311 310
+    )
+    (attributes
+      1 1
+    )
     (image "tiles/jungle/concave.png")
   )
   (tile
@@ -1973,160 +2273,74 @@
     (solid #t)
     (anim-fps 10)
   )
-  (tile
-    (id 313)
-    (images
-      "tiles/doodads/stone1_1.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      313 314
+      315 316
     )
-  )
-  (tile
-    (id 314)
-    (images
-      "tiles/doodads/stone1_2.png"
+    (attributes
+      0 0
+      1 1
     )
+    (image "tiles/doodads/stone1.png")
   )
-  (tile
-    (id 315)
-    (images
-      "tiles/doodads/stone1_3.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      317 318
+      319 320
     )
-    (solid #t)
+    (attributes
+      0 0
+      1 1
+    )
+    (image "tiles/doodads/stone2.png")
   )
   (tile
-    (id 316)
+    (id 321)
     (images
-      "tiles/doodads/stone1_4.png"
+      "tiles/castle/grey_jungle.png"
     )
     (solid #t)
   )
   (tile
-    (id 317)
+    (id 322)
     (images
-      "tiles/doodads/stone2_1.png"
+      "tiles/doodads/plant1.png"
     )
   )
-  (tile
-    (id 318)
-    (images
-      "tiles/doodads/stone2_2.png"
+  (tiles
+    (width 2)
+    (height 4)
+    (ids
+      323 324
+      325 326
+      327 328
+      329 330
     )
-  )
-  (tile
-    (id 319)
-    (images
-      "tiles/doodads/stone2_3.png"
+    (attributes
+      0 0
+      0 0
+      0 0
+      0 0
     )
-    (solid #t)
+    (image "tiles/doodads/liane.png")
   )
-  (tile
-    (id 320)
-    (images
-      "tiles/doodads/stone2_4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 321)
-    (images
-      "tiles/castle/grey_jungle.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 322)
-    (images
-      "tiles/doodads/plant1.png"
-    )
-  )
-  (tile
-    (id 323)
-    (images
-      "tiles/doodads/liane1.png"
-    )
-  )
-  (tile
-    (id 324)
-    (images
-      "tiles/doodads/liane2.png"
-    )
-  )
-  (tile
-    (id 325)
-    (images
-      "tiles/doodads/liane3.png"
-    )
-  )
-  (tile
-    (id 326)
-    (images
-      "tiles/doodads/liane4.png"
-    )
-  )
-  (tile
-    (id 327)
-    (images
-      "tiles/doodads/liane5.png"
-    )
-  )
-  (tile
-    (id 328)
-    (images
-      "tiles/doodads/liane6.png"
-    )
-  )
-  (tile
-    (id 329)
-    (images
-      "tiles/doodads/liane7.png"
-    )
-  )
-  (tile
-    (id 330)
-    (images
-      "tiles/doodads/liane8.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
@@ -2145,21 +2359,6 @@
     )
   )
   (tile
-    (id 400)
-    (images
-      "tiles/snow/slope-right.png"
-    )
-    (slope-type 2)
-    (data 2)
-  )
-  (tile
-    (id 401)
-    (images
-      "tiles/snow/slope-left.png"
-    )
-    (slope-type 0)
-  )
-  (tile
     (id 402)
     (images
       (region "tiles/forest/foresttiles-12.png" 0 0 32 32)
@@ -3930,20 +4129,6 @@
     (solid #t)
   )
   (tile
-    (id 1219)
-    (images
-      (region "tiles/forest/foresttiles-9.png" 128 256 32 32)
-    )
-    (solid #t)
-  )
-  (tile
-    (id 1220)
-    (images
-      (region "tiles/forest/foresttiles-9.png" 160 256 32 32)
-    )
-    (solid #t)
-  )
-  (tile
     (id 1221)
     (images
       (region "tiles/forest/foresttiles-9.png" 0 288 32 32)
@@ -3970,20 +4155,6 @@
     (solid #t)
   )
   (tile
-    (id 1225)
-    (images
-      (region "tiles/forest/foresttiles-9.png" 128 288 32 32)
-    )
-    (solid #t)
-  )
-  (tile
-    (id 1226)
-    (images
-      (region "tiles/forest/foresttiles-9.png" 160 288 32 32)
-    )
-    (solid #t)
-  )
-  (tile
     (id 1227)
     (images
       (region "tiles/forest/foresttiles-9.png" 0 320 32 32)
@@ -4059,6 +4230,19 @@
       (region "tiles/forest/foresttiles-9.png" 160 352 32 32)
     )
   )
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      2045 1219 1220
+      2046 1225 1226
+    )
+    (attributes
+      0 1 1
+      0 1 1
+    )
+    (image "tiles/forest/foresttiles-9a.png")
+  )
   (tile
     (id 1239)
     (images
@@ -4774,52 +4958,31 @@
     )
   )
   (tile
-    (id 1347)
-    (images
-      "tiles/pole/vert_bm.png")
-    (solid #f)
-  )
-  (tile
-    (id 1348)
-    (images
-      "tiles/pole/vert_end_tp.png")
-    (solid #f)
-  )
-  (tile
-    (id 1349)
-    (images
-      "tiles/pole/vert_end_bm.png")
-    (solid #f)
-  )
-  (tile
     (id 1350)
     (images
       "tiles/doodads/platter.png")
     (solid #f)
   )
-  (tile
-    (id 1351)
-    (images
-      (region "tiles/forest/hole.png" 0 0 32 32)
-    )
-  )
-  (tile
-    (id 1352)
-    (images
-      (region "tiles/forest/hole.png" 0 32 32 32)
-    )
-  )
-  (tile
-    (id 1353)
-    (images
-      (region "tiles/forest/hole.png" 0 64 32 32)
+
+
+  (tiles
+    (width 3)
+    (height 5)
+    (ids
+      2005 1351 2010
+      2006 1352 2011
+      2007 1353 2012
+      2008 1354 2013
+      2009 1821 2014
     )
-  )
-  (tile
-    (id 1354)
-    (images
-      (region "tiles/forest/hole.png" 0 96 32 32)
+    (attributes
+      0 0 0
+      0 0 0
+      0 0 0
+      0 0 0
+      0 0 0
     )
+    (image "tiles/forest/hole.png")
   )
   (tile
     (id 1355)
@@ -5297,16 +5460,20 @@
   (tiles
     (width 4)
     (height 5)
-    (ids 1423 1424 1425 1426
-         1427 1428 1429 1430
-         1431 1432 1433 1434
-         1435 1436 1437 1438
-         1439 1440 1441 1442)
-    (attributes 0 0 0 0
-                1 1 1 1
-                1 1 1 1
-                1 1 1 1
-                1 1 1 1)
+    (ids
+      1423 1424 1425 1426
+      1427 1428 1429 1430
+      1431 1432 1433 1434
+      1435 1436 1437 1438
+      1439 1440 1441 1442
+    )
+    (attributes
+      0 0 0 0
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
     (image "tiles/ghostwood/ghostwood-1.png")
   )
   (tile
@@ -5388,78 +5555,124 @@
   (tiles
     (width 4)
     (height 2)
-    (ids 1467 1468 1469 1470
-         1471 1472 1473 1474)
-    (attributes 0 0 0 0
-                0 0 0 0 )
+    (ids
+      1467 1468 1469 1470
+      1471 1472 1473 1474
+    )
+    (attributes
+      0 0 0 0
+      0 0 0 0
+    )
     (image "tiles/castle/web.png")
   )
   (tiles
     (width 7)
     (height 5)
-    (ids 1476 1477 1478 1479 1480 1481 1482
-         1483 1484 1485 1486 1487 1488 1489
-         1490 1491 1492 1493 1494 1495 1496
-         1497 1498 1499 1500 1501 1502 1503
-         1504 1505 1506 1507 1508 1509 1510)
-    (attributes 1 1 0 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)
+    (ids
+      1476 1477 1478 1479 1480 1481 1482
+      1483 1484 1485 1486 1487 1488 1489
+      1490 1491 1492 1493 1494 1495 1496
+      1497 1498 1499 1500 1501 1502 1503
+      1504 1505 1506 1507 1508 1509 1510
+    )
+    (attributes
+      1 1 0 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
+    )
     (image "tiles/castle/castle_wall.png")
   )
   (tiles
     (width 2)
     (height 3)
-    (ids 1511 1512
-         1513 1514
-         1515 1516)
-    (attributes 0 0
-                0 0
-                0 0)
+    (ids
+      1511 1512
+      1513 1514
+      1515 1516
+    )
+    (attributes
+      0 0
+      0 0
+      0 0
+    )
     (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)
-    (ids 1517
-         1518)
-    (attributes 0
-                0)
-    (image "tiles/castle/walltorch.png")
+    (height 1)
+    (ids
+      1518
+    )
+    (attributes
+      0
+    )
+    (image "tiles/castle/walltorch/flame-base-0.png")
   )
-
   (tiles
     (width 4)
     (height 3)
-    (ids 1519 1520 1521 1522
-         1523 1524 1525 1526
-         1527 1528 1529 1530)
-    (attributes 0 0 0 0
-                0 0 0 0
-                0 0 0 0)
+    (ids
+      1519 1520 1521 1522
+      1523 1524 1525 1526
+      1527 1528 1529 1530
+    )
+    (attributes
+      0 0 0 0
+      0 0 0 0
+      0 0 0 0
+    )
     (image "tiles/castle/door.png")
   )
 
   (tiles
     (width 3)
     (height 2)
-    (ids 1533 1534 1535
-         1536 1537 1538)
-    (attributes 1 1 1
-                1 1 1)
+    (ids
+      1533 1534 1535
+      1536 1537 1538
+    )
+    (attributes
+      1 1 1
+      1 1 1
+    )
     (image "tiles/forest/fishbone.png")
   )
   (tiles
     (width 4)
     (height 3)
-    (ids 1551 1540 1541 1542
-         1543 1544 1545 1546
-         1547 1548 1549 1550 )
-    (attributes 1 1 1 1
-                1 1 1 1
-                1 1 1 1)
+    (ids
+      1551 1540 1541 1542
+      1543 1544 1545 1546
+      1547 1548 1549 1550
+    )
+    (attributes
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
     (image "tiles/blocks/icebridge.png")
   )
   (tile
@@ -5484,12 +5697,17 @@
   (tiles
     (width 2)
     (height 2)
-    (ids 1570 1571
-         1572 1573)
-    (attributes 0 0 0 0)
+    (ids
+      1570 1571
+      1572 1573
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/forest/pogonia/base.png")
   )
- (tile
+  (tile
     (id 1574)
     (images
       "tiles/forest/pogonia/pogonia-1-flip.png"
@@ -5503,72 +5721,112 @@
   (tiles
     (width 2)
     (height 2)
-    (ids 1600 1601
-         1602 1603)
-    (attributes 0 0 0 0)
+    (ids
+      1600 1601
+      1602 1603
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/rightup.png")
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 1604 1605
-         1606 1607)
-    (attributes 0 0 0 0)
+    (ids
+      1604 1605
+      1606 1607
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/rightdown.png")
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 1608 1609
-         1610 1611)
-    (attributes 0 0 0 0)
+    (ids
+      1608 1609
+      1610 1611
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/left.png")
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 1612 1613
-         1614 1615)
-    (attributes 0 0 0 0)
+    (ids
+      1612 1613
+      1614 1615
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/leftup.png")
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 1616 1617
-         1618 1619)
-    (attributes 0 0 0 0)
+    (ids
+      1616 1617
+      1618 1619
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/leftdown.png")
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 1620 1621
-         1622 1623)
-    (attributes 0 0 0 0)
+    (ids
+      1620 1621
+      1622 1623
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/up.png")
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 1624 1625
-         1626 1627)
-    (attributes 0 0 0 0)
+    (ids
+      1624 1625
+      1626 1627
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/down.png")
   )
 
   (tiles
     (width 2)
     (height 2)
-    (ids 1628 1629
-         1630 1631)
-    (attributes 0 0 0 0)
+    (ids
+      1628 1629
+      1630 1631
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/danger.png")
   )
 
@@ -5582,14 +5840,17 @@
       1653 1654 1655 1656 1657 1658 1659
       1660 1661 1662 1663 1664 1665 1666
       1667 1668 1669 1670 1671 1672 1673
-      1674 1675 1676 1677 1678 1679 1680 )
-    (attributes 0 0 0 0 0 0 0
-                0 1 1 0 0 0 0
-                0 1 1 0 0 0 0
-                0 1 1 0 0 0 0
-                0 1 1 1 1 0 0
-                0 0 0 0 0 1 0
-                0 0 0 0 0 1 0 )
+      1674 1675 1676 1677 1678 1679 1680
+    )
+    (attributes
+      0 0 0 0 0 0 0
+      0 1 1 0 0 0 0
+      0 1 1 0 0 0 0
+      0 1 1 0 0 0 0
+      0 1 1 1 1 0 0
+      0 0 0 0 0 1 0
+      0 0 0 0 0 1 0
+    )
     (image "tiles/forest/exit-tree.png")
   )
   (tile
@@ -5600,6 +5861,7 @@
       "tiles/lava/zone/body-1-3.png"
       "tiles/lava/zone/body-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5611,6 +5873,7 @@
       "tiles/lava/zone/edge-1-3.png"
       "tiles/lava/zone/edge-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5626,6 +5889,7 @@
       "tiles/lava/zone/rest.png"
       "tiles/lava/zone/rest.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5641,6 +5905,7 @@
       "tiles/lava/zone/bubble-in-1-3.png"
       "tiles/lava/zone/bubble-in-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5657,6 +5922,7 @@
       "tiles/lava/zone/bubble-out-1-4.png"
     )
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5668,6 +5934,7 @@
       "tiles/lava/zone/body-2-3.png"
       "tiles/lava/zone/body-2-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5679,6 +5946,7 @@
       "tiles/lava/zone/body-bottom-1-3.png"
       "tiles/lava/zone/body-bottom-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5690,6 +5958,7 @@
       "tiles/lava/zone/edge-right-1-3.png"
       "tiles/lava/zone/edge-right-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5700,7 +5969,6 @@
       "tiles/lava/zone/surface-1-2.png"
       "tiles/lava/zone/surface-1-3.png"
       "tiles/lava/zone/surface-1-4.png")
-    (hurts #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5712,6 +5980,7 @@
       "tiles/lava/zone/edge-left-1-3.png"
       "tiles/lava/zone/edge-left-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5723,6 +5992,7 @@
       "tiles/lava/zone/edge-right-1-2.png"
       "tiles/lava/zone/edge-right-1-1.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5734,6 +6004,7 @@
       "tiles/lava/zone/edge-left-1-3.png"
       "tiles/lava/zone/edge-left-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5745,6 +6016,7 @@
       "tiles/lava/zone/edge-flip-1-3.png"
       "tiles/lava/zone/edge-flip-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5756,6 +6028,7 @@
       "tiles/lava/zone/bubble-bottom-1-3.png"
       "tiles/lava/zone/bubble-bottom-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5771,6 +6044,7 @@
       "tiles/lava/zone/bubble-out-1-3.png"
       "tiles/lava/zone/bubble-out-1-4.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5786,6 +6060,7 @@
       "tiles/lava/zone/rest.png"
       "tiles/lava/zone/rest.png")
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
@@ -5803,14 +6078,19 @@
       "tiles/lava/zone/bubble-in-1-4.png"
     )
     (hurts #t)
+    (fire #t)
     (solid #f)
     (anim-fps 2)
   )
   (tiles
     (width 5)
     (height 1)
-    (ids 1717 1718 1719 1720 1721)
-    (attributes 1 0 0 0 1)
+    (ids
+      1717 1718 1719 1720 1721
+    )
+    (attributes
+      1 0 0 0 1
+    )
     (image "tiles/pole/horz.png")
   )
   (tile
@@ -5821,26 +6101,55 @@
     (solid #f)
   )
   (tiles
+    (width 2)
+    (height 2)
+    (ids
+      2001 2002
+      2003 2004
+    )
+    (attributes
+      0 0
+      0 0
+    )
+    (image "tiles/pole/t-cross.png")
+  )
+  (tiles
     (width 4)
-    (height 1)
-    (ids 1723 1724 1725 1726)
-    (attributes 1 1 1 1)
+    (height 2)
+    (ids
+      1723 1724 1725 1726
+      1817 1818 1819 1820
+    )
+    (attributes
+      0 0 0 0
+      1 1 0 1
+    )
     (image "tiles/forest/earth-floor.png")
   )
   (tiles
     (width 2)
     (height 2)
-    (ids 1727 1728
-         1729 1730)
-    (attributes 0 0 0 0)
+    (ids
+      1727 1728
+      1729 1730
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/color_cyan.png")
   )
   (tiles
     (width 2)
     (height 2)
-    (ids 1731 1732
-         1733 1734)
-    (attributes 0 0 0 0)
+    (ids
+      1731 1732
+      1733 1734
+    )
+    (attributes
+      0 0
+      0 0
+    )
     (image "tiles/signs/color_yellow.png")
   )
   (tile
@@ -5868,40 +6177,40 @@
   (tiles
     (width 1)
     (height 3)
-    (ids 1741
-         1740
-         1739)
-    (attributes 0
-                1
-                1)
-    (image "tiles/darksnow/wall.png")
-  )
-  (tiles
-    (width 2)
-    (height 2)
-    (ids 1742 1743
-         1744 1745)
-    (attributes 1 1
-                1 1)
-    (image "tiles/pipe/mirrored.png")
+    (ids
+      1741
+      1740
+      1739
+    )
+    (attributes
+      0
+      1
+      1
+    )
+    (image "tiles/darksnow/wall.png")
   )
+
 ;unisolid Branches. Tile ID  1746-1761
   (tiles
-     (width 4)
-     (height 6)
-     (ids    0    0 1746 1747
-          1760 1761 1748 1749       
-             0    0 1750 1751
-          1752 1753    0    0
-          1754 1755 1756 1757
-          1758 1759    0    0)
-    (attributes 0 0 0 0
-                3 3 3 3
-                0 0 0 0
-                0 0 0 0
-                3 3 3 3
-                0 0 0 0)
-     (image "tiles/forest/branch.png") 
+    (width 4)
+    (height 6)
+    (ids
+      0    0    1746 1747
+      1760 1761 1748 1749
+      0    0    1750 1751
+      1752 1753 0    0
+      1754 1755 1756 1757
+      1758 1759 0    0
+    )
+    (attributes
+      0 0 0 0
+      3 3 3 3
+      0 0 0 0
+      0 0 0 0
+      3 3 3 3
+      0 0 0 0
+    )
+    (image "tiles/forest/branch.png")
   )
   (tile
     (id 1762)
@@ -5987,50 +6296,814 @@
     )
     (solid #t)
   )
- 
+
+  (tiles
+    (width  5)
+    (height 7)
+    (ids
+      1774 1775 1776 1777 1778
+      1779 1780 1781 1782 1783
+      1784 1785 1786 1787 1788
+      1789 1790 1791 1792 1793
+      1794 1795 1796 1797 1798
+      1799 1800 1801 1802 1803
+      1804 1805 1806 1807 1808
+    )
+    (attributes
+      0 0 0 0 0
+      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
+    )
+    (image "tiles/castle/brown.png")
+  )
+
+  ;Statue of Nolok, Tile ID 1809-1814
+  (tiles
+    (width 2)
+    (height 3)
+    (ids
+      1809 1812
+      1810 1813
+      1811 1814
+    )
+    (attributes
+      0 0
+      0 0
+      0 0
+    )
+    (image "tiles/doodads/nolok-statue.png")
+  )
+  (tiles
+    (width 2)
+    (height 1)
+    (ids
+      1815 1816
+    )
+    (attributes
+      1 1
+    )
+    (image "tiles/darksnow/small.png")
+  )
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      1822 1823
+      1824 1825
+    )
+    (attributes
+      0 0
+      0 0
+    )
+    (image "tiles/signs/needrock.png")
+  )
+  (tiles
+    (width 4)
+    (height 5)
+    (ids
+      1860 1861 1862 1863
+      1864 1865 1866 1867
+      1868 1869 1870 1871
+      1872 1873 1874 1875
+      1876 1877 1879 1880
+    )
+    (attributes
+      0 0 0 0
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
+    (image "tiles/forest/underground/groundtiles-1.png")
+  )
+  (tile
+    (id 1890)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 32 0 32 32)
+    )
+  )
+  (tile
+    (id 1891)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 64 0 32 32)
+    )
+  )
+  (tile
+    (id 1892)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 0 32 32 32)
+    )
+    (solid #t)
+    (slope-type 18)
+    (data 18)
+  )
+  (tile
+    (id 1893)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 32 32 32 32)
+    )
+    (solid #t)
+    (slope-type 34)
+    (data 34)
+  )
+  (tile
+    (id 1894)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 64 32 32 32)
+    )
+    (solid #t)
+    (slope-type 32)
+    (data 32)
+  )
+  (tile
+    (id 1895)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 96 32 32 32)
+    )
+    (solid #t)
+    (slope-type 16)
+    (data 16)
+  )
+  (tile
+    (id 1896)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 0 64 32 32)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1897)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 32 64 32 32)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1898)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 64 64 32 32)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1899)
+    (images
+      (region "tiles/forest/underground/groundtiles-7.png" 96 64 32 32)
+    )
+    (solid #t)
+  )
+  (tiles
+    (width 4)
+    (height 4)
+    (ids
+      1900 1901 1902 1903
+      1904 1905 1906 1907
+      1908 1909 1910 1911
+      1912 1913 1914 1915
+    )
+    (attributes
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
+    (image "tiles/forest/underground/background1.png")
+  )
+  (tiles
+    (width 4)
+    (height 5)
+    (ids
+      1916 1917 1918 1919
+      1920 1921 1922 1923
+      1924 1925 1926 1927
+      1928 1929 1930 1931
+      1932 1933 1934 1935
+    )
+    (attributes
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
+    (image "tiles/forest/underground/background2.png")
+  )
+  (tiles
+    (width 4)
+    (height 5)
+    (ids
+      1936 1937 1938 1939
+      1940 1941 1942 1943
+      1944 1945 1946 1947
+      1948 1949 1950 1951
+      1952 1953 1954 1955
+    )
+    (attributes
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
+    (image "tiles/forest/underground/roots.png")
+  )
+  (tiles
+    (width 4)
+    (height 4)
+    (ids
+      1956 1957 1958 1959
+      1960 1961 1962 1963
+      1964 1965 1966 1967
+      1968 1969 1970 1971
+    )
+    (attributes
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
+    (image "tiles/forest/underground/background3.png")
+  )
+  (tile
+    (id 1972 )
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 0 0 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1973)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 0 32 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1974)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 0 64 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1975)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 0 96 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1976)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 32 0 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1977)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 32 32 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1978)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 32 64 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1979 )
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 32 96 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1980)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 64 0 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1981)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 64 32 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1982)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 64 64 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1983)
+    (images
+      (region "tiles/forest/spikevine/spikevine.png" 64 96 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1984)
+    (images
+      (region  "tiles/forest/spikevine/spikevine.png" 96 0 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1985)
+    (images
+      (region  "tiles/forest/spikevine/spikevine.png" 96 32 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1986)
+    (images
+      (region  "tiles/forest/spikevine/spikevine.png" 96 64 32 32)
+    )
+    (hurts #t)
+  )
+  (tile
+    (id 1987)
+    (images
+      (region  "tiles/forest/spikevine/spikevine.png" 96 96 32 32)
+    )
+    (hurts #t)
+  )
+  (tiles
+    (width 2)
+    (height 4)
+    (ids
+      1988 1989
+      1990 1991
+      1992 1993
+      1994 1995
+    )
+    (attributes
+      1 1
+      1 1
+      1 1
+      1 1
+    )
+    (image "tiles/forest/statue.png")
+  )
+  (tiles
+    (width 2)
+    (height 1)
+    (ids
+      1996 1997
+    )
+    (attributes
+      1 1
+    )
+    (image "tiles/forest/pogonia/dangersign.png")
+  )
+  (tiles
+    (width 3)
+    (height 4)
+    (ids
+      1998 1999 2000
+      2023 2024 2025
+      2026 2027 2028
+      2029 2030 2031
+    )
+    (attributes
+      1 1 1
+      1 1 1
+      1 1 1
+      1 1 1
+    )
+    (image "tiles/forest/exit/outhouse.png")
+  )
+  (tiles
+    (width 4)
+    (height 4)
+    (ids
+      2032 2033 2034 2035
+      2036 2037    0 2038
+      2039    0    0 2040
+         0 2041 2042    0
+    )
+    (attributes
+      0 0 0 0
+      0 0 0 0
+      0 0 0 0
+      0 0 0 0
+    )
+    (image "tiles/lightmap/lightmap-bw.png")
+  )
+  (tile
+    ; NOT a dupe of tile 57
+    (id 2043)
+    (images
+      (region  "tiles/pipe/pipev.png" 0 0 32 32)
+    )
+    (solid #t)
+    (unisolid #t)
+  )
+  (tile
+    ; NOT a dupe of tile 58
+    (id 2044)
+    (images
+      (region  "tiles/pipe/pipev.png" 32 0 32 32)
+    )
+    (solid #t)
+    (unisolid #t)
+  )
+  (tiles
+    (width 1)
+    (height 3)
+    (ids
+      2047
+      2048
+      2049
+    )
+    (attributes
+      0
+      0
+      0
+    )
+    (image "tiles/forest/ladder.png")
+  )
+  (tiles
+    (width  7)
+    (height 5)
+    (ids 2050 2051 2052 2053 2054 2075 2076
+         2055 2056 2057 2058 2059 2077 2078
+         2060 2061 2062 2063 2064 2079 2080
+         2065 2066 2067 2068 2069 2081 2082
+         2070 2071 2072 2073 2074 2083 2084
+    )
+    (attributes
+      0 0 0 0 0 0 0
+      0 0 0 0 0 3 3
+      0 0 0 0 0 0 0
+      0 0 0 0 0 0 0
+      0 0 3 3 3 0 0
+    )
+    (image "tiles/snow/unisolid.png")
+  )
+  (tiles
+    (width  2)
+    (height 3)
+    (ids 2085 2086
+         2087 2088
+         2089 2090
+    )
+    (attributes
+     1 1
+     1 1
+     1 1
+    )
+    (image "tiles/pipe/blue.png")
+  )
+
+  (tile
+    (id 2019)
+    (images
+       (region "tiles/water/antarctic-1.png" 0 0 32 32)
+       (region "tiles/water/antarctic-2.png" 0 0 32 32)
+       (region "tiles/water/antarctic-3.png" 0 0 32 32)
+       (region "tiles/water/antarctic-4.png" 0 0 32 32)
+       (region "tiles/water/antarctic-5.png" 0 0 32 32)
+       (region "tiles/water/antarctic-6.png" 0 0 32 32)
+       (region "tiles/water/antarctic-7.png" 0 0 32 32)
+       (region "tiles/water/antarctic-8.png" 0 0 32 32)
+    )
+    (water #t)
+    (anim-fps 16)
+  )
+
+  (tile
+    (id 2140)
+    (images
+       (region "tiles/water/antarctic-1.png" 32 0 32 32)
+       (region "tiles/water/antarctic-2.png" 32 0 32 32)
+       (region "tiles/water/antarctic-3.png" 32 0 32 32)
+       (region "tiles/water/antarctic-4.png" 32 0 32 32)
+       (region "tiles/water/antarctic-5.png" 32 0 32 32)
+       (region "tiles/water/antarctic-6.png" 32 0 32 32)
+       (region "tiles/water/antarctic-7.png" 32 0 32 32)
+       (region "tiles/water/antarctic-8.png" 32 0 32 32)
+    )
+    (water #t)
+    (anim-fps 16)
+  )
+
+  (tile
+    (id 2141)
+    (images
+       (region "tiles/water/antarctic-1.png" 64 0 32 32)
+       (region "tiles/water/antarctic-2.png" 64 0 32 32)
+       (region "tiles/water/antarctic-3.png" 64 0 32 32)
+       (region "tiles/water/antarctic-4.png" 64 0 32 32)
+       (region "tiles/water/antarctic-5.png" 64 0 32 32)
+       (region "tiles/water/antarctic-6.png" 64 0 32 32)
+       (region "tiles/water/antarctic-7.png" 64 0 32 32)
+       (region "tiles/water/antarctic-8.png" 64 0 32 32)
+    )
+    (water #t)
+    (anim-fps 16)
+  )
+
+  (tile
+    (id 2142)
+    (images
+       (region "tiles/water/antarctic-1.png" 96 0 32 32)
+       (region "tiles/water/antarctic-2.png" 96 0 32 32)
+       (region "tiles/water/antarctic-3.png" 96 0 32 32)
+       (region "tiles/water/antarctic-4.png" 96 0 32 32)
+       (region "tiles/water/antarctic-5.png" 96 0 32 32)
+       (region "tiles/water/antarctic-6.png" 96 0 32 32)
+       (region "tiles/water/antarctic-7.png" 96 0 32 32)
+       (region "tiles/water/antarctic-8.png" 96 0 32 32)
+    )
+    (water #t)
+    (anim-fps 16)
+  )
+
+  (tile
+    (id 2020)
+    (images
+     "tiles/water/antarctic.png")
+    (water #t)
+    )
+
+  (tiles
+    (width  5)
+    (height 6)
+    (ids 2091 2092 2093 2094 2095
+         2096 2097 2098 2099 2100
+         2101 2102 2103 2104 2105
+         2106 2107 2108 2109 2110
+         2111 2112 2113 2114 2115
+         2116 2117 2118 2119 2120
+    )
+    (attributes
+      1 1 1 1 1
+      1 1 1 0 0
+      1 1 1 0 0
+      1 1 1 0 0
+      1 1 1 0 0
+      1 1 1 0 1024
+    )
+    (image "tiles/snowcastle/foreground.png")
+  )
+
   (tiles
-     (width  5)
-     (height 7)
-     (ids 1774 1775 1776 1777 1778
-          1779 1780 1781 1782 1783
-          1784 1785 1786 1787 1788
-          1789 1790 1791 1792 1793
-          1794 1795 1796 1797 1798
-          1799 1800 1801 1802 1803
-          1804 1805 1806 1807 1808)
+    (width  5)
+    (height 3)
+    (ids 2121 2122 2123 2124 2125
+         2126 2127 2128 2129 2130
+         2131 2132 2133 2134 2135
+    )
+    (attributes
+      0 0 0 0 0 
+      0 0 0 0 0 
+      0 0 0 0 0
+    )
+    (image "tiles/snow/unisolid2.png")
+  )
+
+  (tile
+    (id 2136)
+    (anim-fps 16)
+    (images
+      (region "tiles/lava/lava-1.png" 0 0 32 32)
+      (region "tiles/lava/lava-2.png" 0 0 32 32)
+      (region "tiles/lava/lava-3.png" 0 0 32 32)
+      (region "tiles/lava/lava-4.png" 0 0 32 32)
+      (region "tiles/lava/lava-5.png" 0 0 32 32)
+      (region "tiles/lava/lava-6.png" 0 0 32 32)
+      (region "tiles/lava/lava-7.png" 0 0 32 32)
+      (region "tiles/lava/lava-8.png" 0 0 32 32)
+    )
+  )
+
+  (tile
+    (id 2137)
+    (anim-fps 16)
+    (images
+      (region "tiles/lava/lava-1.png" 32 0 32 32)
+      (region "tiles/lava/lava-2.png" 32 0 32 32)
+      (region "tiles/lava/lava-3.png" 32 0 32 32)
+      (region "tiles/lava/lava-4.png" 32 0 32 32)
+      (region "tiles/lava/lava-5.png" 32 0 32 32)
+      (region "tiles/lava/lava-6.png" 32 0 32 32)
+      (region "tiles/lava/lava-7.png" 32 0 32 32)
+      (region "tiles/lava/lava-8.png" 32 0 32 32)
+    )
+  )
+
+  (tile
+    (id 2138)
+    (anim-fps 16)
+    (images
+      (region "tiles/lava/lava-1.png" 64 0 32 32)
+      (region "tiles/lava/lava-2.png" 64 0 32 32)
+      (region "tiles/lava/lava-3.png" 64 0 32 32)
+      (region "tiles/lava/lava-4.png" 64 0 32 32)
+      (region "tiles/lava/lava-5.png" 64 0 32 32)
+      (region "tiles/lava/lava-6.png" 64 0 32 32)
+      (region "tiles/lava/lava-7.png" 64 0 32 32)
+      (region "tiles/lava/lava-8.png" 64 0 32 32)
+    )
+  )
 
-    (attributes 0 0 0 0 0
-                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)
-     (image "tiles/castle/brown.png")
+  (tile
+    (id 2139)
+    (anim-fps 16)
+    (images
+      (region "tiles/lava/lava-1.png" 96 0 32 32)
+      (region "tiles/lava/lava-2.png" 96 0 32 32)
+      (region "tiles/lava/lava-3.png" 96 0 32 32)
+      (region "tiles/lava/lava-4.png" 96 0 32 32)
+      (region "tiles/lava/lava-5.png" 96 0 32 32)
+      (region "tiles/lava/lava-6.png" 96 0 32 32)
+      (region "tiles/lava/lava-7.png" 96 0 32 32)
+      (region "tiles/lava/lava-8.png" 96 0 32 32)
+    )
   )
 
-;Statue of Nolok, Tile ID 1809-1814
   (tiles
-     (width 1)
-     (height 3)
-     (ids 1809
-          1810
-          1811)
-    (attributes 0
-                0
-                0)
-     (image "tiles/doodads/nolok1.png") 
+    (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 1)
-     (height 3)
-     (ids 1812
-          1813
-          1814)
-    (attributes 0
-                0
-                0)
-     (image "tiles/doodads/nolok2.png") 
+    (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 3 3 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)
+    (hurts #t)
+    (images
+      "tiles/snow/spike.png"))
+
+  (tiles
+    (width  8)
+    (height 3)
+    (ids
+     2179 2180 2181 2182   2183 2184 2185 2186
+     2187 2188 2189 2190   2191 2192 2193 2194
+     2195 2196 2197 2198   2199 2200 2201 2202)
+
+    (attributes 
+     0 0 0 0   0 0 0 0
+     0 0 0 0   0 0 0 0
+     0 0 0 0   0 0 0 0)
+    (image "tiles/snow/background2.png"))
+
+  (tiles
+    (width  3)
+    (height 3)
+    (ids
+     2203 2204 2205
+     2206 2207 2208
+     2209 2210 2211)
+    (attributes
+     1 1 1 
+     1 1 1
+     1 1 1)
+    (image "tiles/test/test.png"))
+
+  (tiles
+   (width  12)
+   (height 14)
+   (ids 
+    2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 
+    2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 
+    2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 
+    2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 
+    2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 
+    2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 
+    2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 
+    2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 
+    2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 
+    2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 
+    2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 
+    2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 
+    2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 
+    2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379)
+   (attributes
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0 
+    0    0    0    0    0    0    0    0    0    0    0    0)
+   (image "tiles/castle/background.png"))
+
+ (tiles
+   (width  2)
+   (height 2)
+   (ids 
+    2380 2381
+    2382 2383)
+   (attributes
+    0 0 
+    0 0)
+   (image "tiles/castle/stones.png"))
+
+  (tiles
+    (width 4)
+    (height 4)
+    (ids
+2384 2385 2386 2396
+2387 2388 2389 2397
+2390 2391 2392 2398
+2393 2394 2395 2399
+    )
+    (attributes
+      0 0 0 1
+      1 1 1 1
+      1 1 1 1
+      1 1 1 1
+    )
+    (image "tiles/darksnow/convex2.png")
+  )
+
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      2400 2401
+      2402 2403
+    )
+    (attributes
+      0 0
+      0 0
+    )
+    (image "tiles/signs/trampoline.png")
   )
 
+;; next-id: 2404
 )