From: Ingo Ruhnke Date: Tue, 7 Oct 2014 15:31:38 +0000 (+0200) Subject: Added roads to Halloween worldmap X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7d759cff7f047a44cf9e239556fac612c2bdb9c8;p=supertux.git Added roads to Halloween worldmap --- diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf index a4ebe5d9c..60ca9f546 100644 --- a/data/images/worldmap.strf +++ b/data/images/worldmap.strf @@ -801,4 +801,23 @@ 1989 1990 1991 1992 1993) (image "worldmap/halloween/darkness.png") ) + + +(tiles + (width 4) + (height 4) + (ids + 1994 1995 1996 1997 + 1998 1999 2000 2001 + 2002 2003 2004 2005 + 2006 2007 2008 2009 + ) + (datas + 6 10 23 30 + 5 9 29 27 + 18 20 3 31 + 17 24 12 0 + ) + (image "worldmap/halloween/roads.png") +) ) diff --git a/data/images/worldmap/halloween/roads.png b/data/images/worldmap/halloween/roads.png new file mode 100644 index 000000000..ef244d9b4 Binary files /dev/null and b/data/images/worldmap/halloween/roads.png differ diff --git a/data/levels/halloween/worldmap.stwm b/data/levels/halloween/worldmap.stwm index 31b6f8b3c..edd2d7b96 100644 --- a/data/levels/halloween/worldmap.stwm +++ b/data/levels/halloween/worldmap.stwm @@ -120,13 +120,13 @@ 1987 1981 0 0 0 0 0 0 0 0 0 0 0 0 1955 1956 1956 1958 0 0 1989 1983 1987 1981 0 0 0 0 0 0 1989 1983 1987 1981 0 0 0 0 0 1984 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 0 0 0 0 1955 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 1955 1956 1956 1957 1966 0 0 0 0 0 0 0 0 1964 0 0 0 0 0 0 1955 1957 1957 1958 0 0 0 1989 1983 1985 1985 1985 1985 - 1985 1987 1981 1978 0 0 0 1973 1960 0 0 0 0 0 0 0 0 0 0 0 1965 1957 1958 0 0 1955 1957 1966 0 0 1965 1957 1958 0 0 1989 1983 1985 1985 1985 - 1985 1985 1987 1980 1981 0 0 0 1967 0 0 0 0 0 0 0 0 0 0 0 0 0 1965 1956 1957 1966 0 0 0 0 0 0 1965 1958 0 0 1989 1983 1985 1985 - 1985 1985 1985 1985 1986 0 0 0 1967 1968 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1964 0 0 0 1984 1985 1985 - 1985 1985 1985 1985 1986 0 0 0 1973 1974 1975 1960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1964 0 0 0 1984 1985 1985 - 1985 1985 1982 1990 1991 0 0 0 0 0 0 1961 1962 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1964 0 0 1979 1980 1988 1985 1985 + 1985 1986 1971 1972 0 0 0 1955 1956 1956 1957 1966 1934 1934 1934 1934 1934 1934 0 0 1964 0 0 0 0 0 0 1955 1957 1957 1958 0 0 0 1989 1983 1985 1985 1985 1985 + 1985 1987 1981 1978 0 0 0 1973 1960 0 0 0 1934 1959 1974 0 0 1934 0 0 1965 1957 1958 0 0 1955 1957 1966 0 0 1965 1957 1958 0 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 1965 1958 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 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 @@ -154,13 +154,13 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1954 1927 1928 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 0 0 0 0 0 0 0 0 1954 1927 1938 1934 1935 1937 1928 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 0 0 0 0 0 1954 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 1954 1927 1927 1928 1938 48 40 40 40 40 39 1934 1935 1936 0 0 0 0 0 0 1954 1927 1928 1929 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 1947 1931 1941 1941 1941 47 1930 1948 1931 1942 47 1934 1935 1937 1928 1929 0 0 1954 1927 1938 1934 1935 1937 1928 1929 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 1933 37 40 40 46 1936 0 1947 1931 47 1934 1934 1934 1935 1937 1927 1928 1938 1935 1935 1935 1935 1935 1935 1937 1929 0 1971 1972 0 0 0 - 0 0 0 0 0 0 0 0 1940 1935 1935 1935 47 1936 0 1954 1938 37 40 40 40 40 39 1935 1935 1934 1935 1934 1935 1934 48 40 42 1936 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 1947 1948 1949 1931 47 1937 1928 1938 1942 1935 1934 1935 1935 1934 47 1934 1935 1934 1935 48 40 40 42 1934 1935 1943 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 1933 37 40 40 40 40 40 39 1942 1942 1935 47 1935 48 40 40 42 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 37 40 40 40 44 40 42 1934 1934 1934 1935 1935 1935 1942 1943 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 1954 1927 1927 1928 1938 1994 2008 2008 2008 2008 1995 1934 1935 1936 0 0 0 0 0 0 1954 1927 1928 1929 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 1947 1931 1941 1941 1941 2004 1930 1948 1931 1942 2004 1934 1935 1937 1928 1929 0 0 1954 1927 1938 1934 1935 1937 1928 1929 0 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 1937 1929 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 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