Notify about game closing; provide small fixes

Author: VladimirKhil

src/SICore/SICore/Clients/Game/Game.cs

@@ -2812,20 +2812,29 @@ private void DropPlayerFromThemeDeleters(int playerIndex)
 
         themeDeleters.RemoveAt(playerIndex);
 
-        if (ClientData.Decision == DecisionType.NextPersonFinalThemeDeleting && !themeDeleters.IsEmpty())
+        if (ClientData.Decision == DecisionType.NextPersonFinalThemeDeleting)
         {
-            var indicies = themeDeleters.Current.PossibleIndicies;
-            var hasAnyFlag = false;
-
-            for (var i = 0; i < ClientData.Players.Count; i++)
+            if (themeDeleters.IsEmpty())
             {
-                ClientData.Players[i].Flag = indicies.Contains(i);
-                hasAnyFlag = true;
+                _logic.StopWaiting();
+                ClientData.MoveDirection = MoveDirections.RoundNext;
+                _logic.Stop(StopReason.Move);
             }
-
-            if (!hasAnyFlag)
+            else
             {
-                _logic.PlanExecution(Tasks.AskToDelete, 10);
+                var indicies = themeDeleters.Current.PossibleIndicies;
+                var hasAnyFlag = false;
+
+                for (var i = 0; i < ClientData.Players.Count; i++)
+                {
+                    ClientData.Players[i].Flag = indicies.Contains(i);
+                    hasAnyFlag = true;
+                }
+
+                if (!hasAnyFlag)
+                {
+                    _logic.PlanExecution(Tasks.AskToDelete, 10);
+                }
             }
         }
     }

src/SICore/SICore/Clients/Game/GameLogic.cs

@@ -2272,6 +2272,11 @@ private void WaitNext(bool isSelectingStaker)
         _gameActions.SendMessage(Messages.Cancel, _data.ShowMan.Name);
         _gameActions.SendMessageWithArgs(Messages.Timer, 2, MessageParams.Timer_Stop);
 
+        if (!isSelectingStaker && _data.ThemeDeleters != null && _data.ThemeDeleters.IsEmpty())
+        {
+            throw new InvalidOperationException("_data.ThemeDeleters are empty");
+        }
+
         var playerIndex = isSelectingStaker ? _data.Order[_data.OrderIndex] : _data.ThemeDeleters?.Current.PlayerIndex;
 
         if (playerIndex == -1) // The showman has not made a decision

src/SICore/SICore/Clients/Viewer/IViewerLogic.cs

@@ -271,4 +271,9 @@ void OnQuestionSelected() { }
     /// Handles player answering outcome.
     /// </summary>
     void OnPlayerOutcome(int playerIndex, bool isRight);
+
+    /// <summary>
+    /// Handles game closing.
+    /// </summary>
+    void OnGameClosed() { }
 }

src/SICore/SICore/Clients/Viewer/Viewer.cs

@@ -243,6 +243,12 @@ await _client.Node.ConnectionsLock.WithLockAsync(() =>
                         break;
                     }
 
+                case SystemMessages.GameClosed:
+                    {
+                        _logic.OnGameClosed();
+                        break;
+                    }
+
                 case Messages.Disconnected:
                     await OnDisconnectedAsync(mparams);
                     break;

src/SIGame/SIGame.ViewModel/Properties/Resources.Designer.cs

@@ -579,4 +579,7 @@
   <data name="QuestionTypeWithButton" xml:space="preserve">
     <value>Question with button</value>
   </data>
+  <data name="GameClosedMessage" xml:space="preserve">
+    <value>Game closed by server due to inactivity </value>
+  </data>
 </root>

src/SIGame/SIGame.ViewModel/Properties/Resources.resx

@@ -576,4 +576,7 @@
   <data name="QuestionTypeWithButton" xml:space="preserve">
     <value>Вопрос с кнопкой</value>
   </data>
+  <data name="GameClosedMessage" xml:space="preserve">
+    <value>Игра завершена сервером по причине неактивности</value>
+  </data>
 </root>

src/SIGame/SIGame.ViewModel/Properties/Resources.ru-RU.resx

@@ -1844,4 +1844,10 @@ public void Report()
         _gameViewModel.DialogMode = DialogModes.Report;
         _data.Host.OnFlash();
     }
+
+    public void OnGameClosed()
+    {
+        PlatformManager.Instance.ShowMessage(Resources.GameClosedMessage, MessageType.Warning, true);
+        OnReplic(ReplicCodes.Special.ToString(), Resources.GameClosedMessage);
+    }
 }