...

13 files changed, 81 insertions, 62 deletions

diff --git a/src/battlemap/src/ElmModule/Init.elm b/src/battlemap/src/ElmModule/Init.elm
index 2b62933..f7885e4 100644
--- a/src/battlemap/src/ElmModule/Init.elm
+++ b/src/battlemap/src/ElmModule/Init.elm
@@ -1,12 +1,12 @@
 module ElmModule.Init exposing (init)
--- Battlemap -------------------------------------------------------------------
 
-import Struct.Model
-import Struct.Event
+-- Battlemap -------------------------------------------------------------------
+import Send.LoadBattlemap
 
 import Shim.Model
 
-import Send.LoadBattlemap
+import Struct.Event
+import Struct.Model
 
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
@@ -15,7 +15,7 @@ import Send.LoadBattlemap
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-init : (Struct.Model.Type, (Cmd Event.Type))
+init : (Struct.Model.Type, (Cmd Struct.Event.Type))
 init =
    let
       model = (Shim.Model.generate)
diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm
index d58c794..79e90a3 100644
--- a/src/battlemap/src/Send/CharacterTurn.elm
+++ b/src/battlemap/src/Send/CharacterTurn.elm
@@ -9,6 +9,7 @@ import Constants.IO
 import Send.Send
 
 import Struct.Battlemap
+import Struct.CharacterTurn
 import Struct.Direction
 import Struct.Event
 import Struct.Model
@@ -23,7 +24,9 @@ import Struct.UI
 --------------------------------------------------------------------------------
 try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value)
 try_encoding model =
-   case model.controlled_character of
+   case
+      (Struct.CharacterTurn.try_getting_controlled_character model.char_turn)
+   of
       (Just char_ref) ->
          (Just
             (Json.Encode.object
@@ -43,7 +46,7 @@ try_encoding model =
                               (Struct.Direction.to_string)
                            )
                            (List.reverse
-                              (Struct.Battlemap.get_navigator_path model.battlemap)
+                              (Struct.CharacterTurn.get_path model.char_turn)
                            )
                         )
                      )
@@ -51,7 +54,10 @@ try_encoding model =
                   (
                      "targets_id",
                      (Json.Encode.list
-                        (List.map (Json.Encode.string) model.targets)
+                        (List.map
+                           (Json.Encode.string)
+                           (Struct.CharacterTurn.get_targets model.char_turn)
+                        )
                      )
                   )
                ]
@@ -66,4 +72,8 @@ try_encoding model =
 --------------------------------------------------------------------------------
 try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type))
 try model =
-   (Send.try_sending model Constants.IO.character_turn_handler try_encoding)
+   (Send.Send.try_sending
+      model
+      Constants.IO.character_turn_handler
+      try_encoding
+   )
diff --git a/src/battlemap/src/Send/LoadBattlemap.elm b/src/battlemap/src/Send/LoadBattlemap.elm
index a177206..f1857dc 100644
--- a/src/battlemap/src/Send/LoadBattlemap.elm
+++ b/src/battlemap/src/Send/LoadBattlemap.elm
@@ -34,6 +34,10 @@ try_encoding model =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-try : Model.Type -> (Maybe (Cmd Event.Type))
+try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type))
 try model =
-   (Send.try_sending model Constants.IO.battlemap_loading_handler try_encoding)
+   (Send.Send.try_sending
+      model
+      Constants.IO.battlemap_loading_handler
+      try_encoding
+   )
diff --git a/src/battlemap/src/Shim/Model.elm b/src/battlemap/src/Shim/Model.elm
index 9503c25..a03be3c 100644
--- a/src/battlemap/src/Shim/Model.elm
+++ b/src/battlemap/src/Shim/Model.elm
@@ -5,6 +5,7 @@ import Dict
 
 -- Struct.Battlemap -------------------------------------------------------------------
 import Struct.Battlemap
+import Struct.CharacterTurn
 import Struct.Model
 import Struct.UI
 
