...

14 files changed, 46 insertions, 71 deletions

diff --git a/src/battle/src/Comm/CharacterTurn.elm b/src/battle/src/Comm/CharacterTurn.elm
index a6d32d7..61b9f99 100644
--- a/src/battle/src/Comm/CharacterTurn.elm
+++ b/src/battle/src/Comm/CharacterTurn.elm
@@ -69,5 +69,5 @@ try model =
    (Comm.Send.maybe_send
       model
       Constants.IO.character_turn_handler
-      maybe_encod
+      maybe_encode
    )
diff --git a/src/battle/src/Comm/LoadBattle.elm b/src/battle/src/Comm/LoadBattle.elm
index 4c20b36..b7c6759 100644
--- a/src/battle/src/Comm/LoadBattle.elm
+++ b/src/battle/src/Comm/LoadBattle.elm
@@ -57,5 +57,5 @@ try model =
    (Comm.Send.maybe_send
       model
       Constants.IO.map_loading_handler
-      maybe_encod
+      maybe_encode
    )
diff --git a/src/battle/src/Comm/Send.elm b/src/battle/src/Comm/Send.elm
index 0971bc8..f67a151 100644
--- a/src/battle/src/Comm/Send.elm
+++ b/src/battle/src/Comm/Send.elm
@@ -79,8 +79,8 @@ maybe_send : (
       (Struct.Model.Type -> (Maybe Json.Encode.Value)) ->
       (Maybe (Cmd Struct.Event.Type))
    )
