From 0639949b90f1927193c7593862905437a1a997cb Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Fri, 14 Jun 2019 11:12:15 +0200
Subject: Removes all occurrences of attributes.

---
 armor/basic.m4d | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'armor/basic.m4d')

diff --git a/armor/basic.m4d b/armor/basic.m4d
index 57f918b..8850f6a 100644
--- a/armor/basic.m4d
+++ b/armor/basic.m4d
@@ -2,29 +2,24 @@ __ARMOR(0,
    None,
    __MOD_LIST(),
    __MOD_LIST(),
-   __MOD_LIST(),
    __MOD_LIST())m4_dnl
 __ARMOR(1,
    Meal Pelts,
-   __MOD_LIST(__FIRST_MOD_CONSTITUTION(-5)__MOD_DEXTERITY(-5)),
    __MOD_LIST(),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_SLASH(10)__MOD_BLUNT(10)__MOD_PIERCE(10)))m4_dnl
 __ARMOR(2,
    Wall Bits,
-   __MOD_LIST(__FIRST_MOD_CONSTITUTION(-5)__MOD_DEXTERITY(-5)__MOD_SPEED(-10)__MOD_STRENGTH(-10)),
    __MOD_LIST(),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_SLASH(15)__MOD_BLUNT(10)__MOD_PIERCE(15)))m4_dnl
 __ARMOR(3,
    Garden Fence,
-   __MOD_LIST(__FIRST_MOD_CONSTITUTION(-5)__MOD_DEXTERITY(-5)__MOD_SPEED(-10)),
    __MOD_LIST(),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_SLASH(15)__MOD_BLUNT(10)__MOD_PIERCE(10)))m4_dnl
 __ARMOR(4,
    Morrigan's Pity,
-   __MOD_LIST(__FIRST_MOD_MIND(-10)),
    __MOD_LIST(),
    __MOD_LIST(),
    __MOD_LIST(__FIRST_MOD_BLUNT(15)__MOD_PIERCE(10)))m4_dnl
-- 
cgit v1.2.3-70-g09d2


From d408e3cbe9718da1239651814950253936dae0a7 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Fri, 14 Jun 2019 12:36:40 +0200
Subject: Adds more/modifies existing items for the changes.

---
 armor/basic.m4d       | 77 +++++++++++++++++++++++++++++++++++++++++++--------
 glyph/basic.m4d       | 50 +++++++++++++++++++++++++++++----
 glyph_board/basic.m4d |  4 +--
 names.m4.conf         |  2 +-
 4 files changed, 114 insertions(+), 19 deletions(-)

(limited to 'armor/basic.m4d')

diff --git a/armor/basic.m4d b/armor/basic.m4d
index 8850f6a..24a529b 100644
--- a/armor/basic.m4d
+++ b/armor/basic.m4d
@@ -4,22 +4,77 @@ __ARMOR(0,
    __MOD_LIST(),
    __MOD_LIST())m4_dnl
 __ARMOR(1,
-   Meal Pelts,
+   [PH] Light Armor (Balanced),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_PARRY(-5)__MOD_DOUBLE_HITS(-5)__MOD_DODGE(-5)),
    __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(10)__MOD_BLUNT(10)__MOD_PIERCE(10)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(5)))m4_dnl
 __ARMOR(2,
-   Wall Bits,
-   __MOD_LIST(),
+   [PH] Plate Armor (Balanced),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-30)__MOD_PARRY(-15)__MOD_DOUBLE_HITS(-15)__MOD_DODGE(-15)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(15)__MOD_BLUNT(10)__MOD_PIERCE(15)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(15)))m4_dnl
 __ARMOR(3,
-   Garden Fence,
+   [PH] Heavy Armor (Balanced),
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-20)__MOD_PARRY(-10)__MOD_DOUBLE_HITS(-10)__MOD_DODGE(-10)),
    __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_SLASH(15)__MOD_BLUNT(10)__MOD_PIERCE(10)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(10)))m4_dnl
 __ARMOR(4,
-   Morrigan's Pity,
+   Assassin Cloak,
+   __MOD_LIST(__FIRST_MOD_DODGE(20)__MOD_PARRY(10)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__ARMOR(5,
+   Traveler Clothes,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(25)__MOD_DODGE(5)__MOD_PARRY(2)),
+   __MOD_LIST(),
+   __MOD_LIST())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)),
+   __MOD_LIST(),
+   __MOD_LIST())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)),
+   __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_SLASH(15)))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)),
+   __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_PIERCE(15)))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)),
+   __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_BLUNT(15)))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)),
+   __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_SLASH(30)))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)),
+   __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_PIERCE(30)))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)),
+   __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_BLUNT(30)))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)),
+   __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_SLASH(45)))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)),
    __MOD_LIST(),
