Implemented ending game and starting a new one after finish. Removed old client

Author: Arcidev

Client.Logic/Game.cs

@@ -2,7 +2,6 @@
 using Arci.Networking.Security;
 using Arci.Networking.Security.AesOptions;
 using Client.Logic.Data;
-using Client.Logic.Data.Cards;
 using Client.Logic.Enums;
 using Client.Logic.Network;
 using System;
@@ -27,6 +26,7 @@ public class Game : IDisposable
 
         public event Action<MessageType, string> MessageReceived;
         public event Action<UInt16> PacketProcessed;
+        public event Action<bool> GameEnded;
 
         /// <summary>
         /// List of available servers
@@ -140,6 +140,12 @@ public void UnsubscribeAllHandlers()
             }
         }
 
+        internal void OnGameEnded(bool hasWon)
+        {
+            IsGameWaiting = false;
+            GameEnded?.Invoke(hasWon);
+        }
+
         internal void OnErrorOccured(string error) => MessageReceived?.Invoke(MessageType.Error, error);
 
         internal void OnInformationReceived(string msg) => MessageReceived?.Invoke(MessageType.Information, msg);

Client.Logic/Network/PacketHandlerGame.cs

@@ -48,8 +48,8 @@ private static void HandlePlayerDisconnected(Packet packet, Game game)
         // Handle SMSG_END_GAME packet
         private static void HandleEndGame(Packet packet, Game game)
         {
-            //var winnerId = packet.ReadUInt32();
-            //game.EndGame(game.Player.Id == winnerId);
+            var winnerId = packet.ReadUInt32();
+            game.OnGameEnded(game.Player.Id == winnerId);
         }
     }
 }

Client.UI/Resources/Texts.Designer.cs

@@ -207,4 +207,10 @@
   <data name="SettingsModified" xml:space="preserve">
     <value>Provedli jste změny v nastavení. Přejete si je uložit?</value>
   </data>
+  <data name="WonGame" xml:space="preserve">
+    <value>Vyhrál jste.</value>
+  </data>
+  <data name="LostGame" xml:space="preserve">
+    <value>Prohrál jste.</value>
+  </data>
 </root>

Client.UI/Resources/Texts.cs-CZ.resx

@@ -207,4 +207,10 @@
   <data name="SettingsModified" xml:space="preserve">
     <value>Ha realizado cambios en la configuración. ¿Quieres salvarlos?</value>
   </data>
+  <data name="WonGame" xml:space="preserve">
+    <value>Usted ha ganado.</value>
+  </data>
+  <data name="LostGame" xml:space="preserve">
+    <value>Usted ha perdido.</value>
+  </data>
 </root>

Client.UI/Resources/Texts.es-ES.resx

@@ -207,4 +207,10 @@
   <data name="SettingsModified" xml:space="preserve">
     <value>You have made some changes to settings. Do you wish to save them?</value>
   </data>
+  <data name="WonGame" xml:space="preserve">
+    <value>You have won.</value>
+  </data>
+  <data name="LostGame" xml:space="preserve">
+    <value>You have lost.</value>
+  </data>
 </root>

Client.UI/Resources/Texts.resx

@@ -207,4 +207,10 @@
   <data name="SettingsModified" xml:space="preserve">
     <value>Vykonali ste zmeny v nastaveniach. Prajete si ich uložiť?</value>
   </data>
+  <data name="WonGame" xml:space="preserve">
+    <value>Vyhrali ste.</value>
+  </data>
+  <data name="LostGame" xml:space="preserve">
+    <value>Prehrali ste.</value>
+  </data>
 </root>

Client.UI/Resources/Texts.sk-SK.resx

