...

13 files changed, 49 insertions, 30 deletions

diff --git a/src/battle/elm.json b/src/battle/elm.json
index f16ab85..d632797 100644
--- a/src/battle/elm.json
+++ b/src/battle/elm.json
@@ -7,7 +7,7 @@
         "../shared/battle-map",
         "../shared/battle-characters"
     ],
-    "elm-version": "0.19.0",
+    "elm-version": "0.19.1",
     "dependencies": {
         "direct": {
             "NoRedInk/elm-json-decode-pipeline": "1.0.0",
diff --git a/src/battle/src/Main.elm b/src/battle/src/Main.elm
index bd497ba..761cf4a 100644
--- a/src/battle/src/Main.elm
+++ b/src/battle/src/Main.elm
@@ -1,3 +1,5 @@
+module Main exposing (main)
+
 -- Elm ------------------------------------------------------------------------
 import Browser
 
diff --git a/src/battle/src/Struct/PuppeteerAction.elm b/src/battle/src/Struct/PuppeteerAction.elm
index 5580409..9627cae 100644
--- a/src/battle/src/Struct/PuppeteerAction.elm
+++ b/src/battle/src/Struct/PuppeteerAction.elm
@@ -2,7 +2,7 @@ module Struct.PuppeteerAction exposing
    (
       Type(..),
       Effect(..),
-      from_turn_results
+      from_turn_result
    )
 
 -- Elm -------------------------------------------------------------------------
diff --git a/src/battle/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm
index 6c16480..4372257 100644
--- a/src/battle/src/Update/HandleServerReply.elm
+++ b/src/battle/src/Update/HandleServerReply.elm
@@ -22,6 +22,7 @@ import Util.Http
 
 -- Battle Characters -----------------------------------------------------------
 import BattleCharacters.Struct.DataSetItem
+import BattleCharacters.Struct.Equipment
 
 -- Battle Map ------------------------------------------------------------------
 import BattleMap.Struct.DataSet
@@ -77,38 +78,35 @@ disconnected current_state =
          ]
       )
 
-add_characters_dataset_item : (
+add_characters_data_set_item : (
       BattleCharacters.Struct.DataSetItem.Type ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
    )
-add_characters_dataset_item item current_state =
+add_characters_data_set_item item current_state =
    let (model, cmds) = current_state in
       (
          {model |
-            characters_dataset =
+            characters_data_set =
                (BattleCharacters.Struct.DataSetItem.add_to
                   item
-                  model.characters_dataset
+                  model.characters_data_set
                )
          },
          cmds
       )
 
-add_map_dataset_item : (
-      BattleMap.Struct.Tile.Type ->
+add_map_data_set_item : (
+      BattleMap.Struct.DataSetItem.Type ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type))) ->
       (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
    )
-add_map_dataset_item item current_state =
+add_map_data_set_item item current_state =
    let (model, cmds) = current_state in
       (
          {model |
-            map_dataset =
-               (BattleMap.Struct.DataSetItem.add_to
-                  item
-                  model.map_dataset
-               )
+            map_data_set =
+               (BattleMap.Struct.DataSetItem.add_to item model.map_data_set)
          },
          cmds
       )
@@ -142,11 +140,13 @@ add_character unresolved_char current_state =
                      (\loc ->
                         (BattleMap.Struct.Map.get_omnimods_at
                            loc
-                           model.map_dataset
+                           model.map_data_set
                            (Struct.Battle.get_map model.battle)
                         )
                      )
-                     model.characters_dataset
+                     (BattleCharacters.Struct.Equipment.resolve
+                        model.characters_data_set
+                     )
                      unresolved_char
                   )
                   model.battle
