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...

---
 weapon/basic.m4d      | 6 +++---
 weapon/global.m4.conf | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'weapon')

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