Get it to compile again, to work on the balancer...

3 files changed, 22 insertions, 22 deletions

diff --git a/armor/basic.m4d b/armor/basic.m4d
index 2b829ae..7e74c6a 100644
--- a/armor/basic.m4d
+++ b/armor/basic.m4d
@@ -1,85 +1,85 @@
 __ARMOR(0,
    Martial Training Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_MAX_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(5)))m4_dnl
 __ARMOR(1,
    Guardsman Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_MAX_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(8)))m4_dnl
 __ARMOR(2,
    Front Soldier Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_MAX_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(12)))m4_dnl
 __ARMOR(3,
    Faction0 Martial Training Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_MAX_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_SLASH(8)))m4_dnl
 __ARMOR(4,
    Faction1 Martial Training Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_MAX_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_BLUNT(8)))m4_dnl
 __ARMOR(5,
    Faction2 Martial Training Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_MAX_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_PIERCE(8)))m4_dnl
 __ARMOR(6,
    Faction0 Guardsman Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_MAX_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(5)__MOD_SLASH(12)))m4_dnl
 __ARMOR(7,
    Faction1 Guardsman Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_MAX_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(5)__MOD_BLUNT(12)))m4_dnl
 __ARMOR(8,
    Faction2 Guardsman Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_MAX_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(5)__MOD_PIERCE(12)))m4_dnl
 __ARMOR(9,
    Faction0 Front Soldier Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_MAX_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(7)__MOD_SLASH(16)))m4_dnl
 __ARMOR(10,
    Faction1 Front Soldier Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_MAX_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(7)__MOD_BLUNT(16)))m4_dnl
 __ARMOR(11,
    Faction2 Front Soldier Armor,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_MAX_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(7)__MOD_PIERCE(16)))m4_dnl
 __ARMOR(12,
    Ranger Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_MAX_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(5)))m4_dnl
 __ARMOR(13,
    Faction0 Ranger Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_MAX_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_SLASH(8)))m4_dnl
 __ARMOR(14,
    Faction1 Ranger Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_MAX_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_BLUNT(8)))m4_dnl
 __ARMOR(15,
    Faction2 Ranger Gear,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_MAX_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_PIERCE(8)))m4_dnl
 __ARMOR(16,
    Inconspicuous Clothing,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(50)),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_MAX_HEALTH(60)__MOD_DODGE(50)),
    __MOD_LIST(),
    __MOD_LIST())m4_dnl
diff --git a/weapon/basic.m4d b/weapon/basic.m4d
index e6c9f34..4c3f2d4 100644
--- a/weapon/basic.m4d
+++ b/weapon/basic.m4d
@@ -3,7 +3,7 @@ __WEAPON(0,
    true,
    0,
    1,
-   __MOD_LIST(__FIRST_MOD_ACCURACY(80)__MOD_PARRIES(40)__MOD_CRITICAL_HITS(40)__MOD_DOUBLE_HITS(80))
+   __MOD_LIST(__FIRST_MOD_ACCURACY(80)__MOD_PARRY(40)__MOD_CRITICAL(40)__MOD_DOUBLE_HITS(80)),
    __MOD_LIST(__FIRST_MOD_BLUNT(3)__MOD_SLASH(3)__MOD_PIERCE(3)),
    __MOD_LIST())m4_dnl
 __WEAPON(1,
@@ -11,7 +11,7 @@ __WEAPON(1,
    true,
    0,
    1,
-   __MOD_LIST(__FIRST_MOD_ACCURACY(40)__MOD_PARRIES(20)__MOD_CRITICAL_HITS(60)__MOD_DOUBLE_HITS(80))
+   __MOD_LIST(__FIRST_MOD_ACCURACY(40)__MOD_PARRY(20)__MOD_CRITICAL(60)__MOD_DOUBLE_HITS(80)),
    __MOD_LIST(__FIRST_MOD_SLASH(7)__MOD_PIERCE(7)),
    __MOD_LIST())m4_dnl
 __WEAPON(2,
@@ -19,7 +19,7 @@ __WEAPON(2,
    true,
    0,
    1,
-   __MOD_LIST(__FIRST_MOD_ACCURACY(20)__MOD_PARRIES(40)__MOD_CRITICAL_HITS(20)__MOD_DOUBLE_HITS(40))
+   __MOD_LIST(__FIRST_MOD_ACCURACY(20)__MOD_PARRY(40)__MOD_CRITICAL(20)__MOD_DOUBLE_HITS(40)),
    __MOD_LIST(__FIRST_MOD_SLASH(15)__MOD_PIERCE(10)__MOD_BLUNT(5)),
    __MOD_LIST())m4_dnl
 __WEAPON(3,
diff --git a/weapon/global.m4.conf b/weapon/global.m4.conf
index 867f313..5f01d79 100644
--- a/weapon/global.m4.conf
+++ b/weapon/global.m4.conf
@@ -15,7 +15,7 @@ m4_define(`__WEAPON_ERLANG_STYLE',`from_id (<<"`$1'">>) ->
       is_primary = $3,
       range_min = $4,
       range_max = $5,
-      omnimods = __OMNIMODS($6, $7, $8, $9)
+      omnimods = __OMNIMODS($6, $7, $8)
    };
 ')m4_dnl
 m4_define(`__WEAPON_USE_ERLANG_STYLE',
@@ -30,7 +30,7 @@ m4_define(`__WEAPON_JSON_STYLE',`   {
       "pri": $3,
       "rmi": $4,
       "rma": $5,
-      "omni": __OMNIMODS($6, $7, $8, $9)
+      "omni": __OMNIMODS($6, $7, $8)
    },
 ')m4_dnl
 m4_define(`__WEAPON_USE_JSON_STYLE',