Removes 'none' list terminators.

1 files changed, 35 insertions, 6 deletions

diff --git a/omnimods.m4.conf b/omnimods.m4.conf
index 706541f..c72c8c5 100644
--- a/omnimods.m4.conf
+++ b/omnimods.m4.conf
@@ -5,20 +5,23 @@ m4_dnl
 m4_define(`__OMNIMODS_CHOOSE_STYLE', `m4_define(`__OMNIMODS',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
 m4_define(`__MOD_LIST_CHOOSE_STYLE', `m4_define(`__MOD_LIST',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
 m4_define(`__MOD_CHOOSE_STYLE', `m4_define(`__MOD',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_define(`__FIRST_MOD_CHOOSE_STYLE', `m4_define(`__FIRST_MOD',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
 m4_dnl
 m4_dnl
 m4_dnl
-m4_define(`__MOD_LIST_ERLANG_STYLE', ``[{none`,' 0}$1]'')m4_dnl
+m4_define(`__MOD_LIST_ERLANG_STYLE', ``[$1]'')m4_dnl
+m4_define(`__FIRST_MOD_ERLANG_STYLE',``{$1, $2}'')m4_dnl
 m4_define(`__MOD_ERLANG_STYLE',``, {$1, $2}'')m4_dnl
 m4_define(`__OMNIMODS_ERLANG_STYLE',
-   ``shr_omnimods:new_dirty($1, $2, $3, $4)'')m4_dnl
+   ``shr_omnimods:new($1, $2, $3, $4)'')m4_dnl
 m4_define(`__MOD_USE_ERLANG_STYLE',
-   `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_ERLANG_STYLE')__MOD_CHOOSE_STYLE(`__MOD_ERLANG_STYLE')__OMNIMODS_CHOOSE_STYLE(`__OMNIMODS_ERLANG_STYLE')')m4_dnl
+   `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_ERLANG_STYLE')__FIRST_MOD_CHOOSE_STYLE(`__FIRST_MOD_ERLANG_STYLE')__MOD_CHOOSE_STYLE(`__MOD_ERLANG_STYLE')__OMNIMODS_CHOOSE_STYLE(`__OMNIMODS_ERLANG_STYLE')')m4_dnl
 m4_dnl
 m4_dnl
 m4_dnl
-m4_define(`__MOD_LIST_JSON_STYLE',```[''$1`` {"t": "none", "v": 0} ]''')m4_dnl
-m4_define(`__MOD_JSON_STYLE',```{"t": "''$1``", "v":'' $2``}, ''')m4_dnl
+m4_define(`__MOD_LIST_JSON_STYLE',```[''$1`` ]''')m4_dnl
+m4_define(`__MOD_JSON_STYLE',```, {"t": "''$1``", "v":'' $2``} ''')m4_dnl
+m4_define(`__FIRST_MOD_JSON_STYLE',```{"t": "''$1``", "v":'' $2``} ''')m4_dnl
 m4_define(`__OMNIMODS_JSON_STYLE',`
          {
             "attm": $1'``,''`
@@ -28,7 +31,7 @@ m4_define(`__OMNIMODS_JSON_STYLE',`
          }
 ')m4_dnl
 m4_define(`__MOD_USE_JSON_STYLE',
-   `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_JSON_STYLE')__MOD_CHOOSE_STYLE(`__MOD_JSON_STYLE')__OMNIMODS_CHOOSE_STYLE(`__OMNIMODS_JSON_STYLE')')m4_dnl
+   `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_JSON_STYLE')__FIRST_MOD_CHOOSE_STYLE(`__FIRST_MOD_JSON_STYLE')__MOD_CHOOSE_STYLE(`__MOD_JSON_STYLE')__OMNIMODS_CHOOSE_STYLE(`__OMNIMODS_JSON_STYLE')')m4_dnl
 m4_dnl
 m4_dnl
 m4_dnl
@@ -58,6 +61,32 @@ m4_define(`__MOD_CRITICAL',         ``__MOD(__SN_CRITICAL_HIT(),    $1)'')m4_dnl
 m4_dnl
 m4_dnl
 m4_dnl
+m4_define(`__FIRST_MOD_CONSTITUTION',  ``__FIRST_MOD(__SN_CONSTITUTION(),   $1)'')m4_dnl
+m4_define(`__FIRST_MOD_DEXTERITY',     ``__FIRST_MOD(__SN_DEXTERITY(),      $1)'')m4_dnl
+m4_define(`__FIRST_MOD_INTELLIGENCE',  ``__FIRST_MOD(__SN_INTELLIGENCE(),   $1)'')m4_dnl
+m4_define(`__FIRST_MOD_MIND',          ``__FIRST_MOD(__SN_MIND(),           $1)'')m4_dnl
+m4_define(`__FIRST_MOD_SPEED',         ``__FIRST_MOD(__SN_SPEED(),          $1)'')m4_dnl
+m4_define(`__FIRST_MOD_STRENGTH',      ``__FIRST_MOD(__SN_STRENGTH(),       $1)'')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__FIRST_MOD_BASE',    ``__FIRST_MOD(__SN_BASE(),     $1)'')m4_dnl
+m4_define(`__FIRST_MOD_SLASH',   ``__FIRST_MOD(__SN_SLASH(),    $1)'')m4_dnl
+m4_define(`__FIRST_MOD_PIERCE',  ``__FIRST_MOD(__SN_PIERCE(),   $1)'')m4_dnl
+m4_define(`__FIRST_MOD_BLUNT',   ``__FIRST_MOD(__SN_BLUNT(),    $1)'')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__FIRST_MOD_MAX_HEALTH',       ``__FIRST_MOD(__SN_MAX_HEALTH(),      $1)'')m4_dnl
+m4_define(`__FIRST_MOD_MOVEMENT_POINTS',  ``__FIRST_MOD(__SN_MOVEMENT_POINTS(), $1)'')m4_dnl
+m4_define(`__FIRST_MOD_DODGE',            ``__FIRST_MOD(__SN_DODGE(),           $1)'')m4_dnl
+m4_define(`__FIRST_MOD_PARRY',            ``__FIRST_MOD(__SN_PARRY(),           $1)'')m4_dnl
+m4_define(`__FIRST_MOD_ACCURACY',         ``__FIRST_MOD(__SN_ACCURACY(),        $1)'')m4_dnl
+m4_define(`__FIRST_MOD_DOUBLE_HITS',      ``__FIRST_MOD(__SN_DOUBLE_HITS(),     $1)'')m4_dnl
+m4_define(`__FIRST_MOD_CRITICAL',         ``__FIRST_MOD(__SN_CRITICAL_HIT(),    $1)'')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
 m4_ifelse(__CODE_STYLE(),
    erlang, `__MOD_USE_ERLANG_STYLE()',
    __CODE_STYLE, json,` __MOD_USE_JSON_STYLE()')m4_dnl