new script test (picnic) tiles

SVN-Revision: 2453

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 322ca3c..8d1ff27 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -4810,4 +4810,77 @@
     )
     (solid #t)
   )
     )
     (solid #t)
   )

+  (tile
+    (id 1337)
+    (images
+      (region "tiles/doodads/shrublong.png" 0 0 800 96)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1338)
+    (images
+      (region "tiles/doodads/shrublongtop.png" 0 0 800 32)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1339)
+    (images
+      (region "tiles/doodads/shrublongtop.png" 0 32 800 32)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1340)
+    (images
+      (region "tiles/doodads/shrublongtop.png" 0 64 800 32)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1341)
+    (images
+      (region "tiles/doodads/shrublongtop.png" 0 96 800 32)
+    )
+    (solid #t)
+  )
+  (tile
+    (id 1342)
+    (images
+      "tiles/doodads/blueice.png"
+    )
+       (solid #t)
+  )
+  (tile
+    (id 1343)
+    (images
+      "tiles/doodads/blueicetop.png"
+    )
+  )
+  (tile
+    (id 1344)
+    (images
+      "tiles/doodads/snowbg5.png"
+    )
+  )
+  (tile
+    (id 1345)
+    (images
+      "tiles/doodads/snowbg6.png"
+    )
+  )
+  (tile
+    (id 1346)
+    (images
+      "tiles/doodads/snowbg7.png"
+    )
+  )
+  (tile
+    (id 1347)
+    (images
+      (region "tiles/doodads/shrublongbg.png" 0 0 800 96)
+    )
+    (solid #t)
+  )

 )
 )

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

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

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

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

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

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

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

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

diff --git a/data/levels/test/script.stl b/data/levels/test/script.stl
index c148948..41cea9f 100644 (file)
--- a/data/levels/test/script.stl
+++ b/data/levels/test/script.stl
@@ -13,7 +13,7 @@
       (speed  1.000000)
       (width  25)
       (height 20)
       (speed  1.000000)
       (width  25)
       (height 20)

-      (tiles
+(tiles

         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 


@@ -29,8 +29,8 @@
         0 0 0 0 0 0 0 0 0 0 0 0 124 210 210 125 0 0 0 0 0 0 0 0 0 
         0 0 124 125 0 0 0 0 0 0 0 0 124 210 210 125 0 0 0 0 0 0 0 0 0 
         0 0 124 125 0 0 0 0 0 0 0 0 124 210 210 125 0 0 124 125 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 124 210 210 125 0 0 0 0 0 0 0 0 0 
         0 0 124 125 0 0 0 0 0 0 0 0 124 210 210 125 0 0 0 0 0 0 0 0 0 
         0 0 124 125 0 0 0 0 0 0 0 0 124 210 210 125 0 0 124 125 0 0 0 0 0 

-        0 0 124 125 0 0 25 0 0 0 24 0 124 210 210 125 0 0 124 125 0 0 24 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 1345 125 0 0 25 0 0 0 24 0 1345 210 210 125 0 0 1345 1344 0 0 24 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1345 1344 0 0 0 

         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 


@@ -54,14 +54,14 @@
         0 0 0 0 0 0 0 0 0 0 0 0 122 209 209 123 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 122 209 209 123 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 

-        0 0 122 123 0 0 0 0 0 0 0 0 0 0 402 403 404 405 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 406 407 408 409 122 123 0 0 0 0 0 
-        0 403 404 0 0 0 0 0 0 0 0 0 0 0 410 451 412 413 0 0 0 0 0 0 0 
-        8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 
-        14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 
-        11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 
-        11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 
-        11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 
+        0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 0 0 0 0 
+        0 403 404 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        1343 1343 1343 1343 1343 1343 1343 1343 1343 1343 1343 1343 1345 1346 1346 1343 1343 1343 1345 1344 1343 1343 1343 1343 1343 
+        1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 
+        1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 
+        1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 
+        1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 1342 

         ))
     (tilemap
       (layer  "foreground")
         ))
     (tilemap
       (layer  "foreground")


@@ -70,6 +70,10 @@
       (width  25)
       (height 20)
       (tiles
       (width  25)
       (height 20)
       (tiles

+        1338 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        1339 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        1340 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        1341 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 

         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 


@@ -78,16 +82,12 @@
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 

-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 402 403 404 405 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 406 407 408 409 0 0 0 0 0 0 0 
-        0 403 404 0 0 0 0 0 0 0 0 0 0 0 410 411 412 413 0 0 0 0 0 0 0 
-        0 407 408 0 0 0 0 0 0 0 0 0 0 0 414 423 416 425 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+        0 1321 1322 1323 1324 0 0 0 0 0 0 0 0 0 1321 1322 1323 1324 0 0 0 0 0 0 0 
+        0 1325 1326 1327 1328 0 0 0 0 0 0 0 0 0 1325 1326 1327 1328 0 0 0 0 0 0 0 
+        0 1329 1330 1331 1332 0 0 0 0 0 0 0 0 0 1329 1330 1331 1332 0 0 0 0 0 0 0 
+        0 1333 1334 1335 1336 0 0 0 0 0 0 0 0 0 1333 1334 1335 1336 0 0 0 0 0 0 0 
+        1337 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 

         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         ))
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         ))