+   __MOD_LIST(__FIRST_MOD_PIERCE(45)))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)),
    __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BLUNT(15)__MOD_PIERCE(10)))m4_dnl
+   __MOD_LIST(__FIRST_MOD_BLUNT(45)))m4_dnl
diff --git a/glyph/basic.m4d b/glyph/basic.m4d
index 3b3b753..84690d9 100644
--- a/glyph/basic.m4d
+++ b/glyph/basic.m4d
@@ -4,12 +4,52 @@ __GLYPH(0,
    __MOD_LIST(),
    __MOD_LIST())m4_dnl
 __GLYPH(1,
-   The Old Sign,
-   __MOD_LIST(__FIRST_MOD_MAX_HEALTH(75)),
+   Heart of Gold,
+   __MOD_LIST(__FIRST_MOD_MAX_HEALTH(35)),
    __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(2)))m4_dnl
 __GLYPH(2,
-   The Courier's Prayer,
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(40)),
+   Courier Prayer,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(125)__MOD_DAMAGE(-20)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(3,
+   Bleeding Heart,
+   __MOD_LIST(__FIRST_MOD_DAMAGE(25)__MOD_MAX_HEALTH(-10)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(4,
+   Glasses,
+   __MOD_LIST(__FIRST_MOD_ACCURACY(25)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(5,
+   Comfy Boots,
+   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(25)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(6,
+   Blinding Mirror,
+   __MOD_LIST(__FIRST_MOD_DODGE(25)__MOD_PARRY(25)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(7,
+   Illusionist Toolbox,
+   __MOD_LIST(__FIRST_MOD_DODGE(40)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(8,
+   Armor Camouflage,
+   __MOD_LIST(__FIRST_MOD_PARRY(40)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(9,
+   Weapon Extension,
+   __MOD_LIST(__FIRST_MOD_DOUBLE_HITS(40)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(10,
+   [PH] Critical,
+   __MOD_LIST(__FIRST_MOD_CRITICAL(40)),
    __MOD_LIST(),
    __MOD_LIST())m4_dnl
diff --git a/glyph_board/basic.m4d b/glyph_board/basic.m4d
index 4f7cb19..cb03d88 100644
--- a/glyph_board/basic.m4d
+++ b/glyph_board/basic.m4d
@@ -1,9 +1,9 @@
 __GLYPH_BOARD(0,
    Sealed Spirit Board,
    __GLYPH_SLOT_LIST(),
+   __MOD_LIST(__FIRST_MOD_MAX_HEALTH(50)__MOD_MOVEMENT_POINTS(50)__MOD_DODGE(15)__MOD_PARRY(15)__MOD_ACCURACY(15)__MOD_DOUBLE_HITS(15)__MOD_CRITICAL(15)__MOD_DAMAGE(15)),
    __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   __MOD_LIST(__FIRST_MOD_BASE(2)))m4_dnl
 __GLYPH_BOARD(1,
    Spirit Board,
    __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)),
diff --git a/names.m4.conf b/names.m4.conf
index 3a6c515..69504e3 100644
--- a/names.m4.conf
+++ b/names.m4.conf
@@ -9,5 +9,5 @@ m4_define(`__SN_DODGE',             dodg)m4_dnl
 m4_define(`__SN_PARRY',             pary)m4_dnl
 m4_define(`__SN_ACCURACY',          accu)m4_dnl
 m4_define(`__SN_DOUBLE_HITS',       dhit)m4_dnl
-m4_define(`__SN_CRICITAL_HIT',      crit)m4_dnl
+m4_define(`__SN_CRITICAL_HIT',      crit)m4_dnl
 m4_define(`__SN_DAMAGE_MODIFIER',   dmgm)m4_dnl
-- 
cgit v1.2.3-70-g09d2


From 60877484e7757ab7943bea9149294ee334ae778c Mon Sep 17 00:00:00 2001
From: nsensfel <SpamShield0@noot-noot.org>
Date: Fri, 21 Jun 2019 18:07:56 +0200
Subject: Working on balance...

---
 armor/basic.m4d  | 101 +++++++++++++++++++++++++++++--------------------------
 weapon/basic.m4d |  16 ++++-----
 2 files changed, 61 insertions(+), 56 deletions(-)

(limited to 'armor/basic.m4d')

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


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 +++++++++++++++++-----------------
 weapon/basic.m4d      |  6 +++---
 weapon/global.m4.conf |  4 ++--
 3 files changed, 22 insertions(+), 22 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
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',
-- 
cgit v1.2.3-70-g09d2