@@ -19,12 +20,11 @@ import Struct.UI
 generate =
    {
       state = Struct.Model.Default,
-      error = Nothing,
       battlemap = (Struct.Battlemap.empty),
+      characters = (Dict.empty),
+      error = Nothing,
       controlled_team = 0,
-      controlled_character = Nothing,
       player_id = "0",
-      targets = [],
-      characters = (Dict.empty),
-      ui = (Struct.UI.default)
+      ui = (Struct.UI.default),
+      char_turn = (Struct.CharacterTurn.new)
    }
diff --git a/src/battlemap/src/Struct/UI.elm b/src/battlemap/src/Struct/UI.elm
index 3ef895d..abf2e54 100644
--- a/src/battlemap/src/Struct/UI.elm
+++ b/src/battlemap/src/Struct/UI.elm
@@ -32,7 +32,7 @@ import Struct.Character
 --------------------------------------------------------------------------------
 type Tab =
    StatusTab
-   | Struct.CharactersTab
+   | CharactersTab
    | SettingsTab
 
 type Action =
@@ -89,12 +89,12 @@ to_string : Tab -> String
 to_string tab =
    case tab of
       StatusTab -> "Status"
-      Struct.CharactersTab -> "Characters"
+      CharactersTab -> "Characters"
       SettingsTab -> "Settings"
 
 get_all_tabs : (List Tab)
 get_all_tabs =
-   [StatusTab, Struct.CharactersTab, SettingsTab]
+   [StatusTab, CharactersTab, SettingsTab]
 
 -- ManualControls --------------------------------------------------------------
 has_manual_controls_enabled : Type -> Bool
diff --git a/src/battlemap/src/Update/EndTurn.elm b/src/battlemap/src/Update/EndTurn.elm
index 75c2c0d..9a8a92f 100644
--- a/src/battlemap/src/Update/EndTurn.elm
+++ b/src/battlemap/src/Update/EndTurn.elm
@@ -17,7 +17,9 @@ import Struct.Model
 --------------------------------------------------------------------------------
 make_it_so : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 make_it_so model =
-   case (Struct.Battlemap.try_getting_navigator_location model.battlemap) of
+   case -- (Struct.Battlemap.try_getting_navigator_location model.battlemap) of
+      (Just {x = 0, y = 0})
+   of
       (Just location) ->
          case (Send.CharacterTurn.try model) of
             (Just cmd) ->
diff --git a/src/battlemap/src/Update/HandleServerReply.elm b/src/battlemap/src/Update/HandleServerReply.elm
index fab1bbc..5a64918 100644
--- a/src/battlemap/src/Update/HandleServerReply.elm
+++ b/src/battlemap/src/Update/HandleServerReply.elm
@@ -1,6 +1,7 @@
 module Update.HandleServerReply exposing (apply_to)
 
 -- Elm -------------------------------------------------------------------------
+import Http
 
 -- Battlemap -------------------------------------------------------------------
 import Struct.Error
@@ -19,10 +20,10 @@ apply_command cmd model =
       cmd
    of
       ["set_map", data] ->
-         (Struct.Model.HandleServerReply.SetMap.apply_to model data)
+         (Update.HandleServerReply.SetMap.apply_to model data)
 
       ["add_char", data] ->
