| 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 /glyph_board/global.m4.conf | |
| parent | a3ca314c49a9acfd2d27742c7a4998b1fa561c5e (diff) | |
Fixes a few issues, makes it easier to read & use.
Diffstat (limited to 'glyph_board/global.m4.conf')
| -rw-r--r-- | glyph_board/global.m4.conf | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/glyph_board/global.m4.conf b/glyph_board/global.m4.conf index 5965616..c30d311 100644 --- a/glyph_board/global.m4.conf +++ b/glyph_board/global.m4.conf @@ -1,25 +1,25 @@ -m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl -m4_define(`__GLYPH_BOARD_CHOOSE_STYLE', `m4_define(`__GLYPH_BOARD',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(`__GLYPH_BOARD_CHOOSE_STYLE', + `m4_define(`__GLYPH_BOARD',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl m4_define(`__GLYPH_SLOT_LIST',``[''$1`` 0 ]'')m4_dnl -m4_define(`__GLYPH_SLOT', $1``, '')m4_dnl +m4_define(`__GLYPH_SLOT', `$1``, ''')m4_dnl m4_dnl m4_dnl m4_dnl -m4_define(`__GLYPH_SLOT_LIST_ERLANG_STYLE',``[''$1`` 0 ]'')m4_dnl -m4_define(`__GLYPH_SLOT_ERLANG_STYLE', $1``, '')m4_dnl m4_define(`__GLYPH_BOARD_ERLANG_STYLE',`from_id (`$1') -> #glyph_board { id = $1, name = <<"$2">>, slots = $3, - attr_mod = $4, - stat_mod = $5, - atk_mod = $6, - def_mod = $7 + omnimods = __OMNIMODS($4, $5, $6, $7) }; ')m4_dnl -m4_define(`__GLYPH_BOARD_USE_ERLANG_STYLE',`__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl +m4_define(`__GLYPH_BOARD_USE_ERLANG_STYLE', + `__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_ERLANG_STYLE')')m4_dnl m4_dnl m4_dnl m4_dnl @@ -28,10 +28,14 @@ m4_define(`__GLYPH_BOARD_JSON_STYLE',` { "id": $1, "nam": "$2", "slot": $3, - "attm": $4, - "stam": $5, - "atkm": $6, - "defm": $7 + "omni": __OMNIMODS($4, $5, $6, $7) }, ')m4_dnl -m4_define(`__GLYPH_BOARD_USE_JSON_STYLE',`__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl +m4_define(`__GLYPH_BOARD_USE_JSON_STYLE', + `__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_JSON_STYLE')')m4_dnl +m4_dnl +m4_dnl +m4_dnl +m4_ifelse(__CODE_STYLE(), + erlang, __GLYPH_BOARD_USE_ERLANG_STYLE(), + __CODE_STYLE, json, __GLYPH_BOARD_USE_JSON_STYLE())m4_dnl |