From 1afb69a11b0e291c7bfd6c24bdd8e55742e61889 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Wed, 5 Jun 2019 11:24:52 +0200 Subject: [Broken] Changing how actions are handled... --- src/battle/struct/btl_character_turn_request.erl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/battle/struct/btl_character_turn_request.erl') diff --git a/src/battle/struct/btl_character_turn_request.erl b/src/battle/struct/btl_character_turn_request.erl index 7246ca7..7d53bcd 100644 --- a/src/battle/struct/btl_character_turn_request.erl +++ b/src/battle/struct/btl_character_turn_request.erl @@ -52,12 +52,16 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec decode_actions (map()) -> list(btl_action:type()). -decode_actions (Act) -> +-spec decode_actions (non_neg_integer(), map()) -> list(btl_action:type()). +decode_actions (CharacterIX, Act) -> S0Result = [], S1Result = case - btl_action:maybe_decode_move(maps:get(?ACTIONS_MOVE_FIELD, Act)) + btl_action:maybe_decode_move + ( + CharacterIX, + maps:get(?ACTIONS_MOVE_FIELD, Act) + ) of [] -> S0Result; [Move] -> [Move|S0Result] @@ -67,6 +71,7 @@ decode_actions (Act) -> case btl_action:maybe_decode_attack ( + CharacterIX, maps:get(?ACTIONS_ATTACK_FIELD, Act) ) of @@ -78,6 +83,7 @@ decode_actions (Act) -> case btl_action:maybe_decode_weapon_switch ( + CharacterIX, maps:get(?ACTIONS_WEAPON_SWITCH_FIELD, Act) ) of @@ -94,7 +100,7 @@ decode_actions (Act) -> decode (Map) -> CharacterIX = maps:get(?CHAR_IX_FIELD, Map), EncodedActions = maps:get(?ACTIONS_FIELD, Map), - Actions = decode_actions(EncodedActions), + Actions = decode_actions(CharacterIX, EncodedActions), #type { -- cgit v1.2.3-70-g09d2