Updates the tile patterns.

3 files changed, 250 insertions, 283 deletions

diff --git a/tile/pattern/frontier.m4d b/tile/pattern/frontier.m4d
new file mode 100644
index 0000000..a250132
--- /dev/null
+++ b/tile/pattern/frontier.m4d
@@ -0,0 +1,247 @@
+m4_ifelse(`
+   a, b, c
+   d, e, f,
+   g, h, i,
+   new_e_base,
+   new_e_border,
+   new_e_variant
+   A -> Lower priority tile
+   B -> Higher priority tile
+   any -> anything
+   new_e_variant = -1 -> keep previous one.
+')m4_dnl
+__TILE_PATTERN(
+   A,    A,    A,
+   A,    A,    A,
+   A,    A,    A,
+   A, A, -1)
+__TILE_PATTERN(
+   any,  B,    any,
+   B,    A,    B,
+   any,  B,    any,
+   A, B, 0)
+__TILE_PATTERN(
+   B,    A,    B,
+   A,    A,    A,
+   B,    A,    B,
+   A, B, 1)
+__TILE_PATTERN(
+   any,  A,    B,
+   B,    A,    A,
+   any,  B,    any,
+   A, B, 2)
+__TILE_PATTERN(
+   any,  A,    A,
+   B,    A,    A,
+   any,  B,    any,
+   A, B, 3)
+__TILE_PATTERN(
+   B,    A,    any,
+   A,    A,    B,
+   any,  B,    any,
+   A, B, 4)
+__TILE_PATTERN(
+   A,    A,    any,
+   A,    A,    B,
+   any,  B,    any,
+   A, B, 5)
+__TILE_PATTERN(
+   B,    A,    B,
+   A,    A,    A,
+   any,  B,    any,
+   A, B, 6)
+__TILE_PATTERN(
+   B,    A,    A,
+   A,    A,    A,
+   any,  B,    any,
+   A, B, 7)
+__TILE_PATTERN(
+   A,    A,    B,
+   A,    A,    A,
+   any,  B,    any,
+   A, B, 8)
+__TILE_PATTERN(
+   A,    A,    A,
+   A,    A,    A,
+   any,  B,    any,
+   A, B, 9)
+__TILE_PATTERN(
+   A,    A,    A,
+   A,    A,    A,
+   B,    A,    B,
+   A, B, 10)
+__TILE_PATTERN(
+   A,    A,    A,
+   A,    A,    A,
+   B,    A,    A,
+   A, B, 11)
+__TILE_PATTERN(
+   A,    A,    A,
+   A,    A,    A,
+   A,    A,    B,
+   A, B, 12)
+__TILE_PATTERN(
+   any,  A,    A,
+   B,    A,    A,
+   any,  A,    B,
+   A, B, 13)
+__TILE_PATTERN(
+   any,  A,    B,
+   B,    A,    A,
+   any,  A,    B,
+   A, B, 14)
+__TILE_PATTERN(
+   any,  A,    B,
+   B,    A,    A,
+   any,  A,    A,
+   A, B, 15)
+__TILE_PATTERN(
+   any,  A,    A,
+   B,    A,    A,
+   any,  A,    A,
+   A, B, 16)
+__TILE_PATTERN(
+   B,    A,    A,
+   A,    A,    A,
+   B,    A,    A,
+   A, B, 17)
+__TILE_PATTERN(
+   any,  B,    any,
+   B,    A,    B,
+   any,  A,    any,
+   A, B, 18)
+__TILE_PATTERN(
+   B,    A,    B,
+   A,    A,    A,
+   A,    A,    B,
+   A, B, 19)
+__TILE_PATTERN(
+   B,    A,    B,
+   A,    A,    A,
+   B,    A,    A,
+   A, B, 20)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    B,
+   any,  B,    any,
+   A, B, 21)
+__TILE_PATTERN(
+   any,  B,    any,
+   B,    A,    A,
+   any,  B,    any,
+   A, B, 22)
+__TILE_PATTERN(
+   any,  A,    any,
+   B,    A,    B,
+   any,  B,    any,
+   A, B, 23)
+__TILE_PATTERN(
+   A,    A,    B,
+   A,    A,    A,
+   B,    A,    B,
+   A, B, 24)
+__TILE_PATTERN(
+   B,    A,    A,
+   A,    A,    A,
+   B,    A,    B,
+   A, B, 25)
+__TILE_PATTERN(
+   any,  A,    any,
+   B,    A,    B,
+   any,  A,    any,
+   A, B, 26)
+__TILE_PATTERN(
+   A,    A,    any,
+   A,    A,    B,
+   B,    A,    any,
+   A, B, 27)
+__TILE_PATTERN(
+   B,    A,    any,
+   A,    A,    B,
+   B,    A,    any,
+   A, B, 28)
+__TILE_PATTERN(
+   B,    A,    any,
+   A,    A,    B,
+   A,    A,    any,
+   A, B, 29)
+__TILE_PATTERN(
+   A,    A,    any,
+   A,    A,    B,
+   A,    A,    any,
+   A, B, 30)
+__TILE_PATTERN(
+   A,    A,    B,
+   A,    A,    A,
+   A,    A,    B,
+   A, B, 31)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    A,
+   any,  B,    any,
+   A, B, 32)
+__TILE_PATTERN(
+   any,  B,    any,
+   B,    A,    A,
+   any,  A,    B,
+   A, B, 33)
+__TILE_PATTERN(
+   any,  B,    any,
+   B,    A,    A,
+   any,  A,    A,
+   A, B, 34)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    B,
+   B,    A,    any,
+   A, B, 35)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    B,
+   A,    A,    any,
+   A, B, 36)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    A,
+   B,    A,    B,
+   A, B, 37)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    A,
+   B,    A,    A,
+   A, B, 38)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    A,
+   A,    A,    B,
+   A, B, 39)
+__TILE_PATTERN(
+   any,  B,    any,
+   A,    A,    A,
+   A,    A,    A,
+   A, B, 40)
+__TILE_PATTERN(
+   B,    A,    B,
+   A,    A,    A,
+   A,    A,    A,
+   A, B, 41)
+__TILE_PATTERN(
+   B,    A,    A,
+   A,    A,    A,
+   A,    A,    B,
+   A, B, 42)
+__TILE_PATTERN(
+   B,    A,    A,
+   A,    A,    A,
+   A,    A,    A,
+   A, B, 43)
+__TILE_PATTERN(
+   A,    A,    B,
+   A,    A,    A,
+   B,    A,    A,
+   A, B, 44)
+__TILE_PATTERN(
+   A,    A,    B,
+   A,    A,    A,
+   A,    A,    A,
+   A, B, 45)
diff --git a/tile/pattern/global.m4.conf b/tile/pattern/global.m4.conf
index a5f7df3..3414359 100644
--- a/tile/pattern/global.m4.conf
+++ b/tile/pattern/global.m4.conf
@@ -4,35 +4,11 @@ m4_define(
       `__TILE_PATTERN',
       m4_defn(`$1'))m4_dnl
       m4_undefine(`$1')')m4_dnl
-m4_define(
-   `__TILE_PATTERN_NOT',
-   `{"c": "n"`,' "i": `$1'}')m4_dnl
-m4_define(
-   `__TILE_PATTERN_ANY',
-   `{"c": "a"`,' "i": -1}')m4_dnl
-m4_define(
-   `__TILE_PATTERN_JUST',
-   `{"c": "e"`,' "i": `$1'}')m4_dnl
-m4_define(
-   `__TILE_PATTERN_HEADER',
-   `m4_define(
-      `not',
-      m4_defn(`__TILE_PATTERN_NOT'))m4_dnl
-   m4_define(`TODO',`-1')m4_dnl
-   m4_define(
-      `any',
-      m4_defn(`__TILE_PATTERN_ANY'))m4_dnl
-   m4_define(
-      `just',
-      m4_defn(`__TILE_PATTERN_JUST'))m4_dnl')m4_dnl
 m4_define(`__TILE_PATTERN_JSON_STYLE',`   {
       "msg": "add_tile_pattern",
-      "s": `$5',
-      "t": `$10',
-      "p": [`$1', `$2', `$3', `$4', `$6', `$7', `$8', `$9']
+      "t": ["`$10'", "`$11'"],
+      "tv": `$12',
+      "p": ["`$1'", "`$2'", "`$3'", "`$4'", "`$6'", "`$7'", "`$8'", "`$9'"]
    },')m4_dnl
-m4_define(
-   `__TILE_PATTERN_FOOTER',
-   `m4_undefine(not)m4_undefine(`???')m4_undefine(any)m4_undefine(just)')m4_dnl
 m4_define(`__TILE_PATTERN_CATEGORY',`m4_define(`__TILE_PATTERN_CATEGORY_NAME', `$1')')m4_dnl
 m4_define(`__TILE_PATTERN_USE_JSON_STYLE',`__TILE_PATTERN_CHOOSE_STYLE(`__TILE_PATTERN_JSON_STYLE')')m4_dnl
diff --git a/tile/pattern/grassland.m4d b/tile/pattern/grassland.m4d
deleted file mode 100644
index bca10cd..0000000
--- a/tile/pattern/grassland.m4d
+++ /dev/null
@@ -1,256 +0,0 @@
-__TILE_PATTERN_CATEGORY(`Grassland')m4_dnl
-m4_ifelse(`
-   a, b, c
-   d, e, f,
-   g, h, i,
-   new_e
-   any -> anything
-   not(X) -> anything but X
-   just(X) -> exactly X
-')m4_dnl
-__TILE_PATTERN_HEADER
-m4_ifelse(`
-   This pattern cleans up watery tiles other that 3 in the middle of
-   water')m4_dnl
-__TILE_PATTERN(
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   3)
-m4_dnl
-__TILE_PATTERN(
-   not(3),  just(3), not(3),
-   just(3), just(3), just(3),
-   any,     not(3),  any,
-   39)
-__TILE_PATTERN(
-   not(3),  just(3), just(3),
-   just(3), just(3), just(3),
-   any,     not(3),  any,
-   38)
-__TILE_PATTERN(
-   just(3), just(3), not(3),
-   just(3), just(3), just(3),
-   any,     not(3),  any,
-   40)
-__TILE_PATTERN(
-   any,     just(3), not(3),
-   not(3),  just(3), just(3),
-   any,     just(3), not(3),
-   30)
-__TILE_PATTERN(
-   any,     just(3), just(3),
-   not(3),  just(3), just(3),
-   any,     just(3), not(3),
-   29)
-__TILE_PATTERN(
-   any,     just(3), not(3),
-   not(3),  just(3), just(3),
-   any,     just(3), just(3),
-   31)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), just(3),
-   not(3),  just(3), not(3),
-   36)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), just(3),
-   just(3), just(3), not(3),
-   37)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), just(3),
-   not(3),  just(3), just(3),
-   35)
-__TILE_PATTERN(
-   not(3),  just(3), any,
-   just(3), just(3), not(3),
-   not(3),  just(3), any,
-   33)
-__TILE_PATTERN(
-   just(3), just(3), any,
-   just(3), just(3), not(3),
-   not(3),  just(3), any,
-   32)
-__TILE_PATTERN(
-   not(3),  just(3), any,
-   just(3), just(3), not(3),
-   just(3), just(3), any,
-   34)
-__TILE_PATTERN(
-   not(3),  just(3), any,
-   just(3), just(3), not(3),
-   any,     not(3),  any,
-   43)
-__TILE_PATTERN(
-   any,     just(3), not(3),
-   not(3),  just(3), just(3),
-   any,     not(3),  any,
-   44)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   not(3),  just(3), just(3),
-   any,     just(3), not(3),
-   41)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), not(3),
-   not(3),  just(3), any,
-   42)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   not(3),  just(3), not(3),
-   any,     not(3),  any,
-   TODO)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), not(3),
-   any,     not(3),  any,
-   TODO)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), not(3),
-   just(3), just(3), any,
-   9)
-__TILE_PATTERN(
-   just(3), just(3), any,
-   just(3), just(3), not(3),
-   any,     not(3),  any,
-   10)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), just(3),
-   any,     not(3),  any,
-   13)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   6)
-__TILE_PATTERN(
-   just(3), just(3), any,
-   just(3), just(3), not(3),
-   just(3), just(3), any,
-   5)
-__TILE_PATTERN(
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   any,     not(3),  any,
-   7)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   not(3),  just(3), not(3),
-   any,     just(3), any,
-   TODO)
-__TILE_PATTERN(
-   any,     just(3), any,
-   not(3),  just(3), not(3),
-   any,     just(3), any,
-   12)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   not(3),  just(3), just(3),
-   any,     just(3), just(3),
-   8)
-__TILE_PATTERN(
-   any,     just(3), just(3),
-   not(3),  just(3), just(3),
-   any,     just(3), just(3),
-   4)
-__TILE_PATTERN(
-   any,     just(3), any,
-   not(3),  just(3), not(3),
-   any,     not(3),  any,
-   TODO)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   not(3),  just(3), just(3),
-   any,     not(3),  any,
-   TODO)
-__TILE_PATTERN(
-   any,     just(3), just(3),
-   not(3),  just(3), just(3),
-   any,     not(3),  any,
-   11)
-__TILE_PATTERN(
-   any,     not(3),  any,
-   just(3), just(3), not(3),
-   any,     not(3),  any,
-   TODO)
-__TILE_PATTERN(
-   not(3),  just(3), not(3),
-   just(3), just(3), just(3),
-   not(3),  just(3), not(3),
-   20)
-__TILE_PATTERN(
-   just(3), just(3), not(3),
-   just(3), just(3), just(3),
-   not(3),  just(3), not(3),
-   19)
-__TILE_PATTERN(
-   not(3),  just(3), just(3),
-   just(3), just(3), just(3),
-   not(3),  just(3), not(3),
-   28)
-__TILE_PATTERN(
-   not(3),  just(3), not(3),
-   just(3), just(3), just(3),
-   not(3),  just(3), just(3),
-   22)
-__TILE_PATTERN(
-   not(3),  just(3), not(3),
-   just(3), just(3), just(3),
-   just(3), just(3), not(3),
-   27)
-__TILE_PATTERN(
-   just(3), just(3), not(3),
-   just(3), just(3), just(3),
-   just(3), just(3), not(3),
-   23)
-__TILE_PATTERN(
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   not(3),  just(3), not(3),
-   25)
-__TILE_PATTERN(
-   just(3), just(3), not(3),
-   just(3), just(3), just(3),
-   not(3),  just(3), just(3),
-   18)
-__TILE_PATTERN(
-   not(3),  just(3), just(3),
-   just(3), just(3), just(3),
-   not(3),  just(3), just(3),
-   21)
-__TILE_PATTERN(
-   not(3),  just(3), just(3),
-   just(3), just(3), just(3),
-   just(3), just(3), not(3),
-   24)
-__TILE_PATTERN(
-   not(3),  just(3), not(3),
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   26)
-__TILE_PATTERN(
-   just(3), just(3), not(3),
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   17)
-__TILE_PATTERN(
-   not(3),  just(3), just(3),
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   16)
-__TILE_PATTERN(
-   just(3), just(3), just(3),
-   just(3), just(3), just(3),
-   just(3), just(3), not(3),
-   15)
-__TILE_PATTERN(
-   just(3),  just(3), just(3),
-   just(3), just(3), just(3),
-   not(3), just(3), just(3),
-   14)
-__TILE_PATTERN_FOOTER