Put Halloween levels into a linear path

diff --git a/data/levels/halloween/worldmap.stwm b/data/levels/halloween/worldmap.stwm
index a857035..4fbe21c 100644 (file)
--- a/data/levels/halloween/worldmap.stwm
+++ b/data/levels/halloween/worldmap.stwm
@@ -53,13 +53,13 @@
       (sprite "images/worldmap/halloween/tree1.png")
     )
     (decal
-      (x 640)
-      (y 384)
+      (x 576)
+      (y 416)
       (sprite "images/worldmap/halloween/tree2.png")
     )
     (decal
-      (x 416)
-      (y 448)
+      (x 352)
+      (y 416)
       (sprite "images/worldmap/halloween/tree2.png")
     )
     (decal
@@ -105,6 +105,21 @@
     (decal
       (sprite "images/background/halloween/vignette.png")
     )
+    (decal
+      (x 576)
+      (y 224)
+      (sprite "images/worldmap/halloween/scarecrow.png")
+    )
+    (decal
+      (x 416)
+      (y 448)
+      (sprite "images/worldmap/halloween/scarecrow.png")
+    )
+    (decal
+      (x 480)
+      (y 448)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
     (tilemap
       (solid #f)
       (z-pos -100)
@@ -122,13 +137,13 @@
       1985 1987 1981 0 0 0 0 0 0 0 0 0 1955 1956 1966 0 0 1965 1956 1958 0 1989 1983 1987 1980 1981 0 0 0 0 0 1984 1985 1987 1980 1980 1980 1980 1980 1988
       1985 1982 1991 0 0 0 0 1955 1956 1956 1957 1956 1966 0 0 0 0 0 0 1965 1958 0 1989 1990 1990 1991 0 0 0 0 0 1989 1990 1990 1983 1985 1985 1985 1985 1985
       1985 1986 1971 1972 0 0 0 1967 0 0 0 1966 1934 1934 1934 1934 1934 1934 0 0 1964 0 0 0 0 0 0 1955 1957 1957 1958 1955 1957 1958 1989 1983 1985 1985 1985 1985
-      1985 1987 1981 1978 0 0 0 1973 1960 1934 0 0 1934 1959 1974 0 0 1934 0 0 1965 1957 1958 0 0 1955 1957 1966 0 0 1965 1966 1958 1964 0 1989 1983 1985 1985 1985
-      1985 1985 1987 1980 1981 0 0 0 1967 1934 1934 1934 1934 1964 0 1973 0 1934 0 0 0 0 1965 1956 1957 1966 0 0 0 0 0 0 1934 1964 0 0 1989 1983 1985 1985
-      1985 1985 1985 1985 1986 0 0 0 1967 1968 0 0 1934 1964 0 1955 1966 1934 1934 1934 1934 1934 1934 0 0 0 0 0 0 0 1934 1934 1934 1964 0 0 0 1984 1985 1985
-      1985 1985 1985 1985 1986 0 0 0 1973 1974 1975 1960 1934 1965 1956 1966 0 0 0 0 0 0 1934 0 0 0 0 1934 1934 1934 1934 0 0 1964 0 0 0 1984 1985 1985
-      1985 1985 1982 1990 1991 0 0 0 0 0 0 1961 1934 1934 1934 1934 1934 1934 1934 0 0 0 1934 0 1934 1934 1934 1934 0 0 0 0 1959 1976 0 0 0 1984 1985 1985
-      1985 1985 1986 0 0 0 0 0 0 0 0 1967 1968 1969 0 0 0 0 1934 1934 1934 1934 1934 1934 1934 0 0 0 0 0 0 0 1964 0 0 1979 1980 1988 1985 1985
-      1985 1982 1991 1993 0 0 0 0 0 0 0 1973 1974 1975 1960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1959 1974 1975 1976 0 0 1984 1985 1985 1985 1985
+      1985 1987 1981 1978 0 0 0 1973 1960 1934 0 0 1934 1959 1974 1960 0 1934 0 0 1965 1957 1958 0 0 1955 1957 1966 0 0 1965 1966 1958 1964 0 1989 1983 1985 1985 1985
+      1985 1985 1987 1980 1981 0 0 0 1967 1934 1934 1934 1934 1964 0 1973 1960 1934 0 1959 1974 1960 1965 1956 1957 1966 0 0 0 0 0 0 1934 1964 0 0 1989 1983 1985 1985
+      1985 1985 1985 1985 1986 0 0 0 1967 1968 1934 1934 1934 1964 0 1955 1966 1934 1934 1964 0 1967 1934 0 0 0 0 0 0 0 1934 1934 1934 1964 0 0 0 1984 1985 1985
+      1985 1985 1985 1985 1986 0 0 0 1973 1974 1975 1960 1934 1965 1956 1966 0 1934 0 1965 1956 1966 1934 0 0 0 0 1934 1934 1934 1934 0 0 1964 0 0 0 1984 1985 1985
+      1985 1985 1982 1990 1991 0 0 0 0 0 0 1961 1934 1934 1934 1934 1934 1934 1934 0 0 1934 1934 1934 1934 1934 1934 1934 0 0 0 0 1959 1976 0 0 0 1984 1985 1985
+      1985 1985 1986 0 0 0 0 0 0 0 0 1967 1968 1969 0 0 0 1934 1934 1934 1934 1934 1934 1934 1959 1960 0 0 0 0 0 0 1964 0 0 1979 1980 1988 1985 1985
+      1985 1982 1991 1993 0 0 0 0 0 0 0 1973 1974 1975 1960 0 0 1934 1934 1934 1934 1934 0 0 1965 1966 0 0 0 1959 1974 1975 1976 0 0 1984 1985 1985 1985 1985
       1985 1986 1971 0 0 0 0 0 0 0 0 0 0 0 1973 1975 1960 0 0 0 0 0 0 0 0 0 0 0 0 1964 0 0 0 0 0 1989 1983 1985 1985 1985
       1985 1986 0 0 0 0 1955 1956 1958 0 0 0 0 0 0 0 1973 1974 1975 1974 1975 1960 0 0 0 1974 1975 1974 1975 1976 0 0 0 0 0 0 1989 1983 1985 1985
       1985 1986 0 0 0 1955 1966 0 1965 1956 1958 0 0 0 0 0 0 0 0 0 0 1973 1974 1975 1976 0 0 0 0 0 0 0 0 0 0 0 0 1984 1985 1985
@@ -157,12 +172,12 @@
       0 0 0 0 0 0 0 1954 1927 1927 1928 1928 1938 1935 1935 1935 1935 1935 1935 1937 1929 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 1940 1935 1935 1935 1935 1994 2008 2008 2008 2008 1995 1934 1935 1936 0 0 0 0 0 0 1954 1927 1928 1929 1954 1927 1929 0 0 0 0 0 0
       0 0 0 0 0 0 0 1947 1931 2002 1941 1941 2004 1930 1948 1931 1942 2004 1934 1935 1937 1928 1929 0 0 1954 1927 1938 1934 1935 1937 1938 1935 1936 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 1933 1998 2008 2008 2001 1936 0 1947 1931 2004 1934 1934 1934 1935 1937 1927 1928 1938 1935 1935 1935 1935 1935 1935 2002 1936 0 1971 1972 0 0 0
-      0 0 0 0 0 0 0 0 1940 1935 1935 1935 2004 1936 0 1954 1938 1998 2008 2008 2008 2008 1995 1935 1935 1934 1935 1934 1935 1934 1994 2008 1999 1936 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 1947 1948 1949 1931 2004 1937 1928 1938 1942 1935 1934 1935 1935 1934 2004 1934 1935 1934 1935 1994 2008 2008 1999 1934 1935 1943 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 1933 1998 2008 2008 2008 2008 2008 1995 1942 1942 1935 2004 1935 1994 2008 2008 1999 1935 1935 1935 1934 1930 1950 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 1940 1941 1942 1941 1935 1935 1934 1998 2008 2008 2008 2000 2008 1999 1934 1934 1934 1935 1935 1935 1942 1943 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 1947 1948 1949 1931 1942 1942 1941 1934 1934 1934 1935 1934 1935 1934 1935 1934 1935 1934 1930 1949 1949 1950 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 1933 1998 1995 1941 2004 1936 0 1947 1931 2004 1934 1930 1948 1931 1937 1927 1928 1938 1935 1935 1935 1935 1935 1935 2002 1936 0 1971 1972 0 0 0
+      0 0 0 0 0 0 0 0 1940 1935 1998 2008 1999 1936 0 1954 1938 2004 1942 1936 0 1940 1942 1935 1935 1934 1935 1934 1935 1934 1994 2008 1999 1936 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 1947 1948 1949 1931 1942 1937 1928 1938 1942 2004 1934 1937 1928 1938 1942 1934 1935 1934 1935 1994 2008 2008 1999 1934 1935 1943 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 1933 1942 1942 1942 1942 1942 2004 1942 1942 1942 1994 2008 2008 2008 2008 2008 1999 1935 1935 1935 1934 1930 1950 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 1940 1941 1942 1941 1935 1935 2004 1942 1942 1942 2004 1934 1934 1930 1931 1934 1934 1935 1935 1935 1942 1943 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 1947 1948 1949 1931 1942 1942 1998 2008 2008 2008 1999 1934 1935 1937 1938 1934 1935 1934 1930 1949 1949 1950 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 1947 1948 1931 1942 1934 1935 1934 1935 1934 1935 1934 1935 1934 1935 1942 1943 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 1954 1928 1929 0 0 0 0 0 0 0 1947 1948 1948 1948 1949 1931 1935 1935 1930 1948 1949 1948 1949 1950 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 1954 1938 1935 1937 1928 1929 0 0 0 0 0 0 0 0 0 0 1947 1948 1949 1950 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -243,26 +258,26 @@
     )
     (level
       (name "halloween1.stl")
-      (x 12)
-      (y 13)
+      (x 11)
+      (y 12)
     )
     (level
-      (name "pools.stl")
-      (x 22)
-      (y 12)
+      (name "mound.stl")
+      (x 23)
+      (y 14)
     )
     (level
       (name "halloween3.stl")
-      (x 20)
-      (y 15)
+      (x 17)
+      (y 13)
     )
     (level
       (name "halloween2.stl")
-      (x 14)
+      (x 15)
       (y 9)
     )
     (level
-      (name "mound.stl")
+      (name "pools.stl")
       (x 28)
       (y 13)
     )
@@ -270,6 +285,7 @@
       (name "intro.stl")
       (extro-script " wait_for_screenswitch();
                          display_text_file( \"levels/halloween/intro.txt\"     );")
+      (auto-play #t)
       (sprite "images/objects/invisible/invisible.sprite")
       (x 9)
       (y 10)