From 68e6ad689deabed93ebfb41abea90d9fe4911179 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Wed, 29 Nov 2017 15:32:32 +0100 Subject: Enables attacks. --- src/battlemap/src/Model/SelectCharacter.elm | 14 ++++++------- src/battlemap/src/View/Footer/TabMenu/Status.elm | 25 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) (limited to 'src/battlemap') diff --git a/src/battlemap/src/Model/SelectCharacter.elm b/src/battlemap/src/Model/SelectCharacter.elm index 585a578..2f10f1e 100644 --- a/src/battlemap/src/Model/SelectCharacter.elm +++ b/src/battlemap/src/Model/SelectCharacter.elm @@ -31,13 +31,13 @@ attack_character : ( Model.Type ) attack_character model main_char_id target_char_id target_char = - (Model.invalidate - model - (Error.new - Error.IllegalAction - "Attacking another character is not yet possible." - ) - ) + {model | + ui = + (UI.set_previous_action + model.ui + (Just (UI.AttackedCharacter target_char_id)) + ) + } select_character : ( Model.Type -> diff --git a/src/battlemap/src/View/Footer/TabMenu/Status.elm b/src/battlemap/src/View/Footer/TabMenu/Status.elm index 5697cba..e3dd19b 100644 --- a/src/battlemap/src/View/Footer/TabMenu/Status.elm +++ b/src/battlemap/src/View/Footer/TabMenu/Status.elm @@ -67,6 +67,28 @@ get_char_info_html model char_ref = ) ) +get_char_attack_info_html : Model.Type -> Character.Ref -> (Html.Html Event.Type) +get_char_attack_info_html model char_ref = + case (Dict.get char_ref model.characters) of + Nothing -> (Html.text "Error: Unknown character selected.") + (Just char) -> + (Html.text + ( + "Attacking " + ++ char.name + ++ " (Team " + ++ (toString (Character.get_team char)) + ++ "): " + ++ (toString (Character.get_movement_points char)) + ++ " movement points; " + ++ (toString (Character.get_attack_range char)) + ++ " attack range. Health: " + ++ (toString (Character.get_current_health char)) + ++ "/" + ++ (toString (Character.get_max_health char)) + ) + ) + get_error_html : Error.Type -> (Html.Html Event.Type) get_error_html err = (Html.div @@ -179,6 +201,9 @@ get_html model = (Just (UI.SelectedCharacter target_char)) -> (get_char_info_html model target_char) + (Just (UI.AttackedCharacter target_char)) -> + (get_char_attack_info_html model target_char) + _ -> (Util.Html.nothing) ) ] -- cgit v1.2.3-70-g09d2