Adds secondary weapons.

3 files changed, 60 insertions, 6 deletions

diff --git a/weapon/basic.m4d b/weapon/basic.m4d
index 4d1faf6..d49ccb4 100644
--- a/weapon/basic.m4d
+++ b/weapon/basic.m4d
@@ -1,5 +1,6 @@
 __WEAPON(0,
    Unarmed,
+   true,
    0,
    1,
    __MOD_LIST(),
@@ -8,6 +9,7 @@ __WEAPON(0,
    __MOD_LIST())m4_dnl
 __WEAPON(1,
    Old Dagger,
+   true,
    0,
    1,
    __MOD_LIST(__MOD_SPEED(-5)),
@@ -16,6 +18,7 @@ __WEAPON(1,
    __MOD_LIST())m4_dnl
 __WEAPON(2,
    Old Sword,
+   true,
    0,
    1,
    __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)),
@@ -24,6 +27,7 @@ __WEAPON(2,
    __MOD_LIST())m4_dnl
 __WEAPON(3,
    Old Claymore,
+   true,
    0,
    2,
    __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)),
@@ -32,6 +36,7 @@ __WEAPON(3,
    __MOD_LIST())m4_dnl
 __WEAPON(4,
    Old Bardiche,
+   true,
    0,
    3,
    __MOD_LIST(__MOD_SPEED(-17)__MOD_DEXTERITY(-30)),
@@ -40,6 +45,7 @@ __WEAPON(4,
    __MOD_LIST())m4_dnl
 __WEAPON(5,
    Old Stiletto,
+   true,
    0,
    1,
    __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)),
@@ -48,6 +54,7 @@ __WEAPON(5,
    __MOD_LIST())m4_dnl
 __WEAPON(6,
    Old Pickaxe,
+   true,
    0,
    2,
    __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
@@ -56,6 +63,7 @@ __WEAPON(6,
    __MOD_LIST())m4_dnl
 __WEAPON(7,
    Old Rapier,
+   true,
    0,
    1,
    __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)),
@@ -64,6 +72,7 @@ __WEAPON(7,
    __MOD_LIST())m4_dnl
 __WEAPON(8,
    Old Pike,
+   true,
    0,
    3,
    __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-20)),
@@ -72,6 +81,7 @@ __WEAPON(8,
    __MOD_LIST())m4_dnl
 __WEAPON(9,
    Old Club,
+   true,
    0,
    1,
    __MOD_LIST(__MOD_SPEED(-5)),
@@ -80,6 +90,7 @@ __WEAPON(9,
    __MOD_LIST())m4_dnl
 __WEAPON(10,
    Old Mace,
+   true,
    0,
    1,
    __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)),
@@ -88,6 +99,7 @@ __WEAPON(10,
    __MOD_LIST())m4_dnl
 __WEAPON(11,
    Old Staff,
+   true,
    0,
    2,
    __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-10)),
@@ -96,6 +108,7 @@ __WEAPON(11,
    __MOD_LIST())m4_dnl
 __WEAPON(12,
    Old War Hammer,
+   true,
    0,
    2,
    __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
@@ -104,6 +117,7 @@ __WEAPON(12,
    __MOD_LIST())m4_dnl
 __WEAPON(13,
    Old Short Bow (Broadhead),
+   true,
    1,
    5,
    __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
@@ -112,6 +126,7 @@ __WEAPON(13,
    __MOD_LIST())m4_dnl
 __WEAPON(14,
    Old Short Bow (Blunt),
+   true,
    1,
    5,
    __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
@@ -120,6 +135,7 @@ __WEAPON(14,
    __MOD_LIST())m4_dnl
 __WEAPON(15,
    Old Short Bow (Bodkin points),
+   true,
    1,
    6,
    __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
@@ -128,6 +144,7 @@ __WEAPON(15,
    __MOD_LIST())m4_dnl
 __WEAPON(16,
    Old Long Bow (Broadhead),
+   true,
    2,
    8,
    __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)),
@@ -136,6 +153,7 @@ __WEAPON(16,
    __MOD_LIST())m4_dnl
 __WEAPON(17,
    Old Long Bow (Blunt),
+   true,
    2,
    8,
    __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)),
@@ -144,6 +162,7 @@ __WEAPON(17,
    __MOD_LIST())m4_dnl
 __WEAPON(18,
    Old Long Bow (Bodkin points),
+   true,
    2,
    9,
    __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)),
@@ -152,6 +171,7 @@ __WEAPON(18,
    __MOD_LIST())m4_dnl
 __WEAPON(19,
    Old Crossbow (Broadhead),
+   true,
    2,
    6,
    __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)),
