| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-08-03 18:01:07 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-08-03 18:01:07 +0200 |
| commit | ba6c56951f5843eddc11a7ee43993d1a4b357391 (patch) | |
| tree | 8792ca76409ee93c5b7dfeb3d10233bf7c9fda28 | |
| parent | 61b6971817cba720ae6df74ef9cde8ab8797d3c6 (diff) | |
Got it to work and look okay. Only for map-editor.
| -rw-r--r-- | tile/global.m4.conf | 9 | ||||
| -rw-r--r-- | tile/pattern/frontier.m4d | 477 | ||||
| -rw-r--r-- | tile/pattern/global.m4.conf | 6 |
3 files changed, 241 insertions, 251 deletions
diff --git a/tile/global.m4.conf b/tile/global.m4.conf index f6ce06b..178f516 100644 --- a/tile/global.m4.conf +++ b/tile/global.m4.conf @@ -10,6 +10,13 @@ m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (`$1') -> family = __TILE_CATEGORY_FAMILY, depth = __TILE_CATEGORY_DEPTH };')m4_dnl +m4_define(`__TILE_CLASS_PARTIAL_ERLANG_STYLE',`from_class_id (`$1') -> + #tile + { + id = $1, + name = <<"[__TILE_CATEGORY_NAME] $2">>, + cost = $3 + };')m4_dnl m4_define(`__TILE_CLASS_JSON_STYLE',` { "msg": "add_tile", "id": $1, @@ -20,5 +27,5 @@ m4_define(`__TILE_CLASS_JSON_STYLE',` { },')m4_dnl m4_define(`__TILE_CATEGORY',`m4_define(`__TILE_CATEGORY_NAME', `$1')m4_define(`__TILE_CATEGORY_FAMILY', `$2')m4_define(`__TILE_CATEGORY_DEPTH', `$3')')m4_dnl m4_define(`__TILE_CLASS_USE_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_STYLE')')m4_dnl -m4_define(`__TILE_CLASS_USE_ERLANG_SELECT_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_SELECT_STYLE')')m4_dnl +m4_define(`__TILE_CLASS_USE_PARTIAL_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_PARTIAL_ERLANG_STYLE')')m4_dnl m4_define(`__TILE_CLASS_USE_JSON_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')')m4_dnl diff --git a/tile/pattern/frontier.m4d b/tile/pattern/frontier.m4d index a250132..0960c7a 100644 --- a/tile/pattern/frontier.m4d +++ b/tile/pattern/frontier.m4d @@ -1,247 +1,230 @@ -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) +__TILE_PATTERN( + 2, 1, 2, + 1, 2, 1, + 2, 1, 2, + 0, true) +__TILE_PATTERN( + 1, 0, 1, + 0, 0, 0, + 1, 0, 1, + 1, false) +__TILE_PATTERN( + 2, 0, 1, + 1, 0, 0, + 2, 1, 2, + 2, true) +__TILE_PATTERN( + 2, 0, 0, + 1, 0, 0, + 2, 1, 2, + 3, true) +__TILE_PATTERN( + 1, 0, 2, + 0, 0, 1, + 2, 1, 2, + 4, true) +__TILE_PATTERN( + 0, 0, 2, + 0, 0, 1, + 2, 1, 2, + 5, true) +__TILE_PATTERN( + 1, 0, 1, + 0, 0, 0, + 2, 1, 2, + 6, true) +__TILE_PATTERN( + 1, 0, 0, + 0, 0, 0, + 2, 1, 2, + 7, true) +__TILE_PATTERN( + 0, 0, 1, + 0, 0, 0, + 2, 1, 2, + 8, true) +__TILE_PATTERN( + 0, 0, 0, + 0, 0, 0, + 2, 1, 2, + 9, true) +__TILE_PATTERN( + 0, 0, 0, + 0, 0, 0, + 1, 0, 1, + 10, false) +__TILE_PATTERN( + 0, 0, 0, + 0, 0, 0, + 1, 0, 0, + 11, false) +__TILE_PATTERN( + 0, 0, 0, + 0, 0, 0, + 0, 0, 1, + 12, false) +__TILE_PATTERN( + 2, 0, 0, + 1, 0, 0, + 2, 0, 1, + 13, true) +__TILE_PATTERN( + 2, 0, 1, + 1, 0, 0, + 2, 0, 1, + 14, true) +__TILE_PATTERN( + 2, 0, 1, + 1, 0, 0, + 2, 0, 0, + 15, true) +__TILE_PATTERN( + 2, 0, 0, + 1, 0, 0, + 2, 0, 0, + 16, true) +__TILE_PATTERN( + 1, 0, 0, + 0, 0, 0, + 1, 0, 0, + 17, false) +__TILE_PATTERN( + 2, 1, 2, + 1, 0, 1, + 2, 0, 2, + 18, true) +__TILE_PATTERN( + 1, 0, 1, + 0, 0, 0, + 0, 0, 1, + 19, false) +__TILE_PATTERN( + 1, 0, 1, + 0, 0, 0, + 1, 0, 0, + 20, false) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 1, + 2, 1, 2, + 21, true) +__TILE_PATTERN( + 2, 1, 2, + 1, 0, 0, + 2, 1, 2, + 22, true) +__TILE_PATTERN( + 2, 0, 2, + 1, 0, 1, + 2, 1, 2, + 23, true) +__TILE_PATTERN( + 0, 0, 1, + 0, 0, 0, + 1, 0, 1, + 24, false) +__TILE_PATTERN( + 1, 0, 0, + 0, 0, 0, + 1, 0, 1, + 25, false) +__TILE_PATTERN( + 2, 0, 2, + 1, 0, 1, + 2, 0, 2, + 26, true) +__TILE_PATTERN( + 0, 0, 2, + 0, 0, 1, + 1, 0, 2, + 27, true) +__TILE_PATTERN( + 1, 0, 2, + 0, 0, 1, + 1, 0, 2, + 28, true) +__TILE_PATTERN( + 1, 0, 2, + 0, 0, 1, + 0, 0, 2, + 29, true) +__TILE_PATTERN( + 0, 0, 2, + 0, 0, 1, + 0, 0, 2, + 30, true) +__TILE_PATTERN( + 0, 0, 1, + 0, 0, 0, + 0, 0, 1, + 31, false) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 0, + 2, 1, 2, + 32, true) +__TILE_PATTERN( + 2, 1, 2, + 1, 0, 0, + 2, 0, 1, + 33, true) +__TILE_PATTERN( + 2, 1, 2, + 1, 0, 0, + 2, 0, 0, + 34, true) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 1, + 1, 0, 2, + 35, true) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 1, + 0, 0, 2, + 36, true) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 0, + 1, 0, 1, + 37, true) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 0, + 1, 0, 0, + 38, true) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 0, + 0, 0, 1, + 39, true) +__TILE_PATTERN( + 2, 1, 2, + 0, 0, 0, + 0, 0, 0, + 40, true) +__TILE_PATTERN( + 1, 0, 1, + 0, 0, 0, + 0, 0, 0, + 41, false) +__TILE_PATTERN( + 1, 0, 0, + 0, 0, 0, + 0, 0, 1, + 42, false) +__TILE_PATTERN( + 1, 0, 0, + 0, 0, 0, + 0, 0, 0, + 43, false) +__TILE_PATTERN( + 0, 0, 1, + 0, 0, 0, + 1, 0, 0, + 44, false) +__TILE_PATTERN( + 0, 0, 1, + 0, 0, 0, + 0, 0, 0, + 45, false) diff --git a/tile/pattern/global.m4.conf b/tile/pattern/global.m4.conf index 3414359..5f787b1 100644 --- a/tile/pattern/global.m4.conf +++ b/tile/pattern/global.m4.conf @@ -6,9 +6,9 @@ m4_define( m4_undefine(`$1')')m4_dnl m4_define(`__TILE_PATTERN_JSON_STYLE',` { "msg": "add_tile_pattern", - "t": ["`$10'", "`$11'"], - "tv": `$12', - "p": ["`$1'", "`$2'", "`$3'", "`$4'", "`$6'", "`$7'", "`$8'", "`$9'"] + "v": `$10', + "w" : `$11', + "p": "`$1'`$2'`$3'`$4'`$6'`$7'`$8'`$9'" },')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 |


