From 672d695c02ab05e3c7c295911e9e9720d4f07d23 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Mon, 15 Jul 2019 23:00:26 +0200
Subject: Get it to compile again, to work on the balancer...

---
 armor/basic.m4d | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'armor/basic.m4d')

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
-- 
cgit v1.2.3-70-g09d2