Removes all occurrences of attributes.

1 files changed, 6 insertions, 23 deletions

diff --git a/omnimods.m4.conf b/omnimods.m4.conf
index c72c8c5..a63c35f 100644
--- a/omnimods.m4.conf
+++ b/omnimods.m4.conf
@@ -13,7 +13,7 @@ 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($1, $2, $3, $4)'')m4_dnl
+   ``shr_omnimods:new($1, $2, $3)'')m4_dnl
 m4_define(`__MOD_USE_ERLANG_STYLE',
    `__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
@@ -24,10 +24,9 @@ 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'``,''`
-            "stam": $2'``,''`
-            "atkm": $3'``,''`
-            "defm": $4
+            "stam": $1'``,''`
+            "atkm": $2'``,''`
+            "defm": $3
          }
 ')m4_dnl
 m4_define(`__MOD_USE_JSON_STYLE',
@@ -35,15 +34,6 @@ m4_define(`__MOD_USE_JSON_STYLE',
 m4_dnl
 m4_dnl
 m4_dnl
-m4_define(`__MOD_CONSTITUTION',  ``__MOD(__SN_CONSTITUTION(),   $1)'')m4_dnl
-m4_define(`__MOD_DEXTERITY',     ``__MOD(__SN_DEXTERITY(),      $1)'')m4_dnl
-m4_define(`__MOD_INTELLIGENCE',  ``__MOD(__SN_INTELLIGENCE(),   $1)'')m4_dnl
-m4_define(`__MOD_MIND',          ``__MOD(__SN_MIND(),           $1)'')m4_dnl
-m4_define(`__MOD_SPEED',         ``__MOD(__SN_SPEED(),          $1)'')m4_dnl
-m4_define(`__MOD_STRENGTH',      ``__MOD(__SN_STRENGTH(),       $1)'')m4_dnl
-m4_dnl
-m4_dnl
-m4_dnl
 m4_define(`__MOD_BASE',    ``__MOD(__SN_BASE(),     $1)'')m4_dnl
 m4_define(`__MOD_SLASH',   ``__MOD(__SN_SLASH(),    $1)'')m4_dnl
 m4_define(`__MOD_PIERCE',  ``__MOD(__SN_PIERCE(),   $1)'')m4_dnl
@@ -58,15 +48,7 @@ m4_define(`__MOD_PARRY',            ``__MOD(__SN_PARRY(),           $1)'')m4_dnl
 m4_define(`__MOD_ACCURACY',         ``__MOD(__SN_ACCURACY(),        $1)'')m4_dnl
 m4_define(`__MOD_DOUBLE_HITS',      ``__MOD(__SN_DOUBLE_HITS(),     $1)'')m4_dnl
 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_define(`__MOD_DAMAGE',           ``__MOD(__SN_DAMAGE_MODIFIER(), $1)'')m4_dnl
 m4_dnl
 m4_dnl
 m4_dnl
@@ -84,6 +66,7 @@ m4_define(`__FIRST_MOD_PARRY',            ``__FIRST_MOD(__SN_PARRY(),
 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_define(`__FIRST_MOD_DAMAGE',           ``__FIRST_MOD(__SN_DAMAGE_MODIFIER(), $1)'')m4_dnl
 m4_dnl
 m4_dnl
 m4_dnl