summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-25 23:33:52 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-25 23:33:52 +0200
commit421de60ec7e969705bef68780507f1fc384f179c (patch)
treecdb72de6b637276319d4dc9593474eefb159de29 /src/battle/mechanic/action/btl_action_move.erl
parent526f9be120ac1ebd1c9014148f663dba10158c52 (diff)
Fixes some of the errors w/ wrong S_Var being used.
Diffstat (limited to 'src/battle/mechanic/action/btl_action_move.erl')
-rw-r--r--src/battle/mechanic/action/btl_action_move.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/mechanic/action/btl_action_move.erl b/src/battle/mechanic/action/btl_action_move.erl
index 9bbbf7a..c1225c3 100644
--- a/src/battle/mechanic/action/btl_action_move.erl
+++ b/src/battle/mechanic/action/btl_action_move.erl
@@ -499,31 +499,31 @@ handle (Action, S0Update) ->
end,
% [FIXME][IMPORTANT]: 'Path' will not be correct if there is an interruption.
- S4Update =
+ S5Update =
commit_move(ActorIX, S1Actor, S4Update, HandledPath, NewLocation),
- {_V0Nothing, S5Update} =
+ {_V0Nothing, S6Update} =
btl_conditions:apply_to_character
(
ActorIX,
?CONDITION_TRIGGER_HAS_MOVED,
{Action, HandledPath, PathCost, NewLocation},
none,
- S4Update
+ S5Update
),
- {_V1Nothing, S6Update} =
+ {_V1Nothing, S7Update} =
btl_conditions:apply_to_character
(
ActorIX,
?CONDITION_TRIGGER_A_CHARACTER_HAS_MOVED,
{Action, HandledPath, PathCost, NewLocation},
none,
- S5Update
+ S6Update
),
case RemainingPath of
- [] -> S6Update;
+ [] -> S7Update;
_ ->
btl_character_turn_update:add_actions
(
@@ -540,6 +540,6 @@ handle (Action, S0Update) ->
)
]
),
- S6Update
+ S7Update
)
end.