summaryrefslogtreecommitdiff |
diff options
author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-27 11:31:17 +0200 |
---|---|---|
committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-27 11:31:17 +0200 |
commit | 2d54254e59289c452777fccb1f4d00b56eb7e451 (patch) | |
tree | ab0835ea7a5917a4363539022cbc730e582aed8a /elm/battlemap/src/Update/DirectionRequest.elm | |
parent | d2b5c94b717e2d1b7b73a74a1f1ec6af70890a96 (diff) |
Improves error msgs & UI controls.
Diffstat (limited to 'elm/battlemap/src/Update/DirectionRequest.elm')
-rw-r--r-- | elm/battlemap/src/Update/DirectionRequest.elm | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/elm/battlemap/src/Update/DirectionRequest.elm b/elm/battlemap/src/Update/DirectionRequest.elm index da32240..e069439 100644 --- a/elm/battlemap/src/Update/DirectionRequest.elm +++ b/elm/battlemap/src/Update/DirectionRequest.elm @@ -11,7 +11,14 @@ import Error make_it_so : Model.Type -> Battlemap.Direction.Type -> Model.Type make_it_so model dir = case model.selection of - Nothing -> {model | state = (Model.Error Error.Programming)} + Nothing -> + (Model.invalidate + model + (Error.new + Error.Programming + "DirectionRequest: model moving char, no selection." + ) + ) (Just selection) -> let (new_bmap, new_nav) = @@ -31,7 +38,14 @@ make_it_so model dir = apply_to : Model.Type -> Battlemap.Direction.Type -> Model.Type apply_to model dir = - case model.state of + case (Model.get_state model) of Model.MovingCharacterWithButtons -> (make_it_so model dir) Model.MovingCharacterWithClick -> (make_it_so model dir) - _ -> {model | state = (Model.Error Error.IllegalAction)} + _ -> + (Model.invalidate + model + (Error.new + Error.IllegalAction + "This can only be done while moving a character." + ) + ) |