From c40ed5e32999c83c91a65b5ca8f62f2e3bdeb724 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Thu, 30 Nov 2017 22:16:28 +0100
Subject: Changing attack targeting logic.

---
 src/battlemap/src/Model.elm                 |  2 ++
 src/battlemap/src/Model/SelectCharacter.elm |  7 ++-----
 src/battlemap/src/Send/CharacterTurn.elm    | 19 ++++++++-----------
 src/battlemap/src/Shim/Model.elm            |  1 +
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/battlemap/src/Model.elm b/src/battlemap/src/Model.elm
index 5a0b754..4eb170a 100644
--- a/src/battlemap/src/Model.elm
+++ b/src/battlemap/src/Model.elm
@@ -38,6 +38,7 @@ type alias Type =
       error: (Maybe Error.Type),
       controlled_team: Int,
       controlled_character: (Maybe Character.Ref),
+      targets: (List Character.Ref),
       player_id: String,
       ui: UI.Type
    }
@@ -71,6 +72,7 @@ reset model characters =
       characters = characters,
       error = Nothing,
       controlled_character = Nothing,
+      targets = [],
       ui = (UI.set_previous_action model.ui Nothing)
    }
 
diff --git a/src/battlemap/src/Model/SelectCharacter.elm b/src/battlemap/src/Model/SelectCharacter.elm
index a4a077d..619a729 100644
--- a/src/battlemap/src/Model/SelectCharacter.elm
+++ b/src/battlemap/src/Model/SelectCharacter.elm
@@ -32,11 +32,8 @@ attack_character : (
    )
 attack_character model main_char_id target_char_id target_char =
    {model |
-      ui =
-         (UI.set_previous_action
-            model.ui
-            (Just (UI.AttackedCharacter target_char_id))
-         )
+      targets = [target_char_id],
+      ui = (UI.set_previous_action model.ui Nothing)
    }
 
 select_character : (
diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm
index 0235122..d096ac3 100644
--- a/src/battlemap/src/Send/CharacterTurn.elm
+++ b/src/battlemap/src/Send/CharacterTurn.elm
@@ -29,11 +29,11 @@ try_encoding model =
          (Just
             (Json.Encode.object
                [
-                  ("session_token", Json.Encode.string "0"),
-                  ("player_id", Json.Encode.string model.player_id),
-                  ("battlemap_id", Json.Encode.string "0"),
-                  ("instance_id", Json.Encode.string "0"),
-                  ("char_id", Json.Encode.string char_ref),
+                  ("session_token", (Json.Encode.string "0")),
+                  ("player_id", (Json.Encode.string model.player_id)),
+                  ("battlemap_id", (Json.Encode.string "0")),
+                  ("instance_id", (Json.Encode.string "0")),
+                  ("char_id", (Json.Encode.string char_ref)),
                   (
                      "path",
                      (Json.Encode.list
@@ -50,12 +50,9 @@ try_encoding model =
                      )
                   ),
                   (
-                     "target_id",
-                     (Json.Encode.string
-                        (case (UI.get_previous_action model.ui) of
-                           (Just (UI.AttackedCharacter id)) -> id
-                           _ -> ""
-                        )
+                     "targets_id",
+                     (Json.Encode.list
+                        (List.map (Json.Encode.string) model.targets)
                      )
                   )
                ]
diff --git a/src/battlemap/src/Shim/Model.elm b/src/battlemap/src/Shim/Model.elm
index e7bd2c3..376250f 100644
--- a/src/battlemap/src/Shim/Model.elm
+++ b/src/battlemap/src/Shim/Model.elm
@@ -26,6 +26,7 @@ generate =
       controlled_team = 0,
       controlled_character = Nothing,
       player_id = "0",
+      targets = [],
       characters = (Dict.empty),
       ui = (UI.default)
    }
-- 
cgit v1.2.3-70-g09d2