| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2019-09-12 17:43:48 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2019-09-12 17:43:48 +0200 |
| commit | 5267b264049c890fdbf689fe4bd247b7fb0a4198 (patch) | |
| tree | c3f490e2813e28a8264a059ff93603e2a6a636a7 /glyph/global.m4.conf | |
| parent | f57632243fc634b8564a413c964f720f518621ef (diff) | |
| parent | 69462b1eb363d386acb94f670067572f00e818d0 (diff) | |
Merge branch 'attributes_removal'
Still missing:
- Secondary weapons are not balanced.
Diffstat (limited to 'glyph/global.m4.conf')
| -rw-r--r-- | glyph/global.m4.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/glyph/global.m4.conf b/glyph/global.m4.conf index ccb601f..bad97f8 100644 --- a/glyph/global.m4.conf +++ b/glyph/global.m4.conf @@ -12,7 +12,8 @@ m4_define(`__GLYPH_ERLANG_STYLE',`from_id (<<"`$1'">>) -> { id = <<"$1">>, name = <<"$2">>, - omnimods = __OMNIMODS($3, $4, $5, $6) + family_id = <<"$3">>, + omnimods = __OMNIMODS($4, $5, $6) }; ')m4_dnl m4_define(`__GLYPH_USE_ERLANG_STYLE',`__GLYPH_CHOOSE_STYLE(`__GLYPH_ERLANG_STYLE')')m4_dnl @@ -23,7 +24,8 @@ m4_define(`__GLYPH_JSON_STYLE',` { "msg": "add_glyph", "id": "$1", "nam": "$2", - "omni": __OMNIMODS($3, $4, $5, $6) + "fam": "$3", + "omni": __OMNIMODS($4, $5, $6) }, ')m4_dnl m4_define(`__GLYPH_USE_JSON_STYLE',`__GLYPH_CHOOSE_STYLE(`__GLYPH_JSON_STYLE')')m4_dnl |