Add unisolid version of blue pipe top, needed for "world1/24 - The Shattered Bridge...

SVN-Revision: 5786

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index d52affa..adae3ee 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -626,6 +626,7 @@
       2043 2044    0  359
       1760 1761 1748 1749
       1754 1755 1756 1757
+      2404 2405
     )
   )
   (tile
@@ -3396,5 +3397,18 @@
     (image "tiles/signs/trampoline.png")
   )
 
-;; next-id: 2404
+  ; NOT dupes of 2085/2086 - unisolid
+  (tiles
+    (width 2)
+    (height 1)
+    (ids
+      2404 2405
+    )
+    (attributes
+      3 3
+    )
+    (image "tiles/pipe/blue.png")
+  )
+
+;; next-id: 2406
 )

diff --git a/data/levels/world1/24 - The Shattered Bridge.stl b/data/levels/world1/24 - The Shattered Bridge.stl
index a823a9c..55a8247 100644 (file)
--- a/data/levels/world1/24 - The Shattered Bridge.stl
+++ b/data/levels/world1/24 - The Shattered Bridge.stl
@@ -188,8 +188,8 @@
       (y 211)
     )
     (tilemap
-      (z-pos -100)
       (solid #f)
+      (z-pos -100)
       (width 525)
       (height 19)
       (tiles
@@ -215,8 +215,8 @@
       )
     )
     (tilemap
-      (z-pos 0)
       (solid #t)
+      (z-pos 0)
       (width 525)
       (height 19)
       (tiles
@@ -228,7 +228,7 @@
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2085 2086 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 9 0 0 0 0 0 44 44 0 0 0 0 0 0 7 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1545 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1545 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 126 0 0 0 0 0 0 0 132 132 0 0 0 0 0
-      1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 2085 2086 0 0 0 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 1545 0 1545 0 0 0 1545 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 1545 0 0 1545 0 1545 0 1551 1540 1540 1540 1540 1540 1540 1541 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 2043 2044 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 1543 1544 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 1543 1544 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1541 0 0 0 1551 1540 1540 1540 1540 1541 0 0 0 0 1551 1541 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0
+      1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 2085 2086 0 0 0 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 1545 0 1545 0 0 0 1545 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 1545 0 0 1545 0 1545 0 1551 1540 1540 1540 1540 1540 1540 1541 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 2404 2405 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 1543 1544 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 2144 1543 1544 0 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1541 0 0 0 1551 1540 1540 1540 1540 1541 0 0 0 0 1551 1541 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 0 0 1551 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1540 1541 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 2087 2088 0 0 0 0 0 7 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 1547 1548 2147 2147 2147 2147 2147 2147 2147 2147 2147 2147 2147 2147 2147 2147 1547 1548 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 1543 1544 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1547 1548 0 0 0 0 0 0 2087 2088 0 0 0 0 0 2085 2086 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1547 1548 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1547 1548 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1547 1548 0 0 0 44 44 0 0 0 1547 1548 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 1547 1548 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 128 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1547 1548 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1547 1548 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 1547 1548 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1547 1548 1547 1548 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 2087 2088 0 0 0 0 0 2087 2088 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 44 44 0 0 0 44 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 44 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 2087 2088 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 2085 2086 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 1545 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 2085 2086 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2087 2088 0 0 0 0 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 44 44 0 0 0 44 0 0 0 0 0 0 1543 1544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1543 1544 1543 1544 1543 1544 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0
@@ -242,8 +242,8 @@
       )
     )
     (tilemap
-      (z-pos 100)
       (solid #f)
+      (z-pos 100)
       (width 525)
       (height 19)
       (tiles