Converts the weapons, adds glyphs and their boards

6 files changed, 282 insertions, 22 deletions

diff --git a/glyph/basic.m4d b/glyph/basic.m4d
new file mode 100644
index 0000000..435e788
--- /dev/null
+++ b/glyph/basic.m4d
@@ -0,0 +1,66 @@
+__GLYPH(0,
+   None,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(1,
+   The Old Sign,
+   __MOD_LIST(__MOD_CONSTITUTION(15)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(2,
+   The Courier's Prayer,
+   __MOD_LIST(__MOD_STRENGTH(-20)__MOD_CONSTITUTION(-10)__MOD_MIND(-10)),
+   __MOD_LIST(__MOD_MOVEMENT_POINTS(40)),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(3,
+   [PH] Speed for Constitution,
+   __MOD_LIST(__MOD_CONSTITUTION(-10)__MOD_SPEED(20)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(4,
+   [PH] Speed for Strength,
+   __MOD_LIST(__MOD_STRENGTH(-13)__MOD_SPEED(25)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(5,
+   [PH] Speed for Dexterity,
+   __MOD_LIST(__MOD_DEXTERITY(-10)__MOD_SPEED(20)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(6,
+   [PH] Constitution for Intelligence,
+   __MOD_LIST(__MOD_INTELLIGENCE(-10)__MOD_CONSTITUTION(15)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(7,
+   [PH] Constitution for Strength,
+   __MOD_LIST(__MOD_INTELLIGENCE(-15)__MOD_CONSTITUTION(23)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(8,
+   [PH] Constitution for Speed,
+   __MOD_LIST(__MOD_SPEED(-10)__MOD_CONSTITUTION(23)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(9,
+   [PH] Dexterity for Constitution,
+   __MOD_LIST(__MOD_CONSTITUTION(-15)__MOD_DEXTERITY(20)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH(10,
+   [PH] Dexterity for Constitution,
+   __MOD_LIST(__MOD_CONSTITUTION(-15)__MOD_DEXTERITY(20)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
diff --git a/glyph/global.m4.conf b/glyph/global.m4.conf
new file mode 100644
index 0000000..fafef02
--- /dev/null
+++ b/glyph/global.m4.conf
@@ -0,0 +1,25 @@
+m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl
+m4_define(`__GLYPH_CHOOSE_STYLE', `m4_define(`__GLYPH',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_define(`__GLYPH_ERLANG_STYLE',`from_id (`$1') ->
+   #glyph
+   {
+      id = $1,
+      name = <<"$2">>,
+      attr_mod = $3,
+      stat_mod = $4,
+      atk_mod = $5,
+      def_mod = $6
+   };
+')m4_dnl
+m4_define(`__GLYPH_JSON_STYLE',`   {
+      "msg": "add_glyph",
+      "id": $1,
+      "nam": "$2",
+      "attm": $3,
+      "stam": $4,
+      "atkm": $5,
+      "defm": $6
+   },
+')m4_dnl
+m4_define(`__GLYPH_USE_ERLANG_STYLE',`__GLYPH_CHOOSE_STYLE(`__GLYPH_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl
+m4_define(`__GLYPH_USE_JSON_STYLE',`__GLYPH_CHOOSE_STYLE(`__GLYPH_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl
diff --git a/glyph_board/basic.m4d b/glyph_board/basic.m4d
new file mode 100644
index 0000000..be5f652
--- /dev/null
+++ b/glyph_board/basic.m4d
@@ -0,0 +1,21 @@
+__GLYPH_BOARD(0,
+   Spirit Board,
+   __GLYPH_SLOT_LIST(__GLYPH_SLOT(1)__GLYPH_SLOT(1)__GLYPH_SLOT(1)__GLYPH_SLOT(1)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
+__GLYPH_BOARD(1,
+   Morrigan's Board,
+   __GLYPH_SLOT_LIST(__GLYPH_SLOT(-1)__GLYPH_SLOT(-1)__GLYPH_SLOT(-1)__GLYPH_SLOT(-1)__GLYPH_SLOT(-1)__GLYPH_SLOT(-1)__GLYPH_SLOT(0.5)__GLYPH_SLOT(0.5)__GLYPH_SLOT(2)),
+   __MOD_LIST(__MOD_CONSTITUTION(10)__MOD_MIND(15)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_SLASH(5)__MOD_BLUNT(5)__MOD_PIERCE(5)))m4_dnl
+__GLYPH_BOARD(2,
+   Tinkered Spirit Board,
+   __GLYPH_SLOT_LIST(__GLYPH_SLOT(0.5)__GLYPH_SLOT(0.5)__GLYPH_SLOT(2)__GLYPH_SLOT(2)),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST())m4_dnl
diff --git a/glyph_board/global.m4.conf b/glyph_board/global.m4.conf
new file mode 100644
index 0000000..5965616
--- /dev/null
+++ b/glyph_board/global.m4.conf
@@ -0,0 +1,37 @@
+m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')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`` 0 ]'')m4_dnl
+m4_define(`__GLYPH_SLOT', $1``, '')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__GLYPH_SLOT_LIST_ERLANG_STYLE',``[''$1`` 0 ]'')m4_dnl
+m4_define(`__GLYPH_SLOT_ERLANG_STYLE', $1``, '')m4_dnl
+m4_define(`__GLYPH_BOARD_ERLANG_STYLE',`from_id (`$1') ->
+   #glyph_board
+   {
+      id = $1,
+      name = <<"$2">>,
+      slots = $3,
+      attr_mod = $4,
+      stat_mod = $5,
+      atk_mod = $6,
+      def_mod = $7
+   };
+')m4_dnl
+m4_define(`__GLYPH_BOARD_USE_ERLANG_STYLE',`__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__GLYPH_BOARD_JSON_STYLE',`   {
+      "msg": "add_glyph_board",
+      "id": $1,
+      "nam": "$2",
+      "slot": $3,
+      "attm": $4,
+      "stam": $5,
+      "atkm": $6,
+      "defm": $7
+   },
+')m4_dnl
+m4_define(`__GLYPH_BOARD_USE_JSON_STYLE',`__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl
diff --git a/weapon/basic.m4d b/weapon/basic.m4d
index 8dfbd61..86132bf 100644
--- a/weapon/basic.m4d
+++ b/weapon/basic.m4d
@@ -69,21 +69,132 @@ __WEAPON(8,
    __MOD_LIST(),
    __MOD_LIST(),
    __MOD_LIST(__MOD_PIERCE(30)__MOD_SLASH(10)),
-   __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-30)))m4_dnl
-__WEAPON(8,Pike,melee,long,pierce,heavy,1.0)m4_dnl
-__WEAPON(9,Club,melee,short,blunt,light,1.0)m4_dnl
-__WEAPON(10,Mace,melee,short,blunt,heavy,1.0)m4_dnl
-__WEAPON(11,Staff,melee,long,blunt,light,1.0)m4_dnl
-__WEAPON(12,War Hammer,melee,long,blunt,heavy,1.0)m4_dnl
-__WEAPON(13,Short Bow (Broadhead),ranged,short,slash,light,1.0)m4_dnl
-__WEAPON(14,Short Bow (Blunt),ranged,short,blunt,light,1.0)m4_dnl
-__WEAPON(15,Short Bow (Bodkin Point),ranged,short,pierce,light,1.0)m4_dnl
-__WEAPON(16,Long Bow (Broadhead),ranged,long,slash,light,1.0)m4_dnl
-__WEAPON(17,Long Bow (Blunt),ranged,long,blunt,light,1.0)m4_dnl
-__WEAPON(18,Long Bow (Bodkin Point),ranged,long,pierce,light,1.0)m4_dnl
-__WEAPON(19,Crossbow (Broadhead),ranged,short,slash,heavy,1.0)m4_dnl
-__WEAPON(20,Crossbow (Blunt),ranged,short,blunt,heavy,1.0)m4_dnl
-__WEAPON(21,Crossbow (Bodkin Point),ranged,short,pierce,heavy,1.0)m4_dnl
-__WEAPON(22,Arbalest (Broadhead),ranged,long,slash,heavy,1.0)m4_dnl
-__WEAPON(23,Arbalest (Blunt),ranged,long,blunt,heavy,1.0)m4_dnl
-__WEAPON(24,Arbalest (Bodkin Point),ranged,long,pierce,heavy,1.0)m4_dnl
+   __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-20)))m4_dnl
+__WEAPON(9,
+   Old Club,
+   0,
+   1,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(15)),
+   __MOD_LIST(__MOD_SPEED(-5)))m4_dnl
+__WEAPON(10,
+   Old Mace,
+   0,
+   1,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(25)),
+   __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)))m4_dnl
+__WEAPON(11,
+   Old Staff,
+   0,
+   2,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(20)),
+   __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-10)))m4_dnl
+__WEAPON(12,
+   Old War Hammer,
+   0,
+   2,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(30)),
+   __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+__WEAPON(13,
+   Old Short Bow (Broadhead),
+   1,
+   5,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(5)__MOD_SLASH(15)__MOD_PIERCE(5)),
+   __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+__WEAPON(14,
+   Old Short Bow (Blunt),
+   1,
+   5,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(20)__MOD_PIERCE(5)),
+   __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+__WEAPON(15,
+   Old Short Bow (Bodkin points),
+   1,
+   6,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_PIERCE(17)),
+   __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+__WEAPON(16,
+   Old Long Bow (Broadhead),
+   2,
+   8,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(5)__MOD_SLASH(15)__MOD_PIERCE(5)),
+   __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)))m4_dnl
+__WEAPON(17,
+   Old Long Bow (Blunt),
+   2,
+   8,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(20)__MOD_PIERCE(5)),
+   __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)))m4_dnl
+__WEAPON(18,
+   Old Long Bow (Bodkin points),
+   2,
+   9,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_PIERCE(17)),
+   __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)))m4_dnl
+__WEAPON(19,
+   Old Crossbow (Broadhead),
+   2,
+   6,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(7)__MOD_SLASH(23)__MOD_PIERCE(10)),
+   __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)))m4_dnl
+__WEAPON(20,
+   Old Crossbow (Blunt),
+   2,
+   6,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(27)__MOD_PIERCE(13)),
+   __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)))m4_dnl
+__WEAPON(21,
+   Old Crossbow (Bodkin points),
+   2,
+   6,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_PIERCE(25)),
+   __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)))m4_dnl
+__WEAPON(22,
+   Old Arbalest (Broadhead),
+   4,
+   9,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(15)__MOD_SLASH(35)__MOD_PIERCE(20)),
+   __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)))m4_dnl
+__WEAPON(23,
+   Old Arbalest (Blunt),
+   4,
+   9,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(37)__MOD_PIERCE(20)),
+   __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)))m4_dnl
+__WEAPON(24,
+   Old Arbalest (Bodkin points),
+   4,
+   10,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_PIERCE(43)),
+   __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)))m4_dnl
diff --git a/weapon/global.m4.conf b/weapon/global.m4.conf
index 498ea01..217788b 100644
--- a/weapon/global.m4.conf
+++ b/weapon/global.m4.conf
@@ -5,8 +5,8 @@ m4_define(`__WEAPON_ERLANG_STYLE',`from_id (`$1') ->
    {
       id = $1,
       name = <<"$2">>,
-      max_range = $3,
-      min_range = $4,
+      min_range = $3,
+      max_range = $4,
       attr_mod = $5,
       stat_mod = $6,
       atk_mod = $7,
@@ -17,8 +17,8 @@ m4_define(`__WEAPON_JSON_STYLE',`   {
       "msg": "add_weapon",
       "id": $1,
       "nam": "$2",
-      "rma": $3,
-      "rmi": $4,
+      "rmi": $3,
+      "rma": $4,
       "attm": $5,
       "stam": $6,
       "atkm": $7,