Working on balance...

2 files changed, 61 insertions, 56 deletions

diff --git a/armor/basic.m4d b/armor/basic.m4d
index 24a529b..2b829ae 100644
--- a/armor/basic.m4d
+++ b/armor/basic.m4d
@@ -1,80 +1,85 @@
 __ARMOR(0,
-   None,
+   Martial Training Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(5)))m4_dnl
 __ARMOR(1,
-   [PH] Light Armor (Balanced),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_PARRY(-5)__MOD_DOUBLE_HITS(-5)__MOD_DODGE(-5)),
+   Guardsman Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BASE(5)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(8)))m4_dnl
 __ARMOR(2,
-   [PH] Plate Armor (Balanced),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-30)__MOD_PARRY(-15)__MOD_DOUBLE_HITS(-15)__MOD_DODGE(-15)),
+   Front Soldier Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BASE(15)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(12)))m4_dnl
 __ARMOR(3,
-   [PH] Heavy Armor (Balanced),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-20)__MOD_PARRY(-10)__MOD_DOUBLE_HITS(-10)__MOD_DODGE(-10)),
+   Faction0 Martial Training Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BASE(10)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_SLASH(8)))m4_dnl
 __ARMOR(4,
-   Assassin Cloak,
-   __MOD_LIST(__FIRST_MOD_DODGE(20)__MOD_PARRY(10)),
+   Faction1 Martial Training Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_BLUNT(8)))m4_dnl
 __ARMOR(5,
-   Traveler Clothes,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(25)__MOD_DODGE(5)__MOD_PARRY(2)),
+   Faction2 Martial Training Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(30)__MOD_HEALTH(75)__MOD_DODGE(50)),
    __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_PIERCE(8)))m4_dnl
 __ARMOR(6,
-   Jester Costume,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-15)__MOD_DODGE(20)__MOD_PARRY(15)__MOD_DOUBLE_HITS(20)__MOD_CRITICAL(15)),
+   Faction0 Guardsman Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(5)__MOD_SLASH(12)))m4_dnl
 __ARMOR(7,
-   [PH] Tailored Light Armor (Slashing),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_PARRY(-5)__MOD_DOUBLE_HITS(-5)__MOD_DODGE(-5)),
+   Faction1 Guardsman Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(15)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(5)__MOD_BLUNT(12)))m4_dnl
 __ARMOR(8,
-   [PH] Tailored Light Armor (Piercing),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_PARRY(-5)__MOD_DOUBLE_HITS(-5)__MOD_DODGE(-5)),
+   Faction2 Guardsman Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(20)__MOD_HEALTH(100)__MOD_DODGE(35)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_PIERCE(15)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(5)__MOD_PIERCE(12)))m4_dnl
 __ARMOR(9,
-   [PH] Tailored Light Armor (Bludgeoning),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_PARRY(-5)__MOD_DOUBLE_HITS(-5)__MOD_DODGE(-5)),
+   Faction0 Front Soldier Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BLUNT(15)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(7)__MOD_SLASH(16)))m4_dnl
 __ARMOR(10,
-   [PH] Heavy Armor (Slashing),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-20)__MOD_PARRY(-10)__MOD_DOUBLE_HITS(-10)__MOD_DODGE(-10)),
+   Faction1 Front Soldier Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(30)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(7)__MOD_BLUNT(16)))m4_dnl
 __ARMOR(11,
-   [PH] Heavy Armor (Piercing),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-20)__MOD_PARRY(-10)__MOD_DOUBLE_HITS(-10)__MOD_DODGE(-10)),
+   Faction2 Front Soldier Armor,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(15)__MOD_HEALTH(150)__MOD_DODGE(20)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_PIERCE(30)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(7)__MOD_PIERCE(16)))m4_dnl
 __ARMOR(12,
-   [PH] Heavy Armor (Bludgeoning),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-20)__MOD_PARRY(-10)__MOD_DOUBLE_HITS(-10)__MOD_DODGE(-10)),
+   Ranger Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BLUNT(30)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(5)))m4_dnl
 __ARMOR(13,
-   [PH] Plate Armor (Slashing),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-30)__MOD_PARRY(-15)__MOD_DOUBLE_HITS(-15)__MOD_DODGE(-15)),
+   Faction0 Ranger Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(45)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_SLASH(8)))m4_dnl
 __ARMOR(14,
-   [PH] Plate Armor (Piercing),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-30)__MOD_PARRY(-15)__MOD_DOUBLE_HITS(-15)__MOD_DODGE(-15)),
+   Faction1 Ranger Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_PIERCE(45)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(3)__MOD_BLUNT(8)))m4_dnl
 __ARMOR(15,
-   [PH] Plate Armor (Bludgeoning),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-30)__MOD_PARRY(-15)__MOD_DOUBLE_HITS(-15)__MOD_DODGE(-15)),
+   Faction2 Ranger Gear,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(50)__MOD_HEALTH(60)__MOD_DODGE(30)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BLUNT(45)))m4_dnl
+   __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(),
+   __MOD_LIST())m4_dnl
diff --git a/weapon/basic.m4d b/weapon/basic.m4d
index f0d95c5..e6c9f34 100644
--- a/weapon/basic.m4d
+++ b/weapon/basic.m4d
@@ -3,24 +3,24 @@ __WEAPON(0,
    true,
    0,
    1,
-   __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BLUNT(5)),
+   __MOD_LIST(__FIRST_MOD_ACCURACY(80)__MOD_PARRIES(40)__MOD_CRITICAL_HITS(40)__MOD_DOUBLE_HITS(80))
+   __MOD_LIST(__FIRST_MOD_BLUNT(3)__MOD_SLASH(3)__MOD_PIERCE(3)),
    __MOD_LIST())m4_dnl
 __WEAPON(1,
-   Old Dagger,
+   Hunting Dagger,
    true,
    0,
    1,
-   __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(10)__MOD_PIERCE(10)),
+   __MOD_LIST(__FIRST_MOD_ACCURACY(40)__MOD_PARRIES(20)__MOD_CRITICAL_HITS(60)__MOD_DOUBLE_HITS(80))
+   __MOD_LIST(__FIRST_MOD_SLASH(7)__MOD_PIERCE(7)),
    __MOD_LIST())m4_dnl
 __WEAPON(2,
-   Old Sword,
+   Bastard Sword,
    true,
    0,
    1,
-   __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(20)__MOD_PIERCE(10)),
+   __MOD_LIST(__FIRST_MOD_ACCURACY(20)__MOD_PARRIES(40)__MOD_CRITICAL_HITS(20)__MOD_DOUBLE_HITS(40))
+   __MOD_LIST(__FIRST_MOD_SLASH(15)__MOD_PIERCE(10)__MOD_BLUNT(5)),
    __MOD_LIST())m4_dnl
 __WEAPON(3,
    Old Claymore,