Merged back changes from 0.3.x branch

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index cd28786..00c310f 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -255,6 +255,10 @@
            1355 1809 1812 0
            1356 1810 1813 0
            1411 1811 1814 0
+        1988 1989 0 0
+        1990 1991 0 0
+        1992 1993 0 0
+        1994 1995 0 0
          )
   )
   (tilegroup
@@ -391,7 +395,11 @@
            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
+           2029 2030 2031 0
            )
   )
  (tilegroup
@@ -436,6 +444,23 @@
            0  0 0 0
            )
   )
+  (tilegroup
+    (name "Lightmap")
+    (tiles
+      2032 2033 2034 2035
+      2036 2037    0 2038
+      2039    0    0 2040
+      2035 2041 2042 2032
+    )
+  )
+  (tilegroup
+    (name "Unisolid")
+    (tiles
+      2043 2044    0  359
+      1760 1761 1748 1749
+      1754 1755 1756 1757
+    )
+  )
   (tile
     (id 0)
   )
@@ -5090,10 +5115,10 @@
      (width 3)
      (height 5)
      (ids 2005 1351 2010
-          2006 1352 2011 
-          2007 1353 2012 
-          2008 1354 2013 
-          2009 1821 2014 
+          2006 1352 2011
+          2007 1353 2012
+          2008 1354 2013
+          2009 1821 2014
           )
      (attributes 0 0 0
                  0 0 0
@@ -5101,7 +5126,7 @@
                  0 0 0
                  0 0 0
                  )
