- moved some .xcf files from supertux/ to media/

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index dca009e..c279b79 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -153,8 +153,8 @@
        1197 1198 1199 1200
        1203 1204 1205 1206
        1209 1210 1211 1212
-       0    0    1219 1220
-       0    0    1225 1226
+       0    2045 1219 1220
+       0    2046 1225 1226
        0    0    1217 1218
        0    0    1223 1224
        0    1228 1229 1230
@@ -395,7 +395,7 @@
            1650 1651 1652 1668
            1657 1658 1659 1675
            0    0    1666 0
-           1643 1644 1645
+           1643 1644 1645 0
            1998 1999 2000 0
            2023 2024 2025 0
            2026 2027 2028 0
@@ -453,6 +453,14 @@
       2035 2041 2042 2032
     )
   )
+  (tilegroup
+    (name "Unisolid")
+    (tiles
+      2043 2044    0  359
+      1760 1761 1748 1749
+      1754 1755 1756 1757
+    )
+  )
   (tile
     (id 0)
   )
@@ -4234,20 +4242,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)
@@ -4274,20 +4268,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)
@@ -4363,6 +4343,18 @@
       (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
@@ -6655,7 +6647,7 @@
                 1 1
 
                 )
-     (image "tiles/forest/nolok_statue.png")
+     (image "tiles/forest/statue.png")
   )
   (tiles
      (width 2)
@@ -6692,4 +6684,20 @@
     )
     (image "tiles/lightmap/lightmap-bw.png")
   )
+  (tile
+    (id 2043)
+    (images
+      "tiles/pipe/pipe5.png"
+    )
+    (solid #t)
+    (unisolid #t)
+  )
+  (tile
+    (id 2044)
+    (images
+      "tiles/pipe/pipe6.png"
+    )
+    (solid #t)
+    (unisolid #t)
+  )
 )