...

3 files changed, 77 insertions, 103 deletions

diff --git a/tile/global.m4.conf b/tile/global.m4.conf
index cfea904..065d966 100644
--- a/tile/global.m4.conf
+++ b/tile/global.m4.conf
@@ -1,7 +1,7 @@
 m4_define(`__TILE_CHOOSE_STYLE', `m4_define(`__TILE_CLASS',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
 m4_define(`__TILE_COST_WHEN_OCCUPIED', 201)m4_dnl
 m4_define(`__TILE_COST_WHEN_OOB', 255)m4_dnl
-m4_define(`__TILE_CLASS_MAX_ID', 17)m4_dnl
+m4_define(`__TILE_CLASS_MAX_ID', 28)m4_dnl
 m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_id (`$1') ->
    #tile
    {
diff --git a/tile/grassland.m4d b/tile/grassland.m4d
index 7d4c943..a4cbac7 100644
--- a/tile/grassland.m4d
+++ b/tile/grassland.m4d
@@ -2,4 +2,4 @@ __TILE_CATEGORY(`Grassland')m4_dnl
 __TILE_CLASS(0, `Grass', 6, 0, 0)
 __TILE_CLASS(1, `Mushroom Infestation', 12, 1, 1)
 __TILE_CLASS(2, `Tree Remains', 24, 2, 2)
-__TILE_CLASS(3, `Clear Water', __TILE_COST_WHEN_OCCUPIED, 3, 17)
+__TILE_CLASS(3, `Clear Water', __TILE_COST_WHEN_OCCUPIED, 3, 28)
diff --git a/tile/pattern/grassland.m4d b/tile/pattern/grassland.m4d
index 0c3e3d7..0c910be 100644
--- a/tile/pattern/grassland.m4d
+++ b/tile/pattern/grassland.m4d
@@ -5,213 +5,214 @@ m4_ifelse(`
    d, e, f,
    g, h, i,
    new_e
-   -1 -> anything
+    A -> anything
+    ~X -> anything but X
 ')
 __TILE_PATTERN(
-   -1,  0, -1,
-    0,  0,  0,
-   -1,  0, -1,
-   0
+    A, ~3,  A,
+   ~3, ~3, ~3,
+    A, ~3,  A,
+  ~3
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
-    0,  3,  0,
-   -1,  0, -1,
+    A, ~3,  A,
+   ~3,  3, ~3,
+    A, ~3,  A,
    ???
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
-    3,  3,  0,
-   -1,  0, -1,
+    A, ~3,  A,
+    3,  3, ~3,
+    A, ~3,  A,
    ???
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
-    3,  3,  0,
-   -1,  3, -1,
+    A, ~3,  A,
+    3,  3, ~3,
+    A,  3,  A,
    9
 )
 
 __TILE_PATTERN(
-   -1,  3, -1,
-    3,  3,  0,
-   -1,  0, -1,
+    A,  3,  A,
+    3,  3, ~3,
+    A, ~3,  A,
    10
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
+    A, ~3,  A,
     3,  3,  3,
-   -1,  0, -1,
+    A, ~3,  A,
    13
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
+    A, ~3,  A,
     3,  3,  3,
-   -1,  3, -1,
+    A,  3,  A,
    6
 )
 
 __TILE_PATTERN(
-   -1,  3, -1,
-    3,  3,  0,
-   -1,  3, -1,
+    A,  3,  A,
+    3,  3, ~3,
+    A,  3,  A,
    5
 )
 
 __TILE_PATTERN(
-   -1,  3, -1,
+    A,  3,  A,
     3,  3,  3,
-   -1,  0, -1,
+    A, ~3,  A,
    7
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
-    0,  3,  0,
-   -1,  3, -1,
+    A, ~3,  A,
+   ~3,  3, ~3,
+    A,  3,  A,
    ???
 )
 
 __TILE_PATTERN(
-   -1,  3, -1,
-    0,  3,  0,
-   -1,  3, -1,
+    A,  3,  A,
+   ~3,  3, ~3,
+    A,  3,  A,
    12
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
-    0,  3,  3,
-   -1,  3, -1,
+    A, ~3,  A,
+   ~3,  3,  3,
+    A,  3,  A,
    8
 )
 
 __TILE_PATTERN(
-   -1,  3, -1,
-    0,  3,  3,
-   -1,  3, -1,
+    A,  3,  A,
+   ~3,  3,  3,
+    A,  3,  A,
    4
 )
 
 __TILE_PATTERN(
-   -1,  3, -1,
-    0,  3,  0,
-   -1,  0, -1,
+    A,  3,  A,
+   ~3,  3, ~3,
+    A, ~3,  A,
    ???
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
-    0,  3,  3,
-   -1,  0, -1,
+    A, ~3,  A,
+   ~3,  3,  3,
+    A, ~3,  A,
    ???
 )
 
 __TILE_PATTERN(
-   -1,  3, -1,
-    0,  3,  3,
-   -1,  0, -1,
+    A,  3,  A,
+   ~3,  3,  3,
+    A, ~3,  A,
    11
 )
 
 __TILE_PATTERN(
-   -1,  0, -1,
-    0,  3,  3,
-   -1,  0, -1,
+    A, ~3,  A,
+   ~3,  3,  3,
+    A, ~3,  A,
    ???
 )
 
 __TILE_PATTERN(
-    0,  3,  0,
+   ~3,  3, ~3,
     3,  3,  3,
-    0,  3,  0,
+   ~3,  3, ~3,
    20
 )
 
 __TILE_PATTERN(
-    3,  3,  0,
+    3,  3, ~3,
     3,  3,  3,
-    0,  3,  0,
+   ~3,  3, ~3,
     19
 )
 
 __TILE_PATTERN(
-    0,  3,  3,
+   ~3,  3,  3,
     3,  3,  3,
-    0,  3,  0,
+   ~3,  3, ~3,
     28
 )
 
 __TILE_PATTERN(
-    0,  3,  0,
+   ~3,  3, ~3,
     3,  3,  3,
-    0,  3,  3,
+   ~3,  3,  3,
     22
 )
 
 __TILE_PATTERN(
-    0,  3,  0,
+   ~3,  3, ~3,
     3,  3,  3,
-    3,  3,  0,
+    3,  3, ~3,
     27
 )
 
 __TILE_PATTERN(
-    3,  3,  0,
+    3,  3, ~3,
     3,  3,  3,
-    3,  3,  0,
+    3,  3, ~3,
     23
 )
 
 __TILE_PATTERN(
     3,  3,  3,
     3,  3,  3,
-    0,  3,  0,
+   ~3,  3, ~3,
     25
 )
 
 __TILE_PATTERN(
-    3,  3,  0,
+    3,  3, ~3,
     3,  3,  3,
-    0,  3,  3,
+   ~3,  3,  3,
     18
 )
 
 __TILE_PATTERN(
-    0,  3,  3,
+   ~3,  3,  3,
     3,  3,  3,
-    0,  3,  3,
+   ~3,  3,  3,
     21
 )
 
 __TILE_PATTERN(
-    0,  3,  3,
+   ~3,  3,  3,
     3,  3,  3,
-    3,  3,  0,
+    3,  3, ~3,
     24
 )
 
 __TILE_PATTERN(
-    0,  3,  0,
+   ~3,  3, ~3,
     3,  3,  3,
     3,  3,  3,
     26
 )
 
 __TILE_PATTERN(
-    3,  3,  0,
+    3,  3, ~3,
     3,  3,  3,
     3,  3,  3,
     17
 )
 
 __TILE_PATTERN(
-    0,  3,  3,
+   ~3,  3,  3,
     3,  3,  3,
     3,  3,  3,
     16
@@ -220,40 +221,13 @@ __TILE_PATTERN(
 __TILE_PATTERN(
     3,  3,  3,
     3,  3,  3,
-    3,  3,  0,
+    3,  3, ~3,
     15
 )
 
 __TILE_PATTERN(
-    0,  3,  3,
+   ~3,  3,  3,
     3,  3,  3,
     3,  3,  3,
     15
 )
-
--------
-__TILE_PATTERN(3, 0, 0, 0, 0, ???)
-
-__TILE_PATTERN(3, 3, 0, 0, 0, ???)
-__TILE_PATTERN(3, 3, 3, 0, 0, 9)
-__TILE_PATTERN(3, 3, 0, 3, 0, 10)
-__TILE_PATTERN(3, 3, 0, 0, 3, 13)
-__TILE_PATTERN(3, 3, 3, 0, 3, 6)
-__TILE_PATTERN(3, 3, 3, 3, 0, 5)
-__TILE_PATTERN(3, 3, 0, 3, 3, 7)
-
-__TILE_PATTERN(3, 0, 3, 0, 0, ???)
-__TILE_PATTERN(3, 0, 3, 3, 0, 12)
-__TILE_PATTERN(3, 0, 3, 0, 3, 8)
-__TILE_PATTERN(3, 0, 3, 3, 3, 4)
-
-__TILE_PATTERN(3, 0, 0, 3, 0, ???)
-__TILE_PATTERN(3, 0, 0, 0, 3, ???)
-__TILE_PATTERN(3, 0, 0, 3, 3, 11)
-
-__TILE_PATTERN(3, 0, 0, 0, 3, ???)
-
-__TILE_PATTERN(0, `Grass', 6, 0, 0)
-__TILE_PATTERN(1, `Mushroom Infestation', 12, 1, 1)
-__TILE_PATTERN(2, `Tree Remains', 24, 2, 2)
-__TILE_PATTERN(3, `Clear Water', __TILE_COST_WHEN_OCCUPIED, 3, 17)