summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-08-29 22:58:48 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-08-29 22:58:48 +0200
commit04b46b69436e099e1b05ab4b9371bc070d95aec1 (patch)
tree8588affbbd36e5d2a84296f3ca079a49e8c5cee4 /src/shared/struct/inventory/shr_weapon.erl.m4
parent921db62f5055b8b77ae1d8c677e43f11371d90c4 (diff)
...
Diffstat (limited to 'src/shared/struct/inventory/shr_weapon.erl.m4')
-rw-r--r--src/shared/struct/inventory/shr_weapon.erl.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/struct/inventory/shr_weapon.erl.m4 b/src/shared/struct/inventory/shr_weapon.erl.m4
index b2c6734..8492189 100644
--- a/src/shared/struct/inventory/shr_weapon.erl.m4
+++ b/src/shared/struct/inventory/shr_weapon.erl.m4
@@ -75,7 +75,8 @@ get_omnimods (Wp) -> Wp#weapon.omnimods.
-spec from_id (id()) -> type().
m4_include(__MAKEFILE_DATA_DIR/weapon/global.m4.conf)m4_dnl
-m4_include(__MAKEFILE_DATA_DIR/weapon/basic.m4d)m4_dnl
+m4_include(__MAKEFILE_DATA_DIR/weapon/primary_melee_10_20_25.m4d)m4_dnl
+m4_include(__MAKEFILE_DATA_DIR/weapon/primary_ranged_5_25_25.m4d)m4_dnl
m4_include(__MAKEFILE_DATA_DIR/weapon/secondary.m4d)m4_dnl
from_id (_) ->
default().