Fixed some tilegroups in tiles.strf

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index ef2637f..3fde936 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -115,10 +115,6 @@
       1960 1961 1962 1963
       1964 1965 1966 1967
       1968 1969 1970 1971
-      0    0    0    0
-      1878 1881 1882 1883
-      1884 1885 1886 1887
-      1888 1889
     )
   )
   (tilegroup
@@ -256,9 +252,9 @@
       76   201  174  130
       75   200  173  129
       295  296  297  298
-      81   126  127  0
-      1355 1809 1812 0
-      1356 1810 1813 0
+      81   126  127  2047
+      1355 1809 1812 2048
+      1356 1810 1813 2049
       1411 1811 1814 0
       1988 1989 0    0
       1990 1991 0    0
@@ -362,20 +358,20 @@
   (tilegroup
     (name "Waterfall-trans")
     (tiles
-      175 176 177 178
-      179 180 181 182
-      183 184 185 186
+      191 192 193 194
       187 188 189 190
-      191 192 193 194)
+      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
+      291 292 293 294
       287 288 289 290
-      291 292 293 294)
+      283 284 285 286
+      279 280 281 282
+      275 276 277 278)
   )
   (tilegroup
     (name "Waterfall-edgecloud")
@@ -767,7 +763,7 @@
     )
   )
   (tile
-    ; dupe of tile 83
+    ; dupe of tile 83, this one will be removed.
     (id 26)
     (images
       "objects/bonus_block/full-0.png"
@@ -809,86 +805,23 @@
     )
     (solid #t)
   )
-  (tile
-    (id 32)
-    (images
-      "tiles/darksnow/darksnow1.png"
-    )
-  )
-  (tile
-    (id 33)
-    (images
-      "tiles/darksnow/darksnow2.png"
-    )
-  )
-  (tile
-    (id 34)
-    (images
-      "tiles/darksnow/darksnow3.png"
-    )
-  )
-  (tile
-    (id 35)
-    (images
-      "tiles/darksnow/darksnow4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 36)
-    (images
-      "tiles/darksnow/darksnow5.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 37)
-    (images
-      "tiles/darksnow/darksnow6.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 38)
-    (images
-      "tiles/darksnow/darksnow7.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 39)
-    (images
-      "tiles/darksnow/darksnow8.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 40)
-    (images
-      "tiles/darksnow/darksnow9.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 41)
-    (images
-      "tiles/darksnow/darksnow10.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 42)
-    (images
-      "tiles/darksnow/darksnow11.png"
+  ; Yes the numbering is extremly odd, backward compatiblity...
+  (tiles
+    (width 3)
+    (height 4)
+    (ids
+      33 32 34
+      35 37 39
+      38 36 43
+      40 41 42
     )
-    (solid #t)
-  )
-  (tile
-    (id 43)
-    (images
-      "tiles/darksnow/darksnow12.png"
+    (attributes
+      0 0 0
+      1 1 1
+      1 1 1
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/darksnow/convex.png")
   )
   (tile
     (id 44)
@@ -919,33 +852,18 @@
     )
     (solid #t)
   )
-  (tile
-    (id 49)
-    (images
-      "tiles/blocks/block6.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 50)
-    (images
-      "tiles/blocks/block7.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 51)
-    (images
-      "tiles/blocks/block8.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      50 49
+      51 52
     )
-    (solid #t)
-  )
-  (tile
-    (id 52)
-    (images
-      "tiles/blocks/block9.png"
+    (attributes
+      1 1
+      1 1
     )
-    (solid #t)
+    (image "tiles/blocks/bigblock.png")
   )
   (tile
     (id 53)
@@ -1020,7 +938,7 @@
     (solid #t)
   )
   (tile
-    ; dupe of tile 70
+    ; dupe of tile 70, this one will be removed.
     (id 63)
     (images
       "tiles/background/backgroundtile1.png"
@@ -1070,7 +988,7 @@
     (solid #t)
   )
   (tile
-    ; dupe of tile 63
+    ; dupe of tile 63, this one will be kept.
     (id 70)
     (images
       "tiles/background/backgroundtile1.png"
@@ -1159,7 +1077,7 @@
     (anim-fps 10)
   )
   (tile
-    ; dupe of tile 26
+    ; dupe of tile 26, this one will be kept.
     (id 83)
     (images
       "objects/bonus_block/full-0.png"
@@ -1187,56 +1105,21 @@
     )
     (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"
+  (tiles
+    (width 4)
+    (height 2)
+    (ids
+      85 86 87 88
+      89 90 91 92
     )
-  )
-  (tile
-    (id 92)
-    (images
-      "tiles/background/cloud-13.png"
+    (attributes
+      0 0 0 0
+      0 0 0 0
     )
+    (image "tiles/background/cloud.png")
   )
   (tile
-    ; dupe of tile 101
+    ; dupe of tile 101, this one will be kept.
     (id 93)
     (images
       "tiles/background/bkgd-00.png"
@@ -1285,7 +1168,7 @@
     )
   )
   (tile
-    ; dupe of tile 93
+    ; dupe of tile 93, this one will be removed.
     (id 101)
     (images
       "tiles/background/bkgd-00.png"
@@ -1357,41 +1240,18 @@
     (data 1)
     (next-tile 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"
-    )
-  )
-  (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)
@@ -6925,4 +6785,19 @@
     (solid #t)
     (unisolid #t)
   )
+  (tiles
+    (width 1)
+    (height 3)
+    (ids
+      2047
+      2048
+      2049
+    )
+    (attributes
+      0
+      0
+      0
+    )
+    (image "tiles/forest/ladder.png")
+  )
 )