-     (image "tiles/forest/hole.png") 
+     (image "tiles/forest/hole.png")
   )
   (tile
     (id 1355)
@@ -6120,9 +6145,9 @@
   (tiles
     (width 2)
     (height 2)
-    (ids 2001 2002 
+    (ids 2001 2002
          2003 2004)
-    (attributes 0 0 
+    (attributes 0 0
                 0 0)
     (image "tiles/pole/t-cross.png")
   )
@@ -6209,7 +6234,7 @@
                 0 0 0 0
                 3 3 3 3
                 0 0 0 0)
-     (image "tiles/forest/branch.png") 
+     (image "tiles/forest/branch.png")
   )
   (tile
     (id 1762)
@@ -6295,7 +6320,7 @@
     )
     (solid #t)
   )
- 
+
   (tiles
      (width  5)
      (height 7)
@@ -6327,7 +6352,7 @@
     (attributes 0
                 0
                 0)
-    (image "tiles/doodads/nolok1.png") 
+    (image "tiles/doodads/nolok1.png")
   )
   (tiles
      (width 1)
@@ -6338,7 +6363,7 @@
     (attributes 0
                 0
                 0)
-     (image "tiles/doodads/nolok2.png") 
+     (image "tiles/doodads/nolok2.png")
   )
   (tiles
     (width 2)
@@ -6358,9 +6383,9 @@
 (tiles
      (width 4)
      (height 5)
-     (ids 1860 1861 1862 1863 
+     (ids 1860 1861 1862 1863
           1864 1865 1866 1867
-          1868 1869 1870 1871 
+          1868 1869 1870 1871
           1872 1873 1874 1875
           1876 1877 1879 1880)
     (attributes 0 0 0 0
@@ -6368,7 +6393,7 @@
                 1 1 1 1
                 1 1 1 1
                 1 1 1 1)
-     (image "tiles/forest/underground/groundtiles-1.png") 
+     (image "tiles/forest/underground/groundtiles-1.png")
 )
 (tile
     (id 1890)
@@ -6446,12 +6471,12 @@
     )
     (solid #t)
   )
-(tiles
+  (tiles
      (width 4)
      (height 4)
-     (ids 1900 1901 1902 1903 
+     (ids 1900 1901 1902 1903
           1904 1905 1906 1907
-          1908 1909 1910 1911 
+          1908 1909 1910 1911
           1912 1913 1914 1915
           )
     (attributes 1 1 1 1
@@ -6459,15 +6484,15 @@
                 1 1 1 1
                 1 1 1 1
                 )
-     (image "tiles/forest/underground/background1.png") 
-)
-(tiles
+     (image "tiles/forest/underground/background1.png")
+  )
+  (tiles
      (width 4)
      (height 5)
      (ids 1916 1917 1918 1919
-          1920 1921 1922 1923 
-          1924 1925 1926 1927 
-          1928 1929 1930 1931 
+          1920 1921 1922 1923
+          1924 1925 1926 1927
+          1928 1929 1930 1931
           1932 1933 1934 1935
           )
     (attributes 1 1 1 1
@@ -6476,9 +6501,9 @@
                 1 1 1 1
                 1 1 1 1
                 )
-     (image "tiles/forest/underground/background2.png") 
-)
-(tiles
+     (image "tiles/forest/underground/background2.png")
+  )
+  (tiles
      (width 4)
      (height 5)
      (ids 1936 1937 1938 1939
@@ -6493,14 +6518,14 @@
                 1 1 1 1
                 1 1 1 1
                 )
-     (image "tiles/forest/underground/roots.png") 
-)
-(tiles
+     (image "tiles/forest/underground/roots.png")
+  )
+  (tiles
      (width 4)
      (height 4)
-     (ids 1956 1957 1958 1959 
-          1960 1961 1962 1963 
-          1964 1965 1966 1967 
+     (ids 1956 1957 1958 1959
+          1960 1961 1962 1963
+          1964 1965 1966 1967
           1968 1969 1970 1971
           )
     (attributes 1 1 1 1
@@ -6508,11 +6533,11 @@
                 1 1 1 1
                 1 1 1 1
                 )
-     (image "tiles/forest/underground/background3.png") 
-)
+     (image "tiles/forest/underground/background3.png")
+  )
   (tile
     (id 1972 )
-    (images  
+    (images
       (region "tiles/forest/spikevine/spikevine.png" 0 0 32 32)
     )
     (hurts #t)
@@ -6523,77 +6548,77 @@
       (region "tiles/forest/spikevine/spikevine.png" 0 32 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1974)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 0 64 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1975)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 0 96 32 32)
     )
     (hurts #t)
-  )     
+  )
   (tile
     (id 1976)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 32 0 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1977)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 32 32 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1978)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 32 64 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1979 )
     (images
       (region "tiles/forest/spikevine/spikevine.png" 32 96 32 32)
     )
     (hurts #t)
-  )      
+  )
   (tile
     (id 1980)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 64 0 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1981)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 64 32 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1982)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 64 64 32 32)
     )
     (hurts #t)
-  ) 
+  )
   (tile
     (id 1983)
     (images
       (region "tiles/forest/spikevine/spikevine.png" 64 96 32 32)
     )
     (hurts #t)
-  )      
+  )
   (tile
     (id 1984)
     (images
@@ -6621,6 +6646,74 @@
       (region  "tiles/forest/spikevine/spikevine.png" 96 96 32 32)
     )
   (hurts #t)
- 
+  )
+  (tiles
+     (width 2)
+     (height 4)
+     (ids
+        1988 1989
+        1990 1991
+        1992 1993
+        1994 1995
+
+          )
+    (attributes 1 1
+                1 1
+                1 1
+                1 1
+
+                )
+     (image "tiles/forest/statue.png")
+  )
+  (tiles
+     (width 2)
+     (height 1)
+     (ids 1996 1997)
+    (attributes 1 1)
+     (image "tiles/forest/pogonia/dangersign.png")
+  )
+  (tiles
+     (width 3)
+     (height 4)
+     (ids 1998 1999 2000 2023 2024 2025 2026 2027 2028 2029 2030 2031)
+    (attributes 1 1 1
+                1 1 1
+                1 1 1
+                1 1 1
+
+                )
+     (image "tiles/forest/exit/outhouse.png")
+  )
+  (tiles
+    (width 4)
+    (height 4)
+    (ids
+      2032 2033 2034 2035
+      2036 2037 2032 2038
+      2039 2032 2032 2040
+      2032 2041 2042 2032
+    )
+    (attributes 0 0 0 0
+                0 0 0 0
+                0 0 0 0
+                0 0 0 0
+    )
+    (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)
   )
 )