summaryrefslogtreecommitdiff |
diff options
author | nsensfel <SpamShield0@noot-noot.org> | 2017-11-20 17:24:12 +0100 |
---|---|---|
committer | nsensfel <SpamShield0@noot-noot.org> | 2017-11-20 17:24:12 +0100 |
commit | 528afdae7b5108d5552564814825591fb56ddfb2 (patch) | |
tree | 99b09de6bcbd70f88446f123350ee243b3afa419 /src/battlemap | |
parent | e406ed71954166f0d71294a9ca8a9527df98265b (diff) |
Add more info on the client when making requests.
Diffstat (limited to 'src/battlemap')
-rw-r--r-- | src/battlemap/src/Send/CharacterTurn.elm | 55 | ||||
-rw-r--r-- | src/battlemap/src/Send/LoadBattlemap.elm | 27 |
2 files changed, 37 insertions, 45 deletions
diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm index ce1438e..38ae6af 100644 --- a/src/battlemap/src/Send/CharacterTurn.elm +++ b/src/battlemap/src/Send/CharacterTurn.elm @@ -29,38 +29,37 @@ try_encoding model = case (Model.get_state model) of (Model.ControllingCharacter char_ref) -> (Just --- (Json.Encode.encode --- 0 - (Json.Encode.object - [ - -- ("user_token", Json.Encode.string model.user_token), - ("user_token", Json.Encode.string "user0"), - ("char_id", Json.Encode.string char_ref), - ( - "path", - (Json.Encode.list - (List.map - ( - (Json.Encode.string) - << - (Battlemap.Direction.to_string) - ) - (Battlemap.get_navigator_path model.battlemap) + (Json.Encode.object + [ + ("session_token", Json.Encode.string "0"), + ("player_id", Json.Encode.string "0"), + ("battlemap_id", Json.Encode.string "0"), + ("instance_id", Json.Encode.string "0"), + ("char_id", Json.Encode.string char_ref), + ( + "path", + (Json.Encode.list + (List.map + ( + (Json.Encode.string) + << + (Battlemap.Direction.to_string) ) + (Battlemap.get_navigator_path model.battlemap) ) - ), - ( - "target_id", - (Json.Encode.string - (case (UI.get_previous_action model.ui) of - (Just (UI.AttackedCharacter id)) -> id - _ -> "" - ) + ) + ), + ( + "target_id", + (Json.Encode.string + (case (UI.get_previous_action model.ui) of + (Just (UI.AttackedCharacter id)) -> id + _ -> "" ) ) - ] - ) --- ) + ) + ] + ) ) _ -> diff --git a/src/battlemap/src/Send/LoadBattlemap.elm b/src/battlemap/src/Send/LoadBattlemap.elm index 6024acd..1aba7d7 100644 --- a/src/battlemap/src/Send/LoadBattlemap.elm +++ b/src/battlemap/src/Send/LoadBattlemap.elm @@ -28,23 +28,16 @@ import Event -------------------------------------------------------------------------------- try_encoding : Model.Type -> (Maybe Json.Encode.Value) try_encoding model = - case (Model.get_state model) of - (Model.ControllingCharacter char_ref) -> - (Just --- (Json.Encode.encode --- 0 - (Json.Encode.object - [ - ("player_id", (Json.Encode.string "0")), - ("battlemap_id", (Json.Encode.string "0")), - ("instance_id", (Json.Encode.string "0")) - ] - ) --- ) - ) - - _ -> - Nothing + (Just + (Json.Encode.object + [ + ("session_token", (Json.Encode.string "0")), + ("player_id", (Json.Encode.string "0")), + ("battlemap_id", (Json.Encode.string "0")), + ("instance_id", (Json.Encode.string "0")) + ] + ) + ) -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- |