Merged darksnow 1-12 into one image, also moved some files in media around

SVN-Revision: 4779

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 5b3d40c..1cd0a55 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -809,86 +809,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)

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

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

diff --git a/data/images/tiles/darksnow/darksnow10.png b/data/images/tiles/darksnow/darksnow10.png
deleted file mode 100644 (file)
index 79facda..0000000
Binary files a/data/images/tiles/darksnow/darksnow10.png and /dev/null differ

diff --git a/data/images/tiles/darksnow/darksnow11.png b/data/images/tiles/darksnow/darksnow11.png
deleted file mode 100644 (file)
index 7e636e9..0000000
Binary files a/data/images/tiles/darksnow/darksnow11.png and /dev/null differ

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

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

diff --git a/data/images/tiles/darksnow/darksnow3.png b/data/images/tiles/darksnow/darksnow3.png
deleted file mode 100644 (file)
index 8a60e6c..0000000
Binary files a/data/images/tiles/darksnow/darksnow3.png and /dev/null differ

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

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

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

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

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

diff --git a/data/images/tiles/darksnow/darksnow9.png b/data/images/tiles/darksnow/darksnow9.png
deleted file mode 100644 (file)
index 852c226..0000000
Binary files a/data/images/tiles/darksnow/darksnow9.png and /dev/null differ