From 76dabb50cd247b8029f5f66a99533a8cbf5cfcd7 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Fri, 9 Mar 2018 21:53:22 +0100 Subject: Send -> Comm --- src/battlemap/src/Comm/AddChar.elm | 40 +++++++ src/battlemap/src/Comm/CharacterTurn.elm | 130 +++++++++++++++++++++ src/battlemap/src/Comm/LoadBattlemap.elm | 42 +++++++ src/battlemap/src/Comm/Send.elm | 72 ++++++++++++ src/battlemap/src/Comm/SetMap.elm | 64 ++++++++++ src/battlemap/src/Comm/TurnResults.elm | 27 +++++ src/battlemap/src/ElmModule/Init.elm | 4 +- src/battlemap/src/Send/AddChar.elm | 40 ------- src/battlemap/src/Send/CharacterTurn.elm | 130 --------------------- src/battlemap/src/Send/LoadBattlemap.elm | 42 ------- src/battlemap/src/Send/Send.elm | 72 ------------ src/battlemap/src/Send/SetMap.elm | 64 ---------- src/battlemap/src/Send/TurnResults.elm | 27 ----- src/battlemap/src/Struct/TurnResult.elm | 1 - src/battlemap/src/Update/EndTurn.elm | 4 +- .../src/Update/SendLoadBattlemapRequest.elm | 4 +- 16 files changed, 381 insertions(+), 382 deletions(-) create mode 100644 src/battlemap/src/Comm/AddChar.elm create mode 100644 src/battlemap/src/Comm/CharacterTurn.elm create mode 100644 src/battlemap/src/Comm/LoadBattlemap.elm create mode 100644 src/battlemap/src/Comm/Send.elm create mode 100644 src/battlemap/src/Comm/SetMap.elm create mode 100644 src/battlemap/src/Comm/TurnResults.elm delete mode 100644 src/battlemap/src/Send/AddChar.elm delete mode 100644 src/battlemap/src/Send/CharacterTurn.elm delete mode 100644 src/battlemap/src/Send/LoadBattlemap.elm delete mode 100644 src/battlemap/src/Send/Send.elm delete mode 100644 src/battlemap/src/Send/SetMap.elm delete mode 100644 src/battlemap/src/Send/TurnResults.elm (limited to 'src/battlemap') diff --git a/src/battlemap/src/Comm/AddChar.elm b/src/battlemap/src/Comm/AddChar.elm new file mode 100644 index 0000000..1270b0d --- /dev/null +++ b/src/battlemap/src/Comm/AddChar.elm @@ -0,0 +1,40 @@ +module Comm.AddChar exposing (decode) + +-- Elm ------------------------------------------------------------------------- +import Dict + +import Json.Decode + +-- Battlemap ------------------------------------------------------------------- +import Data.Weapons + +import Struct.Character +import Struct.Model +import Struct.ServerReply +import Struct.Weapon + +-------------------------------------------------------------------------------- +-- TYPES ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +weapon_getter : Struct.Model.Type -> Struct.Weapon.Ref -> Struct.Weapon.Type +weapon_getter model ref = + case (Dict.get ref model.weapons) of + (Just w) -> w + Nothing -> Data.Weapons.none + +internal_decoder : Struct.Character.Type -> Struct.ServerReply.Type +internal_decoder char = (Struct.ServerReply.AddCharacter char) + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +decode : (Struct.Model.Type -> (Json.Decode.Decoder Struct.ServerReply.Type)) +decode model = + (Json.Decode.map + (internal_decoder) + (Struct.Character.decoder (weapon_getter model)) + ) diff --git a/src/battlemap/src/Comm/CharacterTurn.elm b/src/battlemap/src/Comm/CharacterTurn.elm new file mode 100644 index 0000000..a7e137d --- /dev/null +++ b/src/battlemap/src/Comm/CharacterTurn.elm @@ -0,0 +1,130 @@ +module Comm.CharacterTurn exposing (try) + +-- Elm ------------------------------------------------------------------------- +import Json.Encode + +-- Battlemap ------------------------------------------------------------------- +import Constants.IO + +import Comm.Send + +import Struct.Character +import Struct.CharacterTurn +import Struct.Direction +import Struct.Event +import Struct.Model + +-------------------------------------------------------------------------------- +-- TYPES ------------------------------------------------------------------------ +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +encode_move : Struct.Model.Type -> (Maybe Json.Encode.Value) +encode_move model = + case (Struct.CharacterTurn.get_path model.char_turn) of + [] -> Nothing + path -> + (Just + (Json.Encode.object + [ + ("t", (Json.Encode.string "mov")), + ( + "p", + (Json.Encode.list + (List.map + ( + (Json.Encode.string) + << + (Struct.Direction.to_string) + ) + (List.reverse path) + ) + ) + ) + ] + ) + ) + +encode_weapon_switch : Struct.Model.Type -> (Maybe Json.Encode.Value) +encode_weapon_switch model = + if (Struct.CharacterTurn.has_switched_weapons model.char_turn) + then + (Just + (Json.Encode.object + [ + ("t", (Json.Encode.string "swp")) + ] + ) + ) + else + Nothing + +encode_attack : Struct.Model.Type -> (Maybe Json.Encode.Value) +encode_attack model = + case (Struct.CharacterTurn.get_target model.char_turn) of + Nothing -> Nothing + (Just ix) -> + (Just + (Json.Encode.object + [ + ("t", (Json.Encode.string "atk")), + ("tix", (Json.Encode.string ix)) + ] + ) + ) + +encode_actions : Struct.Model.Type -> (List Json.Encode.Value) +encode_actions model = + case + ( + (encode_move model), + (encode_weapon_switch model), + (encode_attack model) + ) + of + ((Just move), Nothing, Nothing) -> [move] + ((Just move), Nothing, (Just attack)) -> [move, attack] + (Nothing, (Just switch_weapon), Nothing) -> [switch_weapon] + (Nothing, (Just switch_weapon), (Just attack)) -> [switch_weapon, attack] + (Nothing, Nothing, (Just attack)) -> [attack] + _ -> [] + +try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value) +try_encoding model = + case + (Struct.CharacterTurn.try_getting_active_character model.char_turn) + of + (Just char) -> + (Just + (Json.Encode.object + [ + ("stk", (Json.Encode.string "0")), + ("pid", (Json.Encode.string model.player_id)), + ("bid", (Json.Encode.string "0")), + ( + "cix", + (Json.Encode.string (Struct.Character.get_ref char)) + ), + ( + "act", + (Json.Encode.list (encode_actions model)) + ) + ] + ) + ) + + _ -> + Nothing + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type)) +try model = + (Comm.Send.try_sending + model + Constants.IO.character_turn_handler + try_encoding + ) diff --git a/src/battlemap/src/Comm/LoadBattlemap.elm b/src/battlemap/src/Comm/LoadBattlemap.elm new file mode 100644 index 0000000..8642ca0 --- /dev/null +++ b/src/battlemap/src/Comm/LoadBattlemap.elm @@ -0,0 +1,42 @@ +module Comm.LoadBattlemap exposing (try) + +-- Elm ------------------------------------------------------------------------- +import Json.Encode + +-- Battlemap ------------------------------------------------------------------- +import Constants.IO + +import Comm.Send + +import Struct.Event +import Struct.Model + +-------------------------------------------------------------------------------- +-- TYPES ------------------------------------------------------------------------ +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value) +try_encoding model = + (Just + (Json.Encode.object + [ + ("stk", (Json.Encode.string "0")), + ("pid", (Json.Encode.string model.player_id)), + ("bmi", (Json.Encode.string "0")) + ] + ) + ) + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type)) +try model = + (Comm.Send.try_sending + model + Constants.IO.battlemap_loading_handler + try_encoding + ) diff --git a/src/battlemap/src/Comm/Send.elm b/src/battlemap/src/Comm/Send.elm new file mode 100644 index 0000000..fbdd26d --- /dev/null +++ b/src/battlemap/src/Comm/Send.elm @@ -0,0 +1,72 @@ +module Comm.Send exposing (try_sending) + +-- Elm ------------------------------------------------------------------------- +import Http + +import Json.Decode +import Json.Encode + +-- Battlemap ------------------------------------------------------------------- +import Comm.SetMap +import Comm.AddChar +import Comm.TurnResults + +import Struct.Event +import Struct.ServerReply +import Struct.Model + +-------------------------------------------------------------------------------- +-- TYPES ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +internal_decoder : ( + Struct.Model.Type -> + String -> + (Json.Decode.Decoder Struct.ServerReply.Type) + ) +internal_decoder model reply_type = + case reply_type of + "add_char" -> (Comm.AddChar.decode model) + "set_map" -> (Comm.SetMap.decode model) + "turn_results" -> (Comm.TurnResults.decode) + other -> + (Json.Decode.fail + ( + "Unknown server command \"" + ++ other + ++ "\"" + ) + ) + +decode : Struct.Model.Type -> (Json.Decode.Decoder Struct.ServerReply.Type) +decode model = + (Json.Decode.field "msg" Json.Decode.string) + |> (Json.Decode.andThen (internal_decoder model)) + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +try_sending : ( + Struct.Model.Type -> + String -> + (Struct.Model.Type -> (Maybe Json.Encode.Value)) -> + (Maybe (Cmd Struct.Event.Type)) + ) +try_sending model recipient try_encoding_fun = + case (try_encoding_fun model) of + (Just serial) -> + (Just + (Http.send + Struct.Event.ServerReplied + (Http.post + recipient + (Http.jsonBody serial) + (Json.Decode.list (decode model)) + ) + ) + ) + + Nothing -> Nothing diff --git a/src/battlemap/src/Comm/SetMap.elm b/src/battlemap/src/Comm/SetMap.elm new file mode 100644 index 0000000..9a9668a --- /dev/null +++ b/src/battlemap/src/Comm/SetMap.elm @@ -0,0 +1,64 @@ +module Comm.SetMap exposing (decode) + +-- Elm ------------------------------------------------------------------------- +import Json.Decode + +-- Battlemap ------------------------------------------------------------------- +import Data.Tiles + +import Struct.Battlemap +import Struct.Model +import Struct.ServerReply +import Struct.Tile + +-------------------------------------------------------------------------------- +-- TYPES ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +type alias MapData = + { + w : Int, + h : Int, + t : (List Int) + } + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +deserialize_tile : Int -> Int -> Int -> Struct.Tile.Type +deserialize_tile map_width index id = + (Struct.Tile.new + (index % map_width) + (index // map_width) + (Data.Tiles.get_icon id) + (Data.Tiles.get_cost id) + ) + +internal_decoder : MapData -> Struct.ServerReply.Type +internal_decoder map_data = + (Struct.ServerReply.SetMap + (Struct.Battlemap.new + map_data.w + map_data.h + (List.indexedMap + (deserialize_tile map_data.w) + map_data.t + ) + ) + ) + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +decode : (Struct.Model.Type -> (Json.Decode.Decoder Struct.ServerReply.Type)) +decode model = + (Json.Decode.map + internal_decoder + (Json.Decode.map3 MapData + (Json.Decode.field "w" Json.Decode.int) + (Json.Decode.field "h" Json.Decode.int) + (Json.Decode.field + "t" + (Json.Decode.list Json.Decode.int) + ) + ) + ) diff --git a/src/battlemap/src/Comm/TurnResults.elm b/src/battlemap/src/Comm/TurnResults.elm new file mode 100644 index 0000000..359e3c9 --- /dev/null +++ b/src/battlemap/src/Comm/TurnResults.elm @@ -0,0 +1,27 @@ +module Comm.TurnResults exposing (decode) + +-- Elm ------------------------------------------------------------------------- +import Json.Decode + +-- Battlemap ------------------------------------------------------------------- +import Struct.ServerReply +import Struct.TurnResult + +-------------------------------------------------------------------------------- +-- TYPES ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +internal_decoder : (List Struct.TurnResult.Type) -> Struct.ServerReply.Type +internal_decoder trl = (Struct.ServerReply.TurnResults trl) + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +decode : (Json.Decode.Decoder Struct.ServerReply.Type) +decode = + (Json.Decode.map + (internal_decoder) + (Json.Decode.field "cnt" (Json.Decode.list Struct.TurnResult.decoder)) + ) diff --git a/src/battlemap/src/ElmModule/Init.elm b/src/battlemap/src/ElmModule/Init.elm index 136a828..f8fb439 100644 --- a/src/battlemap/src/ElmModule/Init.elm +++ b/src/battlemap/src/ElmModule/Init.elm @@ -1,7 +1,7 @@ module ElmModule.Init exposing (init) -- Battlemap ------------------------------------------------------------------- -import Send.LoadBattlemap +import Comm.LoadBattlemap import Struct.Event import Struct.Model @@ -20,7 +20,7 @@ init = in ( model, - (case (Send.LoadBattlemap.try model) of + (case (Comm.LoadBattlemap.try model) of (Just cmd) -> cmd Nothing -> Cmd.none ) diff --git a/src/battlemap/src/Send/AddChar.elm b/src/battlemap/src/Send/AddChar.elm deleted file mode 100644 index be3fea7..0000000 --- a/src/battlemap/src/Send/AddChar.elm +++ /dev/null @@ -1,40 +0,0 @@ -module Send.AddChar exposing (decode) - --- Elm ------------------------------------------------------------------------- -import Dict - -import Json.Decode - --- Battlemap ------------------------------------------------------------------- -import Data.Weapons - -import Struct.Character -import Struct.Model -import Struct.ServerReply -import Struct.Weapon - --------------------------------------------------------------------------------- --- TYPES ----------------------------------------------------------------------- --------------------------------------------------------------------------------- - --------------------------------------------------------------------------------- --- LOCAL ----------------------------------------------------------------------- --------------------------------------------------------------------------------- -weapon_getter : Struct.Model.Type -> Struct.Weapon.Ref -> Struct.Weapon.Type -weapon_getter model ref = - case (Dict.get ref model.weapons) of - (Just w) -> w - Nothing -> Data.Weapons.none - -internal_decoder : Struct.Character.Type -> Struct.ServerReply.Type -internal_decoder char = (Struct.ServerReply.AddCharacter char) - --------------------------------------------------------------------------------- --- EXPORTED -------------------------------------------------------------------- --------------------------------------------------------------------------------- -decode : (Struct.Model.Type -> (Json.Decode.Decoder Struct.ServerReply.Type)) -decode model = - (Json.Decode.map - (internal_decoder) - (Struct.Character.decoder (weapon_getter model)) - ) diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm deleted file mode 100644 index f23e905..0000000 --- a/src/battlemap/src/Send/CharacterTurn.elm +++ /dev/null @@ -1,130 +0,0 @@ -module Send.CharacterTurn exposing (try) - --- Elm ------------------------------------------------------------------------- -import Json.Encode - --- Battlemap ------------------------------------------------------------------- -import Constants.IO - -import Send.Send - -import Struct.Character -import Struct.CharacterTurn -import Struct.Direction -import Struct.Event -import Struct.Model - --------------------------------------------------------------------------------- --- TYPES ------------------------------------------------------------------------ --------------------------------------------------------------------------------- - --------------------------------------------------------------------------------- --- LOCAL ----------------------------------------------------------------------- --------------------------------------------------------------------------------- -encode_move : Struct.Model.Type -> (Maybe Json.Encode.Value) -encode_move model = - case (Struct.CharacterTurn.get_path model.char_turn) of - [] -> Nothing - path -> - (Just - (Json.Encode.object - [ - ("t", (Json.Encode.string "mov")), - ( - "p", - (Json.Encode.list - (List.map - ( - (Json.Encode.string) - << - (Struct.Direction.to_string) - ) - (List.reverse path) - ) - ) - ) - ] - ) - ) - -encode_weapon_switch : Struct.Model.Type -> (Maybe Json.Encode.Value) -encode_weapon_switch model = - if (Struct.CharacterTurn.has_switched_weapons model.char_turn) - then - (Just - (Json.Encode.object - [ - ("t", (Json.Encode.string "swp")) - ] - ) - ) - else - Nothing - -encode_attack : Struct.Model.Type -> (Maybe Json.Encode.Value) -encode_attack model = - case (Struct.CharacterTurn.get_target model.char_turn) of - Nothing -> Nothing - (Just ix) -> - (Just - (Json.Encode.object - [ - ("t", (Json.Encode.string "atk")), - ("tix", (Json.Encode.string ix)) - ] - ) - ) - -encode_actions : Struct.Model.Type -> (List Json.Encode.Value) -encode_actions model = - case - ( - (encode_move model), - (encode_weapon_switch model), - (encode_attack model) - ) - of - ((Just move), Nothing, Nothing) -> [move] - ((Just move), Nothing, (Just attack)) -> [move, attack] - (Nothing, (Just switch_weapon), Nothing) -> [switch_weapon] - (Nothing, (Just switch_weapon), (Just attack)) -> [switch_weapon, attack] - (Nothing, Nothing, (Just attack)) -> [attack] - _ -> [] - -try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value) -try_encoding model = - case - (Struct.CharacterTurn.try_getting_active_character model.char_turn) - of - (Just char) -> - (Just - (Json.Encode.object - [ - ("stk", (Json.Encode.string "0")), - ("pid", (Json.Encode.string model.player_id)), - ("bid", (Json.Encode.string "0")), - ( - "cix", - (Json.Encode.string (Struct.Character.get_ref char)) - ), - ( - "act", - (Json.Encode.list (encode_actions model)) - ) - ] - ) - ) - - _ -> - Nothing - --------------------------------------------------------------------------------- --- EXPORTED -------------------------------------------------------------------- --------------------------------------------------------------------------------- -try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type)) -try model = - (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 deleted file mode 100644 index 0bd8342..0000000 --- a/src/battlemap/src/Send/LoadBattlemap.elm +++ /dev/null @@ -1,42 +0,0 @@ -module Send.LoadBattlemap exposing (try) - --- Elm ------------------------------------------------------------------------- -import Json.Encode - --- Battlemap ------------------------------------------------------------------- -import Constants.IO - -import Send.Send - -import Struct.Event -import Struct.Model - --------------------------------------------------------------------------------- --- TYPES ------------------------------------------------------------------------ --------------------------------------------------------------------------------- - --------------------------------------------------------------------------------- --- LOCAL ----------------------------------------------------------------------- --------------------------------------------------------------------------------- -try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value) -try_encoding model = - (Just - (Json.Encode.object - [ - ("stk", (Json.Encode.string "0")), - ("pid", (Json.Encode.string model.player_id)), - ("bmi", (Json.Encode.string "0")) - ] - ) - ) - --------------------------------------------------------------------------------- --- EXPORTED -------------------------------------------------------------------- --------------------------------------------------------------------------------- -try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type)) -try model = - (Send.Send.try_sending - model - Constants.IO.battlemap_loading_handler - try_encoding - ) diff --git a/src/battlemap/src/Send/Send.elm b/src/battlemap/src/Send/Send.elm deleted file mode 100644 index c8f7f5e..0000000 --- a/src/battlemap/src/Send/Send.elm +++ /dev/null @@ -1,72 +0,0 @@ -module Send.Send exposing (try_sending) - --- Elm ------------------------------------------------------------------------- -import Http - -import Json.Decode -import Json.Encode - --- Battlemap ------------------------------------------------------------------- -import Send.SetMap -import Send.AddChar -import Send.TurnResults - -import Struct.Event -import Struct.ServerReply -import Struct.Model - --------------------------------------------------------------------------------- --- TYPES ----------------------------------------------------------------------- --------------------------------------------------------------------------------- - --------------------------------------------------------------------------------- --- LOCAL ----------------------------------------------------------------------- --------------------------------------------------------------------------------- -internal_decoder : ( - Struct.Model.Type -> - String -> - (Json.Decode.Decoder Struct.ServerReply.Type) - ) -internal_decoder model reply_type = - case reply_type of - "add_char" -> (Send.AddChar.decode model) - "set_map" -> (Send.SetMap.decode model) - "turn_results" -> (Send.TurnResults.decode) - other -> - (Json.Decode.fail - ( - "Unknown server command \"" - ++ other - ++ "\"" - ) - ) - -decode : Struct.Model.Type -> (Json.Decode.Decoder Struct.ServerReply.Type) -decode model = - (Json.Decode.field "msg" Json.Decode.string) - |> (Json.Decode.andThen (internal_decoder model)) - --------------------------------------------------------------------------------- --- EXPORTED -------------------------------------------------------------------- --------------------------------------------------------------------------------- -try_sending : ( - Struct.Model.Type -> - String -> - (Struct.Model.Type -> (Maybe Json.Encode.Value)) -> - (Maybe (Cmd Struct.Event.Type)) - ) -try_sending model recipient try_encoding_fun = - case (try_encoding_fun model) of - (Just serial) -> - (Just - (Http.send - Struct.Event.ServerReplied - (Http.post - recipient - (Http.jsonBody serial) - (Json.Decode.list (decode model)) - ) - ) - ) - - Nothing -> Nothing diff --git a/src/battlemap/src/Send/SetMap.elm b/src/battlemap/src/Send/SetMap.elm deleted file mode 100644 index f09e6bf..0000000 --- a/src/battlemap/src/Send/SetMap.elm +++ /dev/null @@ -1,64 +0,0 @@ -module Send.SetMap exposing (decode) - --- Elm ------------------------------------------------------------------------- -import Json.Decode - --- Battlemap ------------------------------------------------------------------- -import Data.Tiles - -import Struct.Battlemap -import Struct.Model -import Struct.ServerReply -import Struct.Tile - --------------------------------------------------------------------------------- --- TYPES ----------------------------------------------------------------------- --------------------------------------------------------------------------------- -type alias MapData = - { - w : Int, - h : Int, - t : (List Int) - } - --------------------------------------------------------------------------------- --- LOCAL ----------------------------------------------------------------------- --------------------------------------------------------------------------------- -deserialize_tile : Int -> Int -> Int -> Struct.Tile.Type -deserialize_tile map_width index id = - (Struct.Tile.new - (index % map_width) - (index // map_width) - (Data.Tiles.get_icon id) - (Data.Tiles.get_cost id) - ) - -internal_decoder : MapData -> Struct.ServerReply.Type -internal_decoder map_data = - (Struct.ServerReply.SetMap - (Struct.Battlemap.new - map_data.w - map_data.h - (List.indexedMap - (deserialize_tile map_data.w) - map_data.t - ) - ) - ) - --------------------------------------------------------------------------------- --- EXPORTED -------------------------------------------------------------------- --------------------------------------------------------------------------------- -decode : (Struct.Model.Type -> (Json.Decode.Decoder Struct.ServerReply.Type)) -decode model = - (Json.Decode.map - internal_decoder - (Json.Decode.map3 MapData - (Json.Decode.field "w" Json.Decode.int) - (Json.Decode.field "h" Json.Decode.int) - (Json.Decode.field - "t" - (Json.Decode.list Json.Decode.int) - ) - ) - ) diff --git a/src/battlemap/src/Send/TurnResults.elm b/src/battlemap/src/Send/TurnResults.elm deleted file mode 100644 index 5d2c748..0000000 --- a/src/battlemap/src/Send/TurnResults.elm +++ /dev/null @@ -1,27 +0,0 @@ -module Send.TurnResults exposing (decode) - --- Elm ------------------------------------------------------------------------- -import Json.Decode - --- Battlemap ------------------------------------------------------------------- -import Struct.ServerReply -import Struct.TurnResult - --------------------------------------------------------------------------------- --- TYPES ----------------------------------------------------------------------- --------------------------------------------------------------------------------- --------------------------------------------------------------------------------- --- LOCAL ----------------------------------------------------------------------- --------------------------------------------------------------------------------- -internal_decoder : (List Struct.TurnResult.Type) -> Struct.ServerReply.Type -internal_decoder trl = (Struct.ServerReply.TurnResults trl) - --------------------------------------------------------------------------------- --- EXPORTED -------------------------------------------------------------------- --------------------------------------------------------------------------------- -decode : (Json.Decode.Decoder Struct.ServerReply.Type) -decode = - (Json.Decode.map - (internal_decoder) - (Json.Decode.field "cnt" (Json.Decode.list Struct.TurnResult.decoder)) - ) diff --git a/src/battlemap/src/Struct/TurnResult.elm b/src/battlemap/src/Struct/TurnResult.elm index dd7c9ef..a7ca4a4 100644 --- a/src/battlemap/src/Struct/TurnResult.elm +++ b/src/battlemap/src/Struct/TurnResult.elm @@ -9,7 +9,6 @@ module Struct.TurnResult exposing -- Elm ------------------------------------------------------------------------- import Json.Decode -import Json.Decode.Pipeline -- Battlemap ------------------------------------------------------------------- import Struct.Direction diff --git a/src/battlemap/src/Update/EndTurn.elm b/src/battlemap/src/Update/EndTurn.elm index 4cae3ab..142f8ff 100644 --- a/src/battlemap/src/Update/EndTurn.elm +++ b/src/battlemap/src/Update/EndTurn.elm @@ -4,7 +4,7 @@ module Update.EndTurn exposing (apply_to) import Dict -- Struct.Battlemap ------------------------------------------------------------------- -import Send.CharacterTurn +import Comm.CharacterTurn import Struct.Character import Struct.CharacterTurn @@ -23,7 +23,7 @@ make_it_so : ( (Struct.Model.Type, (Cmd Struct.Event.Type)) ) make_it_so model char nav = - case (Send.CharacterTurn.try model) of + case (Comm.CharacterTurn.try model) of (Just cmd) -> ( (Struct.Model.reset diff --git a/src/battlemap/src/Update/SendLoadBattlemapRequest.elm b/src/battlemap/src/Update/SendLoadBattlemapRequest.elm index 333ea2d..e55d60b 100644 --- a/src/battlemap/src/Update/SendLoadBattlemapRequest.elm +++ b/src/battlemap/src/Update/SendLoadBattlemapRequest.elm @@ -2,7 +2,7 @@ module Update.SendLoadBattlemapRequest exposing (apply_to) -- Elm ------------------------------------------------------------------------- -- Battlemap ------------------------------------------------------------------- -import Send.LoadBattlemap +import Comm.LoadBattlemap import Struct.Event import Struct.Model @@ -21,7 +21,7 @@ apply_to : ( apply_to model = ( model, - (case (Send.LoadBattlemap.try model) of + (case (Comm.LoadBattlemap.try model) of (Just cmd) -> cmd Nothing -> Cmd.none ) -- cgit v1.2.3-70-g09d2