refactored some supertux mainloops

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index bf7961c..b31abba 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -2,7 +2,7 @@
 (supertux-tiles
   (tilegroup
     (name "Snow")
-    (tiles 7 8 9 202 13 14 15 204 10 11 12 206 16 17 18 205 22 21 19 203 23 20 207 208 31 30 114 113 115 116 0 0 117 118 0 0 122 209 123 0 124 210 125 0 1345 1346 1344 0 33 32 34 0 35 37 39 0 38 36 43 0 40 41 42 0 119 121 120 0 )
+    (tiles 7 8 9 202 13 14 15 204 10 11 12 206 16 17 18 205 22 21 19 203 23 20 207 208 31 30 114 113 115 116 0 0 117 118 0 0 122 209 123 0 124 210 125 0 1345 1346 1344 0 33 32 34 0 35 37 39 0 38 36 43 0 40 41 42 0 119 121 120 0 1539)
   )
 
 (tilegroup
@@ -63,7 +63,7 @@
   )
   (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")
@@ -89,6 +89,10 @@
     (name "IceWood")
     (tiles 1442 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 0 1443 1444 0 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1459 1460 1455 1456 1461 1462 1457 1458 1463 1464 0 0 1465 1466)
 )  
+(tilegroup
+    (name "Icebridge")
+    (tiles 0 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551)
+)  
 (tile
     (id 0)
     (editor-images "objects/bonus_block/bonus-fire_flower.png")
@@ -100,119 +104,62 @@
     )
     (solid #t)
   )
-  (tile
-    (id 7)
-    (images
-      "tiles/snow/snow1.png"
-    )
-  )
-  (tile
-    (id 8)
-    (images
-      "tiles/snow/snow2.png"
-    )
-  )
-  (tile
-    (id 9)
-    (images
-      "tiles/snow/snow3.png"
-    )
-  )
-  (tile
-    (id 10)
-    (images
-      "tiles/snow/snow4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 11)
-    (images
-      "tiles/snow/snow5.png"
-    )
-    (solid #t)
-    (ice #t)
-  )
-  (tile
-    (id 12)
-    (images
-      "tiles/snow/snow6.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 13)
-    (images
-      "tiles/snow/snow7.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 14)
-    (images
-      "tiles/snow/snow8.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 15)
-    (images
-      "tiles/snow/snow9.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 16)
-    (images
-      "tiles/snow/snow10.png"
-    )
-  )
-  (tile
-    (id 17)
-    (images
-      "tiles/snow/snow11.png"
-    )
-  )
-  (tile
-    (id 18)
-    (images
-      "tiles/snow/snow12.png"
-    )
-  )
-  (tile
-    (id 19)
-    (images
-      "tiles/snow/snow13.png"
-    )
-    (solid #t)
+  (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")
   )
-  (tile
-    (id 20)
-    (images
-      "tiles/snow/snow14.png"
-    )
-    (solid #t)
+  (tiles
+    (width 2)
+    (height 3)
+    (ids 30 31
+         21 22
+        20 23)
+    (attributes 1 1
+                1 1
+               1 1)
+    (image "tiles/snow/concave.png")
   )
-  (tile
-    (id 21)
-    (images
-      "tiles/snow/snow15.png"
-    )
-    (solid #t)
+  (tiles
+    (width 2)
+    (height 3)
+    (ids 115 116
+         117 118
+        19 1539)
+    (attributes 1 1
+                1 1
+               1 1)
+    (image "tiles/snow/variants.png")
   )
-  (tile
-    (id 22)
-    (images
-      "tiles/snow/snow16.png"
-    )
-    (solid #t)
+  (tiles
+    (width 3)
+    (height 3)
+    (ids 205 202 203
+         113 204 114
+        208 205 207)
+    (attributes 1 0 1
+                1 1 1
+               1 1 1)
+    (image "tiles/snow/special.png")
   )
-  (tile
-    (id 23)
-    (images
-      "tiles/snow/snow17.png"
-    )
-    (solid #t)
+  (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")
   )
   (tile
     (id 24)
@@ -269,20 +216,6 @@
     (solid #t)
   )
   (tile
-    (id 30)
-    (images
-      "tiles/snow/snow18.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 31)
-    (images
-      "tiles/snow/snow19.png"
-    )
-    (solid #t)
-  )
-  (tile
     (id 32)
     (images
       "tiles/darksnow/darksnow1.png"
@@ -865,48 +798,6 @@
     (editor-images "objects/bonus_block/bonus-invisible.png")
   )
   (tile
-    (id 113)
-    (images
-      "tiles/snow/snow20.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 114)
-    (images
-      "tiles/snow/snow21.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 115)
-    (images
-      "tiles/snow/snow22.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 116)
-    (images
-      "tiles/snow/snow23.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 117)
-    (images
-      "tiles/snow/snow24.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 118)
-    (images
-      "tiles/snow/snow25.png"
-    )
-    (solid #t)
-  )
-  (tile
     (id 119)
     (images
       "tiles/darksnow/darksnow13.png"
@@ -928,36 +819,6 @@
     (solid #t)
   )
   (tile
-    (id 122)
-    (images
-      "tiles/snow/snowbg1.png"
-    )
-    (solid #t)
-    (unisolid #t)
-  )
-  (tile
-    (id 123)
-    (images
-      "tiles/snow/snowbg2.png"
-    )
-    (solid #t)
-    (unisolid #t)
-  )
-  (tile
-    (id 124)
-    (images
-      "tiles/snow/snowbg3.png"
-    )
-    (solid #f)
-  )
-  (tile
-    (id 125)
-    (images
-      "tiles/snow/snowbg4.png"
-    )
-    (solid #f)
-  )
-  (tile
     (id 126)
     (images
       "tiles/goal/exitbg.png"
@@ -1087,30 +948,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 +1174,7 @@
       "tiles/lava/lava1-4.png"
     )
     (water #t)
-    (spike #t)
+    (hurts #t)
     (anim-fps 10)
   )
   (tile
@@ -1276,7 +1186,7 @@
       "tiles/lava/lava2-4.png"
     )
     (water #t)
-    (spike #t)
+    (hurts #t)
     (anim-fps 10)
   )
   (tile
@@ -1571,70 +1481,7 @@
     (water #t)
     (anim-fps 10)
   )
-  (tile
-    (id 202)
-    (images
-      "tiles/snow/snow1b.png"
-    )
-  )
-  (tile
-    (id 203)
-    (images
-      "tiles/snow/snow7b.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 204)
-    (images
-      "tiles/snow/snow7c.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 205)
-    (images
-      "tiles/snow/snow15b.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 206)
-    (images
-      "tiles/snow/snow14b.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 207)
-    (images
-      "tiles/snow/snow18b.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 208)
-    (images
-      "tiles/snow/snow19b.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 209)
-    (images
-      "tiles/snow/snowbg1b.png"
-    )
-    (solid #t)
-    (unisolid #t)
-  )
-  (tile
-    (id 210)
-    (images
-      "tiles/snow/snowbg3b.png"
-    )
-    (solid #t)
-  )
-  (tile
+    (tile
     (id 211)
     (images
       "tiles/blocks/block1b.png"
@@ -1880,28 +1727,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)
@@ -2151,13 +1998,16 @@
     )
     (solid #t)
   )
+
+  ; experimental unisolid tile
   (tile
     (id 359)
     (images
-      "tiles/snow/snow11.png"
+      "tiles/auxiliary/notile.png"
     )
     (unisolid #t)
   )
+
   (tile
     (id 360)
     (images
@@ -4830,26 +4680,6 @@
     )
   )
   (tile
-    (id 1344)
-    (images
-      "tiles/snow/snowbg5.png"
-    )
-    (solid #f)
-  )
-  (tile
-    (id 1345)
-    (images
-       "tiles/snow/snowbg6.png"
-    )
-    (solid #f)
-  )
-  (tile
-    (id 1346)
-    (images
-      "tiles/snow/snowbg7.png")
-       (solid #f)
-  )
-  (tile
     (id 1347)
     (images
       "tiles/pole/vert_bm.png")
@@ -4898,12 +4728,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 +5187,7 @@
       "tiles/water/electrified-1.png"
     )
     (anim-fps 10)
-    (spike #t)
+    (hurts #t)
     (water #t)
   )
   (tile
@@ -5373,7 +5197,7 @@
       "tiles/water/electrified_waves-1.png"
     )
     (anim-fps 10)
-    (spike #t)
+    (hurts #t)
     (water #t)
   )
   (tile
@@ -6145,6 +5969,139 @@
     (images
       (region "tiles/castle/door.png"  96 64 32 32)
     )
-    (solid #f)
+ 
 )
+  (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)
+    )
+  (tile
+    (id 1540)
+    (images
+      (region "tiles/blocks/icebridge.png" 32 0 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1541)
+    (images
+      (region "tiles/blocks/icebridge.png" 64 0 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1542)
+    (images
+      (region "tiles/blocks/icebridge.png" 96 0 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1543)
+    (images
+      (region "tiles/blocks/icebridge.png" 0 32 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1544)
+    (images
+      (region "tiles/blocks/icebridge.png" 32 32 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1545)
+    (images
+      (region "tiles/blocks/icebridge.png" 64 32 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1546)
+    (images
+      (region "tiles/blocks/icebridge.png" 96 32 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1547)
+    (images
+      (region "tiles/blocks/icebridge.png" 0 64 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1548)
+    (images
+      (region "tiles/blocks/icebridge.png" 32 64 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1549)
+    (images
+      (region "tiles/blocks/icebridge.png" 64 64 32 32)
+    )
+    (solid #t)
+    )
+  (tile
+    (id 1550)
+    (images
+      (region "tiles/blocks/icebridge.png" 96 64 32 32)
+    )
+    (solid #t)
+    )
+(tile
+    (id 1551)
+    (images
+      (region "tiles/blocks/icebridge.png" 0 0 32 32)
+    )
+    (solid #t)
+    )
 )