| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-08-28 17:03:35 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-08-28 17:03:35 +0200 |
| commit | 225df72e3cf2dbd6c00a75e33be0034e8e76d769 (patch) | |
| tree | ed23193108825abc1fe2d2571a8df7b9811709ca /tile | |
| parent | a3ca314c49a9acfd2d27742c7a4998b1fa561c5e (diff) | |
Fixes a few issues, makes it easier to read & use.
Diffstat (limited to 'tile')
| -rw-r--r-- | tile/global.m4.conf | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/tile/global.m4.conf b/tile/global.m4.conf index 57b12d9..e05dd64 100644 --- a/tile/global.m4.conf +++ b/tile/global.m4.conf @@ -1,44 +1,45 @@ -m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl -m4_define(`__TILE_CHOOSE_STYLE', `m4_define(`__TILE_CLASS',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl +m4_include(__MAKEFILE_DATA_DIR`/omnimods.m4.conf')m4_dnl +m4_dnl +m4_dnl +m4_dnl +m4_define(`__TILE_CHOOSE_STYLE', + `m4_define(`__TILE_CLASS',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl +m4_dnl +m4_dnl +m4_dnl m4_define(`__TILE_COST_WHEN_OCCUPIED', 201)m4_dnl m4_define(`__TILE_COST_WHEN_OOB', 255)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_dnl +m4_dnl +m4_dnl m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (`$1') -> #tile { id = $1, name = <<"[__TILE_CATEGORY_NAME] $2">>, cost = $3, - attr_mod = $4, - stat_mod = $5, - atk_mod = $6, - def_mod = $7 + omnimods = __OMNIMODS($4, $5, $6, $7), 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, - attr_mod = $4, - stat_mod = $5, - atk_mod = $6, - def_mod = $7 - };')m4_dnl +m4_define(`__TILE_CLASS_USE_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl +m4_dnl +m4_dnl +m4_dnl m4_define(`__TILE_CLASS_JSON_STYLE',` { "msg": "add_tile", "id": $1, "nam": "[__TILE_CATEGORY_NAME] $2", "ct": $3, - "attm": $4, - "stam": $5, - "atkm": $6, - "defm": $7 + "omni": __OMNIMODS($4, $5, $6, $7), "fa": __TILE_CATEGORY_FAMILY, "de": __TILE_CATEGORY_DEPTH },')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')__MOD_USE_ERLANG_STYLE()')m4_dnl -m4_define(`__TILE_CLASS_USE_PARTIAL_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_PARTIAL_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl m4_define(`__TILE_CLASS_USE_JSON_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl +m4_dnl +m4_dnl +m4_dnl +m4_ifelse(__CODE_STYLE(), + erlang, __TILE_CLASS_USE_ERLANG_STYLE(), + __CODE_STYLE, json, __TILE_CLASS_USE_JSON_STYLE())m4_dnl |