@@ -167,7 +167,7 @@ set_map map current_state =
             battle =
                (Struct.Battle.set_map
                   (BattleMap.Struct.Map.solve_tiles
-                     model.map_dataset
+                     model.map_data_set
                      (Struct.Battle.get_map model.battle)
                   )
                   model.battle
@@ -190,11 +190,16 @@ add_to_timeline turn_results current_state =
                {model |
                   puppeteer =
                      (List.foldl
-                        (\action puppeteer ->
-                           (Struct.Puppeteer.append_forward action puppeteer)
+                        (\turn_result puppeteer ->
+                           (Struct.Puppeteer.append_forward
+                              (Struct.PuppeteerAction.from_turn_result
+                                 turn_result
+                              )
+                              puppeteer
+                           )
                         )
                         model.puppeteer
-                        (Struct.PuppeteerAction.from_turn_results turn_results)
+                        turn_results
                      ),
                   battle =
                      (Struct.Battle.set_timeline
@@ -226,11 +231,14 @@ set_timeline turn_results current_state =
          {model |
             puppeteer =
                (List.foldr
-                  (\action puppeteer ->
-                     (Struct.Puppeteer.append_backward action puppeteer)
+                  (\turn_result puppeteer ->
+                     (Struct.Puppeteer.append_backward
+                        (Struct.PuppeteerAction.from_turn_result turn_result)
+                        puppeteer
+                     )
                   )
                   model.puppeteer
-                  (Struct.PuppeteerAction.from_turn_results turn_results)
+                  turn_results
                ),
             battle =
                (Struct.Battle.set_timeline
@@ -251,10 +259,10 @@ apply_command command current_state =
       Struct.ServerReply.Disconnected -> (disconnected current_state)
 
       (Struct.ServerReply.AddCharactersDataSetItem item) ->
-         (add_characters_dataset_item item current_state)
+         (add_characters_data_set_item item current_state)
 
       (Struct.ServerReply.AddMapDataSetItem item) ->
-         (add_map_dataset_item item current_state)
+         (add_map_data_set_item item current_state)
 
       (Struct.ServerReply.AddPlayer pl) ->
          (add_player pl current_state)
diff --git a/src/battle/src/View/SubMenu/Status.elm b/src/battle/src/View/SubMenu/Status.elm
index e08e786..e351b34 100644
--- a/src/battle/src/View/SubMenu/Status.elm
+++ b/src/battle/src/View/SubMenu/Status.elm
@@ -47,8 +47,9 @@ get_html model =
             (Just (Struct.UI.SelectedCharacter target_char)) ->
                case (Struct.Battle.get_character target_char model.battle) of
                   (Just char) ->
-                     (Html.Lazy.lazy
+                     (Html.Lazy.lazy2
                         (View.SubMenu.Status.CharacterInfo.get_html)
+                        model.battle.own_player_ix
                         char
                      )
 
diff --git a/src/login/elm.json b/src/login/elm.json
index 929038d..7926815 100644
--- a/src/login/elm.json
+++ b/src/login/elm.json
@@ -4,7 +4,7 @@
         "src",
         "../shared/elm"
     ],
-    "elm-version": "0.19.0",
+    "elm-version": "0.19.1",
     "dependencies": {
         "direct": {
             "NoRedInk/elm-json-decode-pipeline": "1.0.0",
diff --git a/src/login/src/Main.elm b/src/login/src/Main.elm
index e0dd884..384ecd8 100644
--- a/src/login/src/Main.elm
+++ b/src/login/src/Main.elm
@@ -1,3 +1,5 @@
+module Main exposing (main)
+
 -- Elm ------------------------------------------------------------------------
 import Browser
 
diff --git a/src/main-menu/elm.json b/src/main-menu/elm.json
index 929038d..7926815 100644
--- a/src/main-menu/elm.json
+++ b/src/main-menu/elm.json
@@ -4,7 +4,7 @@
         "src",
         "../shared/elm"
     ],
-    "elm-version": "0.19.0",
+    "elm-version": "0.19.1",
     "dependencies": {
         "direct": {
             "NoRedInk/elm-json-decode-pipeline": "1.0.0",
diff --git a/src/main-menu/src/Main.elm b/src/main-menu/src/Main.elm
index 0ee235f..4922621 100644
--- a/src/main-menu/src/Main.elm
+++ b/src/main-menu/src/Main.elm
@@ -1,3 +1,5 @@
+module Main exposing (main)
+
 -- Elm ------------------------------------------------------------------------
 import Browser
 
diff --git a/src/map-editor/elm.json b/src/map-editor/elm.json
index 55f961b..ed96a3e 100644
--- a/src/map-editor/elm.json
+++ b/src/map-editor/elm.json
@@ -6,7 +6,7 @@
         "../shared/battle",
         "../shared/battle-map"
     ],
-    "elm-version": "0.19.0",
+    "elm-version": "0.19.1",
     "dependencies": {
         "direct": {
             "NoRedInk/elm-json-decode-pipeline": "1.0.0",
diff --git a/src/map-editor/src/Main.elm b/src/map-editor/src/Main.elm
index bd497ba..761cf4a 100644
--- a/src/map-editor/src/Main.elm
+++ b/src/map-editor/src/Main.elm
@@ -1,3 +1,5 @@
+module Main exposing (main)
+
 -- Elm ------------------------------------------------------------------------
 import Browser
 
diff --git a/src/roster-editor/elm.json b/src/roster-editor/elm.json
index 75ba72e..6c8f390 100644
--- a/src/roster-editor/elm.json
+++ b/src/roster-editor/elm.json
@@ -6,7 +6,7 @@
         "../shared/battle",
         "../shared/battle-characters"
     ],
-    "elm-version": "0.19.0",
+    "elm-version": "0.19.1",
     "dependencies": {
         "direct": {
             "NoRedInk/elm-json-decode-pipeline": "1.0.0",
diff --git a/src/roster-editor/src/Main.elm b/src/roster-editor/src/Main.elm
index 4974d67..9a8eeb7 100644
--- a/src/roster-editor/src/Main.elm
+++ b/src/roster-editor/src/Main.elm
@@ -1,3 +1,5 @@
+module Main exposing (main)
+
 -- Elm -------------------------------------------------------------------------
 import Browser