From da5528c7b2836e3b0e1a1b5041c9468543d7dd72 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Fri, 23 Oct 2020 13:58:44 +0200
Subject: [PATCH] added updating scores on lobby list receive

---
 Client/Client.cs                   | 10 ++++++++--
 Client/ViewModels/ViewModel.cs     |  7 ++++++-
 Client/ViewModels/ViewModelGame.cs | 28 +++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/Client/Client.cs b/Client/Client.cs
index 77fc98b..d3788f3 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -20,6 +20,7 @@ namespace Client
     public delegate void CanvasDataReceived(double[][] coordinates, Color color);
     public delegate void CanvasReset();
     public delegate void LobbyCallback(int id);
+    
 
     class Client : ObservableObject
     {
@@ -48,6 +49,7 @@ namespace Client
         private ClientData data = ClientData.Instance;
         public CanvasDataReceived CanvasDataReceived;
         public CanvasReset CReset;
+        public HandleIncomingPlayer UpdateUserScores;
         public Lobby[] Lobbies { get; set; }
 
         public Client(string username)
@@ -190,7 +192,6 @@ namespace Client
 
                         case JSONConvert.CANVAS_WRITING:
                             CanvasDataReceived?.Invoke(JSONConvert.getCoordinates(payload), JSONConvert.getCanvasDrawingColor(payload));
-                            // we hebben gedrawed, dus stuur dat we weer kunnen drawen
                             
                             break;
                     }
@@ -216,11 +217,16 @@ namespace Client
 
         private void updateGameLobby()
         {
+            Debug.WriteLine("[CLIENT] updating game lobby");
             foreach (var item in Lobbies)
             {
                 Debug.WriteLine("[CLIENT] lobby data: {0}", item.Users.Count);
                 if (item.ID == data.Lobby?.ID)
-                    IncomingPlayer?.Invoke(item);
+                {
+                    //IncomingPlayer?.Invoke(item);
+                    UpdateUserScores?.Invoke(item as Lobby);
+                }
+
             }
         }
         
diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs
index 3bedfe0..2a23b36 100644
--- a/Client/ViewModels/ViewModel.cs
+++ b/Client/ViewModels/ViewModel.cs
@@ -112,7 +112,7 @@ namespace Client
 
         private void updateLobbies()
         {
-            Debug.WriteLine("updating lobbies...");
+            Debug.WriteLine("[VIEWMODEL] updating lobbies...");
             Lobby[] lobbiesArr = client.Lobbies;
             Application.Current.Dispatcher.Invoke(delegate
             {
@@ -122,6 +122,11 @@ namespace Client
                 foreach (Lobby l in lobbiesArr)
                 {
                     _lobbies.Add(l);
+                    Lobby clientLobby = ClientData.Instance.Lobby;
+                    if (l.ID == clientLobby?.ID)
+                    {
+                        clientLobby = l;
+                    }
                 }
 
             });
diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs
index 212584e..40ac402 100644
--- a/Client/ViewModels/ViewModelGame.cs
+++ b/Client/ViewModels/ViewModelGame.cs
@@ -91,6 +91,7 @@ namespace Client.ViewModels
             data.Client.RandomWord = HandleRandomWord;
             data.Client.IncomingMsg = HandleIncomingMsg;
             data.Client.IncomingPlayer = HandleIncomingPlayer;
+            data.Client.UpdateUserScores = UpdateUserScores;
         }
 
         public ICommand OnKeyDown { get; set; }
@@ -255,9 +256,34 @@ namespace Client.ViewModels
                 Players.Clear();
                 foreach (var item in lobby.Users)
                 {
-                    Players.Add(item.Username);
+                    Players.Add(item.Username + "\n" + item.Score);
                 }
             });
         }
+
+        private void UpdateUserScores(Lobby newLobby) {
+            Debug.WriteLine("[GAME] updating user scores");
+            List<User> newUsers = newLobby.Users;
+            // go over all users in current lobby
+            foreach (User user in data.Lobby?.Users)
+            {
+                // check with all users in new lobby
+                foreach (User newUser in newUsers)
+                {
+                    // and update the score
+                    if (newUser.Username == user.Username)
+                    {
+                        Debug.WriteLine($"[GAME] setting score of {user.Username} to {newUser.Score}. it was {user.Score}");
+                        user.Score = newUser.Score;
+                        break;
+                    }
+                }
+            }
+
+            // update all the scores in the player list
+            HandleIncomingPlayer(newLobby);
+        }
+
+        
     }
 }