Tried merging some snow tiles

SVN-Revision: 3125

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index a746433..21240d5 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
@@ -100,119 +100,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
+               1 1 1)
+    (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 +212,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 +794,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 +815,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"
@@ -1620,70 +1477,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"
@@ -4879,26 +4673,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")

diff --git a/data/images/tiles/snow/background.png b/data/images/tiles/snow/background.png
new file mode 100644 (file)
index 0000000..5255656
Binary files /dev/null and b/data/images/tiles/snow/background.png differ

diff --git a/data/images/tiles/snow/concave.png b/data/images/tiles/snow/concave.png
new file mode 100644 (file)
index 0000000..a39ed04
Binary files /dev/null and b/data/images/tiles/snow/concave.png differ

diff --git a/data/images/tiles/snow/convex.png b/data/images/tiles/snow/convex.png
new file mode 100644 (file)
index 0000000..edcf8a0
Binary files /dev/null and b/data/images/tiles/snow/convex.png differ

diff --git a/data/images/tiles/snow/snow1.png b/data/images/tiles/snow/snow1.png
deleted file mode 100644 (file)
index 765e4ec..0000000
Binary files a/data/images/tiles/snow/snow1.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow10.png b/data/images/tiles/snow/snow10.png
deleted file mode 100644 (file)
index 46c2ddb..0000000
Binary files a/data/images/tiles/snow/snow10.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow11.png b/data/images/tiles/snow/snow11.png
deleted file mode 100644 (file)
index f3075e7..0000000
Binary files a/data/images/tiles/snow/snow11.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow12.png b/data/images/tiles/snow/snow12.png
deleted file mode 100644 (file)
index 5fec995..0000000
Binary files a/data/images/tiles/snow/snow12.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow13.png b/data/images/tiles/snow/snow13.png
deleted file mode 100644 (file)
index 4bbfa1c..0000000
Binary files a/data/images/tiles/snow/snow13.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow14.png b/data/images/tiles/snow/snow14.png
deleted file mode 100644 (file)
index 53f6128..0000000
Binary files a/data/images/tiles/snow/snow14.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow14b.png b/data/images/tiles/snow/snow14b.png
deleted file mode 100644 (file)
index 8081413..0000000
Binary files a/data/images/tiles/snow/snow14b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow15.png b/data/images/tiles/snow/snow15.png
deleted file mode 100644 (file)
index 04d3d24..0000000
Binary files a/data/images/tiles/snow/snow15.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow15b.png b/data/images/tiles/snow/snow15b.png
deleted file mode 100644 (file)
index 5d347d2..0000000
Binary files a/data/images/tiles/snow/snow15b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow16.png b/data/images/tiles/snow/snow16.png
deleted file mode 100644 (file)
index e599141..0000000
Binary files a/data/images/tiles/snow/snow16.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow17.png b/data/images/tiles/snow/snow17.png
deleted file mode 100644 (file)
index 170b684..0000000
Binary files a/data/images/tiles/snow/snow17.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow18.png b/data/images/tiles/snow/snow18.png
deleted file mode 100644 (file)
index 3e9af5d..0000000
Binary files a/data/images/tiles/snow/snow18.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow18b.png b/data/images/tiles/snow/snow18b.png
deleted file mode 100644 (file)
index bbb7aa7..0000000
Binary files a/data/images/tiles/snow/snow18b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow19.png b/data/images/tiles/snow/snow19.png
deleted file mode 100644 (file)
index e55a72e..0000000
Binary files a/data/images/tiles/snow/snow19.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow19b.png b/data/images/tiles/snow/snow19b.png
deleted file mode 100644 (file)
index 23de4e4..0000000
Binary files a/data/images/tiles/snow/snow19b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow1b.png b/data/images/tiles/snow/snow1b.png
deleted file mode 100644 (file)
index f5ad375..0000000
Binary files a/data/images/tiles/snow/snow1b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow2.png b/data/images/tiles/snow/snow2.png
deleted file mode 100644 (file)
index 264cb78..0000000
Binary files a/data/images/tiles/snow/snow2.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow20.png b/data/images/tiles/snow/snow20.png
deleted file mode 100644 (file)
index 5da8ff5..0000000
Binary files a/data/images/tiles/snow/snow20.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow21.png b/data/images/tiles/snow/snow21.png
deleted file mode 100644 (file)
index 470e0e0..0000000
Binary files a/data/images/tiles/snow/snow21.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow22.png b/data/images/tiles/snow/snow22.png
deleted file mode 100644 (file)
index 85d5016..0000000
Binary files a/data/images/tiles/snow/snow22.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow23.png b/data/images/tiles/snow/snow23.png
deleted file mode 100644 (file)
index 3bec8ac..0000000
Binary files a/data/images/tiles/snow/snow23.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow24.png b/data/images/tiles/snow/snow24.png
deleted file mode 100644 (file)
index f93b16b..0000000
Binary files a/data/images/tiles/snow/snow24.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow25.png b/data/images/tiles/snow/snow25.png
deleted file mode 100644 (file)
index d965d2e..0000000
Binary files a/data/images/tiles/snow/snow25.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow3.png b/data/images/tiles/snow/snow3.png
deleted file mode 100644 (file)
index b601689..0000000
Binary files a/data/images/tiles/snow/snow3.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow4.png b/data/images/tiles/snow/snow4.png
deleted file mode 100644 (file)
index 793d302..0000000
Binary files a/data/images/tiles/snow/snow4.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow5.png b/data/images/tiles/snow/snow5.png
deleted file mode 100644 (file)
index a748a6f..0000000
Binary files a/data/images/tiles/snow/snow5.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow6.png b/data/images/tiles/snow/snow6.png
deleted file mode 100644 (file)
index dd09965..0000000
Binary files a/data/images/tiles/snow/snow6.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow7.png b/data/images/tiles/snow/snow7.png
deleted file mode 100644 (file)
index 9268c7b..0000000
Binary files a/data/images/tiles/snow/snow7.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow7b.png b/data/images/tiles/snow/snow7b.png
deleted file mode 100644 (file)
index c0d6ae6..0000000
Binary files a/data/images/tiles/snow/snow7b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow7c.png b/data/images/tiles/snow/snow7c.png
deleted file mode 100644 (file)
index 4a0cf81..0000000
Binary files a/data/images/tiles/snow/snow7c.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow8.png b/data/images/tiles/snow/snow8.png
deleted file mode 100644 (file)
index c7d172f..0000000
Binary files a/data/images/tiles/snow/snow8.png and /dev/null differ

diff --git a/data/images/tiles/snow/snow9.png b/data/images/tiles/snow/snow9.png
deleted file mode 100644 (file)
index 3dbfdab..0000000
Binary files a/data/images/tiles/snow/snow9.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg1.png b/data/images/tiles/snow/snowbg1.png
deleted file mode 100644 (file)
index 1d62cab..0000000
Binary files a/data/images/tiles/snow/snowbg1.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg1b.png b/data/images/tiles/snow/snowbg1b.png
deleted file mode 100644 (file)
index 563664c..0000000
Binary files a/data/images/tiles/snow/snowbg1b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg2.png b/data/images/tiles/snow/snowbg2.png
deleted file mode 100644 (file)
index a09b48e..0000000
Binary files a/data/images/tiles/snow/snowbg2.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg3.png b/data/images/tiles/snow/snowbg3.png
deleted file mode 100644 (file)
index 7994243..0000000
Binary files a/data/images/tiles/snow/snowbg3.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg3b.png b/data/images/tiles/snow/snowbg3b.png
deleted file mode 100644 (file)
index 3aac84f..0000000
Binary files a/data/images/tiles/snow/snowbg3b.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg4.png b/data/images/tiles/snow/snowbg4.png
deleted file mode 100644 (file)
index 3a2c997..0000000
Binary files a/data/images/tiles/snow/snowbg4.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg5.png b/data/images/tiles/snow/snowbg5.png
deleted file mode 100644 (file)
index bc6d4df..0000000
Binary files a/data/images/tiles/snow/snowbg5.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg6.png b/data/images/tiles/snow/snowbg6.png
deleted file mode 100644 (file)
index 42e197b..0000000
Binary files a/data/images/tiles/snow/snowbg6.png and /dev/null differ

diff --git a/data/images/tiles/snow/snowbg7.png b/data/images/tiles/snow/snowbg7.png
deleted file mode 100644 (file)
index fbf00b9..0000000
Binary files a/data/images/tiles/snow/snowbg7.png and /dev/null differ

diff --git a/data/images/tiles/snow/special.png b/data/images/tiles/snow/special.png
new file mode 100644 (file)
index 0000000..bf408c5
Binary files /dev/null and b/data/images/tiles/snow/special.png differ

diff --git a/data/images/tiles/snow/variants.png b/data/images/tiles/snow/variants.png
new file mode 100644 (file)
index 0000000..bc22470
Binary files /dev/null and b/data/images/tiles/snow/variants.png differ