Merged rock_plate tiles

SVN-Revision: 4936

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index ea64971..1146fc5 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -2269,47 +2269,18 @@
     )
     (image "tiles/doodads/liane.png")
   )
-  (tile
-    (id 337)
-    (images
-      "tiles/blocks/rock_plate1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 338)
-    (images
-      "tiles/blocks/rock_plate2.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 339)
-    (images
-      "tiles/blocks/rock_plate3.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 340)
-    (images
-      "tiles/blocks/rock_plate_cracked1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 341)
-    (images
-      "tiles/blocks/rock_plate_cracked2.png"
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      337 338 339
+      340 341 342
     )
-    (solid #t)
-  )
-  (tile
-    (id 342)
-    (images
-      "tiles/blocks/rock_plate_cracked3.png"
+    (attributes
+      1 1 1
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/blocks/rock_plate.png")
   )
 
   ; experimental unisolid tile

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

diff --git a/data/images/tiles/blocks/rock_plate1.png b/data/images/tiles/blocks/rock_plate1.png
deleted file mode 100644 (file)
index 9bc9029..0000000
Binary files a/data/images/tiles/blocks/rock_plate1.png and /dev/null differ

diff --git a/data/images/tiles/blocks/rock_plate2.png b/data/images/tiles/blocks/rock_plate2.png
deleted file mode 100644 (file)
index 2dcf90d..0000000
Binary files a/data/images/tiles/blocks/rock_plate2.png and /dev/null differ

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

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

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

diff --git a/data/images/tiles/blocks/rock_plate_cracked3.png b/data/images/tiles/blocks/rock_plate_cracked3.png
deleted file mode 100644 (file)
index 430f0f5..0000000
Binary files a/data/images/tiles/blocks/rock_plate_cracked3.png and /dev/null differ

diff --git a/data/images/tiles/snow/unisolid.png b/data/images/tiles/snow/unisolid.png
index 2604cae..b5b5f7f 100644 (file)
Binary files a/data/images/tiles/snow/unisolid.png and b/data/images/tiles/snow/unisolid.png differ