| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | src/battlemap/src/Update/EndTurn.elm | 1 | ||||
| -rw-r--r-- | src/battlemap/src/View/Footer.elm | 11 | ||||
| -rw-r--r-- | src/battlemap/src/View/SideBar/ManualControls.elm | 10 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/battlemap/src/Update/EndTurn.elm b/src/battlemap/src/Update/EndTurn.elm index 0e046bf..f3e275c 100644 --- a/src/battlemap/src/Update/EndTurn.elm +++ b/src/battlemap/src/Update/EndTurn.elm @@ -12,6 +12,7 @@ import Struct.CharacterTurn import Struct.Error import Struct.Event import Struct.Model +import Struct.Navigator -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- diff --git a/src/battlemap/src/View/Footer.elm b/src/battlemap/src/View/Footer.elm index b7f652b..35c1be3 100644 --- a/src/battlemap/src/View/Footer.elm +++ b/src/battlemap/src/View/Footer.elm @@ -5,6 +5,7 @@ import Dict import Html import Html.Attributes +import Html.Events -- Struct.Battlemap ------------------------------------------------------------------- import Struct.Battlemap @@ -20,6 +21,13 @@ import Util.Html -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- +end_turn_button : (Html.Html Struct.Event.Type) +end_turn_button = + (Html.button + [ (Html.Events.onClick Struct.Event.TurnEnded) ] + [ (Html.text "End Turn") ] + ) + get_curr_char_info_htmls : ( Struct.Model.Type -> Struct.Character.Ref -> @@ -44,7 +52,8 @@ get_curr_char_info_htmls model char_ref = ++ (toString (Struct.Character.get_movement_points char)) ++ " movement points remaining." ) - ) + ), + (end_turn_button) ] (_, _) -> diff --git a/src/battlemap/src/View/SideBar/ManualControls.elm b/src/battlemap/src/View/SideBar/ManualControls.elm index 6dbd100..f2e900c 100644 --- a/src/battlemap/src/View/SideBar/ManualControls.elm +++ b/src/battlemap/src/View/SideBar/ManualControls.elm @@ -27,13 +27,6 @@ direction_button dir label = [ (Html.text label) ] ) -end_turn_button : (Html.Html Struct.Event.Type) -end_turn_button = - (Html.button - [ (Html.Events.onClick Struct.Event.TurnEnded) ] - [ (Html.text "End Turn") ] - ) - -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- -------------------------------------------------------------------------------- @@ -47,7 +40,6 @@ get_html = (direction_button Struct.Direction.Left "Left"), (direction_button Struct.Direction.Down "Down"), (direction_button Struct.Direction.Up "Up"), - (direction_button Struct.Direction.Right "Right"), - (end_turn_button) + (direction_button Struct.Direction.Right "Right") ] ) |