summaryrefslogtreecommitdiff
path: root/src/battle/src/Comm
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/src/Comm')
-rw-r--r--src/battle/src/Comm/AddArmor.elm30
-rw-r--r--src/battle/src/Comm/AddChar.elm8
-rw-r--r--src/battle/src/Comm/AddPortrait.elm33
-rw-r--r--src/battle/src/Comm/AddTile.elm26
-rw-r--r--src/battle/src/Comm/AddWeapon.elm33
-rw-r--r--src/battle/src/Comm/Send.elm30
-rw-r--r--src/battle/src/Comm/SetMap.elm28
7 files changed, 21 insertions, 167 deletions
diff --git a/src/battle/src/Comm/AddArmor.elm b/src/battle/src/Comm/AddArmor.elm
deleted file mode 100644
index 5dd7aad..0000000
--- a/src/battle/src/Comm/AddArmor.elm
+++ /dev/null
@@ -1,30 +0,0 @@
-module Comm.AddArmor exposing (decode)
-
--- Elm -------------------------------------------------------------------------
-import Json.Decode
-
--- Battle Characters -----------------------------------------------------------
-import BattleCharacters.Struct.Armor
-
--- Local Module ----------------------------------------------------------------
-import Struct.ServerReply
-
---------------------------------------------------------------------------------
--- TYPES -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-internal_decoder : BattleCharacters.Struct.Armor.Type -> Struct.ServerReply.Type
-internal_decoder ar = (Struct.ServerReply.AddArmor ar)
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode =
- (Json.Decode.map
- (internal_decoder)
- (BattleCharacters.Struct.Armor.decoder)
- )
diff --git a/src/battle/src/Comm/AddChar.elm b/src/battle/src/Comm/AddChar.elm
index 9b63c6f..9137d17 100644
--- a/src/battle/src/Comm/AddChar.elm
+++ b/src/battle/src/Comm/AddChar.elm
@@ -14,12 +14,8 @@ import Struct.ServerReply
--------------------------------------------------------------------------------
-- LOCAL -----------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-internal_decoder : (
- Struct.Character.TypeAndEquipmentRef ->
- Struct.ServerReply.Type
- )
-internal_decoder char_and_refs = (Struct.ServerReply.AddCharacter char_and_refs)
+internal_decoder : Struct.Character.Unresolved -> Struct.ServerReply.Type
+internal_decoder ref = (Struct.ServerReply.AddCharacter ref)
--------------------------------------------------------------------------------
-- EXPORTED --------------------------------------------------------------------
diff --git a/src/battle/src/Comm/AddPortrait.elm b/src/battle/src/Comm/AddPortrait.elm
deleted file mode 100644
index 8fd29af..0000000
--- a/src/battle/src/Comm/AddPortrait.elm
+++ /dev/null
@@ -1,33 +0,0 @@
-module Comm.AddPortrait exposing (decode)
-
--- Elm -------------------------------------------------------------------------
-import Json.Decode
-
--- Battle Characters -----------------------------------------------------------
-import BattleCharacters.Struct.Portrait
-
--- Local Module ----------------------------------------------------------------
-import Struct.ServerReply
-
---------------------------------------------------------------------------------
--- TYPES -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-internal_decoder : (
- BattleCharacters.Struct.Portrait.Type ->
- Struct.ServerReply.Type
- )
-internal_decoder pt = (Struct.ServerReply.AddPortrait pt)
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode =
- (Json.Decode.map
- (internal_decoder)
- (BattleCharacters.Struct.Portrait.decoder)
- )
diff --git a/src/battle/src/Comm/AddTile.elm b/src/battle/src/Comm/AddTile.elm
deleted file mode 100644
index 797731b..0000000
--- a/src/battle/src/Comm/AddTile.elm
+++ /dev/null
@@ -1,26 +0,0 @@
-module Comm.AddTile exposing (decode)
-
--- Elm -------------------------------------------------------------------------
-import Json.Decode
-
--- Battle Map ------------------------------------------------------------------
-import BattleMap.Struct.Tile
-
--- Local Module ----------------------------------------------------------------
-import Struct.ServerReply
-
---------------------------------------------------------------------------------
--- TYPES -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-internal_decoder : BattleMap.Struct.Tile.Type -> Struct.ServerReply.Type
-internal_decoder wp = (Struct.ServerReply.AddTile wp)
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode = (Json.Decode.map (internal_decoder) (BattleMap.Struct.Tile.decoder))
diff --git a/src/battle/src/Comm/AddWeapon.elm b/src/battle/src/Comm/AddWeapon.elm
deleted file mode 100644
index 307dc6a..0000000
--- a/src/battle/src/Comm/AddWeapon.elm
+++ /dev/null
@@ -1,33 +0,0 @@
-module Comm.AddWeapon exposing (decode)
-
--- Elm -------------------------------------------------------------------------
-import Json.Decode
-
--- Battle Characters -----------------------------------------------------------
-import BattleCharacters.Struct.Weapon
-
--- Local Module ----------------------------------------------------------------
-import Struct.ServerReply
-
---------------------------------------------------------------------------------
--- TYPES -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-internal_decoder : (
- BattleCharacters.Struct.Weapon.Type ->
- Struct.ServerReply.Type
- )
-internal_decoder wp = (Struct.ServerReply.AddWeapon wp)
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode =
- (Json.Decode.map
- (internal_decoder)
- (BattleCharacters.Struct.Weapon.decoder)
- )
diff --git a/src/battle/src/Comm/Send.elm b/src/battle/src/Comm/Send.elm
index 3394b26..faac297 100644
--- a/src/battle/src/Comm/Send.elm
+++ b/src/battle/src/Comm/Send.elm
@@ -6,14 +6,20 @@ import Http
import Json.Decode
import Json.Encode
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Comm.AddArmor
+import BattleCharacters.Comm.AddGlyph
+import BattleCharacters.Comm.AddGlyphBoard
+import BattleCharacters.Comm.AddPortrait
+import BattleCharacters.Comm.AddWeapon
+
+-- Battle Map ------------------------------------------------------------------
+import BattleMap.Comm.AddTile
+import BattleMap.Comm.SetMap
+
-- Local Module ----------------------------------------------------------------
-import Comm.AddArmor
-import Comm.AddPortrait
-import Comm.AddPlayer
import Comm.AddChar
-import Comm.AddTile
-import Comm.AddWeapon
-import Comm.SetMap
+import Comm.AddPlayer
import Comm.SetTimeline
import Comm.TurnResults
@@ -31,13 +37,15 @@ import Struct.Model
internal_decoder : String -> (Json.Decode.Decoder Struct.ServerReply.Type)
internal_decoder reply_type =
case reply_type of
- "add_tile" -> (Comm.AddTile.decode)
- "add_armor" -> (Comm.AddArmor.decode)
+ "add_tile" -> (BattleMap.Comm.AddTile.decode)
+ "add_armor" -> (BattleCharacters.Comm.AddArmor.decode)
"add_char" -> (Comm.AddChar.decode)
- "add_portrait" -> (Comm.AddPortrait.decode)
+ "add_portrait" -> (BattleCharacters.Comm.AddPortrait.decode)
+ "add_glyph_board" -> (BattleCharacters.Comm.AddGlyphBoard.decode)
+ "add_glyph" -> (BattleCharacters.Comm.AddGlyph.decode)
"add_player" -> (Comm.AddPlayer.decode)
- "add_weapon" -> (Comm.AddWeapon.decode)
- "set_map" -> (Comm.SetMap.decode)
+ "add_weapon" -> (BattleCharacters.Comm.AddWeapon.decode)
+ "set_map" -> (BattleMap.Comm.SetMap.decode)
"turn_results" -> (Comm.TurnResults.decode)
"set_timeline" -> (Comm.SetTimeline.decode)
"disconnected" -> (Json.Decode.succeed Struct.ServerReply.Disconnected)
diff --git a/src/battle/src/Comm/SetMap.elm b/src/battle/src/Comm/SetMap.elm
deleted file mode 100644
index 80f6db1..0000000
--- a/src/battle/src/Comm/SetMap.elm
+++ /dev/null
@@ -1,28 +0,0 @@
-module Comm.SetMap exposing (decode)
-
--- Elm -------------------------------------------------------------------------
-import Json.Decode
-
--- Battle Map ------------------------------------------------------------------
-import BattleMap.Struct.Map
-
--- Local Module ----------------------------------------------------------------
-import Struct.ServerReply
-
---------------------------------------------------------------------------------
--- TYPES -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode =
- (Json.Decode.map
- (\map -> (Struct.ServerReply.SetMap map))
- (BattleMap.Struct.Map.decoder)
- )