summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/struct/sh_armor.erl22
-rw-r--r--src/shared/struct/sh_weapon.erl6
2 files changed, 14 insertions, 14 deletions
diff --git a/src/shared/struct/sh_armor.erl b/src/shared/struct/sh_armor.erl
index 1fda4eb..6b9111a 100644
--- a/src/shared/struct/sh_armor.erl
+++ b/src/shared/struct/sh_armor.erl
@@ -166,17 +166,17 @@ get_resistance_to (DamageType, Armor) ->
BaseResistance =
case {DamageType, ArmorCategory} of
{slash, kinetic} -> 0.0;
- {slash, leather} -> 5.0;
- {slash, chain} -> 10.0;
- {slash, plate} -> 10.0;
- {blunt, kinetic} -> 10.0;
- {blunt, leather} -> 5.0;
- {blunt, chain} -> 5.0;
- {blunt, plate} -> 5.0;
- {pierce, kinetic} -> 5.0;
- {pierce, leather} -> 5.0;
- {pierce, chain} -> 5.0;
- {pierce, plate} -> 10.0
+ {slash, leather} -> 15.0;
+ {slash, chain} -> 20.0;
+ {slash, plate} -> 20.0;
+ {blunt, kinetic} -> 15.0;
+ {blunt, leather} -> 15.0;
+ {blunt, chain} -> 15.0;
+ {blunt, plate} -> 15.0;
+ {pierce, kinetic} -> 15.0;
+ {pierce, leather} -> 15.0;
+ {pierce, chain} -> 15.0;
+ {pierce, plate} -> 20.0
end,
ArmorCoefficient = Armor#armor.coef,
diff --git a/src/shared/struct/sh_weapon.erl b/src/shared/struct/sh_weapon.erl
index d0293eb..74c7a42 100644
--- a/src/shared/struct/sh_weapon.erl
+++ b/src/shared/struct/sh_weapon.erl
@@ -86,8 +86,8 @@ ranges_of_type (melee, short) -> {0, 1}.
damage_modifier()
)
-> {non_neg_integer(), non_neg_integer()}.
-damages_of_type (ranged, heavy) -> {10, 25};
-damages_of_type (ranged, light) -> {5, 20};
+damages_of_type (ranged, heavy) -> {15, 30};
+damages_of_type (ranged, light) -> {10, 25};
damages_of_type (melee, heavy) -> {20, 35};
damages_of_type (melee, light) -> {15, 30}.
@@ -138,7 +138,7 @@ from_id (0) ->
range_mod = short,
damage_type = blunt,
damage_mod = light,
- coef = 1.0
+ coef = 0.3
};
from_id (1) ->
#weapon{