Tile fixes.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6269 837edb03-e0f3-0310-88ca-d4d4e8b29345

diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index d92d1d2..9f82b1a 100644 (file)
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -140,14 +140,6 @@
     914 915 916 0
   )
 )
-(tile (id 1)
-      ; TODO: This editor image is just temporary, please make a better one.
-      (solid #t)
-      (editor-images
-        "tiles/auxiliary/notile.png"
-      )
-)
-
 (tile (id 9)
       (images "worldmap/antarctica/water.png"))
 
@@ -800,319 +792,51 @@
   )
   (image "worldmap/forest/castlemap.png")
 )
-(tile (id 1735)
-      (images
-        (region "worldmap/forest/castlemap.png" 256 64 32 32))
-      (stop #t)
-      (north #f)
-      (south #t)
-      (west  #t)
-      (east  #f))
-(tile (id 1736)
-      (images
-        (region "worldmap/forest/castlemap.png" 256 96 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1737)
-      (images
-        (region "worldmap/forest/castlemap.png" 256 128 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1738)
-      (images
-        (region "worldmap/forest/castlemap.png" 256 160 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1739)
-      (images
-        (region "worldmap/forest/castlemap.png" 96 192 32 32))
-      (stop #t)
-      (north #f)
-      (south #t)
-      (west  #f)
-      (east  #t))
-(tile (id 1740)
-      (images
-        (region "worldmap/forest/castlemap.png" 128 192 32 32))
-      (stop #f)
-      (north #f)
-      (south #f)
-      (west  #t)
-      (east  #t))
-(tile (id 1741)
-      (images
-        (region "worldmap/forest/castlemap.png" 160 192 32 32))
-      (stop #f)
-      (north #f)
-      (south #f)
-      (west  #t)
-      (east  #t))
-(tile (id 1742)
-      (images
-        (region "worldmap/forest/castlemap.png" 192 192 32 32))
-      (stop #f)
-      (north #f)
-      (south #t)
-      (west  #t)
-      (east  #f))
-(tile (id 1743)
-      (images
-        (region "worldmap/forest/castlemap.png" 256 192 32 32))
-      (stop #f)
-      (north #t)
-      (south #f)
-      (west  #f)
-      (east  #t))
-(tile (id 1744)
-      (images
-        (region "worldmap/forest/castlemap.png" 288 192 32 32))
-      (stop #f)
-      (north #f)
-      (south #t)
-      (west  #t)
-      (east  #f))
-(tile (id 1745)
-      (images
-        (region "worldmap/forest/castlemap.png" 96 224 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-
-(tile (id 1746)
-      (images
-        (region "worldmap/forest/castlemap.png" 192 224 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1747)
-      (images
-        (region "worldmap/forest/castlemap.png" 288 224 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1748)
-      (images
-        (region "worldmap/forest/castlemap.png" 384 224 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1749)
-      (images
-        (region "worldmap/forest/castlemap.png" 96 256 32 32))
-      (stop #f)
-      (north #t)
-      (south #f)
-      (west  #f)
-      (east  #t))
-(tile (id 1750)
-      (images
-        (region "worldmap/forest/castlemap.png" 128 256 32 32))
-      (stop #f)
-      (north #f)
-      (south #t)
-      (west  #t)
-      (east  #f))
-(tile (id 1751)
-      (images
-        (region "worldmap/forest/castlemap.png" 192 256 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1752)
-      (images
-        (region "worldmap/forest/castlemap.png" 288 256 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1753)
-      (images
-        (region "worldmap/forest/castlemap.png" 128 288 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1754)
-      (images
-        (region "worldmap/forest/castlemap.png" 192 288 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1755)
-      (images
-        (region "worldmap/forest/castlemap.png" 256 288 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1756)
-      (images
-        (region "worldmap/forest/castlemap.png" 288 288 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1757)
-      (images
-        (region "worldmap/forest/castlemap.png" 128 320 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1758)
-      (images
-        (region "worldmap/forest/castlemap.png" 192 320 32 32))
-      (stop #f)
-      (north #t)
-      (south #f)
-      (west  #f)
-      (east  #t))
-(tile (id 1759)
-      (images
-        (region "worldmap/forest/castlemap.png" 224 320 32 32))
-      (stop #f)
-      (north #f)
-      (south #f)
-      (west  #t)
-      (east  #t))
-(tile (id 1760)
-      (images
-        (region "worldmap/forest/castlemap.png" 256 320 32 32))
-      (stop #f)
-      (north #f)
-      (south #f)
-      (west  #t)
-      (east  #t))
-(tile (id 1761)
-      (images
-        (region "worldmap/forest/castlemap.png" 288 320 32 32))
-      (stop #f)
-      (north #t)
-      (south #f)
-      (west  #t)
-      (east  #f))
-(tile (id 1762)
-      (images
-        (region "worldmap/forest/castlemap.png" 0 352 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1763)
-      (images
-        (region "worldmap/forest/castlemap.png" 128 352 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1764)
-      (images
-        (region "worldmap/forest/castlemap.png" 0 384 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1765)
-      (images
-        (region "worldmap/forest/castlemap.png" 128 384 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #f))
-(tile (id 1766)
-      (images
-        (region "worldmap/forest/castlemap.png" 128 416 32 32))
-      (stop #f)
-      (north #t)
-      (south #f)
-      (west  #f)
-      (east  #t))
-(tile (id 1767)
-      (images
-        (region "worldmap/forest/castlemap.png" 160 416 32 32))
-      (stop #f)
-      (north #f)
-      (south #f)
-      (west  #t)
-      (east  #t))
-(tile (id 1768)
-      (images
-        (region "worldmap/forest/castlemap.png" 192 416 32 32))
-      (stop #f)
-      (north #f)
-      (south #f)
-      (west  #t)
-      (east  #t))
-(tile (id 1769)
-      (images
-        (region "worldmap/forest/castlemap.png" 224 416 32 32))
-      (stop #f)
-      (north #f)
-      (south #t)
-      (west  #t)
-      (east  #f))
-(tile (id 1770)
-      (images
-        (region "worldmap/forest/castlemap.png" 224 448 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #t))
-(tile (id 1771)
-      (images
-        (region "worldmap/forest/castlemap.png" 224 480 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #t))
-(tile (id 1772)
-      (images
-        (region "worldmap/forest/castlemap.png" 224 512 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #t))
-(tile (id 1773)
-      (images
-        (region "worldmap/forest/castlemap.png" 224 544 32 32))
-      (stop #f)
-      (north #t)
-      (south #t)
-      (west  #f)
-      (east  #t))
+(tiles
+  (width 13)
+  (height 18)
+  (ids
+       0    0    0    0    0    0    0    0    0    0    0    0    0
+       0    0    0    0    0    0    0    0    0    0    0    0    0
+       0    0    0    0    0    0    0    0 1735    0    0    0    0
+       0    0    0    0    0    0    0    0 1736    0    0    0    0
+       0    0    0    0    0    0    0    0 1737    0    0    0    0
+       0    0    0    0    0    0    0    0 1738    0    0    0    0
+       0    0    0 1739 1740 1741 1742    0 1743 1744    0    0    0
+       0    0    0 1745    0    0 1746    0    0 1747    0    0 1748
+       0    0    0 1749 1750    0 1751    0    0 1752    0    0    0
+       0    0    0    0 1753    0 1754    0 1755 1756    0    0    0
+       0    0    0    0 1757    0 1758 1759 1760 1761    0    0    0
+    1762    0    0    0 1763    0    0    0    0    0    0    0    0
+    1764    0    0    0 1765    0    0    0    0    0    0    0    0
+       0    0    0    0 1766 1767 1768 1769    0    0    0    0    0
+       0    0    0    0    0    0    0 1770    0    0    0    0    0
+       0    0    0    0    0    0    0 1771    0    0    0    0    0
+       0    0    0    0    0    0    0 1772    0    0    0    0    0
+       0    0    0    0    0    0    0 1773    0    0    0    0    0
+  )
+  (datas
+       0    0    0    0    0    0    0    0    0    0    0    0    0
+       0    0    0    0    0    0    0    0    0    0    0    0    0
+       0    0    0    0    0    0    0    0   26    0    0    0    0
+       0    0    0    0    0    0    0    0    3    0    0    0    0
+       0    0    0    0    0    0    0    0    3    0    0    0    0
+       0    0    0    0    0    0    0    0    3    0    0    0    0
+       0    0    0   22   12   12   10    0    5   10    0    0    0
+       0    0    0    3    0    0    3    0    0    3    0    0    3
+       0    0    0    5   10    0    3    0    0    3    0    0    0
+       0    0    0    0    3    0    3    0    3    3    0    0    0
+       0    0    0    0    3    0    5   12   12    9    0    0    0
+       3    0    0    0    3    0    0    0    0    0    0    0    0
+       3    0    0    0    3    0    0    0    0    0    0    0    0
+       0    0    0    0    5   12   12   10    0    0    0    0    0
+       0    0    0    0    0    0    0    7    0    0    0    0    0
+       0    0    0    0    0    0    0    7    0    0    0    0    0
+       0    0    0    0    0    0    0    7    0    0    0    0    0
+       0    0    0    0    0    0    0    7    0    0    0    0    0
+  )
+  (image "worldmap/forest/castlemap.png")
+)
 (tiles
   (width 9)
   (height 14)

diff --git a/data/levels/world2/worldmap.stwm b/data/levels/world2/worldmap.stwm
index 818ee56..d40f0c6 100644 (file)
--- a/data/levels/world2/worldmap.stwm
+++ b/data/levels/world2/worldmap.stwm
@@ -28,25 +28,25 @@ state.world <- \"levels/world1/worldmap.stwm\";")
       (stay-action "empty")
       (initial-stay-action #t)
       (stay-group "world1-boat")
+      (sprite "images/worldmap/common/boat/boat.sprite")
       (x 19)
       (y 42)
-      (sprite "images/worldmap/common/boat/boat.sprite")
     )
     (sprite-change
       (change-on-touch #t)
       (initial-stay-action #f)
+      (sprite "images/worldmap/common/tux.sprite")
       (x 19)
       (y 41)
-      (sprite "images/worldmap/common/tux.sprite")
     )
     (sprite-change
       (change-on-touch #t)
       (stay-action "")
       (initial-stay-action #f)
       (stay-group "world1-boat")
+      (sprite "images/worldmap/common/boat/boat.sprite")
       (x 10)
       (y 45)
-      (sprite "images/worldmap/common/boat/boat.sprite")
     )
     (teleporter
       (worldmap "levels/world1/worldmap.stwm")
@@ -120,24 +120,24 @@ state.world <- \"levels/world1/worldmap.stwm\";")
       (height 50)
       (tiles
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1 1 1 1 1 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1 1 1 1 1 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1 1 1 1 1 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1 1 1 1 1 1 1 109 1 1 1 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1 1 1 1 1 1 1 109 1 1 1 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 655 655 655 655 655 1 1 1 1 1 1 1 1 109 1 1 1 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 758 762 762 762 761 564 1 1 1 1 1 1 1 1 109 1 1 1 655 655 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 765 564 564 564 765 564 1 1 1 100 110 110 101 1 104 101 1 1 559 564 564 614 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 765 564 564 564 765 564 1 1 1 104 101 1 109 1 1 109 1 1 559 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 765 564 564 564 765 564 1 1 1 1 109 1 109 1 1 109 1 1 559 564 564 564 564 614 655 655 655 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 655 655 633 765 564 564 564 765 564 1 1 1 1 109 1 109 1 1 109 1 1 559 564 743 564 564 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 765 564 758 762 769 564 1 1 1 1 109 1 104 110 110 105 1 1 559 758 762 762 762 762 762 761 564 564 614 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 633 564 564 564 564 765 564 765 564 564 564 1 1 1 1 109 1 1 1 1 1 1 1 1668 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 758 762 769 564 760 762 761 559 1 1 1 1 104 110 110 101 1 1 1 1 1681 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 765 564 564 564 564 564 765 559 1 1 1 1 1 1 1 109 1 1 1 1 1694 760 761 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 760 761 564 564 564 564 765 564 1 1 1 1 1 1 1 109 1 1 1 1 1707 564 765 564 564 564 758 769 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 564 715 564 564 564 564 715 564 1 1 1 1 1 1 1 109 1 1 1 1 1721 564 765 564 564 758 769 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 633 1882 1883 708 712 712 718 712 712 713 712 718 711 1 1 1 1 1 1 1 109 1 1 1 1 559 564 765 564 564 765 564 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 0 0 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 0 0 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 0 0 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 0 0 0 0 0 0 0 109 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 0 0 0 0 0 0 0 109 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 655 655 655 655 655 0 0 0 0 0 0 0 0 109 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 758 762 762 762 761 564 0 0 0 0 0 0 0 0 109 0 0 0 655 655 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 765 564 564 564 765 564 0 0 0 100 110 110 101 0 104 101 0 0 559 564 564 614 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 765 564 564 564 765 564 0 0 0 104 101 0 109 0 0 109 0 0 559 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 765 564 564 564 765 564 0 0 0 0 109 0 109 0 0 109 0 0 559 564 564 564 564 614 655 655 655 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 655 655 633 765 564 564 564 765 564 0 0 0 0 109 0 109 0 0 109 0 0 559 564 743 564 564 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 765 564 758 762 769 564 0 0 0 0 109 0 104 110 110 105 0 0 559 758 762 762 762 762 762 761 564 564 614 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 633 564 564 564 564 765 564 765 564 564 564 0 0 0 0 109 0 0 0 0 0 0 0 1668 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 758 762 769 564 760 762 761 559 0 0 0 0 104 110 110 101 0 0 0 0 1681 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 765 564 564 564 564 564 765 559 0 0 0 0 0 0 0 109 0 0 0 0 1694 760 761 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 760 761 564 564 564 564 765 564 0 0 0 0 0 0 0 109 0 0 0 0 1707 564 765 564 564 564 758 769 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 564 715 564 564 564 564 715 564 0 0 0 0 0 0 0 109 0 0 0 0 1721 564 765 564 564 758 769 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 633 1882 1883 708 712 712 718 712 712 713 712 718 711 0 0 0 0 0 0 0 109 0 0 0 0 559 564 765 564 564 765 564 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 1882 1883 1893 409 410 410 410 410 410 409 410 410 717 712 711 559 559 559 559 559 715 1874 1875 564 564 564 564 765 564 564 765 564 564 564 564 564 615 653 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 1882 1883 1893 798 409 410 410 410 410 410 409 410 410 693 410 717 712 712 712 712 712 714 410 698 733 689 564 564 765 564 758 769 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 1884 1891 1893 410 789 409 410 410 410 410 410 409 871 872 873 874 875 876 877 878 410 410 409 410 410 748 687 564 564 765 564 765 564 564 743 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
@@ -291,177 +291,177 @@ state.world <- \"levels/world1/worldmap.stwm\";")
     )
     (level
       (name "christoph9.stl")
+      (sprite "images/worldmap/common/torch.sprite")
       (x 32)
       (y 8)
-      (sprite "images/worldmap/common/torch.sprite")
     )
     (level
       (name "keystodoor.stl")
+      (sprite "images/worldmap/forest/leveldots/door.sprite")
       (x 33)
       (y 13)
-      (sprite "images/worldmap/forest/leveldots/door.sprite")
     )
     (level
       (name "christoph8.stl")
+      (sprite "images/worldmap/common/torch.sprite")
       (x 37)
       (y 12)
-      (sprite "images/worldmap/common/torch.sprite")
     )
     (level
       (name "christophC.stl")
+      (sprite "images/worldmap/common/torch.sprite")
       (x 38)
       (y 8)
-      (sprite "images/worldmap/common/torch.sprite")
     )
     (level
       (name "christophE.stl")
+      (sprite "images/worldmap/common/torch.sprite")
       (x 37)
       (y 4)
-      (sprite "images/worldmap/common/torch.sprite")
     )
     (level
       (name "christoph2.stl")
+      (sprite "images/worldmap/forest/small_wood.sprite")
       (x 33)
       (y 37)
-      (sprite "images/worldmap/forest/small_wood.sprite")
     )
     (level
       (name "airkey.stl")
+      (sprite "images/worldmap/forest/small_air.sprite")
       (x 35)
       (y 26)
-      (sprite "images/worldmap/forest/small_air.sprite")
     )
     (level
       (name "christoph1.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 25)
       (y 34)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "christoph3.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 31)
       (y 29)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "christoph5.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 36)
       (y 29)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "christoph6.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 23)
       (y 39)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "christophA.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 19)
       (y 24)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "updown.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 35)
       (y 33)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "level2.stl")
+      (sprite "images/worldmap/forest/small_earth.sprite")
       (x 19)
       (y 18)
-      (sprite "images/worldmap/forest/small_earth.sprite")
     )
     (level
       (name "Crumbling_Path.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 26)
       (y 18)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "ghostly.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 21)
       (y 14)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "builder.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 25)
       (y 22)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "christoph7.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 43)
       (y 19)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "christophB.stl")
+      (sprite "images/worldmap/forest/small_fire.sprite")
       (x 47)
       (y 12)
-      (sprite "images/worldmap/forest/small_fire.sprite")
     )
     (level
       (name "leaves.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 27)
       (y 37)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "fish.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 25)
       (y 30)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "owls_revenge.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 22)
       (y 27)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "trees.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 41)
       (y 35)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "dan_morial.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 44)
       (y 24)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "village.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 47)
       (y 16)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "detour.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 42)
       (y 12)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "light+magic.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 23)
       (y 8)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (level
       (name "shocking.stl")
+      (sprite "images/worldmap/forest/small_water.sprite")
       (x 27)
       (y 9)
-      (sprite "images/worldmap/forest/small_water.sprite")
     )
     (level
       (name "level4.stl")
+      (sprite "images/worldmap/common/shroom.sprite")
       (x 27)
       (y 16)
-      (sprite "images/worldmap/common/shroom.sprite")
     )
     (worldmap-spawnpoint
       (name "main")