Turned home and scarecrow into decal, added trees, copied water tiles from ice-world

diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index a59bd6e..3f999f5 100644 (file)
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -1,4 +1,25 @@
 (supertux-tiles
+(tile
+       (id 1)
+       (images "worldmap/shared/water_01.png"
+               "worldmap/shared/water_02.png"
+               "worldmap/shared/water_03.png"
+               "worldmap/shared/water_04.png"
+               "worldmap/shared/water_05.png"
+               "worldmap/shared/water_06.png"
+               "worldmap/shared/water_07.png"
+               "worldmap/shared/water_08.png"
+               "worldmap/shared/water_09.png"
+               "worldmap/shared/water_10.png"
+               "worldmap/shared/water_11.png"
+               "worldmap/shared/water_12.png"
+               "worldmap/shared/water_13.png"
+               "worldmap/shared/water_14.png"
+               "worldmap/shared/water_15.png"
+               "worldmap/shared/water_16.png"
+       )
+)
+
 (tilegroup
   (name "Darker Forest")
   (tiles
@@ -725,13 +746,13 @@
 )
 
 (tiles
-  (width 9)
+  (width 6)
   (height 4)
   (ids
-   1954 1927 1928 1929 1930 1931 1932 1955 1959
-   1933 1934 1935 1936 1937 1938 1939 1956 1960
-   1940 1941 1942 1943 1944 1945 1946 1957 1961
-   1947 1948 1949 1950 1951 1952 1953 1958 1962
+   1954 1927 1928 1929 1930 1931
+   1933 1934 1935 1936 1937 1938
+   1940 1941 1942 1943 1944 1945
+   1947 1948 1949 1950 1951 1952
   )
   (image "worldmap/halloween/tiles.png")
 )

diff --git a/data/images/worldmap/halloween/home.png b/data/images/worldmap/halloween/home.png
new file mode 100644 (file)
index 0000000..c0cd128
Binary files /dev/null and b/data/images/worldmap/halloween/home.png differ

diff --git a/data/images/worldmap/halloween/scarecrow.png b/data/images/worldmap/halloween/scarecrow.png
new file mode 100644 (file)
index 0000000..b8a7ac5
Binary files /dev/null and b/data/images/worldmap/halloween/scarecrow.png differ

diff --git a/data/images/worldmap/halloween/tree1.png b/data/images/worldmap/halloween/tree1.png
new file mode 100644 (file)
index 0000000..698658d
Binary files /dev/null and b/data/images/worldmap/halloween/tree1.png differ

diff --git a/data/images/worldmap/halloween/tree2.png b/data/images/worldmap/halloween/tree2.png
new file mode 100644 (file)
index 0000000..055687f
Binary files /dev/null and b/data/images/worldmap/halloween/tree2.png differ

diff --git a/data/levels/halloween/worldmap.stwm b/data/levels/halloween/worldmap.stwm
index d2b1d28..2292725 100644 (file)
--- a/data/levels/halloween/worldmap.stwm
+++ b/data/levels/halloween/worldmap.stwm
@@ -9,6 +9,96 @@
     (camera
       (mode "normal")
     )
+    (decal
+      (x 256)
+      (y 288)
+      (sprite "images/worldmap/halloween/home.png")
+    )
+    (decal
+      (x 576)
+      (y 224)
+      (sprite "images/worldmap/halloween/scarecrow.png")
+    )
+    (decal
+      (x 864)
+      (y 512)
+      (sprite "images/worldmap/halloween/scarecrow.png")
+    )
+    (decal
+      (x 992)
+      (y 320)
+      (sprite "images/worldmap/halloween/home.png")
+    )
+    (decal
+      (x 192)
+      (y 64)
+      (sprite "images/worldmap/halloween/scarecrow.png")
+    )
+    (decal
+      (x 864)
+      (y 320)
+      (sprite "images/worldmap/halloween/tree1.png")
+    )
+    (decal
+      (x 608)
+      (y 32)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
+    (decal
+      (x 448)
+      (y 192)
+      (sprite "images/worldmap/halloween/tree1.png")
+    )
+    (decal
+      (x 640)
+      (y 384)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
+    (decal
+      (x 416)
+      (y 448)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
+    (decal
+      (x 928)
+      (y 416)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
+    (decal
+      (x 704)
+      (y 544)
+      (sprite "images/worldmap/halloween/tree1.png")
+    )
+    (decal
+      (x 1088)
+      (y 608)
+      (sprite "images/worldmap/halloween/tree1.png")
+    )
+    (decal
+      (x 288)
+      (y 608)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
+    (decal
+      (x 896)
+      (y 256)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
+    (decal
+      (x 736)
+      (y 352)
+      (sprite "images/worldmap/halloween/tree1.png")
+    )
+    (decal
+      (x 800)
+      (y 320)
+      (sprite "images/worldmap/halloween/tree2.png")
+    )
+    (decal
+      (x 864)
+      (y 320)
+      (sprite "images/worldmap/halloween/tree1.png")
+    )
     (tilemap
       (solid #f)
       (z-pos -100)
@@ -16,31 +106,31 @@
       (width 40)
       (height 25)
       (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 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
       )
     )
     (tilemap
@@ -52,10 +142,10 @@
       (tiles
       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 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 0 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 1954 1929 0 0 0 0 0 0 0 0 0 0 0 0 1954 1927 1928 1929 0 0 0
-      0 0 1954 1938 1934 1935 1937 1928 1929 0 0 0 0 0 0 0 0 0 0 1947 1950 0 0 0 0 0 0 0 0 0 0 0 0 1933 1934 1935 1936 0 0 0
-      0 0 1947 1931 1941 1942 1941 1942 1936 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1954 1929 0 0 0 0 0 1940 1941 1942 1943 0 0 0
-      0 0 0 1947 1948 1949 1948 1949 1950 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1947 1950 0 0 0 0 0 1947 1948 1949 1950 0 0 0
+      0 0 0 1954 1927 1928 1929 0 0 0 0 0 0 0 0 0 0 0 0 1954 1929 0 0 0 0 0 0 0 0 0 0 0 0 0 1954 1928 1929 0 0 0
+      0 0 1954 1938 1934 1935 1937 1928 1929 0 0 0 0 0 0 0 0 0 0 1947 1950 0 0 0 0 0 0 0 0 0 0 0 0 1954 1938 1935 1936 0 0 0
+      0 0 1947 1931 1941 1942 1941 1942 1936 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1954 1929 0 0 0 0 0 1940 1941 1942 1937 1929 0 0
+      0 0 0 1947 1948 1949 1948 1949 1950 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1947 1950 0 0 0 0 0 1947 1948 1949 1949 1950 0 0
       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
@@ -90,18 +180,18 @@
       0 0 0 0 1954 1927 1927 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 1929 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 0 0 0 0 0 0 0 0 0 0 0 1947 1950 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 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 1957 1961 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 0 0 0 0 1958 1962 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 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 0 0 0 1955 1959 0 1939 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 0 0 1956 1960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1957 1961 0 1939 0 1955 1959 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 1958 1962 0 0 0 1956 1960 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 1957 1961 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 0 0 0 0 1958 1962 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 1957 1961 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 0 0 0 0 1958 1962 0 0 0 0 0 0 0 0 0 0 1957 1961 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 0 0 0 0 1958 1962 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 1939 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 0 0 0 1947 1950 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
@@ -128,7 +218,7 @@
     )
     (level
       (name "halloween1.stl")
-      (x 15)
+      (x 14)
       (y 9)
     )
     (level