Changed the Icy Island worldmap to a linear worldmap based on that from Milestone 1.

The passage to the Forest and back has been removed. The Forest world is now
listed in "Contributed Levels".

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

diff --git a/data/levels/world1/worldmap.stwm b/data/levels/world1/worldmap.stwm
index e08668a..71f6a40 100644 (file)
--- a/data/levels/world1/worldmap.stwm
+++ b/data/levels/world1/worldmap.stwm
@@ -8,289 +8,197 @@
     (name "main")
     (music "music/salcon.ogg")
     (ambient-light 1 1 1)
-    (special-tile
-      (teleport-to-x 0)
-      (teleport-to-y 0)
-      (map-message (_ "You found a secret area!"))
-      (invisible-tile #t)
-      (passive-message #t)
-      (x 1)
-      (y 31)
-    )
-    (special-tile
-      (invisible-tile #t)
-      (script "fadeout_screen( 2 );
-state.world <- \"levels/world2/worldmap.stwm\";")
-      (apply-to-direction "north")
-      (x 37)
-      (y 20)
-    )
-    (special-tile
-      (invisible-tile #t)
-      (script "abort_screenfade();")
-      (apply-to-direction "south")
-      (x 37)
-      (y 19)
-    )
-    (sprite-change
-      (change-on-touch #t)
-      (initial-stay-action #f)
-      (sprite "images/worldmap/common/tux.sprite")
-      (x 33)
-      (y 15)
-    )
-    (sprite-change
-      (change-on-touch #t)
-      (stay-action "")
-      (initial-stay-action #f)
-      (stay-group "world2-boat")
-      (sprite "images/worldmap/common/boat/boat.sprite")
-      (x 38)
-      (y 21)
-    )
-    (sprite-change
-      (change-on-touch #f)
-      (stay-action "empty")
-      (initial-stay-action #t)
-      (stay-group "world2-boat")
-      (sprite "images/worldmap/common/boat/boat.sprite")
-      (x 34)
-      (y 15)
-    )
-    (teleporter
-      (worldmap "levels/world2/worldmap.stwm")
-      (spawnpoint "world1")
-      (automatic #t)
-      (x 54)
-      (y 21)
-    )
-    (teleporter
-      (spawnpoint "bridge")
-      (sprite "images/worldmap/common/teleporterdot.sprite")
-      (x 1)
-      (y 30)
-    )
-    (teleporter
-      (spawnpoint "bonus")
-      (x 16)
-      (y 29)
-    )
     (tilemap
       (solid #t)
-      (z-pos -100)
-      (width 80)
-      (height 40)
+      (z-pos 0)
+      (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 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 22 19 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 15 19 59 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 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 16 16 16 16 12 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 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 22 24 25 25 26 23 12 11 16 16 12 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 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 22 19 30 29 29 28 19 23 22 19 19 23 12 9 9 9 9 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 17 9 9 9 9 9 9 9 9 9 9 9 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 22 48 40 40 40 40 40 39 24 25 25 25 26 17 9 9 9 9 9 9
-      9 9 15 30 29 28 48 40 40 43 40 40 40 40 44 39 69 40 44 40 43 40 42 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 43 42 24 25 25 25 26 47 30 29 29 36 27 17 9 9 9 9 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 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 15 47 19 30 36 32 35 28 37 40 40 39 30 28 23 12 9 9 9 9 9
-      9 9 14 18 21 24 25 25 26 47 31 32 32 27 19 37 40 40 40 40 42 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 37 40 39 30 29 28 19 19 19 60 41 40 71 19 17 9 9 9 9 9
-      9 9 9 9 15 31 32 32 27 47 31 32 32 27 20 18 18 18 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 9 9 14 18 21 47 19 19 48 40 40 40 40 42 19 19 19 17 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 37 40 40 42 19 19 19 20 18 18 18 18 13 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 18 18 13 9 9 9 9 9 9 9 9 9 9
-      9 9 11 12 9 14 21 19 47 19 17 11 16 12 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 14 13 11 12 14 21 47 19 17 15 48 73 74 74 74 74 74 75 77 76 57 73 74 74 74 75 40 40 40 40 914 915 78 78 78 81 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 14 13 9 15 47 19 17 15 47 17 9 9 9 9 9 14 18 18 18 13 9 9 9 14 18 18 18 18 18 13 9 9 9 79 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 15 47 19 17 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 79 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 15 47 19 17 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 79 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 15 47 19 17 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 79 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 15 47 19 17 15 47 23 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 12 9 9 9 9 9 9 79 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 16 22 47 19 23 22 37 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 39 17 9 9 9 9 9 9 84 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 78
-      9 9 9 11 16 22 19 48 44 40 40 39 24 25 25 26 24 25 25 25 25 26 19 19 19 19 19 19 19 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 15 24 26 19 47 19 19 19 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 15 31 27 19 37 40 39 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 15 31 34 26 19 19 47 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 15 30 29 28 19 19 37 40 46 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 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 12 9 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 14 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 11 22 58 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9 9 9 9 9 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9
+      9 9 15 19 59 19 20 13 9 9 15 31 35 29 29 28 19 19 60 23 16 12 9 9 9 11 22 19 24 25 26 23 12 11 16 16 12 9 9 9
+      9 9 15 19 47 19 17 11 16 16 22 30 28 19 48 40 40 39 19 20 18 13 9 9 11 22 19 19 30 36 34 26 23 22 19 19 23 12 9 9
+      9 9 15 19 47 19 23 22 19 19 19 19 24 26 47 24 26 47 19 23 16 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9 9
+      9 9 15 19 37 39 19 48 40 40 40 39 30 28 47 30 28 37 40 40 40 40 40 40 40 42 19 19 47 30 29 29 29 29 29 36 27 17 9 9
+      9 9 15 19 19 47 19 47 24 25 26 37 40 40 42 24 25 25 26 20 18 18 18 21 24 25 25 26 37 40 40 40 40 40 39 31 27 23 12 9
+      9 9 14 18 21 47 19 47 30 29 28 19 24 25 25 33 35 29 28 17 9 9 9 15 30 29 36 27 19 19 19 19 19 60 47 31 34 26 17 9
+      9 9 9 9 15 37 40 42 19 19 24 25 33 35 29 29 28 20 18 13 9 9 9 14 18 21 31 27 48 40 40 40 40 40 42 30 36 27 17 9
+      9 9 9 9 15 19 19 24 25 25 33 32 35 28 20 18 18 13 9 9 9 9 9 9 9 15 31 27 47 24 25 25 25 26 19 19 30 28 17 9
+      9 9 9 9 14 21 19 31 32 32 32 35 28 20 13 9 9 11 16 12 9 9 9 9 9 15 30 28 47 30 29 29 29 28 20 21 19 20 13 9
+      9 9 11 12 9 14 21 30 29 29 29 28 20 13 9 11 16 22 20 13 9 9 9 9 9 14 21 19 37 40 40 40 39 20 13 14 21 17 9 9
+      9 9 14 13 11 12 14 18 18 18 18 18 13 9 9 14 18 18 13 9 9 9 9 9 9 9 14 21 19 24 25 26 47 17 9 9 14 13 9 9
+      9 9 9 9 14 13 9 9 9 9 11 12 9 9 9 9 9 11 16 12 9 9 9 9 9 9 9 14 21 31 32 27 47 17 9 9 9 9 9 9
+      9 9 9 9 9 11 16 16 16 16 22 17 11 12 9 9 11 22 19 23 16 16 12 9 9 9 9 9 15 31 32 27 47 17 9 9 9 9 9 9
+      9 9 9 11 16 22 24 25 25 25 26 17 14 13 9 9 15 24 25 25 25 26 23 16 16 16 16 16 22 30 29 28 47 17 9 9 9 9 9 9
+      9 11 16 22 19 19 30 29 29 29 28 17 9 9 9 9 15 30 29 29 29 28 24 25 25 26 48 40 40 40 40 40 42 17 9 9 9 9 9 9
+      9 15 24 26 19 70 49 50 51 19 48 73 74 74 74 74 75 40 40 43 40 71 30 29 29 28 47 20 18 18 18 18 18 13 9 9 9 9 9 9
+      9 15 31 27 19 47 52 53 54 19 47 17 9 9 9 9 15 24 26 47 19 24 26 48 40 40 42 23 12 9 9 9 9 11 12 9 9 9 9 9
+      9 15 31 34 26 37 77 76 57 40 42 23 12 9 9 9 15 30 28 47 19 30 28 47 19 19 24 26 17 9 9 9 9 14 13 9 9 9 9 9
+      9 15 30 29 28 19 20 18 21 24 25 26 17 9 9 9 14 21 48 42 24 26 48 42 24 25 33 27 17 9 9 9 9 9 9 9 9 9 9 9
+      9 14 18 18 18 18 13 9 15 30 29 28 17 9 9 9 9 15 47 19 30 28 47 19 30 29 36 27 17 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 11 12 9 9 9 14 18 18 18 13 9 9 9 11 22 37 40 40 40 42 19 20 21 30 28 17 9 9 11 16 16 12 9 9 9 9 9
+      9 9 9 14 13 9 9 9 9 9 9 9 9 9 9 9 15 24 25 25 26 19 19 20 13 14 18 18 13 9 9 14 21 60 23 12 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 29 29 28 19 20 13 11 12 9 9 9 9 9 9 14 18 18 13 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 13 9 14 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 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       )
     )
     (level
-      (name "01 - Welcome to Antarctica.stl")
-      (x 22)
+      (name "intro.stl")
+      (auto-play #t)
+      (sprite "images/objects/invisible/invisible.sprite")
+      (x 4)
       (y 5)
     )
     (level
+      (name "01 - Welcome to Antarctica.stl")
+      (x 4)
+      (y 6)
+    )
+    (level
       (name "02 - The Journey Begins.stl")
-      (x 22)
+      (x 4)
       (y 8)
     )
     (level
+      (name "03 - Via Nostalgica.stl")
+      (x 5)
+      (y 11)
+    )
+    (level
       (name "04 - Tobgle Road.stl")
-      (x 14)
-      (y 6)
+      (x 7)
+      (y 11)
     )
     (level
       (name "05 - The Somewhat Smaller Bath.stl")
-      (x 18)
-      (y 6)
+      (x 7)
+      (y 8)
     )
     (level
       (name "06 - The Frosted Fields.stl")
-      (x 25)
-      (y 25)
+      (x 11)
+      (y 9)
     )
     (level
       (name "07 - Oh No More Snowballs.stl")
-      (x 8)
-      (y 20)
+      (x 14)
+      (y 9)
     )
     (level
       (name "08 - Stone Cold.stl")
-      (x 26)
-      (y 29)
+      (x 17)
+      (y 6)
     )
     (level
       (name "09 - Grumbels Sense of Snow.stl")
-      (x 25)
-      (y 21)
+      (x 14)
+      (y 6)
     )
     (level
       (name "10 - 23rd Airborne.stl")
-      (x 16)
+      (x 21)
       (y 8)
     )
     (level
       (name "11 - Night Chill.stl")
-      (x 8)
-      (y 17)
+      (x 26)
+      (y 7)
     )
     (level
       (name "12 - Into the Stars.stl")
-      (x 8)
-      (y 14)
+      (x 28)
+      (y 9)
     )
     (level
       (name "13 - Above the Arctic Skies.stl")
-      (x 6)
+      (x 31)
       (y 9)
     )
     (level
       (name "14 - Entrance to the Cave.stl")
-      (x 9)
-      (y 12)
+      (x 34)
+      (y 11)
     )
     (level
       (name "15 - Under the Ice.stl")
-      (x 14)
-      (y 28)
+      (x 29)
+      (y 11)
     )
     (level
       (name "16 - Living in a Fridge.stl")
-      (x 10)
-      (y 22)
+      (x 28)
+      (y 13)
     )
     (level
       (name "17 - Or is it just me.stl")
-      (x 9)
-      (y 25)
+      (x 32)
+      (y 15)
     )
     (level
       (name "18 - Ice in the Hole.stl")
-      (x 15)
-      (y 24)
+      (x 32)
+      (y 18)
     )
     (level
       (name "19 - Miyamoto Monument.stl")
-      (x 11)
-      (y 27)
+      (x 29)
+      (y 19)
     )
     (level
       (name "20 - End of the Tunnel.stl")
-      (x 17)
-      (y 26)
+      (x 26)
+      (y 20)
     )
     (level
       (name "21 - A Path in the Clouds.stl")
-      (x 22)
-      (y 28)
+      (x 23)
+      (y 22)
     )
     (level
       (name "22 - A Mysterious House of Ice.stl")
       (x 20)
-      (y 26)
+      (y 25)
     )
     (level
       (name "23 - The Escape.stl")
-      (x 20)
-      (y 28)
+      (x 19)
+      (y 20)
     )
     (level
       (name "24 - The Shattered Bridge.stl")
-      (x 14)
-      (y 15)
+      (x 15)
+      (y 20)
     )
     (level
       (name "25 - Arctic Ruins.stl")
-      (x 17)
-      (y 15)
+      (x 12)
+      (y 20)
     )
     (level
-      (name "26 - The Castle of Nolok.stl")
+      (name "bonus.stl")
       (x 21)
-      (y 15)
+      (y 20)
     )
     (level
-      (name "03 - Via Nostalgica.stl")
-      (x 18)
-      (y 10)
+      (name "26 - The Castle of Nolok.stl")
+      (x 7)
+      (y 22)
     )
     (level
       (name "27 - No More Mr Ice Guy.stl")
       (quit-worldmap #t)
       (sprite "images/worldmap/common/yeti.sprite")
-      (x 29)
-      (y 15)
-    )
-    (level
-      (name "bonus.stl")
-      (x 3)
-      (y 32)
-    )
-    (level
-      (name "intro.stl")
-      (auto-play #t)
-      (sprite "images/objects/invisible/invisible.sprite")
-      (x 22)
-      (y 4)
+      (x 5)
+      (y 20)
     )
     (worldmap-spawnpoint
       (name "main")
-      (x 22)
-      (y 4)
-    )
-    (worldmap-spawnpoint
-      (name "world2")
-      (x 38)
-      (y 21)
-    )
-    (worldmap-spawnpoint
-      (name "bonus")
-      (x 1)
-      (y 30)
-    )
-    (worldmap-spawnpoint
-      (name "bridge")
-      (x 16)
-      (y 29)
+      (x 4)
+      (y 5)
     )
   )
   (tileset "images/worldmap.strf")

diff --git a/data/levels/world2/info b/data/levels/world2/info
index a307985..e0b18a9 100644 (file)
--- a/data/levels/world2/info
+++ b/data/levels/world2/info
@@ -1,6 +1,6 @@
 (supertux-world
   (title (_ "Forest World"))
-  (description "World 2")
-  (hide-from-contribs #t)
+  (description "An attempt at the Forest world planned for Milestone 3")
+  (hide-from-contribs #f)
   (levelset #f)
 )

diff --git a/data/levels/world2/worldmap.stwm b/data/levels/world2/worldmap.stwm
index ae8f7ba..bf29a70 100644 (file)
--- a/data/levels/world2/worldmap.stwm
+++ b/data/levels/world2/worldmap.stwm
@@ -20,53 +20,6 @@
       (layer 101)
       (sprite "images/worldmap/forest/castlemap_overlay.png")
     )
-    (special-tile
-      (invisible-tile #t)
-      (script "fadeout_screen( 2 );
-state.world <- \"levels/world1/worldmap.stwm\";")
-      (apply-to-direction "east")
-      (x 8)
-      (y 45)
-    )
-    (special-tile
-      (invisible-tile #t)
-      (script "abort_screenfade();")
-      (apply-to-direction "west")
-      (x 9)
-      (y 45)
-    )
-    (sprite-change
-      (change-on-touch #f)
-      (stay-action "empty")
-      (initial-stay-action #t)
-      (stay-group "world1-boat")
-      (sprite "images/worldmap/common/boat/boat.sprite")
-      (x 19)
-      (y 42)
-    )
-    (sprite-change
-      (change-on-touch #t)
-      (initial-stay-action #f)
-      (sprite "images/worldmap/common/tux.sprite")
-      (x 19)
-      (y 41)
-    )
-    (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)
-    )
-    (teleporter
-      (worldmap "levels/world1/worldmap.stwm")
-      (spawnpoint "world2")
-      (automatic #t)
-      (x 0)
-      (y 44)
-    )
     (tilemap
       (solid #f)
       (z-pos -200)
@@ -173,10 +126,10 @@ state.world <- \"levels/world1/worldmap.stwm\";")
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 791 748 410 402 406 406 406 413 410 748 789 552 410 789 790 410 748 410 410 410 410 410 410 410 410 410 410 809 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 792 703 703 767 703 703 818 410 748 748 789 555 410 798 799 410 748 811 812 410 410 410 410 410 410 410 748 800 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 772 9 9 791 410 693 693 789 410 410 410 410 410 410 410 410 410 410 555 556 410 748 748 748 800 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 79 9 9 792 818 410 410 789 748 693 748 809 703 703 818 410 410 809 703 703 818 410 809 703 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 79 9 9 9 792 703 818 789 410 809 703 793 9 9 792 703 703 793 9 9 792 703 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      78 78 78 78 78 78 78 78 81 9 9 9 9 9 9 417 80 78 78 85 9 9 9 9 9 808 809 703 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 84 78 78 78 78 78 78 78 85 9 9 9 9 9 9 9 9 792 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 792 818 410 410 789 748 693 748 809 703 703 818 410 410 809 703 703 818 410 809 703 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 792 703 818 789 410 809 703 793 9 9 792 703 703 793 9 9 792 703 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 417 9 9 9 9 9 9 9 9 9 808 809 703 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 792 793 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
@@ -477,13 +430,8 @@ state.world <- \"levels/world1/worldmap.stwm\";")
     )
     (worldmap-spawnpoint
       (name "main")
-      (x 10)
-      (y 45)
-    )
-    (worldmap-spawnpoint
-      (name "world1")
-      (x 10)
-      (y 45)
+      (x 19)
+      (y 41)
     )
   )
   (tileset "images/worldmap.strf")