From 8e1b3049072575543b3bde2b7954f52167a53459 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Fri, 1 Dec 2017 11:10:03 +0100 Subject: Updates the way the targets are displayed. --- src/battlemap/src/View/SideBar.elm | 8 ++++ src/battlemap/src/View/SideBar/Targets.elm | 63 ++++++++++++++++++++++++++++++ src/battlemap/www/style.css | 10 ++++- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/battlemap/src/View/SideBar/Targets.elm (limited to 'src/battlemap') diff --git a/src/battlemap/src/View/SideBar.elm b/src/battlemap/src/View/SideBar.elm index 050ee29..aa76a6f 100644 --- a/src/battlemap/src/View/SideBar.elm +++ b/src/battlemap/src/View/SideBar.elm @@ -14,6 +14,7 @@ import Util.Html import UI import View.SideBar.TabMenu +import View.SideBar.Targets import View.SideBar.ManualControls -------------------------------------------------------------------------------- @@ -27,6 +28,13 @@ get_html model = ] [ (View.SideBar.TabMenu.get_html model), + ( + if (model.targets == []) + then + (Util.Html.nothing) + else + (View.SideBar.Targets.get_html model) + ), ( if (UI.has_manual_controls_enabled model.ui) then diff --git a/src/battlemap/src/View/SideBar/Targets.elm b/src/battlemap/src/View/SideBar/Targets.elm new file mode 100644 index 0000000..f8d3cc6 --- /dev/null +++ b/src/battlemap/src/View/SideBar/Targets.elm @@ -0,0 +1,63 @@ +module View.SideBar.Targets exposing (get_html) + +-- Elm ------------------------------------------------------------------------- +import Dict + +import Html +import Html.Attributes + +-- Battlemap ------------------------------------------------------------------- +import Battlemap +import Battlemap.Location +import Battlemap.Tile + +import Character + +import UI + +import Util.Html + +import Error +import Event +import Model + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- + +get_target_info_html : Model.Type -> Character.Ref -> (Html.Html Event.Type) +get_target_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)) + ) + ) + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +get_html : Model.Type -> (Html.Html Event.Type) +get_html model = + (Html.div + [ + (Html.Attributes.class "battlemap-side-bar-targets") + ] + (List.map + (get_target_info_html model) + model.targets + ) + ) diff --git a/src/battlemap/www/style.css b/src/battlemap/www/style.css index 251ab0e..ad632a5 100644 --- a/src/battlemap/www/style.css +++ b/src/battlemap/www/style.css @@ -153,7 +153,15 @@ .battlemap-tabmenu { flex-grow: 1; - height: inherit; + display: flex; + flex-direction: column; + flex-wrap: wrap; + width: inherit; +} + +.battlemap-side-bar-targets +{ + flex-grow: 1; display: flex; flex-direction: column; flex-wrap: wrap; -- cgit v1.2.3-70-g09d2