@@ -160,6 +180,7 @@ __WEAPON(19,
    __MOD_LIST())m4_dnl
 __WEAPON(20,
    Old Crossbow (Blunt),
+   true,
    2,
    6,
    __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)),
@@ -168,6 +189,7 @@ __WEAPON(20,
    __MOD_LIST())m4_dnl
 __WEAPON(21,
    Old Crossbow (Bodkin points),
+   true,
    2,
    6,
    __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)),
@@ -176,6 +198,7 @@ __WEAPON(21,
    __MOD_LIST())m4_dnl
 __WEAPON(22,
    Old Arbalest (Broadhead),
+   true,
    4,
    9,
    __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)),
@@ -184,6 +207,7 @@ __WEAPON(22,
    __MOD_LIST())m4_dnl
 __WEAPON(23,
    Old Arbalest (Blunt),
+   true,
    4,
    9,
    __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)),
@@ -192,6 +216,7 @@ __WEAPON(23,
    __MOD_LIST())m4_dnl
 __WEAPON(24,
    Old Arbalest (Bodkin points),
+   true,
    4,
    10,
    __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)),
diff --git a/weapon/global.m4.conf b/weapon/global.m4.conf
index d70589c..867f313 100644
--- a/weapon/global.m4.conf
+++ b/weapon/global.m4.conf
@@ -12,9 +12,10 @@ m4_define(`__WEAPON_ERLANG_STYLE',`from_id (<<"`$1'">>) ->
    {
       id = <<"$1">>,
       name = <<"$2">>,
-      range_min = $3,
-      range_max = $4,
-      omnimods = __OMNIMODS($5, $6, $7, $8)
+      is_primary = $3,
+      range_min = $4,
+      range_max = $5,
+      omnimods = __OMNIMODS($6, $7, $8, $9)
    };
 ')m4_dnl
 m4_define(`__WEAPON_USE_ERLANG_STYLE',
@@ -26,9 +27,10 @@ m4_define(`__WEAPON_JSON_STYLE',`   {
       "msg": "add_weapon",
       "id": "$1",
       "nam": "$2",
-      "rmi": $3,
-      "rma": $4,
-      "omni": __OMNIMODS($5, $6, $7, $8)
+      "pri": $3,
+      "rmi": $4,
+      "rma": $5,
+      "omni": __OMNIMODS($6, $7, $8, $9)
    },
 ')m4_dnl
 m4_define(`__WEAPON_USE_JSON_STYLE',
diff --git a/weapon/secondary.m4d b/weapon/secondary.m4d
new file mode 100644
index 0000000..4b5e226
--- /dev/null
+++ b/weapon/secondary.m4d
@@ -0,0 +1,27 @@
+__WEAPON(s0,
+   Unarmed,
+   false,
+   0,
+   1,
+   __MOD_LIST(),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_BLUNT(5)),
+   __MOD_LIST())m4_dnl
+__WEAPON(s1,
+   Small Dagger,
+   false,
+   0,
+   1,
+   __MOD_LIST(__MOD_SPEED(-3)),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_SLASH(7)__MOD_PIERCE(7)),
+   __MOD_LIST())m4_dnl
+__WEAPON(s2,
+   Small Sword,
+   false,
+   0,
+   1,
+   __MOD_LIST(__MOD_SPEED(-7)__MOD_DEXTERITY(-3)),
+   __MOD_LIST(),
+   __MOD_LIST(__MOD_SLASH(15)__MOD_PIERCE(7)),
+   __MOD_LIST())m4_dnl