Fixed sprite, bounding-boxes and behaviour of Mr. Tree

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 0706944..01a4cf1 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -59,11 +59,11 @@
   )
   (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 1418 1419 1420 1467 1468 1469 1470 1471 1472 1473 1474 1475 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 1511 1512 1513 1514 1515 1516 1516 1517 1518)
+    (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 1418 1419 1420 1467 1468 1469 1470 1471 1472 1473 1474 1475 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 1511 1512 1513 1514 1515 1516 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531)
   )
   (tilegroup
     (name "Signs")
-    (tiles 136 137 141 142 138 139 143 144)
+    (tiles 136 137 141 142 138 139 143 144 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631)
   )
   (tilegroup
     (name "Jungle")
@@ -1087,30 +1087,79 @@
     (data 5)
     (anim-fps 2)
   )
-  (tile
-    (id 141)
-    (images
-      "tiles/signs/sign_right1.png"
-    )
-  )
-  (tile
-    (id 142)
-    (images
-      "tiles/signs/sign_right2.png"
-    )
-  )
-  (tile
-    (id 143)
-    (images
-      "tiles/signs/sign_right3.png"
-    )
-  )
-  (tile
-    (id 144)
-    (images
-      "tiles/signs/sign_right4.png"
-    )
-  )
+
+  (tiles
+   (width 2)
+   (height 2)
+   (ids 141 142
+        143 144)
+   (attributes 0 0 0 0)
+   (image "tiles/signs/right.png"))
+
+  (tiles
+   (width 2)
+   (height 2)
+   (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)
+   (image "tiles/signs/rightdown.png"))
+
+  (tiles
+   (width 2)
+   (height 2)
+   (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)
+   (image "tiles/signs/leftup.png"))
+
+  (tiles
+   (width 2)
+   (height 2)
+   (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)
+   (image "tiles/signs/up.png"))
+
+  (tiles
+   (width 2)
+   (height 2)
+   (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)
+   (image "tiles/signs/danger.png"))
+
   (tile
     (id 149)
     (images
@@ -1264,7 +1313,7 @@
       "tiles/lava/lava1-4.png"
     )
     (water #t)
-    (spike #t)
+    (hurts #t)
     (anim-fps 10)
   )
   (tile
@@ -1276,7 +1325,7 @@
       "tiles/lava/lava2-4.png"
     )
     (water #t)
-    (spike #t)
+    (hurts #t)
     (anim-fps 10)
   )
   (tile
@@ -1880,28 +1929,28 @@
     (images
       "creatures/spike/up.png"
     )
-    (spike #t)
+    (hurts #t)
   )
   (tile
     (id 296)
     (images
       "creatures/spike/right.png"
     )
-    (spike #t)
+    (hurts #t)
   )
   (tile
     (id 297)
     (images
       "creatures/spike/down.png"
     )
-    (spike #t)
+    (hurts #t)
   )
   (tile
     (id 298)
     (images
       "creatures/spike/left.png"
     )
-    (spike #t)
+    (hurts #t)
   )
   (tile
     (id 301)
@@ -4898,12 +4947,6 @@
     )
   )
   (tile
-    (id 1354)
-    (images
-      (region "tiles/forest/hole.png" 0 128 32 32)
-    )
-  )
-  (tile
     (id 1355)
     (images
       (region "tiles/doodads/pedestal.png" 0 0 32 32)
@@ -5363,7 +5406,7 @@
       "tiles/water/electrified-1.png"
     )
     (anim-fps 10)
-    (spike #t)
+    (hurts #t)
     (water #t)
   )
   (tile
@@ -5373,7 +5416,7 @@
       "tiles/water/electrified_waves-1.png"
     )
     (anim-fps 10)
-    (spike #t)
+    (hurts #t)
     (water #t)
   )
   (tile
@@ -6056,5 +6099,145 @@
     )
     (solid #f)
 )
+  (tile
+    (id 1519)
+    (images
+      "tiles/blocks/keyhole.png"
+    )
+    (solid #t)
+)
+  (tile
+    (id 1520)
+    (images
+      (region "tiles/castle/door.png"  0 0 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1521)
+    (images
+      (region "tiles/castle/door.png"  0 32 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1522)
+    (images
+      (region "tiles/castle/door.png"  0 64 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1523)
+    (images
+      (region "tiles/castle/door.png"  32 0 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1524)
+    (images
+      (region "tiles/castle/door.png"  32 32 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1525)
+    (images
+      (region "tiles/castle/door.png"  32 64 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1526)
+    (images
+      (region "tiles/castle/door.png"  64 0 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1527)
+    (images
+      (region "tiles/castle/door.png"  64 32 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1528)
+    (images
+      (region "tiles/castle/door.png"  64 64 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1529)
+    (images
+      (region "tiles/castle/door.png"  96 0 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1530)
+    (images
+      (region "tiles/castle/door.png"  96 32 32 32)
+    )
+    (solid #f)
+)
+  (tile
+    (id 1531)
+    (images
+      (region "tiles/castle/door.png"  96 64 32 32)
+    )
+ 
+)
+  (tile
+    (id 1532)
+    (images
+      "tiles/doodads/clover.png" )
+    (solid #t)
+  )
+
+  (tile
+    (id 1533)
+    (images
+      (region "tiles/forest/fishbone.png" 0 0 32 32)
+    )
+    (solid #f)
+  )
+  (tile
+    (id 1534)
+    (images
+      (region "tiles/forest/fishbone.png" 32 0 32 32)
+    )
+    (solid #f)
+    ) 
+  (tile
+    (id 1535)
+    (images
+      (region "tiles/forest/fishbone.png" 64 0 32 32)
+    )
+    (solid #f)
+    )
+  (tile
+    (id 1536)
+    (images
+      (region "tiles/forest/fishbone.png" 0 32 32 32)
+    )
+    (solid #f)
+  )
+  (tile
+    (id 1537)
+    (images
+      (region "tiles/forest/fishbone.png" 32 32 32 32)
+    )
+    (solid #f)
+    ) 
+  (tile
+    (id 1538)
+    (images
+      (region "tiles/forest/fishbone.png" 64 32 32 32)
+    )
+    (solid #f)
+    )
 )
 )