summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-10-16 12:59:09 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-10-16 12:59:09 +0200
commit48c021b8faeab207abd24e90b67c660d638cd1bd (patch)
treec5fee4f72244d385ffe97e4f084ff967269622b0 /src/battle/mechanic/action/btl_action_move.erl
parent7c9fdca6dee0ba9953427fe8ade2f7f395686322 (diff)
...
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, 6 insertions, 8 deletions
diff --git a/src/battle/mechanic/action/btl_action_move.erl b/src/battle/mechanic/action/btl_action_move.erl
index 347ca93..bdefee9 100644
--- a/src/battle/mechanic/action/btl_action_move.erl
+++ b/src/battle/mechanic/action/btl_action_move.erl
@@ -448,11 +448,7 @@ commit_move (CharacterIX, Character, S0Update, Path, NewLocation) ->
btl_action:type(),
btl_character_turn_update:type()
)
- ->
- (
- {'ok', btl_character_turn_update:type()}
- | {'events', list(btl_action:type()), btl_character_turn_update:type()}
- ).
+ -> btl_character_turn_update:type().
handle (Action, S0Update) ->
ActorIX = btl_action:get_actor_index(Action),
@@ -526,9 +522,11 @@ handle (Action, S0Update) ->
),
case RemainingPath of
- [] -> {ok, S6Update};
+ [] -> S6Update;
_ ->
- {events,
+ btl_character_turn_update:add_actions
+ (
+ false,
(
Interruptions
++
@@ -542,5 +540,5 @@ handle (Action, S0Update) ->
]
),
S6Update
- }
+ )
end.