From 3e338edd3d3a5bde1ea738f197762360c125261c Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Thu, 28 Dec 2017 18:48:18 +0100
Subject: Improves the footer's text.

---
 src/battlemap/src/View/Footer.elm | 57 +++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/battlemap/src/View/Footer.elm b/src/battlemap/src/View/Footer.elm
index 35c1be3..a607b14 100644
--- a/src/battlemap/src/View/Footer.elm
+++ b/src/battlemap/src/View/Footer.elm
@@ -28,6 +28,26 @@ end_turn_button =
       [ (Html.text "End Turn") ]
    )
 
+get_navigator_info : (
+      Struct.Model.Type ->
+      Struct.Character.Type->
+      String
+   )
+get_navigator_info model char =
+   case
+      (Struct.CharacterTurn.try_getting_navigator model.char_turn)
+   of
+      (Just nav) ->
+         (
+            (toString (Struct.Navigator.get_remaining_points nav))
+            ++ "/"
+            ++ (toString (Struct.Character.get_movement_points char))
+            ++ " movement points remaining"
+         )
+
+      _ ->
+         "[Error: Unknown character selected.]"
+
 get_curr_char_info_htmls : (
       Struct.Model.Type ->
       Struct.Character.Ref ->
@@ -36,21 +56,42 @@ get_curr_char_info_htmls : (
 get_curr_char_info_htmls model char_ref =
    case
       (
-         (Dict.get char_ref model.characters),
-         (Struct.CharacterTurn.try_getting_navigator model.char_turn)
+         (Struct.CharacterTurn.get_state model.char_turn),
+         (Dict.get char_ref model.characters)
       )
    of
-      ((Just char), (Just nav)) ->
+      (Struct.CharacterTurn.SelectedCharacter, (Just char)) ->
+         [
+            (Html.text
+               (
+                  "Controlling "
+                  ++ char.name
+                  ++ ". Moving ("
+                  ++ (get_navigator_info model char)
+                  ++ ")."
+               )
+            )
+         ]
+
+      (Struct.CharacterTurn.MovedCharacter, (Just char)) ->
+         [
+            (Html.text
+               (
+                  "Controlling "
+                  ++ char.name
+                  ++ ". Moved. Select targets or "
+               )
+            ),
+            (end_turn_button)
+         ]
+
+      (Struct.CharacterTurn.ChoseTarget, (Just char)) ->
          [
             (Html.text
                (
                   "Controlling "
                   ++ char.name
-                  ++ ": "
-                  ++ (toString (Struct.Navigator.get_remaining_points nav))
-                  ++ "/"
-                  ++ (toString (Struct.Character.get_movement_points char))
-                  ++ " movement points remaining."
+                  ++ ". Moved. Chose target(s). Select additional targets or "
                )
             ),
             (end_turn_button)
-- 
cgit v1.2.3-70-g09d2