@@ -8,7 +8,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Threading;
 
 namespace Client.UI.ViewModels.Cards
 {

Client.UI/ViewModels/Cards/PlayableCardViewModel.cs

@@ -9,7 +9,7 @@ namespace Client.UI.ViewModels.MainGame
 {
     public class PlayingGameViewModel : NotifyPropertyViewModel
     {
-        private readonly Game game;
+        public Game Game { get; }
 
         public CardDeckViewModel Player { get; }
 
@@ -23,26 +23,26 @@ public class PlayingGameViewModel : NotifyPropertyViewModel
 
         public PlayingGameViewModel()
         {
-            game = App.GetGame() ?? throw new InvalidOperationException("Game must exist at this point");
-            if (game.Player == null || game.Opponent == null)
+            Game = App.GetGame() ?? throw new InvalidOperationException("Game must exist at this point");
+            if (Game.Player == null || Game.Opponent == null)
                 throw new InvalidOperationException("Both players must exist at this point");
 
-            Player = new CardDeckViewModel(game.Player);
-            Opponent = new CardDeckViewModel(game.Opponent);
+            Player = new CardDeckViewModel(Game.Player);
+            Opponent = new CardDeckViewModel(Game.Opponent);
 
             AttackCmd = new CommandHandler(() => InvokeCardAction(CardAction.BasicAttack));
             SpellAttackCmd = new CommandHandler(() => InvokeCardAction(CardAction.SpellUse));
-            DefendCmd = new AsyncCommandHandler(() => game.DefendSelfAsync());
+            DefendCmd = new AsyncCommandHandler(() => Game.DefendSelfAsync());
 
-            game.PacketProcessed += OnPacketProcessed;
+            Game.PacketProcessed += OnPacketProcessed;
         }
 
         private void OnPacketProcessed(UInt16 packet)
         {
             if (packet == (UInt16)SMSGPackets.ActivePlayer)
             {
                 foreach (var card in Player.Cards)
-                    card.SelectionType = !game.IsGameWaiting && game.Player.ActiveCard.Guid == card.Guid ? SelectionType.Selected : SelectionType.None;
+                    card.SelectionType = !Game.IsGameWaiting && Game.Player.ActiveCard.Guid == card.Guid ? SelectionType.Selected : SelectionType.None;
 
                 foreach (var card in Opponent.Cards)
                     card.SelectionType = SelectionType.None;
@@ -53,15 +53,15 @@ private void InvokeCardAction(CardAction action)
         {
             if (action == CardAction.SpellUse)
             {
-                var targets = game.Player.ActiveCard.Spell?.GetPossibleTargets(game.Player, game.Opponent);
+                var targets = Game.Player.ActiveCard.Spell?.GetPossibleTargets(Game.Player, Game.Opponent);
                 foreach (var playerCards in Player.Cards.Where(x => targets.Contains(x.Guid)).Concat(Opponent.Cards.Where(x => targets.Contains(x.Guid))))
                 {
                     playerCards.SelectionType = SelectionType.SpellUsable;
                 }
             }
             else if (action == CardAction.BasicAttack)
             {
-                var targets = game.Player.ActiveCard.GetPossibleTargets(game.Opponent.CardDeck, game.Player.ActiveCardPosition);
+                var targets = Game.Player.ActiveCard.GetPossibleTargets(Game.Opponent.CardDeck, Game.Player.ActiveCardPosition);
                 foreach (var playerCards in Opponent.Cards.Where(x => targets.Contains(x.Guid)))
                 {
                     playerCards.SelectionType = SelectionType.BasicDamageAttackable;

Client.UI/ViewModels/MainGame/PlayingGameViewModel.cs

@@ -1,4 +1,7 @@
-using System.Windows.Controls;
+using Client.UI.Resources;
+using Client.UI.ViewModels.MainGame;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace Client.UI.Views.Game
 {
@@ -7,9 +10,32 @@ namespace Client.UI.Views.Game
     /// </summary>
     public partial class PlayingGame : Page
     {
+        private bool loaded;
+
         public PlayingGame()
         {
             InitializeComponent();
+
+            Loaded += PlayingGame_Loaded;
+        }
+
+        private void PlayingGame_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (loaded || !(DataContext is PlayingGameViewModel vm))
+                return;
+
+            loaded = true;
+            vm.Game.GameEnded += Game_GameEnded;
+        }
+
+        private void Game_GameEnded(bool hasWon)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                MessageBox.Show(hasWon ? Texts.WonGame : Texts.LostGame, string.Empty, MessageBoxButton.OK, MessageBoxImage.None);
+
+                NavigationService.Navigate(new MainMenu());
+            });
         }
     }
 }