Forest WM tiles, more work in progress

SVN-Revision: 2750

diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index ba5a2c3..511b210 100644 (file)
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -515,6 +515,91 @@
 (tile (id 115)
      (images "worldmap/forest/m14.png"))
 (tile (id 116)
-     (images "worldmap/forest/m15.png"))
+     (images "worldmap/forest/f1.png"))
+(tile (id 117)
+     (images "worldmap/forest/f2.png"))
+(tile (id 118)
+     (images "worldmap/forest/f3.png"))
+(tile (id 119)
+     (images "worldmap/forest/f4.png"))
+(tile (id 120)
+     (images "worldmap/forest/f5.png"))
+(tile (id 121)
+     (images "worldmap/forest/f6.png"))
+(tile (id 122)
+     (images "worldmap/forest/f7.png"))
+(tile (id 123)
+     (images "worldmap/forest/f8.png"))
+(tile (id 124)
+     (images "worldmap/forest/f9.png"))
+(tile (id 125)
+     (images "worldmap/forest/f10.png"))
+(tile (id 126)
+     (images "worldmap/forest/gd2.png"))
+(tile (id 127)
+     (images "worldmap/forest/gr1.png")
+     (stop #f)
+     (north #t)
+     (south #t)
+     (west  #f)
+     (east  #f))
+(tile (id 128)
+     (images "worldmap/forest/gd2m.png"))
+(tile (id 129)
+     (images "worldmap/forest/gr2.png")
+     (stop #f)
+     (north #t)
+     (south #t)
+     (west  #f)
+     (east  #f))
+(tile (id 130)
+     (images "worldmap/forest/gr3.png"))
+(tile (id 131)
+     (images "worldmap/forest/gr4.png")
+     (stop #f)
+     (north #f)
+     (south #f)
+     (west  #t)
+     (east  #t))
+(tile (id 132)
+     (images "worldmap/forest/gr5.png")
+     (stop #t)
+     (north #t)
+     (south #t)
+     (west  #f)
+     (east  #t))
+(tile (id 133)
+     (images "worldmap/forest/gr6.png"))
+(tile (id 134)
+     (images "worldmap/forest/gr7.png")
+     (stop #f)
+     (north #t)
+     (south #t)
+     (west  #f)
+     (east  #t))
+(tile (id 135)
+     (images "worldmap/forest/g8.png"))
+(tile (id 136)
+     (images "worldmap/forest/g9.png"))
+(tile (id 137)
+     (images "worldmap/forest/g10.png"))
+(tile (id 138)
+     (images "worldmap/forest/g11.png"))
+(tile (id 139)
+     (images "worldmap/forest/g12.png"))
+(tile (id 140)
+     (images "worldmap/forest/e1.png")
+     (stop #t)
+     (north #f)
+     (south #f)
+     (west  #f)
+     (east  #t))
+(tile (id 141)
+     (images "worldmap/forest/e2.png")
+     (stop #t)
+     (north #f)
+     (south #f)
+     (west  #t)
+     (east  #f))
 )
 

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

diff --git a/data/images/worldmap/forest/e2.png b/data/images/worldmap/forest/e2.png
new file mode 100644 (file)
index 0000000..7ea98fa
Binary files /dev/null and b/data/images/worldmap/forest/e2.png differ

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

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

diff --git a/data/images/worldmap/forest/f3.png b/data/images/worldmap/forest/f3.png
new file mode 100644 (file)
index 0000000..7f15628
Binary files /dev/null and b/data/images/worldmap/forest/f3.png differ

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

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

diff --git a/data/images/worldmap/forest/f7.png b/data/images/worldmap/forest/f7.png
new file mode 100644 (file)
index 0000000..03a83c2
Binary files /dev/null and b/data/images/worldmap/forest/f7.png differ

diff --git a/data/images/worldmap/forest/g10.png b/data/images/worldmap/forest/g10.png
new file mode 100644 (file)
index 0000000..91b6b9b
Binary files /dev/null and b/data/images/worldmap/forest/g10.png differ

diff --git a/data/images/worldmap/forest/g11.png b/data/images/worldmap/forest/g11.png
new file mode 100644 (file)
index 0000000..63f9d5c
Binary files /dev/null and b/data/images/worldmap/forest/g11.png differ

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

diff --git a/data/images/worldmap/forest/g8.png b/data/images/worldmap/forest/g8.png
new file mode 100644 (file)
index 0000000..6f68325
Binary files /dev/null and b/data/images/worldmap/forest/g8.png differ

diff --git a/data/images/worldmap/forest/g9.png b/data/images/worldmap/forest/g9.png
new file mode 100644 (file)
index 0000000..2b5435b
Binary files /dev/null and b/data/images/worldmap/forest/g9.png differ

diff --git a/data/images/worldmap/forest/gd2.png b/data/images/worldmap/forest/gd2.png
new file mode 100644 (file)
index 0000000..399f034
Binary files /dev/null and b/data/images/worldmap/forest/gd2.png differ

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

diff --git a/data/images/worldmap/forest/ghost_wood.png b/data/images/worldmap/forest/ghost_wood.png
index 85c9e5b..ea219c4 100644 (file)
Binary files a/data/images/worldmap/forest/ghost_wood.png and b/data/images/worldmap/forest/ghost_wood.png differ

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

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

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

diff --git a/data/images/worldmap/forest/gr4.png b/data/images/worldmap/forest/gr4.png
new file mode 100644 (file)
index 0000000..6347d33
Binary files /dev/null and b/data/images/worldmap/forest/gr4.png differ

diff --git a/data/images/worldmap/forest/gr5.png b/data/images/worldmap/forest/gr5.png
new file mode 100644 (file)
index 0000000..738a1b9
Binary files /dev/null and b/data/images/worldmap/forest/gr5.png differ

diff --git a/data/images/worldmap/forest/gr6.png b/data/images/worldmap/forest/gr6.png
new file mode 100644 (file)
index 0000000..793af77
Binary files /dev/null and b/data/images/worldmap/forest/gr6.png differ

diff --git a/data/images/worldmap/forest/gr7.png b/data/images/worldmap/forest/gr7.png
new file mode 100644 (file)
index 0000000..8595fe2
Binary files /dev/null and b/data/images/worldmap/forest/gr7.png differ

diff --git a/data/levels/world2/worldmap.stwm b/data/levels/world2/worldmap.stwm
index 4f464fc..74c6f23 100644 (file)
--- a/data/levels/world2/worldmap.stwm
+++ b/data/levels/world2/worldmap.stwm
@@ -24,26 +24,26 @@
  73  73  73  73  73  113 109 74  74  105 113 109 83  75  75  75  89  90  75  75  75  75  86  75  75  75  75  75  75  75  75  75  75  75  75  88  74  74  74  74  74  74  74  74  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
  73  73  73  73  73  106 74  74  74  107 109 74  78  74  74  74  93  92  74  74  74  74  78  74  74  74  74  74  74  74  74  74  74  74  74  78  74  74  74  74  74  74  74  74  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
  73  73  73  73  73  106 74  83  75  75  75  75  84  74  74  74  94  97  74  74  74  74  78  74  74  74  74  74  74  74  74  74  74  74  74  78  74  74  74  74  74  74  77  77  77  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  73  106 74  78  74  74  74  74  74  74  74  94 100  74  74  74  74  74  78  74  74  74  74  74  77  74  74  74  74  74  74  78  74  77  77  77  77  77  77  77  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  73  106 74  82  88  74  74  74  74  74  74  95  74  74  74  74  74  74  78  74  74  74  74  74  77  77  74  74  74  74  77  82  76  76  76  76  76  76  76  76  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  73  111 104 74  78  74  74  74  74  74  74  98 101  74  74  74  74  74  78  74  74  74  77  74  77  77  74  74  74  74  77  77  77  77  77  77  77  77  77  76  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  73  113 109 74  78  74  74  74  74  74  74  74  95  74  74  74  74  74  78  74  74  77  77  77  77  77  77  77  74  74  77  77  77  77  77  77  77  77  77  76  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  73  106 74  83  84  74  74  74  74  74  74  94  97  74  74  74  74  74  78  74  74  77  77  77  77  77  77  77  74  77  77  77  77  77  77  77  77  77  77  76  77  77  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  73  106 74  78  74  74  74  74  74  74  74  91  74  74  74  74  74  74  78  74  74  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  113 108 108 108 109 74  80  75  75  75  75  75  75  75  89  90  75  75  75  75  75  85  74  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  106 75  75  75  75  75  79  74  74  74  74  74  74  74  93  92  74  74  74  74  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  77  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  111 103 103 103 74  74  78  74  74  74  74  74  74  74  74  95  74  74  74  77  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  74  95  74  74  77  77  77  76  76  76  76  76  76  76  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  74  95  74  74  77  77  77  76  77  77  77  77  77  77  76  77  77  77  77  77  77  77  77  76  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  94  96  96  97  74  74  77  77  77  76  77  77  77  77  77  77  76  77  77  77  77  77  77  77  77  76  77  77  76  76  76  77  77  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  98 101  74  74  74  74  74  77  77  76  77  77  77  77  77  77  76  77  77  77  77  77  77  77  77  76  76  76  76  77  76  77  77  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  74  98  101 74  74  74  74  77  77  76  77  77  77  77  77  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  74  94  97  74  74  74  74  74  77  76  77  77  77  77  77  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  74  91  74  74  74  74  74  74  74  78  74  77  77  77  77  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  80  75  75  75  75  75  75  89  90  75  75  74  74  74  74  78  74  74  77  77  77  77  76  76  76  76  76  76  76  76  76  76  76  76  76  76  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  74  93  92  74  74  74  74  74  74  78  74  74  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  115 73  73  73  106 74  78  74  102 103 103 104 74  74  94 100  74  74  74  74  74  78  74  74  74  74  74  77  74  74  74  74  74  74  78  74  77  77  77  77  77  77  77  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  73  106 74  82  88  107 112 113 109 74  74  95  74  74  74  74  74  74  78  74  74  74  74  74  77  77  74  74  74  74  77  82  76  76  76  76  76  76  76  76  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  73  111 104 74  78  74  105 106 74  74  74  98 101  74  74  74  74  74  78  74  74  74  77  74  77  77  74  74  74  74  77  77  77  77  77  77  77  77  77  76  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  73  113 109 74  78  74  107 109 74  74  74  74  95  74  74  74  74  74  78  74  74  116  77  77  77  77  77  77  74  74  77  77  77  77  77  77  77  77  77  76  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  73  106 74  83  84  74  74  74  74  74  74  94  97  74  74  74  74  74  78  74  74  119  77  77  77  77  77  77  74  77  77  77  77  77  77  77  77  77  77  76  77  77  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  73  106 74  78  74  74  74  74  74  74  74  91  74  74  74  74  74  74  78  74  74  119  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  77  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  113 108 108 108 109 74  80  75  75  75  75  75  75  75  89  90  75  75  75  75  75  85  74  116 77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  106 140  75  75  75  75  79  74  74  74  74  74  74  74  93  92  74  74  74  116 126 127 128 77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  77  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  111 103 103 103 74  74  78  74  74  74  74  74  74  74  74  95  74  74  74  119 130 129 135 138  138  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  74  95  74  74  116 77 130 132 131 131  76  76  76  76  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  115 73  74  74  74  78  74  74  74  74  74  74  74  74  95  74  74  119 77 130 129 136 137  137  77  77  77  76  77  77  77  77  77  77  77  77  76  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  94  96  96  97  74  74  122 77 130 129 133 77  77  77  77  77  76  77  77  77  77  77  77  77  77  76  77  77  76  76  76  77  77  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  98 101  74  74  74  74  74  119 130 129 133 77  77  77  77  77  76  77  77  77  77  77  77  77  77  76  76  76  76  77  76  77  77  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  74  98  101 74  74  74  74  122 130 129 133 77  77  77  77  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  74  94  97  74  74  74  74  74  139 134 133 77  77  77  77  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  74  91  74  74  74  74  74  74  74  78  74  77  77  120  77  77  76  77  77  77  77  77  77  77  77  77  77  77  77  77  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  80  75  75  75  75  75  75  89  90  75  141  74  74  74  74  78  74  74  77  77  77  77  76  76  76  76  76  76  76  76  76  76  76  76  76  76  76  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  74  93  92  74  74  74  74  74  74  78  74  74  77  77  120  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
  73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  95  74  74  74  74  74  74  78  74  74  77  77  77  77  77  77  77  77  77  74  74  78  74  77  77  77  77  77  77  77  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
- 73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  95  74  74  74  74  74  74  78  74  74  77  77  77  77  77  74  74  74  74  74  74  78  74  74  77  77  77  77  77  77  74  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
+ 73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  95  74  74  74  74  74  74  78  74  74  122  77  77  77  77  74  74  74  74  74  74  78  74  74  77  77  77  77  77  77  74  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
  73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  98 101  74  74  74  74  74  78  74  74  74  77  74  77  74  74  74  74  74  74  74  78  74  74  77  77  77  77  77  74  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
  73  73  73  73  74  74  74  78  74  74  74  74  74  74  74  74  91  74  74  74  74  74  78  74  74  74  74  74  74  74  74  74  74  74  74  74  78  74  74  74  74  77  77  74  74  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
  73  73  73  73  73  74  74  82  75  75  75  75  75  75  75  75  89  90  75  75  75  75  87  75  75  75  75  75  75  75  75  75  75  75  75  75  81  74  74  74  74  74  77  74  74  74  74  74  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73  73
@@ -70,8 +70,8 @@
 )
   )
   (level
-    (x 6)
-    (y 14)
+    (x 17)
+    (y 24)
     (name "level1.stl")
   )
   (level