Balances glyph boards.

2 files changed, 24 insertions, 48 deletions

diff --git a/glyph_board/basic.m4d b/glyph_board/basic.m4d
index a139546..1588a79 100644
--- a/glyph_board/basic.m4d
+++ b/glyph_board/basic.m4d
@@ -1,48 +1,30 @@
 __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(__FIRST_MOD_BLUNT(2)__MOD_PIERCE(2)__MOD_SLASH(2)))m4_dnl
+   Equity,
+   __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)))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)),
-   __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   Passion,
+   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(450)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)))m4_dnl
 __GLYPH_BOARD(2,
-   Extended 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)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_MAX_HEALTH(-10)),
-   __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   Preference,
+   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(150)__GLYPH_SLOT(150)__GLYPH_SLOT(150)__GLYPH_SLOT(150)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)))m4_dnl
 __GLYPH_BOARD(3,
-   Dual 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)__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)),
-   __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-30)__MOD_MAX_HEALTH(-30)),
-   __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   Dedication,
+   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(250)__GLYPH_SLOT(250)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)))m4_dnl
 __GLYPH_BOARD(4,
-   Twisted Spirit Board,
-   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(-200)__GLYPH_SLOT(100)__GLYPH_SLOT(-100)__GLYPH_SLOT(200)__GLYPH_SLOT(-200)__GLYPH_SLOT(100)__GLYPH_SLOT(-100)__GLYPH_SLOT(-200)__GLYPH_SLOT(100)),
-   __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   Compulsion,
+   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(450)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)))m4_dnl
 __GLYPH_BOARD(5,
-   Shielded Spirit Board,
-   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(50)),
-   __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BLUNT(10)__MOD_PIERCE(10)__MOD_SLASH(10)))m4_dnl
+   Obsession,
+   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(250)__GLYPH_SLOT(250)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)))m4_dnl
 __GLYPH_BOARD(6,
-   Shielded Spirit Board (Alt.),
-   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(100)__GLYPH_SLOT(75)),
-   __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST(__FIRST_MOD_BLUNT(10)__MOD_PIERCE(10)__MOD_SLASH(10)))m4_dnl
+   Mania,
+   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(150)__GLYPH_SLOT(150)__GLYPH_SLOT(150)__GLYPH_SLOT(150)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)))m4_dnl
 __GLYPH_BOARD(7,
-   Compact Spirit Board,
-   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(200)__GLYPH_SLOT(200)__GLYPH_SLOT(200)__GLYPH_SLOT(200)__GLYPH_SLOT(150)),
-   __MOD_LIST(),
-   __MOD_LIST(),
-   __MOD_LIST())m4_dnl
+   Addiction,
+   __GLYPH_SLOT_LIST(__FIRST_GLYPH_SLOT(150)__GLYPH_SLOT(150)__GLYPH_SLOT(-150)__GLYPH_SLOT(-150)__GLYPH_SLOT(50)__GLYPH_SLOT(50)__GLYPH_SLOT(-50)__GLYPH_SLOT(-50)))m4_dnl
+__GLYPH_BOARD(8,
+   Lunacy,
+   __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)))m4_dnl
+__GLYPH_BOARD(9,
+   Parity,
+   __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)))m4_dnl
diff --git a/glyph_board/global.m4.conf b/glyph_board/global.m4.conf
index 03345d2..4b84334 100644
--- a/glyph_board/global.m4.conf
+++ b/glyph_board/global.m4.conf
@@ -1,7 +1,3 @@
-m4_include(__MAKEFILE_DATA_DIR`/omnimods.m4.conf')m4_dnl
-m4_dnl
-m4_dnl
-m4_dnl
 m4_define(`__GLYPH_BOARD_CHOOSE_STYLE',
    `m4_define(`__GLYPH_BOARD',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
 m4_define(`__GLYPH_SLOT_LIST',``[''$1``]'')m4_dnl
@@ -15,8 +11,7 @@ m4_define(`__GLYPH_BOARD_ERLANG_STYLE',`from_id (<<"`$1'">>) ->
    {
       id = <<"$1">>,
       name = <<"$2">>,
-      slots = $3,
-      omnimods = __OMNIMODS($4, $5, $6)
+      slots = $3
    };
 ')m4_dnl
 m4_define(`__GLYPH_BOARD_USE_ERLANG_STYLE',
@@ -28,8 +23,7 @@ m4_define(`__GLYPH_BOARD_JSON_STYLE',`   {
       "msg": "add_glyph_board",
       "id": "$1",
       "nam": "$2",
-      "slot": $3,
-      "omni": __OMNIMODS($4, $5, $6)
+      "slot": $3
    },
 ')m4_dnl
 m4_define(`__GLYPH_BOARD_USE_JSON_STYLE',