more worldmap work

SVN-Revision: 3222

diff --git a/data/levels/world1/worldmap.stwm b/data/levels/world1/worldmap.stwm
index a3a6d8d..c70f767 100644 (file)
--- a/data/levels/world1/worldmap.stwm
+++ b/data/levels/world1/worldmap.stwm
@@ -1,206 +1,196 @@
 (supertux-level
+  (version 2)
   (name (_ "Icyisland"))
-  (tileset "images/worldmap.strf")
-
+  (author "")
   (sector
     (name "main")
     (music "music/salcon.ogg")
-  
     (tilemap
-      (width 40)
-      (height 30)
       (layer "interactive")
       (solid #t)
-      (speed 1.000000)
-      (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 11 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 12 11 16 16 16 16 12 9 9 9 9 11 16 16 16 12 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 22 19 17 15 24 25 25 26 23 16 12 9 9 15 19 58 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 22 19 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 15 19 59 19 17 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9 9 9 15 24 25 26 20 13 9 9 15 31 35 29 29 28 19 19 60 17 14 21 47 20 13 11 22 24 25 25 26 23 12 11 16 16 12 9 9 9 9 9 15 31 32 27 17 11 16 16 22 30 28 19 48 40 40 40 39 17 9 15 47 17 11 22 19 30 29 29 28 19 23 22 19 19 23 12 9 9 9 9 15 31 32 27 23 22 19 19 19 19 19 19 47 19 19 19 47 23 16 22 47 23 22 48 40 40 40 40 40 39 24 25 25 25 26 17 9 9 9 9 15 30 29 28 48 40 40 43 40 40 40 40 44 39 69 40 44 40 43 40 44 40 43 42 24 25 25 25 26 47 30 29 29 36 27 17 9 9 9 9 15 19 19 60 68 19 19 47 24 25 25 26 19 47 19 19 19 19 47 20 18 21 47 19 30 36 32 35 28 37 40 40 39 30 28 23 12 9 9 9 14 18 21 24 25 25 26 47 31 32 32 27 19 37 40 40 40 40 42 17 9 15 37 40 39 30 29 28 19 19 19 60 41 66 71 19 17 9 9 9 9 9 15 31 32 32 27 47 31 32 32 27 20 18 18 18 18 18 18 13 9 14 18 21 47 19 19 48 40 40 40 40 42 19 19 19 17 9 9 9 9 9 15 30 29 29 28 47 30 29 29 28 17 9 9 9 9 11 16 16 16 12 9 15 37 40 40 42 19 19 19 20 18 18 18 18 13 9 9 9 9 9 14 21 19 19 48 42 20 18 18 18 13 9 9 9 9 15 49 50 51 17 9 14 18 18 18 18 18 18 18 13 9 9 9 9 9 9 9 9 11 12 9 14 21 19 47 19 17 9 9 9 9 9 9 9 9 15 52 53 54 17 9 9 9 11 16 16 16 16 16 12 9 9 9 9 9 9 9 9 14 13 11 12 14 21 47 69 73 74 74 74 74 74 74 74 74 75 77 76 57 73 74 74 74 75 40 40 40 40 71 17 9 9 9 9 9 9 9 9 9 9 14 13 9 15 47 19 17 9 9 9 9 9 9 9 9 14 18 18 18 13 9 9 9 14 18 18 18 18 18 13 9 9 9 9 9 9 9 9 9 9 9 11 16 22 47 19 23 16 16 16 16 16 16 16 16 16 16 16 12 9 9 9 9 9 11 16 12 9 9 9 9 9 9 9 9 9 9 9 9 11 16 22 19 48 44 40 40 39 24 25 25 26 24 25 25 25 25 26 23 16 16 16 16 16 22 70 17 9 9 9 9 9 9 9 9 9 9 9 9 15 24 26 19 47 24 25 26 47 30 29 29 28 30 29 36 32 32 34 25 26 24 26 24 25 26 47 17 9 9 9 9 9 9 9 9 9 9 9 9 15 31 27 19 47 30 29 28 37 40 40 40 40 39 19 30 29 29 29 29 28 30 28 30 29 28 47 17 9 9 9 9 9 9 9 9 9 9 9 9 15 31 34 26 37 40 40 40 39 60 24 25 26 47 19 19 19 19 19 19 48 40 40 40 43 40 42 17 9 9 11 12 9 9 9 9 9 9 9 9 15 30 29 28 19 19 19 19 47 19 31 32 27 41 40 40 40 43 40 40 46 24 26 60 47 20 18 13 9 9 14 13 9 9 9 9 9 9 9 9 14 18 18 18 18 21 24 26 47 19 30 29 28 47 19 60 19 47 19 48 42 31 27 48 42 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 28 37 40 40 40 40 42 19 19 19 47 19 47 19 30 28 47 19 17 9 9 9 9 9 9 9 9 9 9 9 11 16 12 9 9 11 12 9 14 18 21 19 24 25 25 26 19 69 40 40 42 19 37 40 40 40 42 19 17 9 9 11 16 16 12 9 9 9 9 9 15 70 17 9 9 14 13 9 9 9 14 21 31 32 32 34 25 25 25 25 25 26 19 20 18 18 18 18 13 9 9 14 21 60 23 12 9 9 9 9 15 47 23 16 12 9 9 9 9 9 9 15 30 29 29 29 29 29 29 29 29 28 20 13 11 12 9 9 9 9 9 9 14 18 18 13 9 9 9 9 15 37 66 71 17 9 9 9 9 9 9 14 18 18 18 18 18 18 18 18 18 18 13 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9)
+      (speed 1)
+      (width 40)
+      (height 30)
+      (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 11 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 12 11 16 16 16 16 12 9 9 9 9 11 16 16 16 12 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 22 19 17 15 24 25 25 26 23 16 12 9 9 15 19 58 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 22 19 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 15 19 59 19 17 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9 9 9 15 24 25 26 20 13 9 9 15 31 35 29 29 28 19 19 60 17 14 21 47 20 13 11 22 24 25 25 26 23 12 11 16 16 12 9 9 9 9 9 15 31 32 27 17 11 16 16 22 30 28 19 48 40 40 40 39 17 9 15 47 17 11 22 19 30 29 29 28 19 23 22 19 19 23 12 9 9 9 9 15 31 32 27 23 22 19 19 19 19 19 19 47 19 19 19 47 23 16 22 47 23 22 48 40 40 40 40 40 39 24 25 25 25 26 17 9 9 9 9 15 30 29 28 48 40 40 43 40 40 40 40 44 39 69 40 44 40 43 40 44 40 43 42 24 25 25 25 26 47 30 29 29 36 27 17 9 9 9 9 15 19 19 60 68 19 19 47 24 25 25 26 19 47 19 19 19 19 47 20 18 21 47 19 30 36 32 35 28 37 40 40 39 30 28 23 12 9 9 9 14 18 21 24 25 25 26 47 31 32 32 27 19 37 40 40 40 40 42 17 9 15 37 40 39 30 29 28 19 19 19 60 41 40 71 19 17 9 9 9 9 9 15 31 32 32 27 47 31 32 32 27 20 18 18 18 18 18 18 13 9 14 18 21 47 19 19 48 40 40 40 40 42 19 19 19 17 9 9 9 9 9 15 30 29 29 28 47 30 29 29 28 17 9 9 9 9 11 16 16 16 12 9 15 37 40 40 42 19 19 19 20 18 18 18 18 13 9 9 9 9 9 14 21 19 19 48 42 20 18 18 18 13 9 9 9 9 15 49 50 51 17 9 14 18 18 18 18 18 18 18 13 9 9 9 9 9 9 9 9 11 12 9 14 21 19 47 19 17 9 9 9 9 9 9 9 9 15 52 53 54 17 9 9 9 11 16 16 16 16 16 12 9 9 9 9 9 9 9 9 14 13 11 12 14 21 47 48 73 74 74 74 74 74 74 74 74 75 77 76 57 73 74 74 74 75 40 40 40 40 71 17 9 9 9 9 9 9 9 9 9 9 14 13 9 15 47 47 17 9 9 9 9 9 9 9 9 14 18 18 18 13 9 9 9 14 18 18 18 18 18 13 9 9 9 9 9 9 9 9 9 9 9 11 16 22 47 47 23 16 16 16 16 16 16 16 16 16 16 16 12 9 9 9 9 9 11 16 12 9 9 9 9 9 9 9 9 9 9 9 9 11 16 22 19 48 42 37 40 39 24 25 25 26 24 25 25 25 25 26 23 16 16 16 16 16 22 70 17 9 9 9 9 9 9 9 9 9 9 9 9 15 24 26 19 47 19 48 40 46 30 29 29 28 30 29 36 32 32 34 25 26 24 26 24 25 26 47 17 9 9 9 9 9 9 9 9 9 9 9 9 15 31 27 19 47 19 47 19 41 40 40 40 40 40 39 30 29 29 29 29 28 30 28 30 29 28 47 17 9 9 9 9 9 9 9 9 9 9 9 9 15 31 34 26 41 40 42 19 47 60 24 25 25 26 47 19 19 19 19 19 48 40 40 40 43 40 42 17 9 9 11 12 9 9 9 9 9 9 9 9 15 30 29 28 37 40 40 40 61 19 31 32 32 27 41 40 40 43 40 40 46 24 26 60 47 20 18 13 9 9 14 13 9 9 9 9 9 9 9 9 14 18 18 18 18 21 24 26 47 19 30 29 29 28 47 60 19 47 19 48 42 31 27 48 42 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 28 37 40 40 40 40 40 42 19 19 47 19 47 19 30 28 47 19 17 9 9 9 9 9 9 9 9 9 9 9 11 16 12 9 9 11 12 9 14 18 21 19 24 25 25 26 69 40 40 40 42 19 37 40 40 40 42 19 17 9 9 11 16 16 12 9 9 9 9 9 15 70 17 9 9 14 13 9 9 9 14 21 31 32 32 34 25 25 25 25 25 26 19 20 18 18 18 18 13 9 9 14 21 60 23 12 9 9 9 9 15 47 23 16 12 9 9 9 9 9 9 15 30 29 29 29 29 29 29 29 29 28 20 13 11 12 9 9 9 9 9 9 14 18 18 13 9 9 9 9 15 37 66 71 17 9 9 9 9 9 9 14 18 18 18 18 18 18 18 18 18 18 13 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9)
     )
     (worldmap-spawnpoint
+      (name "main")
       (x 22)
       (y 4)
-      (name "main")
     )
     (level
+      (name "01 - Welcome to Antarctica.stl")
       (x 22)
       (y 5)
-      (name "01 - Welcome to Antarctica.stl")
     )
     (level
+      (name "02 - The Journey Begins.stl")
       (x 22)
       (y 8)
-      (name "02 - The Journey Begins.stl")
     )
     (level
+      (name "04 - Tobgle Road.stl")
       (x 14)
       (y 6)
-      (name "04 - Tobgle Road.stl")
     )
     (level
+      (name "05 - The Somewhat Smaller Bath.stl")
       (x 26)
       (y 25)
-      (name "05 - The Somewhat Smaller Bath.stl")
     )
     (level
+      (name "06 - The Frosted Fields.stl")
       (x 25)
       (y 21)
-      (name "06 - The Frosted Fields.stl")
     )
     (level
+      (name "07 - Oh No More Snowballs.stl")
       (x 29)
       (y 12)
-      (name "07 - Oh No More Snowballs.stl")
     )
     (level
+      (name "08 - Stone Cold.stl")
       (x 18)
       (y 6)
-      (name "08 - Stone Cold.stl")
     )
     (level
+      (name "09 - Grumbels Sense of Snow.stl")
       (x 16)
       (y 8)
-      (name "09 - Grumbels Sense of Snow.stl")
     )
     (level
-      (x 34)
-      (y 10)
       (name "10 - 23rd Airborne.stl")
+      (x 36)
+      (y 10)
     )
     (level
+      (name "11 - Night Chill.stl")
       (x 24)
       (y 10)
-      (name "11 - Night Chill.stl")
     )
     (level
+      (name "12 - Into the Stars.stl")
       (x 28)
       (y 7)
-      (name "12 - Into the Stars.stl")
     )
     (level
+      (name "13 - Above the Arctic Skies.stl")
       (x 6)
       (y 9)
-      (name "13 - Above the Arctic Skies.stl")
     )
     (level
-      (x 8)
-      (y 17)
       (name "14 - Entrance to the Cave.stl")
+      (x 8)
+      (y 16)
     )
     (level
+      (name "15 - Under the Ice.stl")
       (x 14)
       (y 24)
-      (name "15 - Under the Ice.stl")
     )
     (level
-      (x 7)
-      (y 20)
       (name "16 - Living in a Fridge.stl")
+      (x 9)
+      (y 20)
     )
     (level
-      (x 9)
-      (y 21)
       (name "17 - Or is it just me.stl")
+      (x 8)
+      (y 22)
     )
     (level
-      (x 13)
-      (y 20)
       (name "18 - Ice in the Hole.stl")
+      (x 15)
+      (y 20)
     )
     (level
+      (name "19 - Miyamoto Monument.stl")
       (x 11)
       (y 23)
-      (name "19 - Miyamoto Monument.stl")
     )
     (level
-      (x 16)
-      (y 22)
       (name "20 - End of the Tunnel.stl")
+      (x 17)
+      (y 22)
     )
     (level
+      (name "21 - A Path in the Clouds.stl")
       (x 22)
       (y 23)
-      (name "21 - A Path in the Clouds.stl")
     )
     (level
+      (name "22 - A Mysterious House of Ice.stl")
       (x 20)
       (y 23)
-      (name "22 - A Mysterious House of Ice.stl")
     )
     (level
+      (name "23 - The Escape.stl")
       (x 20)
       (y 25)
-      (name "23 - The Escape.stl")
     )
     (level
+      (name "24 - The Shattered Bridge.stl")
       (x 13)
       (y 15)
-      (name "24 - The Shattered Bridge.stl")
     )
     (level
+      (name "25 - Arctic Ruins.stl")
       (x 16)
       (y 15)
-      (name "25 - Arctic Ruins.stl")
     )
     (level
-      (x 21)
-      (y 15)
       (name "26 - The Castle of Nolok.stl")
-    )
-    (special-tile
-      (x 17)
-      (y 25)
-      (teleport-to-x 9)
-      (teleport-to-y 15)
-    )
-    (special-tile
-      (x 36)
-      (y 10)
-      (teleport-to-x 9)
-      (teleport-to-y 15)
-    )
-    (special-tile
-      (x 9)
+      (x 21)
       (y 15)
-      (map-message (_ "Warp Home"))
-      (teleport-to-x 22)
-      (teleport-to-y 4)
     )
     (level
+      (name "03 - Via Nostalgica.stl")
       (x 18)
       (y 10)
-      (name "03 - Via Nostalgica.stl")
     )
     (level
+      (name "27 - No More Mr Ice Guy.stl")
+      (quit-worldmap #t)
       (x 29)
       (y 15)
       (sprite "images/worldmap/common/yeti.sprite")
-      (name "27 - No More Mr Ice Guy.stl")
-      (quit-worldmap #t)
+    )
+    (level
+      (name "")
+      (x 3)
+      (y 28)
+    )
+    (special-tile
+      (teleport-to-x 9)
+      (teleport-to-y 15)
+      (map-message (_ ""))
+      (x 16)
+      (y 25)
     )
     (special-tile
-      (x 29)
-      (y 18)
-      (invisible-tile #t)
       (teleport-to-x 1)
       (teleport-to-y 26)
+      (map-message (_ ""))
+      (invisible-tile #t)
+      (x 29)
+      (y 18)
     )
     (special-tile
-      (x 1)
-      (y 26)
       (teleport-to-x 22)
       (teleport-to-y 4)
-    )
-    (level
-      (x 3)
-      (y 28)
-      (name "")
+      (map-message (_ ""))
+      (x 1)
+      (y 26)
     )
     (special-tile
-      (x 1)
-      (y 28)
-      (map-message (_ "You found a secret area!"))
-      (passive-message #t)
-      (invisible-tile #t)
       (teleport-to-x 0)
       (teleport-to-y 0)
+      (map-message (_ "You found a secret area!"))
+      (invisible-tile #t)
+      (passive-message #t)
+      (x 1)
+      (y 28)
     )
   )
+  (tileset "images/worldmap.strf")
 )