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(-)

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