summaryrefslogtreecommitdiff
path: root/tile
diff options
context:
space:
mode:
Diffstat (limited to 'tile')
-rw-r--r--tile/global.m4.conf2
-rw-r--r--tile/grassland.m4d2
-rw-r--r--tile/pattern/global.m4.conf2
-rw-r--r--tile/pattern/grassland.m4d293
4 files changed, 194 insertions, 105 deletions
diff --git a/tile/global.m4.conf b/tile/global.m4.conf
index 065d966..727c111 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', 28)m4_dnl
+m4_define(`__TILE_CLASS_MAX_ID', 44)m4_dnl
m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_id (`$1') ->
#tile
{
diff --git a/tile/grassland.m4d b/tile/grassland.m4d
index a4cbac7..ff9a8e4 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, 28)
+__TILE_CLASS(3, `Clear Water', __TILE_COST_WHEN_OCCUPIED, 3, 44)
diff --git a/tile/pattern/global.m4.conf b/tile/pattern/global.m4.conf
index 724bfcc..a5f7df3 100644
--- a/tile/pattern/global.m4.conf
+++ b/tile/pattern/global.m4.conf
@@ -9,7 +9,7 @@ m4_define(
`{"c": "n"`,' "i": `$1'}')m4_dnl
m4_define(
`__TILE_PATTERN_ANY',
- `{"c": "n"`,' "i": -1}')m4_dnl
+ `{"c": "a"`,' "i": -1}')m4_dnl
m4_define(
`__TILE_PATTERN_JUST',
`{"c": "e"`,' "i": `$1'}')m4_dnl
diff --git a/tile/pattern/grassland.m4d b/tile/pattern/grassland.m4d
index 504dec2..bca10cd 100644
--- a/tile/pattern/grassland.m4d
+++ b/tile/pattern/grassland.m4d
@@ -1,167 +1,256 @@
__TILE_PATTERN_CATEGORY(`Grassland')m4_dnl
-m4_ifelse(`actual, left, down, up, right,')m4_dnl
m4_ifelse(`
a, b, c
d, e, f,
g, h, i,
new_e
- A -> anything
- not(X) -> anything but X
+ 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,
+ 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,
+ any, not(3), any,
TODO)
__TILE_PATTERN(
- any, not(3), any,
- just(3), just(3), not(3),
- any, not(3), any,
+ 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),
- any, just(3), any,
+ any, not(3), any,
+ just(3), just(3), not(3),
+ just(3), just(3), any,
9)
__TILE_PATTERN(
- any, just(3), any,
- just(3), just(3), not(3),
- any, not(3), any,
+ 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,
+ 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),
- any, just(3), any,
+ any, not(3), any,
+ just(3), just(3), just(3),
+ just(3), just(3), just(3),
6)
__TILE_PATTERN(
- any, just(3), any,
- just(3), just(3), not(3),
- any, just(3), any,
+ just(3), just(3), any,
+ just(3), just(3), not(3),
+ just(3), just(3), any,
5)
__TILE_PATTERN(
- any, just(3), any,
- just(3), just(3), just(3),
- any, not(3), any,
+ just(3), just(3), just(3),
+ just(3), just(3), just(3),
+ any, not(3), any,
7)
__TILE_PATTERN(
- any, not(3), any,
+ any, not(3), any,
not(3), just(3), not(3),
- any, just(3), any,
+ any, just(3), any,
TODO)
__TILE_PATTERN(
- any, just(3), any,
+ any, just(3), any,
not(3), just(3), not(3),
- any, just(3), any,
+ any, just(3), any,
12)
__TILE_PATTERN(
- any, not(3), any,
- not(3), just(3), just(3),
- any, just(3), any,
+ any, not(3), any,
+ not(3), just(3), just(3),
+ any, just(3), just(3),
8)
__TILE_PATTERN(
- any, just(3), any,
- not(3), just(3), just(3),
- any, just(3), any,
+ any, just(3), just(3),
+ not(3), just(3), just(3),
+ any, just(3), just(3),
4)
__TILE_PATTERN(
- any, just(3), any,
+ any, just(3), any,
not(3), just(3), not(3),
- any, not(3), any,
+ any, not(3), any,
TODO)
__TILE_PATTERN(
- any, not(3), any,
- not(3), just(3), just(3),
- any, not(3), any,
+ any, not(3), any,
+ not(3), just(3), just(3),
+ any, not(3), any,
TODO)
__TILE_PATTERN(
- any, just(3), any,
- not(3), just(3), just(3),
- any, not(3), any,
+ any, just(3), just(3),
+ not(3), just(3), just(3),
+ any, not(3), any,
11)
__TILE_PATTERN(
- any, not(3), any,
- not(3), just(3), just(3),
- any, not(3), any,
+ 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),
+ 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),
+ just(3), just(3), not(3),
+ just(3), just(3), just(3),
not(3), just(3), not(3),
- 19)
+ 19)
__TILE_PATTERN(
- not(3), just(3), just(3),
- just(3), just(3), just(3),
+ not(3), just(3), just(3),
+ just(3), just(3), just(3),
not(3), just(3), not(3),
- 28)
+ 28)
__TILE_PATTERN(
not(3), just(3), not(3),
- just(3), just(3), just(3),
- not(3), just(3), just(3),
- 22)
+ 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)
+ 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)
+ 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),
+ just(3), just(3), just(3),
+ just(3), just(3), just(3),
not(3), just(3), not(3),
- 25)
+ 25)
__TILE_PATTERN(
- just(3), just(3), not(3),
- just(3), just(3), just(3),
- not(3), just(3), just(3),
- 18)
+ 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)
+ 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)
+ 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(
- not(3), just(3), just(3),
- just(3), just(3), just(3),
- just(3), just(3), just(3),
- 15)
+ 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