Merged even more tile images.

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index c24b8c9..2f18be4 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -236,7 +236,6 @@
       89   90   91   92
       93   94   95   96
       97   98   99   100
-      101  0    0    0
       1321 1322 1323 1324
       1325 1326 1327 1328
       1329 1330 1331 1332
@@ -437,10 +436,6 @@
   (tilegroup
     (name "Cave background")
     (tiles
-      63 0 0 0
-      0  0 0 0
-      0  0 0 0
-      0  0 0 0
       70 0 0 0
       0  0 0 0
       0  0 0 0
@@ -865,63 +860,33 @@
     )
     (image "tiles/blocks/bigblock.png")
   )
-  (tile
-    (id 53)
-    (images
-      "tiles/pipe/pipe1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 54)
-    (images
-      "tiles/pipe/pipe2.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 55)
-    (images
-      "tiles/pipe/pipe3.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 56)
-    (images
-      "tiles/pipe/pipe4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    ; NOT a dupe of tile 2043
-    (id 57)
-    (images
-      "tiles/pipe/pipe5.png"
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      53 55 1744
+      54 56 1745
     )
-    (solid #t)
-  )
-  (tile
-    ; NOT a dupe of tile 2044
-    (id 58)
-    (images
-      "tiles/pipe/pipe6.png"
+    (attributes
+      1 1 1
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/pipe/pipeh.png")
   )
-  (tile
-    (id 59)
-    (images
-      "tiles/pipe/pipe7.png"
+  (tiles
+    (width 2)
+    (height 3)
+    (ids
+      57   58
+      59   60
+      1742 1743
     )
-    (solid #t)
-  )
-  (tile
-    (id 60)
-    (images
-      "tiles/pipe/pipe8.png"
+    (attributes
+      1 1
+      1 1
+      1 1
     )
-    (solid #t)
+    (image "tiles/pipe/pipev.png")
   )
   (tile
     (id 61)
@@ -1056,17 +1021,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)
@@ -1118,60 +1090,25 @@
     )
     (image "tiles/background/cloud.png")
   )
-  (tile
-    ; dupe of tile 101, this one will be kept.
-    (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"
-    )
-  )
-  (tile
-    (id 98)
-    (images
-      "tiles/background/bkgd-11.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
@@ -1260,26 +1197,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)
@@ -4941,24 +4868,6 @@
     )
   )
   (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")
@@ -6172,19 +6081,7 @@
     )
     (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")
-  )
+
 ;unisolid Branches. Tile ID  1746-1761
   (tiles
     (width 4)
@@ -6701,7 +6598,7 @@
     ; NOT a dupe of tile 57
     (id 2043)
     (images
-      "tiles/pipe/pipe5.png"
+      (region  "tiles/pipe/pipev.png" 0 0 32 32)
     )
     (solid #t)
     (unisolid #t)
@@ -6710,7 +6607,7 @@
     ; NOT a dupe of tile 58
     (id 2044)
     (images
-      "tiles/pipe/pipe6.png"
+      (region  "tiles/pipe/pipev.png" 32 0 32 32)
     )
     (solid #t)
     (unisolid #t)