summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/battlemap/struct/bm_tile.erl2
-rw-r--r--src/shared/struct/sh_weapon.erl5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/battlemap/struct/bm_tile.erl b/src/battlemap/struct/bm_tile.erl
index 36c22dc..f8ce633 100644
--- a/src/battlemap/struct/bm_tile.erl
+++ b/src/battlemap/struct/bm_tile.erl
@@ -58,7 +58,7 @@ class_id_to_type_id (ClassID) ->
0 -> 0;
1 -> 1;
2 -> 2;
- N when ((N >= 3) and (N =< 16)) -> 3
+ N when ((N >= 3) and (N =< 17)) -> 3
end.
-spec from_id (id()) -> type().
diff --git a/src/shared/struct/sh_weapon.erl b/src/shared/struct/sh_weapon.erl
index 2cd3fda..d0293eb 100644
--- a/src/shared/struct/sh_weapon.erl
+++ b/src/shared/struct/sh_weapon.erl
@@ -411,7 +411,8 @@ apply_to_attributes (Weapon, Attributes) ->
light -> (Speed - QuarterImpact)
end,
- S0Attributes = sh_attributes:set_speed(ResultingSpeed, Attributes),
- S1Attributes = sh_attributes:set_dexterity(ResultingDexterity, S0Attributes),
+ S0Attributes = sh_attributes:set_unsafe_speed(ResultingSpeed, Attributes),
+ S1Attributes =
+ sh_attributes:set_unsafe_dexterity(ResultingDexterity, S0Attributes),
S1Attributes.