Display info. nav., outside clicks leave it before abort. turn.

7 files changed, 31 insertions, 21 deletions

diff --git a/src/battle/src/Struct/Model.elm b/src/battle/src/Struct/Model.elm
index 2ddeecd..d121792 100644
--- a/src/battle/src/Struct/Model.elm
+++ b/src/battle/src/Struct/Model.elm
@@ -86,7 +86,7 @@ clear model =
    {model |
       message_board = (Struct.MessageBoard.clear model.message_board),
       ui =
-         (Struct.UI.reset_displayed_nav
+         (Struct.UI.reset_displayed_navigator
             (Struct.UI.set_previous_action Nothing model.ui)
          ),
       char_turn = (Struct.CharacterTurn.new)
diff --git a/src/battle/src/Struct/UI.elm b/src/battle/src/Struct/UI.elm
index f853c01..6f6a48e 100644
--- a/src/battle/src/Struct/UI.elm
+++ b/src/battle/src/Struct/UI.elm
@@ -19,9 +19,9 @@ module Struct.UI exposing
       get_all_tabs,
 
       -- Navigator
-      maybe_get_displayed_nav,
-      set_displayed_nav,
-      reset_displayed_nav,
+      maybe_get_displayed_navigator,
+      set_displayed_navigator,
+      reset_displayed_navigator,
 
       -- Manual Controls
       has_manual_controls_enabled,
@@ -58,7 +58,7 @@ type alias Type =
       show_manual_controls : Bool,
       displayed_tab : (Maybe Tab),
       previous_action : (Maybe Action),
-      displayed_nav : (Maybe Struct.Navigator.Type)
+      displayed_navigator : (Maybe Struct.Navigator.Type)
    }
 
 --------------------------------------------------------------------------------
@@ -75,7 +75,7 @@ default =
       show_manual_controls = True,
       displayed_tab = Nothing,
       previous_action = Nothing,
-      displayed_nav = Nothing
+      displayed_navigator = Nothing
    }
 
 -- Zoom ------------------------------------------------------------------------
@@ -111,14 +111,14 @@ get_all_tabs =
    [StatusTab, CharactersTab, SettingsTab, TimelineTab]
 
 -- Navigator -------------------------------------------------------------------
-maybe_get_displayed_nav : Type -> (Maybe Struct.Navigator.Type)
-maybe_get_displayed_nav ui = ui.displayed_nav
+maybe_get_displayed_navigator : Type -> (Maybe Struct.Navigator.Type)
+maybe_get_displayed_navigator ui = ui.displayed_navigator
 
-set_displayed_nav : Struct.Navigator.Type -> Type -> Type
-set_displayed_nav nav ui = {ui | displayed_nav = (Just nav)}
+set_displayed_navigator : Struct.Navigator.Type -> Type -> Type
+set_displayed_navigator nav ui = {ui | displayed_navigator = (Just nav)}
 
-reset_displayed_nav : Type -> Type
-reset_displayed_nav ui = {ui | displayed_nav = Nothing}
+reset_displayed_navigator : Type -> Type
+reset_displayed_navigator ui = {ui | displayed_navigator = Nothing}
 
 -- ManualControls --------------------------------------------------------------
 has_manual_controls_enabled : Type -> Bool
diff --git a/src/battle/src/Update/Character/DisplayNavigator.elm b/src/battle/src/Update/Character/DisplayNavigator.elm
index 1ac6618..cb94846 100644
--- a/src/battle/src/Update/Character/DisplayNavigator.elm
+++ b/src/battle/src/Update/Character/DisplayNavigator.elm
@@ -14,6 +14,9 @@ import Struct.Battle
 import Struct.Character
 import Struct.Event
 import Struct.Model
