summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2017-12-11 18:27:39 +0100
committernsensfel <SpamShield0@noot-noot.org>2017-12-11 18:27:39 +0100
commitceb16eb4848810d06325b950d997d4dcbea60e0d (patch)
tree8299e1e64924430ca9980f2b2053c406f5c82bd2
parentf9d92b5f1a0595679eddd8b8fda5e816569f15ea (diff)
Re-enables display of remaining points.
-rw-r--r--src/battlemap/src/View/Footer.elm19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/battlemap/src/View/Footer.elm b/src/battlemap/src/View/Footer.elm
index f3be7af..b7f652b 100644
--- a/src/battlemap/src/View/Footer.elm
+++ b/src/battlemap/src/View/Footer.elm
@@ -12,6 +12,7 @@ import Struct.Character
import Struct.CharacterTurn
import Struct.Event
import Struct.Model
+import Struct.Navigator
import Struct.UI
import Util.Html
@@ -25,20 +26,20 @@ get_curr_char_info_htmls : (
(List (Html.Html Struct.Event.Type))
)
get_curr_char_info_htmls model char_ref =
- case (Dict.get char_ref model.characters) of
- (Just char) ->
+ case
+ (
+ (Dict.get char_ref model.characters),
+ (Struct.CharacterTurn.try_getting_navigator model.char_turn)
+ )
+ of
+ ((Just char), (Just nav)) ->
[
(Html.text
(
"Controlling "
++ char.name
++ ": "
- ++ (toString
--- (Struct.Battlemap.get_navigator_remaining_points
--- model.battlemap
--- )
- 0
- )
+ ++ (toString (Struct.Navigator.get_remaining_points nav))
++ "/"
++ (toString (Struct.Character.get_movement_points char))
++ " movement points remaining."
@@ -46,7 +47,7 @@ get_curr_char_info_htmls model char_ref =
)
]
- Nothing ->
+ (_, _) ->
[(Html.text "Error: Unknown character selected.")]
--------------------------------------------------------------------------------