Reverted r4742 and r4744 as it still broke totaly, please test before commit next...

SVN-Revision: 4745

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index f6837ff..133ef8b 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -788,20 +788,26 @@
     (data 1)
     (anim-fps 2)
   )
-  (tiles
-    (width 4)
-    (height 3)
-    (ids
-      27 28 29 211
-      50 49 47 212
-      51 52 48 213
+  (tile
+    (id 27)
+    (images
+      "tiles/blocks/block1.png"
     )
-    (attributes
-      1 1 1 1
-      1 1 1 1
-      1 1 1 1
+    (solid #t)
+  )
+  (tile
+    (id 28)
+    (images
+      "tiles/blocks/block2.png"
     )
-    (image "tiles/blocks/brown.png")
+    (solid #t)
+  )
+  (tile
+    (id 29)
+    (images
+      "tiles/blocks/block3.png"
+    )
+    (solid #t)
   )
   (tile
     (id 32)
@@ -900,6 +906,48 @@
     (anim-fps 10)
   )
   (tile
+    (id 47)
+    (images
+      "tiles/blocks/block4.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 48)
+    (images
+      "tiles/blocks/block5.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 49)
+    (images
+      "tiles/blocks/block6.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 50)
+    (images
+      "tiles/blocks/block7.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 51)
+    (images
+      "tiles/blocks/block8.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 52)
+    (images
+      "tiles/blocks/block9.png"
+    )
+    (solid #t)
+  )
+  (tile
     (id 53)
     (images
       "tiles/pipe/pipe1.png"
@@ -957,16 +1005,19 @@
     )
     (solid #t)
   )
-  (tiles
-    (width 2)
-    (height 1)
-    (ids
-      61 62
+  (tile
+    (id 61)
+    (images
+      "tiles/blocks/block10.png"
     )
-    (attributes
-      1 1
+    (solid #t)
+  )
+  (tile
+    (id 62)
+    (images
+      "tiles/blocks/block11.png"
     )
-    (image "tiles/block/grey.png")
+    (solid #t)
   )
   (tile
     ; dupe of tile 70, this one will be removed.
@@ -1074,7 +1125,7 @@
   (tile
     (id 77)
     (images
-      (region "tiles/blocks/bricks.png" 0 0 32 32)
+      "tiles/blocks/brick0.png"
     )
     (solid #t)
     (brick #t)
@@ -1082,7 +1133,7 @@
   (tile
     (id 78)
     (images
-      (region "tiles/blocks/bricks.png" 32 0 32 32)
+      "tiles/blocks/brick1.png"
     )
     (solid #t)
     (brick #t)
@@ -1136,32 +1187,102 @@
     )
     (solid #t)
   )
-  (tiles
-    (width 4)
-    (height 2)
-    (ids
-      85 86 87 88
-      89 90 91 92
+  (tile
+    (id 85)
+    (images
+      "tiles/background/cloud-00.png"
     )
-    (attributes
-      0 0 0 0
-      0 0 0 0
+  )
+  (tile
+    (id 86)
+    (images
+      "tiles/background/cloud-01.png"
     )
-    (image "tiles/background/cloud.png")
   )
-  ; tile 93 is duped @ 101, this one will be kept.
-  (tiles
-    (width 4)
-    (height 2)
-    (ids
-      93 94 95 96
-      97 98 99 100
+  (tile
+    (id 87)
+    (images
+      "tiles/background/cloud-02.png"
     )
-    (attributes
-      0 0 0 0
-      0 0 0 0
+  )
+  (tile
+    (id 88)
+    (images
+      "tiles/background/cloud-03.png"
+    )
+  )
+  (tile
+    (id 89)
+    (images
+      "tiles/background/cloud-10.png"
+    )
+  )
+  (tile
+    (id 90)
+    (images
+      "tiles/background/cloud-11.png"
+    )
+  )
+  (tile
+    (id 91)
+    (images
+      "tiles/background/cloud-12.png"
+    )
+  )
+  (tile
+    (id 92)
+    (images
+      "tiles/background/cloud-13.png"
+    )
+  )
+  (tile
+    ; dupe of tile 101, this one will be kept.
+    (id 93)
+    (images
+      "tiles/background/bkgd-00.png"
+    )
+  )
+  (tile
+    (id 94)
+    (images
+      "tiles/background/bkgd-01.png"
+    )
+  )
+  (tile
+    (id 95)
+    (images
+      "tiles/background/bkgd-02.png"
+    )
+  )
+  (tile
+    (id 96)
+    (images
+      "tiles/background/bkgd-03.png"
+    )
+  )
+  (tile
+    (id 97)
+    (images
+      "tiles/background/bkgd-10.png"
+    )
+  )
+  (tile
+    (id 98)
+    (images
+      "tiles/background/bkgd-11.png"
+    )
+  )
+  (tile
+    (id 99)
+    (images
+      "tiles/background/bkgd-12.png"
+    )
+  )
+  (tile
+    (id 100)
+    (images
+      "tiles/background/bkgd-13.png"
     )
-    (image "tiles/background/bigiceberg.png")
   )
   (tile
     ; dupe of tile 93, this one will be removed.
@@ -1217,11 +1338,9 @@
   (tile
     (id 104)
     (images
-      (region "tiles/blocks/bricks.png" 0 0 32 32)
-    )
-    (editor-images
-      (region "tiles/blocks/bricks.png" 0 32 32 32)
+      "tiles/blocks/brick0.png"
     )
+    (editor-images "tiles/blocks/brick0_full.png")
     (solid #t)
     (brick #t)
     (data 1)
@@ -1230,28 +1349,49 @@
   (tile
     (id 105)
     (images
-      (region "tiles/blocks/bricks.png" 0 32 32 32)
-    )
-    (editor-images
-      (region "tiles/blocks/bricks.png" 32 32 32 32)
+      "tiles/blocks/brick1.png"
     )
+    (editor-images "tiles/blocks/brick1_full.png")
     (solid #t)
     (brick #t)
     (data 1)
     (next-tile 84)
   )
-  (tiles
-    (width 3)
-    (height 2)
-    (ids
-      106 107 108
-      109 110 111
+  (tile
+    (id 106)
+    (images
+      "tiles/background/background1.png"
     )
-    (attributes
-      0 0 0
-      0 0 0
+  )
+  (tile
+    (id 107)
+    (images
+      "tiles/background/background2.png"
+    )
+  )
+  (tile
+    (id 108)
+    (images
+      "tiles/background/background3.png"
+    )
+  )
+  (tile
+    (id 109)
+    (images
+      "tiles/background/background4.png"
+    )
+  )
+  (tile
+    (id 110)
+    (images
+      "tiles/background/background5.png"
+    )
+  )
+  (tile
+    (id 111)
+    (images
+      "tiles/background/background6.png"
     )
-    (image "tiles/background/iceberg.png")
   )
   (tile
     (id 112)
@@ -1896,6 +2036,27 @@
     (anim-fps 10)
   )
   (tile
+    (id 211)
+    (images
+      "tiles/blocks/block1b.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 212)
+    (images
+      "tiles/blocks/block2b.png"
+    )
+    (solid #t)
+  )
+  (tile
+    (id 213)
+    (images
+      "tiles/blocks/block3b.png"
+    )
+    (solid #t)
+  )
+  (tile
     (id 275)
     (images
       "tiles/waterfall/waterfall1-1-1.png"
@@ -2302,18 +2463,47 @@
       "tiles/doodads/liane8.png"
     )
   )
-  (tiles
-    (width 3)
-    (height 2)
-    (ids
-      337 338 339
-      340 341 342
+  (tile
+    (id 337)
+    (images
+      "tiles/blocks/rock_plate1.png"
     )
-    (attributes
-      1 1 1
-      1 1 1
+    (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"
     )
-    (image "tiles/blocks/rockplate.png")
+    (solid #t)
+  )
+  (tile
+    (id 342)
+    (images
+      "tiles/blocks/rock_plate_cracked3.png"
+    )
+    (solid #t)
   )
 
   ; experimental unisolid tile

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/data/images/tiles/background/cloud.png b/data/images/tiles/background/cloud.png
deleted file mode 100644 (file)
index 7871b38..0000000
Binary files a/data/images/tiles/background/cloud.png and /dev/null differ

diff --git a/data/images/tiles/background/iceberg.png b/data/images/tiles/background/iceberg.png
deleted file mode 100644 (file)
index 67f09fc..0000000
Binary files a/data/images/tiles/background/iceberg.png and /dev/null differ

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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