+import Struct.UI
+
+import Util.Navigator
 
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
@@ -29,7 +32,13 @@ apply_to_character : (
    )
 apply_to_character char model =
    (
-      model,
+      {model |
+         ui =
+            (Struct.UI.set_displayed_navigator
+               (Util.Navigator.get_character_navigator model.battle char)
+               model.ui
+            )
+      },
       (Task.attempt
          (Struct.Event.attempted)
          (Action.Scroll.to
diff --git a/src/battle/src/Update/CharacterTurn.elm b/src/battle/src/Update/CharacterTurn.elm
index 9f1483a..90811c3 100644
--- a/src/battle/src/Update/CharacterTurn.elm
+++ b/src/battle/src/Update/CharacterTurn.elm
@@ -29,7 +29,7 @@ apply_to : (
 apply_to target_char model =
    let
       nav =
-         (case (Struct.UI.maybe_get_displayed_nav model.ui) of
+         (case (Struct.UI.maybe_get_displayed_navigator model.ui) of
             (Just dnav) -> dnav
             Nothing ->
                (Util.Navigator.get_character_navigator
@@ -57,7 +57,7 @@ apply_to target_char model =
                   model.battle
                ),
             ui =
-               (Struct.UI.reset_displayed_nav
+               (Struct.UI.reset_displayed_navigator
                   (Struct.UI.reset_displayed_tab
                      (Struct.UI.set_previous_action Nothing model.ui)
                   )
diff --git a/src/battle/src/Update/CharacterTurn/ToggleTarget.elm b/src/battle/src/Update/CharacterTurn/ToggleTarget.elm
index 8dfeb75..aed38b3 100644
--- a/src/battle/src/Update/CharacterTurn/ToggleTarget.elm
+++ b/src/battle/src/Update/CharacterTurn/ToggleTarget.elm
@@ -70,7 +70,7 @@ toggle_attack_character model target_char_id =
             model.battle
          ),
       ui =
-         (Struct.UI.reset_displayed_nav
+         (Struct.UI.reset_displayed_navigator
             (Struct.UI.reset_displayed_tab
                (Struct.UI.set_previous_action Nothing model.ui)
             )
@@ -98,7 +98,7 @@ undo_attack_character model target_char_id =
             model.battle
          ),
       ui =
-         (Struct.UI.reset_displayed_nav
+         (Struct.UI.reset_displayed_navigator
             (Struct.UI.reset_displayed_tab
                (Struct.UI.set_previous_action Nothing model.ui)
             )
diff --git a/src/battle/src/Update/SelectTile.elm b/src/battle/src/Update/SelectTile.elm
index 16583a2..1d42490 100644
--- a/src/battle/src/Update/SelectTile.elm
+++ b/src/battle/src/Update/SelectTile.elm
@@ -70,7 +70,7 @@ go_to_current_tile model loc_ref =
       (
          {model |
             ui =
-               (Struct.UI.reset_displayed_nav
+               (Struct.UI.reset_displayed_navigator
                   (Struct.UI.set_displayed_tab
                      Struct.UI.StatusTab
                      (Struct.UI.set_previous_action
@@ -180,18 +180,19 @@ apply_to : (
 apply_to loc_ref model =
    case
       (
+         (Struct.UI.maybe_get_displayed_navigator model.ui),
          (Struct.CharacterTurn.maybe_get_navigator model.char_turn),
          (Struct.CharacterTurn.maybe_get_active_character model.char_turn)
       )
    of
-      ((Just navigator), (Just char)) ->
+      (Nothing, (Just navigator), (Just char)) ->
          (go_to_tile model char navigator loc_ref)
 
       _ ->
          (
             {model |
                ui =
-                  (Struct.UI.reset_displayed_nav
+                  (Struct.UI.reset_displayed_navigator
                      (Struct.UI.set_displayed_tab
                         Struct.UI.StatusTab
                         (Struct.UI.set_previous_action
diff --git a/src/battle/src/View/Map.elm b/src/battle/src/View/Map.elm
index f6e6c28..9edb7bd 100644
--- a/src/battle/src/View/Map.elm
+++ b/src/battle/src/View/Map.elm
@@ -153,7 +153,7 @@ get_html model =
          (Html.Lazy.lazy2
             (maybe_print_navigator)
             False
-            model.ui.displayed_nav
+            model.ui.displayed_navigator
          )
       ]
    )