Merged more tiles.

SVN-Revision: 4788

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 95df10e..c24b8c9 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -2212,57 +2212,31 @@
     (solid #t)
     (anim-fps 10)
   )
-  (tile
-    (id 313)
-    (images
-      "tiles/doodads/stone1_1.png"
-    )
-  )
-  (tile
-    (id 314)
-    (images
-      "tiles/doodads/stone1_2.png"
-    )
-  )
-  (tile
-    (id 315)
-    (images
-      "tiles/doodads/stone1_3.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 316)
-    (images
-      "tiles/doodads/stone1_4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 317)
-    (images
-      "tiles/doodads/stone2_1.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      313 314
+      315 316
     )
-  )
-  (tile
-    (id 318)
-    (images
-      "tiles/doodads/stone2_2.png"
+    (attributes
+      0 0
+      1 1
     )
+    (image "tiles/doodads/stone1.png")
   )
-  (tile
-    (id 319)
-    (images
-      "tiles/doodads/stone2_3.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      317 318
+      319 320
     )
-    (solid #t)
-  )
-  (tile
-    (id 320)
-    (images
-      "tiles/doodads/stone2_4.png"
+    (attributes
+      0 0
+      1 1
     )
-    (solid #t)
+    (image "tiles/doodads/stone2.png")
   )
   (tile
     (id 321)
@@ -2277,53 +2251,22 @@
       "tiles/doodads/plant1.png"
     )
   )
-  (tile
-    (id 323)
-    (images
-      "tiles/doodads/liane1.png"
-    )
-  )
-  (tile
-    (id 324)
-    (images
-      "tiles/doodads/liane2.png"
-    )
-  )
-  (tile
-    (id 325)
-    (images
-      "tiles/doodads/liane3.png"
-    )
-  )
-  (tile
-    (id 326)
-    (images
-      "tiles/doodads/liane4.png"
-    )
-  )
-  (tile
-    (id 327)
-    (images
-      "tiles/doodads/liane5.png"
-    )
-  )
-  (tile
-    (id 328)
-    (images
-      "tiles/doodads/liane6.png"
-    )
-  )
-  (tile
-    (id 329)
-    (images
-      "tiles/doodads/liane7.png"
+  (tiles
+    (width 2)
+    (height 4)
+    (ids
+      323 324
+      325 326
+      327 328
+      329 330
     )
-  )
-  (tile
-    (id 330)
-    (images
-      "tiles/doodads/liane8.png"
+    (attributes
+      0 0
+      0 0
+      0 0
+      0 0
     )
+    (image "tiles/doodads/liane.png")
   )
   (tile
     (id 337)

diff --git a/data/images/tiles/doodads/liane.png b/data/images/tiles/doodads/liane.png
new file mode 100644 (file)
index 0000000..6941a42
Binary files /dev/null and b/data/images/tiles/doodads/liane.png differ

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

diff --git a/data/images/tiles/doodads/liane2.png b/data/images/tiles/doodads/liane2.png
deleted file mode 100644 (file)
index 87ab928..0000000
Binary files a/data/images/tiles/doodads/liane2.png and /dev/null differ

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

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

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

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

diff --git a/data/images/tiles/doodads/liane7.png b/data/images/tiles/doodads/liane7.png
deleted file mode 100644 (file)
index 78eb001..0000000
Binary files a/data/images/tiles/doodads/liane7.png and /dev/null differ

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

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

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

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

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

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

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

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

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

diff --git a/data/images/tiles/doodads/stone2_3.png b/data/images/tiles/doodads/stone2_3.png
deleted file mode 100644 (file)
index 98faded..0000000
Binary files a/data/images/tiles/doodads/stone2_3.png and /dev/null differ

diff --git a/data/images/tiles/doodads/stone2_4.png b/data/images/tiles/doodads/stone2_4.png
deleted file mode 100644 (file)
index 291e453..0000000
Binary files a/data/images/tiles/doodads/stone2_4.png and /dev/null differ