summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-29 21:01:53 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-29 21:01:53 +0200
commit0c86b3f337a24e9936bfec0fe5dc127d7f6212d4 (patch)
tree47631f6c3a970b988737f41651f05eb2b8563954 /src/battle/mechanic/action/btl_action_attack.erl
parent6f6e00b95365a4f30f3aaff408cd446ff7486bca (diff)
Enables -Wall -Werror, corrects issue w/ variables.
Diffstat (limited to 'src/battle/mechanic/action/btl_action_attack.erl')
-rw-r--r--src/battle/mechanic/action/btl_action_attack.erl14
1 files changed, 7 insertions, 7 deletions
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,