-maybe_send model recipient maybe_encod_fun =
-   case (maybe_encod_fun model) of
+maybe_send model recipient maybe_encode_fun =
+   case (maybe_encode_fun model) of
       (Just serial) ->
          (Just
             (Http.post
diff --git a/src/battle/src/ElmModule/Update.elm b/src/battle/src/ElmModule/Update.elm
index a56becd..a6e1de5 100644
--- a/src/battle/src/ElmModule/Update.elm
+++ b/src/battle/src/ElmModule/Update.elm
@@ -18,10 +18,8 @@ import Update.SelectCharacter
 import Update.SelectCharacterOrTile
 import Update.SelectTab
 import Update.SelectTile
-import Update.SendLoadBattleRequest
 import Update.SetRequestedHelp
 import Update.SwitchWeapon
-import Update.TestAnimation
 import Update.UndoAction
 
 --------------------------------------------------------------------------------
diff --git a/src/battle/src/Update/Puppeteer/Hit.elm b/src/battle/src/Update/Puppeteer/Hit.elm
index 3c0e409..7465e7c 100644
--- a/src/battle/src/Update/Puppeteer/Hit.elm
+++ b/src/battle/src/Update/Puppeteer/Hit.elm
@@ -1,8 +1,12 @@
 module Update.Puppeteer.Hit exposing (forward, backward)
 
+-- Elm -------------------------------------------------------------------------
+import Array
+
 -- Local Module ----------------------------------------------------------------
 import Action.Scroll
 
+import Struct.Attack
 import Struct.Battle
 import Struct.Character
 import Struct.Event
@@ -26,7 +30,7 @@ apply_damage_to_character damage char =
 apply_to_characters : (
       Int ->
       Int ->
-      Type ->
+      Struct.Attack.Type ->
       (Array.Array Struct.Character.Type) ->
       (Array.Array Struct.Character.Type)
    )
@@ -56,7 +60,7 @@ apply_to_characters attacker_ix defender_ix attack characters =
 apply_inverse_to_characters : (
       Int ->
       Int ->
-      Type ->
+      Struct.Attack.Type ->
       (Array.Array Struct.Character.Type) ->
       (Array.Array Struct.Character.Type)
    )
diff --git a/src/battle/src/Update/Puppeteer/Move.elm b/src/battle/src/Update/Puppeteer/Move.elm
index 8626c56..6e5b3fd 100644
--- a/src/battle/src/Update/Puppeteer/Move.elm
+++ b/src/battle/src/Update/Puppeteer/Move.elm
@@ -18,7 +18,7 @@ import Struct.UI
 --------------------------------------------------------------------------------
 apply_direction_to_character : (
       Int ->
-      Battle.Struct.Direction ->
+      BattleMap.Struct.Direction.Type ->
       Struct.Model.Type ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
    )
@@ -47,7 +47,7 @@ apply_direction_to_character actor_ix direction model =
 --------------------------------------------------------------------------------
 forward : (
       Int ->
-      BattleMap.Struct.Direction ->
+      BattleMap.Struct.Direction.Type ->
       Struct.Model.Type ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
    )
@@ -60,7 +60,7 @@ forward actor_ix direction model =
 
 backward : (
       Int ->
-      BattleMap.Struct.Direction ->
+      BattleMap.Struct.Direction.Type ->
       Struct.Model.Type ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
    )
diff --git a/src/battle/src/Update/RequestDirection.elm b/src/battle/src/Update/RequestDirection.elm
index 828f78f..de46ecc 100644
--- a/src/battle/src/Update/RequestDirection.elm
+++ b/src/battle/src/Update/RequestDirection.elm
@@ -2,6 +2,7 @@ module Update.RequestDirection exposing (apply_to)
 
 -- Battle Map ------------------------------------------------------------------
 import BattleMap.Struct.Direction
+import BattleMap.Struct.Map
 
 -- Battle Characters -----------------------------------------------------------
 import BattleCharacters.Struct.Character
@@ -35,11 +36,12 @@ make_it_so model char navigator dir =
                   (Struct.CharacterTurn.set_active_character_no_reset
                      (Struct.Character.set_base_character
                         (BattleCharacters.Struct.Character.set_extra_omnimods
-                           (Struct.Model.tile_omnimods_fun
-                              model
+                           (BattleMap.Struct.Map.get_omnimods_at
                               (Struct.Navigator.get_current_location
                                  new_navigator
                               )
+                              model.map_data_set
+                              (Struct.Battle.get_map model.battle)
                            )
                            (Struct.Character.get_base_character char)
                         )
diff --git a/src/battle/src/Update/SelectTile.elm b/src/battle/src/Update/SelectTile.elm
index 529e956..c5d9f36 100644
--- a/src/battle/src/Update/SelectTile.elm
+++ b/src/battle/src/Update/SelectTile.elm
@@ -95,11 +95,12 @@ go_to_another_tile model char navigator loc_ref =
                            (Struct.CharacterTurn.set_active_character
                               (Struct.Character.set_base_character
                                  (BattleCharacters.Struct.Character.set_extra_omnimods
-                                    (Struct.Model.tile_omnimods_fun
-                                       model
+                                    (BattleMap.Struct.Map.get_omnimods_at
                                        (Struct.Navigator.get_current_location
                                           new_navigator
                                        )
+                                       model.map_data_set
+                                       (Struct.Battle.get_map model.battle)
                                     )
                                     (Struct.Character.get_base_character char)
                                  )
@@ -133,7 +134,12 @@ go_to_another_tile model char navigator loc_ref =
                )
 
       Nothing -> -- Clicked outside of the range indicator
-         ((Struct.Model.reset model), Cmd.none)
+         (
+            {model |
+               char_turn = (Struct.CharacterTurn.new)
+            },
+            Cmd.none
+         )
 
 go_to_tile : (
       Struct.Model.Type ->
diff --git a/src/battle/src/Update/SendLoadBattleRequest.elm b/src/battle/src/Update/SendLoadBattleRequest.elm
deleted file mode 100644
index e463954..0000000
--- a/src/battle/src/Update/SendLoadBattleRequest.elm
+++ /dev/null
@@ -1,25 +0,0 @@
-module Update.SendLoadBattleRequest exposing (apply_to)
-
--- Local Module ----------------------------------------------------------------
-import Comm.LoadBattle
-
-import Struct.Event
-import Struct.Model
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
-apply_to model =
-   (
-      (Struct.Model.full_debug_reset model),
-      (case (Comm.LoadBattle.try model) of
-         (Just cmd) -> cmd
-         Nothing -> Cmd.none
-      )
-   )
-
diff --git a/src/battle/src/Update/SetRequestedHelp.elm b/src/battle/src/Update/SetRequestedHelp.elm
index 45e5e93..6a56752 100644
--- a/src/battle/src/Update/SetRequestedHelp.elm
+++ b/src/battle/src/Update/SetRequestedHelp.elm
@@ -3,6 +3,7 @@ module Update.SetRequestedHelp exposing (apply_to)
 -- Local Module ----------------------------------------------------------------
 import Struct.Event
 import Struct.HelpRequest
+import Struct.MessageBoard
 import Struct.Model
 
 --------------------------------------------------------------------------------
@@ -18,4 +19,13 @@ apply_to : (
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
 apply_to model help_request =
-   ({model | help_request = help_request}, Cmd.none)
+   (
+      {model |
+         message_board =
+            (Struct.MessageBoard.display
+               (Struct.MessageBoard.Help help_request)
+               model.message_board
+            )
+      },
+      Cmd.none
+   )
diff --git a/src/battle/src/Update/TestAnimation.elm b/src/battle/src/Update/TestAnimation.elm
deleted file mode 100644
index 36e2c04..0000000
--- a/src/battle/src/Update/TestAnimation.elm
+++ /dev/null
@@ -1,24 +0,0 @@
-module Update.TestAnimation exposing (apply_to)
-
--- Elm -------------------------------------------------------------------------
-import Delay
-
-import Time
-
--- Local Module ----------------------------------------------------------------
-import Struct.Model
-import Struct.Event
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
-apply_to model =
-   (
-      (Struct.Model.initialize_animator model),
-      (Delay.after 1 Delay.Millisecond Struct.Event.AnimationEnded)
-   )
diff --git a/src/battle/src/Update/UndoAction.elm b/src/battle/src/Update/UndoAction.elm
index 1a53adb..a0c8b0f 100644
--- a/src/battle/src/Update/UndoAction.elm
+++ b/src/battle/src/Update/UndoAction.elm
@@ -99,7 +99,7 @@ handle_undo_switched_weapons model =
 
 handle_undo_chose_target : Struct.Model.Type -> Struct.CharacterTurn.Type
 handle_undo_chose_target model =
-   (Struct.CharacterTurn.set_target Nothing model.char_turn
+   (Struct.CharacterTurn.set_target Nothing model.char_turn)
 -- Was previously something like below, but that looks really wrong:
 --   (Struct.CharacterTurn.lock_path
 --      (Struct.CharacterTurn.unlock_path
diff --git a/src/battle/src/View/MessageBoard/Help.elm b/src/battle/src/View/MessageBoard/Help.elm
index 89af283..038183f 100644
--- a/src/battle/src/View/MessageBoard/Help.elm
+++ b/src/battle/src/View/MessageBoard/Help.elm
@@ -23,15 +23,19 @@ import View.MessageBoard.Help.Rank
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
-get_html model =
+get_html : (
+      Struct.Model.Type ->
+      Struct.HelpRequest.Type ->
+      (Html.Html Struct.Event.Type)
+   )
+get_html model help_request =
    (Html.div
       [
          (Html.Attributes.class "message-board"),
          (Html.Attributes.class "message-board-help")
       ]
       (
-         case model.help_request of
+         case help_request of
             Struct.HelpRequest.None ->
                (View.MessageBoard.Help.Guide.get_html_contents model)
 
diff --git a/src/battle/src/View/SubMenu/Timeline.elm b/src/battle/src/View/SubMenu/Timeline.elm
index 7c081f4..18d6eca 100644
--- a/src/battle/src/View/SubMenu/Timeline.elm
+++ b/src/battle/src/View/SubMenu/Timeline.elm
@@ -75,7 +75,7 @@ true_get_html battle =
                (Struct.Battle.get_characters battle)
                (Struct.Battle.get_own_player_index battle)
             )
-            (Struct.Battle.get_turn_results battle)
+            (Struct.Battle.get_timeline battle)
          )
       )
    )