summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-26 23:54:06 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-26 23:54:06 +0200
commit6f6e00b95365a4f30f3aaff408cd446ff7486bca (patch)
tree9a84767eb56d7b892f5b6bccff994726d7127e0b
parent8b0c3fbc2ff79e2223a28d2fbdf4ffe8b8ff1887 (diff)
Another S_Val issue.
-rw-r--r--src/battle/mechanic/action/btl_action_attack.erl38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/battle/mechanic/action/btl_action_attack.erl b/src/battle/mechanic/action/btl_action_attack.erl
index 8ddd119..2d98a45 100644
--- a/src/battle/mechanic/action/btl_action_attack.erl
+++ b/src/battle/mechanic/action/btl_action_attack.erl
@@ -573,19 +573,19 @@ commit_hit
S0Target
),
- {S1Battle, BattleAtaxicUpdate1} =
+ {S2Battle, BattleAtaxicUpdate1} =
btl_battle:ataxia_set_character
(
TargetIX,
S1Target,
TargetAtaxicUpdate,
- S0Battle
+ S1Battle
),
S2Update =
btl_character_turn_update:ataxia_set_battle
(
- S1Battle,
+ S2Battle,
BattleAtaxicUpdate1,
S1Update
),
@@ -1049,43 +1049,43 @@ handle_hit (AttackCategory, S0Sequence, Action, S0Update) ->
{
Precision,
- S2ModdedActor,
- S2ModdedTarget,
- S3Sequence,
- S4Update
+ S3ModdedActor,
+ S3ModdedTarget,
+ S4Sequence,
+ S5Update
} =
handle_precision
(
S1ModdedActor,
S1ModdedTarget,
- S2Sequence,
+ S3Sequence,
AttackCategory,
Action,
IsParry,
ActorHasRange,
- S3Update
+ S4Update
),
{
IsCritical,
- S3ModdedActor,
- S3ModdedTarget,
- S4Sequence,
- S5Update
+ S4ModdedActor,
+ S4ModdedTarget,
+ S5Sequence,
+ S6Update
} =
handle_critical_hit
(
S2ModdedActor,
S2ModdedTarget,
- S3Sequence,
+ S4Sequence,
AttackCategory,
Action,
IsParry,
Precision,
- S4Update
+ S5Update
),
- {S5Sequence, S6Update} =
+ {S6Sequence, S7Update} =
commit_hit
(
IsParry,
@@ -1093,13 +1093,13 @@ handle_hit (AttackCategory, S0Sequence, Action, S0Update) ->
IsCritical,
S3ModdedActor,
S3ModdedTarget,
- S4Sequence,
+ S5Sequence,
AttackCategory,
Action,
- S5Update
+ S6Update
),
- {S5Sequence, S6Update}
+ {S6Sequence, S7Update}
end;
{_, _} -> {S1Sequence, S2Update}