summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--src/battle/mechanic/action/btl_action_attack.erl14
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index b14b123..c9d2c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ ERL_NAME_VS_SNAME ?= -sname
## Binaries
ERLC ?= erlc
-ERLC_OPTS ?= -I $(INCLUDE_DIR)
+ERLC_OPTS ?= -Wall -Werror -I $(INCLUDE_DIR)
ERL ?= erl
ERL_OPTS ?= -connect_all false \
diff --git a/src/battle/mechanic/action/btl_action_attack.erl b/src/battle/mechanic/action/btl_action_attack.erl
index 2d98a45..e6b65fc 100644
--- a/src/battle/mechanic/action/btl_action_attack.erl
+++ b/src/battle/mechanic/action/btl_action_attack.erl
@@ -521,7 +521,7 @@ commit_hit
S1DamageMultiplier =
case IsCritical of
true -> (S0DamageMultiplier) * 2.0;
- false -> 0.0
+ false -> 1.0
end,
S0AttackDamage =
@@ -1056,8 +1056,8 @@ handle_hit (AttackCategory, S0Sequence, Action, S0Update) ->
} =
handle_precision
(
- S1ModdedActor,
- S1ModdedTarget,
+ S2ModdedActor,
+ S2ModdedTarget,
S3Sequence,
AttackCategory,
Action,
@@ -1075,8 +1075,8 @@ handle_hit (AttackCategory, S0Sequence, Action, S0Update) ->
} =
handle_critical_hit
(
- S2ModdedActor,
- S2ModdedTarget,
+ S3ModdedActor,
+ S3ModdedTarget,
S4Sequence,
AttackCategory,
Action,
@@ -1091,8 +1091,8 @@ handle_hit (AttackCategory, S0Sequence, Action, S0Update) ->
IsParry,
Precision,
IsCritical,
- S3ModdedActor,
- S3ModdedTarget,
+ S4ModdedActor,
+ S4ModdedTarget,
S5Sequence,
AttackCategory,
Action,