-         (Struct.Model.HandleServerReply.AddChar.apply_to model data)
+         (Update.HandleServerReply.AddChar.apply_to model data)
 
       _ ->
          (Struct.Model.invalidate
@@ -41,7 +42,7 @@ apply_command cmd model =
 --------------------------------------------------------------------------------
 apply_to : (
       Struct.Model.Type ->
-      (Result Http.Error (List (List String)) ->
+      (Result Http.Error (List (List String))) ->
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
 apply_to model query_result =
@@ -56,4 +57,4 @@ apply_to model query_result =
          )
 
       (Result.Ok commands) ->
-         ((List.foldl (apply_command) model serialized_commands), Cmd.none)
+         ((List.foldl (apply_command) model commands), Cmd.none)
diff --git a/src/battlemap/src/Update/RequestDirection.elm b/src/battlemap/src/Update/RequestDirection.elm
index 3d6dfbe..48174d6 100644
--- a/src/battlemap/src/Update/RequestDirection.elm
+++ b/src/battlemap/src/Update/RequestDirection.elm
@@ -5,11 +5,13 @@ import Dict
 
 -- Battlemap -------------------------------------------------------------------
 import Struct.Battlemap
-import Struct.Direction
 import Struct.Character
-import Struct.UI
-import Struct.Model
+import Struct.CharacterTurn
+import Struct.Direction
 import Struct.Error
+import Struct.Event
+import Struct.Model
+import Struct.UI
 
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
@@ -23,11 +25,11 @@ make_it_so : (
 make_it_so model char_ref dir =
    let
       new_bmap =
-         (Struct.Battlemap.try_adding_step_to_navigator
-            model.battlemap
-            (Dict.values model.characters)
-            dir
-         )
+--         (Struct.Battlemap.try_adding_step_to_navigator
+           (Just model.battlemap)
+--            (Dict.values model.characters)
+--            dir
+--         )
    in
       case new_bmap of
          (Just bmap) ->
@@ -55,10 +57,12 @@ make_it_so model char_ref dir =
 apply_to : (
       Struct.Model.Type ->
       Struct.Direction.Type ->
-      Struct.Model.Type
+      (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
 apply_to model dir =
-   case model.controlled_character of
+   case
+      (Struct.CharacterTurn.try_getting_controlled_character model.char_turn)
+   of
       (Just char_ref) ->
          (
             (make_it_so model char_ref dir),
diff --git a/src/battlemap/src/Update/SelectCharacter.elm b/src/battlemap/src/Update/SelectCharacter.elm
index 1535c8c..4d90840 100644
--- a/src/battlemap/src/Update/SelectCharacter.elm
+++ b/src/battlemap/src/Update/SelectCharacter.elm
@@ -8,6 +8,7 @@ import Struct.Battlemap
 import Struct.Character
 import Struct.Direction
 import Struct.Error
+import Struct.Event
 import Struct.UI
 import Struct.Model
 
@@ -18,7 +19,7 @@ import Update.RequestDirection
 --------------------------------------------------------------------------------
 autopilot : Struct.Direction.Type -> Struct.Model.Type -> Struct.Model.Type
 autopilot dir model =
-   (Model.RequestDirection.apply_to model dir)
+   (Update.RequestDirection.apply_to model dir)
 
 attack_character : (
       Struct.Model.Type ->
@@ -47,13 +48,13 @@ select_character model target_char_id target_char =
          controlled_character = (Just target_char_id),
          ui = (Struct.UI.set_previous_action model.ui Nothing),
          battlemap =
-            (Struct.Battlemap.set_navigator
-               (Struct.Character.get_location target_char)
-               (Struct.Character.get_movement_points target_char)
-               (Struct.Character.get_attack_range target_char)
-               (Dict.values model.characters)
-               model.battlemap
-            )
+--            (Struct.Battlemap.set_navigator
+--               (Struct.Character.get_location target_char)
+--               (Struct.Character.get_movement_points target_char)
+--               (Struct.Character.get_attack_range target_char)
+--               (Dict.values model.characters)
+                 model.battlemap
+--            )
       }
    else
       {model |
diff --git a/src/battlemap/src/View/Battlemap.elm b/src/battlemap/src/View/Battlemap.elm
index 56b2186..5487115 100644
--- a/src/battlemap/src/View/Battlemap.elm
+++ b/src/battlemap/src/View/Battlemap.elm
@@ -5,21 +5,16 @@ import Array
 
 import Html
 import Html.Attributes
-import Html.Events
 import Html.Lazy
 
 import List
 
 -- Battlemap -------------------------------------------------------------------
-import Constants.UI
-
 import Struct.Battlemap
-import Struct.Character
 import Struct.Event
 import Struct.Model
 import Struct.Tile
-
-import Util.Html
+import Struct.UI
 
 import View.Battlemap.Character
 import View.Battlemap.Navigator
@@ -62,7 +57,7 @@ get_tiles_lines_html max_index tile (curr_index, curr_line, result) =
          [],
          (
             (get_tiles_line_html
-               ((View.Tile.get_html tile) :: curr_line)
+               ((View.Battlemap.Tile.get_html tile) :: curr_line)
             )
             ::
             result
@@ -71,14 +66,14 @@ get_tiles_lines_html max_index tile (curr_index, curr_line, result) =
    else
       (
          (curr_index - 1),
-         ((View.Tile.get_html tile) :: curr_line),
+         ((View.Battlemap.Tile.get_html tile) :: curr_line),
          result
       )
 
 get_tiles_html : Struct.Battlemap.Type -> (Html.Html Struct.Event.Type)
 get_tiles_html battlemap =
    let
-      bmap_width (Struct.Battlemap.get_width battlemap)
+      bmap_width = (Struct.Battlemap.get_width battlemap)
       max_index = (bmap_width - 1)
       (_, last_line, other_lines) =
          (Array.foldr
@@ -112,7 +107,7 @@ get_html model =
                   (
                      "scale("
                      ++
-                     (toString (Struct.UI.get_scale model))
+                     (toString (Struct.UI.get_zoom_level model))
                      ++ ")"
                   )
                )
@@ -120,10 +115,7 @@ get_html model =
          )
       ]
       (
-         (Html.Lazy.lazy
-            (get_tiles_html (Battlemap.get_width model.battlemap))
-            model.battlemap
-         )
+         (Html.Lazy.lazy (get_tiles_html) model.battlemap)
          ::
          (List.map
             (View.Battlemap.Character.get_html)
diff --git a/src/battlemap/src/View/Footer.elm b/src/battlemap/src/View/Footer.elm
index 343fbd9..f3be7af 100644
--- a/src/battlemap/src/View/Footer.elm
+++ b/src/battlemap/src/View/Footer.elm
@@ -9,6 +9,7 @@ import Html.Attributes
 -- Struct.Battlemap -------------------------------------------------------------------
 import Struct.Battlemap
 import Struct.Character
+import Struct.CharacterTurn
 import Struct.Event
 import Struct.Model
 import Struct.UI
@@ -33,9 +34,10 @@ get_curr_char_info_htmls model char_ref =
                   ++ char.name
                   ++ ": "
                   ++ (toString
-                        (Struct.Battlemap.get_navigator_remaining_points
-                           model.battlemap
-                        )
+--                        (Struct.Battlemap.get_navigator_remaining_points
+--                           model.battlemap
+--                        )
+                        0
                      )
                   ++ "/"
                   ++ (toString (Struct.Character.get_movement_points char))
@@ -52,7 +54,9 @@ get_curr_char_info_htmls model char_ref =
 --------------------------------------------------------------------------------
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
-   case model.controlled_character of
+   case
+      (Struct.CharacterTurn.try_getting_controlled_character model.char_turn)
+   of
       (Just char_id) ->
          (Html.div
             [(Html.Attributes.class "battlemap-footer")]
diff --git a/src/battlemap/src/View/SideBar.elm b/src/battlemap/src/View/SideBar.elm
index 45a55ea..4dc2365 100644
--- a/src/battlemap/src/View/SideBar.elm
+++ b/src/battlemap/src/View/SideBar.elm
@@ -28,7 +28,7 @@ get_html model =
       [
          (View.SideBar.TabMenu.get_html model),
          (
-            if (model.targets == [])
+            if ((Struct.CharacterTurn.get_targets model.char_turn) == [])
             then
                (Util.Html.nothing)
             else
diff --git a/src/battlemap/src/View/SideBar/Targets.elm b/src/battlemap/src/View/SideBar/Targets.elm
index e3e4006..46aedb9 100644
--- a/src/battlemap/src/View/SideBar/Targets.elm
+++ b/src/battlemap/src/View/SideBar/Targets.elm
@@ -9,6 +9,7 @@ import Html.Attributes
 -- Battlemap -------------------------------------------------------------------
 import Struct.Battlemap
 import Struct.Character
+import Struct.CharacterTurn
 import Struct.Error
 import Struct.Event
 import Struct.Location
@@ -59,6 +60,6 @@ get_html model =
       ]
       (List.map
          (get_target_info_html model)
-         model.targets
+         (Struct.CharacterTurn.get_targets model.char_turn)
       )
    )