Got the client to validate the reply.

4 files changed, 28 insertions, 12 deletions

diff --git a/src/battlemap/src/Event.elm b/src/battlemap/src/Event.elm
index efa80c7..d0eced0 100644
--- a/src/battlemap/src/Event.elm
+++ b/src/battlemap/src/Event.elm
@@ -1,5 +1,7 @@
 module Event exposing (Type(..))
 
+import Dict
+
 import Http
 
 import Battlemap.Direction
@@ -16,5 +18,5 @@ type Type =
    | TurnEnded
    | ScaleChangeRequested Float
    | TabSelected UI.Tab
-   | ServerReplied (Result Http.Error String)
+   | ServerReplied (Result Http.Error (Dict.Dict String (List String)))
    | DebugTeamSwitchRequest
diff --git a/src/battlemap/src/Model/HandleServerReply.elm b/src/battlemap/src/Model/HandleServerReply.elm
index 4f84821..7245cc4 100644
--- a/src/battlemap/src/Model/HandleServerReply.elm
+++ b/src/battlemap/src/Model/HandleServerReply.elm
@@ -1,5 +1,8 @@
 module Model.HandleServerReply exposing (apply_to)
 
+-- Elm -------------------------------------------------------------------------
+import Dict
+
 -- Battlemap -------------------------------------------------------------------
 import Model
 import Error
@@ -12,12 +15,22 @@ import Event
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-apply_to : Model.Type -> String -> (Model.Type, (Cmd Event.Type))
+apply_to : (
+      Model.Type ->
+      (Dict.Dict String (List String)) ->
+      (Model.Type, (Cmd Event.Type))
+   )
 apply_to model serialized_commands =
    (
       (Model.invalidate
          model
-         (Error.new Error.Unimplemented "Received reply from server.")
+         (Error.new
+            Error.Unimplemented
+            (
+               "Received reply from server:"
+               ++ (toString serialized_commands)
+            )
+         )
       ),
       Cmd.none
    )
diff --git a/src/battlemap/src/Send.elm b/src/battlemap/src/Send.elm
index 9aafda0..8f8d44f 100644
--- a/src/battlemap/src/Send.elm
+++ b/src/battlemap/src/Send.elm
@@ -1,7 +1,7 @@
 module Send exposing (Reply)
 
-type alias Reply = String
---   {
---      types : (List String),
---      data : (List String)
---   }
+type alias Reply = --String
+   {
+      types : (List String),
+      data : (List String)
+   }
diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm
index 750c9e8..9e2aa8f 100644
--- a/src/battlemap/src/Send/CharacterTurn.elm
+++ b/src/battlemap/src/Send/CharacterTurn.elm
@@ -3,6 +3,8 @@ module Send.CharacterTurn exposing (try_sending)
 -- Elm -------------------------------------------------------------------------
 import Http
 
+import Dict
+
 import Json.Encode
 import Json.Decode
 
@@ -69,11 +71,10 @@ try_encoding model =
       _ ->
          Nothing
 
-decode : (Json.Decode.Decoder String) --Send.Reply)
+decode : (Json.Decode.Decoder (Dict.Dict String (List String))) --Send.Reply)
 decode =
-   (Json.Decode.string ---Send.Reply
---      |> Json.Decode.required "types" (Json.Decode.list (Json.Decode.string))
---      |> Json.Decode.required "data" (Json.Decode.list (Json.Decode.string))
+   (Json.Decode.dict
+      (Json.Decode.list Json.Decode.string)
    )
 
 -- Reply: