X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Flevels%2Fbonus1%2Fworldmap.stwm;h=53d9f863245a72542617fbf83505a4cb372976ca;hb=18b731c69b969928e2e1e89bef3abc374a1497e7;hp=efb1733e6443b1ced407bb176e3ac55f002bdaec;hpb=220c5ff034795391b7c00e8b36c38c27b79aa4a3;p=supertux.git

diff --git a/data/levels/bonus1/worldmap.stwm b/data/levels/bonus1/worldmap.stwm
index efb1733e6..53d9f8632 100644
--- a/data/levels/bonus1/worldmap.stwm
+++ b/data/levels/bonus1/worldmap.stwm
@@ -6,7 +6,7 @@
     (name "main")
     (music "music/salcon.ogg")
     (tilemap
-      (layer "interactive")
+      (z-pos -100)
       (solid #t)
       (speed 1)
       (width 70)
@@ -18,6 +18,66 @@
       (x 35)
       (y 2)
     )
+    (worldmap-spawnpoint
+      (name "thompson")
+      (x 34)
+      (y 18)
+    )
+    (worldmap-spawnpoint
+      (name "matr1x2")
+      (x 19)
+      (y 24)
+    )
+    (worldmap-spawnpoint
+      (name "team")
+      (x 51)
+      (y 10)
+    )
+    (worldmap-spawnpoint
+      (name "abednego")
+      (x 15)
+      (y 31)
+    )
+    (worldmap-spawnpoint
+      (name "torfi")
+      (x 61)
+      (y 33)
+    )
+    (worldmap-spawnpoint
+      (name "matr1x3")
+      (x 32)
+      (y 37)
+    )
+    (worldmap-spawnpoint
+      (name "matr1x4")
+      (x 33)
+      (y 8)
+    )
+    (worldmap-spawnpoint
+      (name "team2")
+      (x 35)
+      (y 8)
+    )
+    (worldmap-spawnpoint
+      (name "abednego2")
+      (x 37)
+      (y 8)
+    )
+    (worldmap-spawnpoint
+      (name "torfi2")
+      (x 39)
+      (y 8)
+    )
+    (worldmap-spawnpoint
+      (name "thompson2")
+      (x 31)
+      (y 8)
+    )
+    (worldmap-spawnpoint
+      (name "matr1x")
+      (x 20)
+      (y 14)
+    )
     (level
       (name "bonus-level1.stl")
       (x 35)
@@ -138,125 +198,129 @@
     )
     (special-tile
       (map-message (_ "Hint: Use igloos to get back here."))
+      (invisible-tile #t)
       (passive-message #t)
       (apply-to-direction "north")
       (x 35)
       (y 5)
     )
-    (special-tile
-      (teleport-to-x 20)
-      (teleport-to-y 14)
-      (map-message (_ "Warp to Matr1x' Sector"))
+    (teleporter
+      (spawnpoint "matr1x")
+      (message (_ "Warp to Matr1x' Sector"))
       (x 33)
       (y 8)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 34)
-      (teleport-to-y 18)
-      (map-message (_ "Warp to Thompson's Domain"))
+    (teleporter
+      (spawnpoint "thompson")
+      (message (_ "Warp to Thompson's Domain"))
       (x 31)
       (y 8)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 51)
-      (teleport-to-y 10)
-      (map-message (_ "Warp to the SuperTux Team Island"))
-      (x 35)
-      (y 8)
+    (teleporter
+      (spawnpoint "team2")
+      (message (_ "Leave the SuperTux Team Island"))
+      (x 54)
+      (y 25)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 15)
-      (teleport-to-y 31)
-      (map-message (_ "Warp to Abednego's Area"))
+    (teleporter
+      (spawnpoint "abednego")
+      (message (_ "Warp to Abednego's Area"))
       (x 37)
       (y 8)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 61)
-      (teleport-to-y 33)
-      (map-message (_ "Warp to Torfi's Territory"))
-      (x 39)
-      (y 8)
+    (teleporter
+      (spawnpoint "torfi2")
+      (message (_ "Leave Torfi's Territory"))
+      (x 65)
+      (y 43)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 32)
-      (teleport-to-y 37)
-      (map-message (_ "Leave Matrix' Sector"))
-      (x 19)
-      (y 24)
+    (teleporter
+      (spawnpoint "abednego2")
+      (message (_ "Leave Abednego's Area"))
+      (x 15)
+      (y 31)
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ "Leave Thompson's Domain"))
+    (teleporter
+      (spawnpoint "thompson2")
+      (message (_ "Leave Thompson's Domain"))
       (x 35)
       (y 26)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ "Leave SuperTux Team Island"))
-      (x 54)
-      (y 25)
+    (teleporter
+      (spawnpoint "matr1x2")
+      (message (_ "Back to Matr1x' Sector"))
+      (x 32)
+      (y 37)
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ "Leave Abednego's Area"))
+    (teleporter
+      (spawnpoint "main")
+      (message (_ "Warp home"))
+      (x 27)
+      (y 39)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
+    )
+    (teleporter
+      (spawnpoint "abednego2")
+      (message (_ "Leave Abednego's Area"))
       (x 18)
       (y 43)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ "Leave Torfi's Territory"))
-      (x 65)
-      (y 43)
+    (teleporter
+      (spawnpoint "team")
+      (message (_ "Warp to the SuperTux Team Island"))
+      (x 35)
+      (y 8)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ "Warp home"))
-      (x 27)
-      (y 39)
+    (teleporter
+      (spawnpoint "team2")
+      (message (_ "Leave the SuperTux Team Island"))
+      (x 51)
+      (y 10)
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ ""))
-      (invisible-tile #t)
-      (x 15)
-      (y 31)
+    (teleporter
+      (spawnpoint "thompson")
+      (message (_ "Warp to Thompson's Domain"))
+      (x 31)
+      (y 8)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ ""))
-      (invisible-tile #t)
+    (teleporter
+      (spawnpoint "thompson2")
+      (message (_ "Leave Thompson's Domain"))
       (x 34)
       (y 18)
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ ""))
-      (invisible-tile #t)
+    (teleporter
+      (spawnpoint "matr1x4")
+      (message (_ "Leave Matr1x' Sector"))
       (x 20)
       (y 14)
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ ""))
-      (invisible-tile #t)
-      (x 51)
-      (y 10)
+    (teleporter
+      (spawnpoint "matr1x3")
+      (message (_ "Continue Matr1x' Sector"))
+      (x 19)
+      (y 24)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
     )
-    (special-tile
-      (teleport-to-x 35)
-      (teleport-to-y 2)
-      (map-message (_ ""))
-      (invisible-tile #t)
+    (teleporter
+      (spawnpoint "torfi")
+      (message (_ "Warp to Torfi's Territory"))
+      (x 39)
+      (y 8)
+      (sprite "images/worldmap/common/teleporterdot.sprite")
+    )
+    (teleporter
+      (spawnpoint "torfi2")
+      (message (_ "Leave Torfi's Territory"))
       (x 61)
       (y 33)
     )