...

2 files changed, 12 insertions, 117 deletions

diff --git a/src/battle/src/Struct/ServerReply.elm b/src/battle/src/Struct/ServerReply.elm
index d059c17..9b0bfd3 100644
--- a/src/battle/src/Struct/ServerReply.elm
+++ b/src/battle/src/Struct/ServerReply.elm
@@ -1,16 +1,11 @@
 module Struct.ServerReply exposing (Type(..))
 
 -- Battle Characters -----------------------------------------------------------
-import BattleCharacters.Struct.Armor
-import BattleCharacters.Struct.Glyph
-import BattleCharacters.Struct.GlyphBoard
-import BattleCharacters.Struct.Portrait
-import BattleCharacters.Struct.Skill
-import BattleCharacters.Struct.Weapon
+import BattleCharacters.Struct.DataSetItem
 
 -- Battle Map ------------------------------------------------------------------
+import BattleMap.Struct.DataSetItem
 import BattleMap.Struct.Map
-import BattleMap.Struct.Tile
 
 -- Local Module ----------------------------------------------------------------
 import Struct.Player
@@ -23,19 +18,16 @@ import Struct.TurnResult
 type Type =
    Okay
    | Disconnected
-   | AddArmor BattleCharacters.Struct.Armor.Type
-   | AddPortrait BattleCharacters.Struct.Portrait.Type
-   | AddGlyphBoard BattleCharacters.Struct.GlyphBoard.Type
-   | AddGlyph BattleCharacters.Struct.Glyph.Type
-   | AddSkill BattleCharacters.Struct.Skill.Type
+
    | AddPlayer Struct.Player.Type
-   | AddWeapon BattleCharacters.Struct.Weapon.Type
    | AddCharacter Struct.Character.Unresolved
-   | AddTile BattleMap.Struct.Tile.Type
    | SetMap BattleMap.Struct.Map.Type
    | TurnResults (List Struct.TurnResult.Type)
    | SetTimeline (List Struct.TurnResult.Type)
 
+   | AddMapDataSetItem BattleMap.Struct.DataSetItem.Type
+   | AddCharactersDataSetItem BattleCharacters.Struct.DataSetItem.Type
+
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
diff --git a/src/battle/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm
index 1ab919e..f497fe0 100644
--- a/src/battle/src/Update/HandleServerReply.elm
+++ b/src/battle/src/Update/HandleServerReply.elm
@@ -21,14 +21,7 @@ import Struct.Flags
 import Util.Http
 
 -- Battle Characters -----------------------------------------------------------
-import BattleCharacters.Struct.Armor
-import BattleCharacters.Struct.DataSet
-import BattleCharacters.Struct.Equipment
-import BattleCharacters.Struct.Glyph
-import BattleCharacters.Struct.GlyphBoard
-import BattleCharacters.Struct.Portrait
-import BattleCharacters.Struct.Skill
-import BattleCharacters.Struct.Weapon
+import BattleCharacters.Struct.DataSetItem
 
 -- Battle Map ------------------------------------------------------------------
 import BattleMap.Struct.DataSet
@@ -81,108 +74,18 @@ disconnected current_state =
          ]
       )
 
-add_armor : (
-      BattleCharacters.Struct.Armor.Type ->
+add_characters_dataset_item : (
+      BattleCharacters.Struct.DataSetItem.Type ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
    )
-add_armor ar current_state =
+add_weapon item current_state =
    let (model, cmds) = current_state in
       (
          {model |
             characters_dataset =
-               (BattleCharacters.Struct.DataSet.add_armor
-                  ar
-                  model.characters_dataset
-               )
-         },
-         cmds
-      )
-
-add_portrait : (
-      BattleCharacters.Struct.Portrait.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-add_portrait pt current_state =
-   let (model, cmds) = current_state in
-      (
-         {model |
-            characters_dataset =
-               (BattleCharacters.Struct.DataSet.add_portrait
-                  pt
-                  model.characters_dataset
-               )
-         },
-         cmds
-      )
-
-add_glyph_board : (
-      BattleCharacters.Struct.GlyphBoard.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-add_glyph_board gb current_state =
-   let (model, cmds) = current_state in
-      (
-         {model |
-            characters_dataset =
-               (BattleCharacters.Struct.DataSet.add_glyph_board
-                  gb
-                  model.characters_dataset
-               )
-         },
-         cmds
-      )
-
-add_glyph : (
-      BattleCharacters.Struct.Glyph.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-add_glyph gl current_state =
-   let (model, cmds) = current_state in
-      (
-         {model |
-            characters_dataset =
-               (BattleCharacters.Struct.DataSet.add_glyph
-                  gl
-                  model.characters_dataset
-               )
-         },
-         cmds
-      )
-
-add_weapon : (
-      BattleCharacters.Struct.Weapon.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-add_weapon wp current_state =
-   let (model, cmds) = current_state in
-      (
-         {model |
-            characters_dataset =
-               (BattleCharacters.Struct.DataSet.add_weapon
-                  wp
-                  model.characters_dataset
-               )
-         },
-         cmds
-      )
-
-add_skill : (
-      BattleCharacters.Struct.Skill.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-add_skill sk current_state =
-   let (model, cmds) = current_state in
-      (
-         {model |
-            characters_dataset =
-               (BattleCharacters.Struct.DataSet.add_skill
-                  sk
+               (BattleCharacters.Struct.Weapon.DataSetItem.add_to
+                  item
                   model.characters_dataset
                )
          },