From dc8d1139c141b5281145829b5e87602425b4893f Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Tue, 14 Jan 2020 19:29:16 +0100
Subject: ...

---
 src/battle/src/Update/HandleServerReply.elm        |  3 +-
 .../src/Update/Puppeteer/RefreshCharactersOf.elm   | 63 ++++++++++++++++++++++
 .../Update/Puppeteer/RefreshCharactersOfPlayer.elm | 63 ----------------------
 3 files changed, 64 insertions(+), 65 deletions(-)
 create mode 100644 src/battle/src/Update/Puppeteer/RefreshCharactersOf.elm
 delete mode 100644 src/battle/src/Update/Puppeteer/RefreshCharactersOfPlayer.elm

(limited to 'src/battle')

diff --git a/src/battle/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm
index 31dc97a..8dee69b 100644
--- a/src/battle/src/Update/HandleServerReply.elm
+++ b/src/battle/src/Update/HandleServerReply.elm
@@ -37,9 +37,8 @@ import Struct.Error
 import Struct.Event
 import Struct.Model
 import Struct.Player
+import Struct.Puppeteer
 import Struct.ServerReply
-import Struct.TurnResult
-import Struct.TurnResultAnimator
 import Struct.UI
 
 import Update.Puppeteer
diff --git a/src/battle/src/Update/Puppeteer/RefreshCharactersOf.elm b/src/battle/src/Update/Puppeteer/RefreshCharactersOf.elm
new file mode 100644
index 0000000..a83cc91
--- /dev/null
+++ b/src/battle/src/Update/Puppeteer/RefreshCharactersOf.elm
@@ -0,0 +1,63 @@
+module Update.Puppeteer.RefreshCharactersOf exposing (forward, backward)
+
+-- Elm -------------------------------------------------------------------------
+import Array
+
+-- Local Module ----------------------------------------------------------------
+import Struct.Battle
+import Struct.Character
+import Struct.Event
+import Struct.Model
+
+--------------------------------------------------------------------------------
+-- LOCAL -----------------------------------------------------------------------
+--------------------------------------------------------------------------------
+perform : (
+      Int ->
+      Struct.Model.Type ->
+      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
+   )
+perform player_ix model =
+   (
+      {model |
+         battle =
+            (Array.foldl
+               (\actor battle ->
+                  if ((Struct.Character.get_player_index actor) == player_ix)
+                  then
+                     (Struct.Battle.refresh_character
+                        (Struct.Character.get_index actor)
+                        battle
+                     )
+                  else battle
+               )
+               model.battle
+               (Struct.Battle.get_characters model.battle)
+            )
+      },
+      []
+   )
+
+--------------------------------------------------------------------------------
+-- EXPORTED --------------------------------------------------------------------
+--------------------------------------------------------------------------------
+forward : (
+      Bool ->
+      Int ->
+      Struct.Model.Type ->
+      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
+   )
+forward is_forward player_ix model =
+   if (is_forward)
+   then (perform player_ix model)
+   else (model, [])
+
+backward : (
+      Int ->
+      Struct.Model.Type ->
+      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
+   )
+backward is_forward player_ix model =
+   if (is_forward)
+   then (model, [])
+   else (perform player_ix model)
diff --git a/src/battle/src/Update/Puppeteer/RefreshCharactersOfPlayer.elm b/src/battle/src/Update/Puppeteer/RefreshCharactersOfPlayer.elm
deleted file mode 100644
index 6c91c9c..0000000
--- a/src/battle/src/Update/Puppeteer/RefreshCharactersOfPlayer.elm
+++ /dev/null
@@ -1,63 +0,0 @@
-module Update.Puppeteer.RefreshCharactersOfPlayer exposing (forward, backward)
-
--- Elm -------------------------------------------------------------------------
-import Array
-
--- Local Module ----------------------------------------------------------------
-import Struct.Battle
-import Struct.Character
-import Struct.Event
-import Struct.Model
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-perform : (
-      Int ->
-      Struct.Model.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-perform player_ix model =
-   (
-      {model |
-         battle =
-            (Array.foldl
-               (\actor battle ->
-                  if ((Struct.Character.get_player_index actor) == player_ix)
-                  then
-                     (Struct.Battle.refresh_character
-                        (Struct.Character.get_index actor)
-                        battle
-                     )
-                  else battle
-               )
-               model.battle
-               (Struct.Battle.get_characters model.battle)
-            )
-      },
-      []
-   )
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-forward : (
-      Bool ->
-      Int ->
-      Struct.Model.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-forward is_forward player_ix model =
-   if (is_forward)
-   then (perform player_ix model)
-   else (model, [])
-
-backward : (
-      Int ->
-      Struct.Model.Type ->
-      (Struct.Model.Type, (List (Cmd Struct.Event.Type)))
-   )
-backward is_forward player_ix model =
-   if (is_forward)
-   then (model, [])
-   else (perform player_ix model)
-- 
cgit v1.2.3-70-g09d2