summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared/struct')
-rw-r--r--src/shared/struct/inventory/shr_armor.erl.m42
-rw-r--r--src/shared/struct/inventory/shr_weapon.erl.m43
2 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/struct/inventory/shr_armor.erl.m4 b/src/shared/struct/inventory/shr_armor.erl.m4
index bdcd249..adbb20b 100644
--- a/src/shared/struct/inventory/shr_armor.erl.m4
+++ b/src/shared/struct/inventory/shr_armor.erl.m4
@@ -61,7 +61,7 @@ get_omnimods (Ar) -> Ar#armor.omnimods.
-spec from_id (id()) -> type().
m4_include(__MAKEFILE_DATA_DIR/armor/global.m4.conf)m4_dnl
-m4_include(__MAKEFILE_DATA_DIR/armor/20_20_20.m4d)m4_dnl
+m4_include(__MAKEFILE_DATA_DIR/armor/10_25_25.m4d)m4_dnl
from_id(_) ->
default().
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().