Tile fixes.

[supertux.git] / data / levels / world2 / worldmap.stwm

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")