summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-09-12 17:43:48 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-09-12 17:43:48 +0200
commit5267b264049c890fdbf689fe4bd247b7fb0a4198 (patch)
treec3f490e2813e28a8264a059ff93603e2a6a636a7 /glyph_board/global.m4.conf
parentf57632243fc634b8564a413c964f720f518621ef (diff)
parent69462b1eb363d386acb94f670067572f00e818d0 (diff)
Merge branch 'attributes_removal'
Still missing: - Secondary weapons are not balanced.
Diffstat (limited to 'glyph_board/global.m4.conf')
-rw-r--r--glyph_board/global.m4.conf10
1 files changed, 2 insertions, 8 deletions
diff --git a/glyph_board/global.m4.conf b/glyph_board/global.m4.conf
index f65b390..4b84334 100644
--- a/glyph_board/global.m4.conf
+++ b/glyph_board/global.m4.conf
@@ -1,7 +1,3 @@
-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``]'')m4_dnl
@@ -15,8 +11,7 @@ m4_define(`__GLYPH_BOARD_ERLANG_STYLE',`from_id (<<"`$1'">>) ->
{
id = <<"$1">>,
name = <<"$2">>,
- slots = $3,
- omnimods = __OMNIMODS($4, $5, $6, $7)
+ slots = $3
};
')m4_dnl
m4_define(`__GLYPH_BOARD_USE_ERLANG_STYLE',
@@ -28,8 +23,7 @@ m4_define(`__GLYPH_BOARD_JSON_STYLE',` {
"msg": "add_glyph_board",
"id": "$1",
"nam": "$2",
- "slot": $3,
- "omni": __OMNIMODS($4, $5, $6, $7)
+ "slot": $3
},
')m4_dnl
m4_define(`__GLYPH_BOARD_USE_JSON_STYLE',