From a2bac44a4c8abc064de55d0779edcb07aaa86e62 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Mon, 25 Nov 2019 14:32:39 +0100 Subject: ... --- .../BattleCharacters/Comm/AddArmor.elm | 6 ++- .../BattleCharacters/Comm/AddDataSetItem.elm | 48 ++++++++++++++++++++++ .../BattleCharacters/Comm/AddGlyph.elm | 7 +++- .../BattleCharacters/Comm/AddGlyphBoard.elm | 6 ++- .../BattleCharacters/Comm/AddPortrait.elm | 6 ++- .../BattleCharacters/Comm/AddSkill.elm | 6 ++- .../BattleCharacters/Comm/AddWeapon.elm | 6 ++- 7 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 src/shared/battle-characters/BattleCharacters/Comm/AddDataSetItem.elm (limited to 'src/shared/battle-characters/BattleCharacters/Comm') diff --git a/src/shared/battle-characters/BattleCharacters/Comm/AddArmor.elm b/src/shared/battle-characters/BattleCharacters/Comm/AddArmor.elm index bdbb137..7fb8021 100644 --- a/src/shared/battle-characters/BattleCharacters/Comm/AddArmor.elm +++ b/src/shared/battle-characters/BattleCharacters/Comm/AddArmor.elm @@ -5,6 +5,7 @@ import Json.Decode -- Battle Characters ----------------------------------------------------------- import BattleCharacters.Struct.Armor +import BattleCharacters.Struct.DataSetItem -- Local Module ---------------------------------------------------------------- import Struct.ServerReply @@ -17,7 +18,10 @@ import Struct.ServerReply -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- internal_decoder : BattleCharacters.Struct.Armor.Type -> Struct.ServerReply.Type -internal_decoder ar = (Struct.ServerReply.AddArmor ar) +internal_decoder ar = + (Struct.ServerReply.AddCharactersDataSetItem + (BattleCharacters.Struct.DataSetItem.Armor ar) + ) -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- diff --git a/src/shared/battle-characters/BattleCharacters/Comm/AddDataSetItem.elm b/src/shared/battle-characters/BattleCharacters/Comm/AddDataSetItem.elm new file mode 100644 index 0000000..aa1ce94 --- /dev/null +++ b/src/shared/battle-characters/BattleCharacters/Comm/AddDataSetItem.elm @@ -0,0 +1,48 @@ +module BattleCharacters.Comm.AddDataSetItem exposing (prefix, get_decoder_for) + +-- Elm ------------------------------------------------------------------------- +import Json.Decode + +-- Battle Characters ----------------------------------------------------------- +import BattleCharacters.Comm.AddArmor +import BattleCharacters.Comm.AddGlyph +import BattleCharacters.Comm.AddGlyphBoard +import BattleCharacters.Comm.AddPortrait +import BattleCharacters.Comm.AddSkill +import BattleCharacters.Comm.AddWeapon + +-- Local Module ---------------------------------------------------------------- +import Struct.ServerReply + +-------------------------------------------------------------------------------- +-- TYPES ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +prefix : String +prefix = "acds" + +get_decoder_for : String -> (Json.Decode.Decoder Struct.ServerReply.Type) +get_decoder_for reply_type = + case reply_type of + "acds_armor" -> (BattleCharacters.Comm.AddArmor.decode) + "acds_weapon" -> (BattleCharacters.Comm.AddWeapon.decode) + "acds_portrait" -> (BattleCharacters.Comm.AddPortrait.decode) + "acds_glyph" -> (BattleCharacters.Comm.AddGlyph.decode) + "acds_glyph_board" -> (BattleCharacters.Comm.AddGlyphBoard.decode) + "acds_skill" -> (BattleCharacters.Comm.AddSkill.decode) + + other -> + (Json.Decode.fail + ( + "Unknown server command \"" + ++ other + ++ "\"" + ) + ) diff --git a/src/shared/battle-characters/BattleCharacters/Comm/AddGlyph.elm b/src/shared/battle-characters/BattleCharacters/Comm/AddGlyph.elm index 100ed54..89e1512 100644 --- a/src/shared/battle-characters/BattleCharacters/Comm/AddGlyph.elm +++ b/src/shared/battle-characters/BattleCharacters/Comm/AddGlyph.elm @@ -4,8 +4,8 @@ module BattleCharacters.Comm.AddGlyph exposing (decode) import Json.Decode -- Battle Characters ----------------------------------------------------------- +import BattleCharacters.Struct.DataSetItem import BattleCharacters.Struct.Glyph -import BattleCharacters.Struct.GlyphBoard -- Local Module ---------------------------------------------------------------- import Struct.ServerReply @@ -18,7 +18,10 @@ import Struct.ServerReply -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- internal_decoder : BattleCharacters.Struct.Glyph.Type -> Struct.ServerReply.Type -internal_decoder gl = (Struct.ServerReply.AddGlyph gl) +internal_decoder gl = + (Struct.ServerReply.AddCharactersDataSetItem + (BattleCharacters.Struct.DataSetItem.Glyph gl) + ) -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- diff --git a/src/shared/battle-characters/BattleCharacters/Comm/AddGlyphBoard.elm b/src/shared/battle-characters/BattleCharacters/Comm/AddGlyphBoard.elm index 825e940..92ebf61 100644 --- a/src/shared/battle-characters/BattleCharacters/Comm/AddGlyphBoard.elm +++ b/src/shared/battle-characters/BattleCharacters/Comm/AddGlyphBoard.elm @@ -4,6 +4,7 @@ module BattleCharacters.Comm.AddGlyphBoard exposing (decode) import Json.Decode -- Battle Characters ----------------------------------------------------------- +import BattleCharacters.Struct.DataSetItem import BattleCharacters.Struct.GlyphBoard -- Local Module----------------------------------------------------------------- @@ -20,7 +21,10 @@ internal_decoder : ( BattleCharacters.Struct.GlyphBoard.Type -> Struct.ServerReply.Type ) -internal_decoder glb = (Struct.ServerReply.AddGlyphBoard glb) +internal_decoder gb = + (Struct.ServerReply.AddCharactersDataSetItem + (BattleCharacters.Struct.DataSetItem.GlyphBoard gb) + ) -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- diff --git a/src/shared/battle-characters/BattleCharacters/Comm/AddPortrait.elm b/src/shared/battle-characters/BattleCharacters/Comm/AddPortrait.elm index 321684c..df16534 100644 --- a/src/shared/battle-characters/BattleCharacters/Comm/AddPortrait.elm +++ b/src/shared/battle-characters/BattleCharacters/Comm/AddPortrait.elm @@ -4,6 +4,7 @@ module BattleCharacters.Comm.AddPortrait exposing (decode) import Json.Decode -- Battle Characters ----------------------------------------------------------- +import BattleCharacters.Struct.DataSetItem import BattleCharacters.Struct.Portrait -- Local Module ---------------------------------------------------------------- @@ -20,7 +21,10 @@ internal_decoder : ( BattleCharacters.Struct.Portrait.Type -> Struct.ServerReply.Type ) -internal_decoder pt = (Struct.ServerReply.AddPortrait pt) +internal_decoder pt = + (Struct.ServerReply.AddCharactersDataSetItem + (BattleCharacters.Struct.DataSetItem.Portrait pt) + ) -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- diff --git a/src/shared/battle-characters/BattleCharacters/Comm/AddSkill.elm b/src/shared/battle-characters/BattleCharacters/Comm/AddSkill.elm index d132050..c38a01e 100644 --- a/src/shared/battle-characters/BattleCharacters/Comm/AddSkill.elm +++ b/src/shared/battle-characters/BattleCharacters/Comm/AddSkill.elm @@ -4,6 +4,7 @@ module BattleCharacters.Comm.AddSkill exposing (decode) import Json.Decode -- Battle Characters ----------------------------------------------------------- +import BattleCharacters.Struct.DataSetItem import BattleCharacters.Struct.Skill -- Local Module ---------------------------------------------------------------- @@ -17,7 +18,10 @@ import Struct.ServerReply -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- internal_decoder : BattleCharacters.Struct.Skill.Type -> Struct.ServerReply.Type -internal_decoder sk = (Struct.ServerReply.AddSkill sk) +internal_decoder sk = + (Struct.ServerReply.AddCharactersDataSetItem + (BattleCharacters.Struct.DataSetItem.Skill sk) + ) -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- diff --git a/src/shared/battle-characters/BattleCharacters/Comm/AddWeapon.elm b/src/shared/battle-characters/BattleCharacters/Comm/AddWeapon.elm index 6a05978..407195f 100644 --- a/src/shared/battle-characters/BattleCharacters/Comm/AddWeapon.elm +++ b/src/shared/battle-characters/BattleCharacters/Comm/AddWeapon.elm @@ -4,6 +4,7 @@ module BattleCharacters.Comm.AddWeapon exposing (decode) import Json.Decode -- Battle Characters ----------------------------------------------------------- +import BattleCharacters.Struct.DataSetItem import BattleCharacters.Struct.Weapon -- Local Module ---------------------------------------------------------------- @@ -20,7 +21,10 @@ internal_decoder : ( BattleCharacters.Struct.Weapon.Type -> Struct.ServerReply.Type ) -internal_decoder wp = (Struct.ServerReply.AddWeapon wp) +internal_decoder wp = + (Struct.ServerReply.AddCharactersDataSetItem + (BattleCharacters.Struct.DataSetItem.Weapon wp) + ) -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- -- cgit v1.2.3-70-g09d2