| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battle/src/Update/RequestDirection.elm')
| -rw-r--r-- | src/battle/src/Update/RequestDirection.elm | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/battle/src/Update/RequestDirection.elm b/src/battle/src/Update/RequestDirection.elm index 625d8fe..676b54a 100644 --- a/src/battle/src/Update/RequestDirection.elm +++ b/src/battle/src/Update/RequestDirection.elm @@ -3,7 +3,11 @@ module Update.RequestDirection exposing (apply_to) -- Battle Map ------------------------------------------------------------------ import BattleMap.Struct.Direction +-- Battle Characters ----------------------------------------------------------- +import BattleCharacters.Struct.Character + -- Local Module ---------------------------------------------------------------- +import Struct.Character import Struct.CharacterTurn import Struct.Error import Struct.Event @@ -16,18 +20,33 @@ import Struct.UI -------------------------------------------------------------------------------- make_it_so : ( Struct.Model.Type -> + Struct.Character.Type -> Struct.Navigator.Type -> BattleMap.Struct.Direction.Type -> Struct.Model.Type ) -make_it_so model navigator dir = +make_it_so model char navigator dir = case (Struct.Navigator.try_adding_step dir navigator) of (Just new_navigator) -> {model | char_turn = (Struct.CharacterTurn.set_navigator new_navigator - model.char_turn + (Struct.CharacterTurn.set_active_character_no_reset + (Struct.Character.set_base_character + (BattleCharacters.Struct.Character.set_extra_omnimods + (Struct.Model.tile_omnimods_fun + model + (Struct.Navigator.get_current_location + new_navigator + ) + ) + (Struct.Character.get_base_character char) + ) + char + ) + model.char_turn + ) ), ui = (Struct.UI.set_previous_action @@ -56,10 +75,11 @@ apply_to : ( apply_to model dir = case (Struct.CharacterTurn.try_getting_navigator model.char_turn) + (Struct.CharacterTurn.try_getting_active_character model.char_turn) of - (Just navigator) -> + ((Just navigator), (Just char)) -> ( - (make_it_so model navigator dir), + (make_it_so model char navigator dir), Cmd.none ) |