| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2017-11-22 16:44:36 +0100 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2017-11-22 16:44:36 +0100 |
| commit | 7a6388eb79b269a4318969cd5c4f131779e4d168 (patch) | |
| tree | 6cc2f6a57f4c76b987f7d20e81e54b70787845ef /src | |
| parent | 72d59d4fce17fc4d6cbe5f04a7ff632c93ba6cd2 (diff) | |
Adds player id.
Diffstat (limited to 'src')
| -rw-r--r-- | src/battlemap/src/Model.elm | 1 | ||||
| -rw-r--r-- | src/battlemap/src/Send/CharacterTurn.elm | 2 | ||||
| -rw-r--r-- | src/battlemap/src/Shim/Model.elm | 1 | ||||
| -rw-r--r-- | src/battlemap/src/Update.elm | 16 |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/battlemap/src/Model.elm b/src/battlemap/src/Model.elm index 0e93e2b..255190b 100644 --- a/src/battlemap/src/Model.elm +++ b/src/battlemap/src/Model.elm @@ -38,6 +38,7 @@ type alias Type = characters: (Dict.Dict Character.Ref Character.Type), error: (Maybe Error.Type), controlled_team: Int, + player_id: String, ui: UI.Type } diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm index 38ae6af..56813f6 100644 --- a/src/battlemap/src/Send/CharacterTurn.elm +++ b/src/battlemap/src/Send/CharacterTurn.elm @@ -32,7 +32,7 @@ try_encoding model = (Json.Encode.object [ ("session_token", Json.Encode.string "0"), - ("player_id", 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), diff --git a/src/battlemap/src/Shim/Model.elm b/src/battlemap/src/Shim/Model.elm index 6f03517..9a3e68d 100644 --- a/src/battlemap/src/Shim/Model.elm +++ b/src/battlemap/src/Shim/Model.elm @@ -44,6 +44,7 @@ generate = error = Nothing, battlemap = (Shim.Battlemap.generate), controlled_team = 0, + player_id = "0", characters = (new_char "0" 0 0 0 7 0 (new_char "1" 0 1 0 6 1 diff --git a/src/battlemap/src/Update.elm b/src/battlemap/src/Update.elm index 091d641..82d1dd5 100644 --- a/src/battlemap/src/Update.elm +++ b/src/battlemap/src/Update.elm @@ -48,12 +48,24 @@ update event model = if (model.controlled_team == 0) then ( - (Model.reset {model | controlled_team = 1} model.characters), + (Model.reset + {model | + controlled_team = 1, + player_id = "1" + } + model.characters + ), Cmd.none ) else ( - (Model.reset {model | controlled_team = 0} model.characters), + (Model.reset + {model | + controlled_team = 0, + player_id = "0" + } + model.characters + ), Cmd.none ) |