Bug fix

MafiaTelegramBot/Game/GameRooms/GameRoom.GameProcess.cs

@@ -243,25 +243,25 @@ namespace MafiaTelegramBot.Game.GameRooms
                     default:
                     {
                         await DefencePhase(VoteUpList);
-                        var contenders = await CalculateCandidates();
-                        switch (contenders.Count)
+                        VoteUpList = await CalculateCandidates();
+                        switch (VoteUpList.Count)
                         {
                             case 0:
                                 await PlayersCh.Send(strings.nothing_up_to_dispatch);
                                 break;
                             case 1:
-                                await contenders[0].CurrentRole.Dispatch();
+                                await VoteUpList[0].CurrentRole.Dispatch();
                                 break;
                             case > 1:
-                                await DefencePhase(contenders);
-                                contenders = await CalculateCandidates();
-                                switch (contenders.Count)
+                                await DefencePhase(VoteUpList);
+                                VoteUpList = await CalculateCandidates();
+                                switch (VoteUpList.Count)
                                 {
                                     case 0:
                                         await PlayersCh.Send(strings.nothing_up_to_dispatch);
                                         break;
                                     case 1:
-                                        await contenders[0].CurrentRole.Dispatch();
+                                        await VoteUpList[0].CurrentRole.Dispatch();
                                         break;
                                     default:
                                         await PlayersCh.Send(strings.villagers_could_not_decide);
@@ -339,9 +339,9 @@ namespace MafiaTelegramBot.Game.GameRooms
                         else if (VoteKillList.AddUniqueByKey(playerId, targetId))
                         {
                             if (playerId != targetId)
-                                await PlayersCh.EditTo(playerId, messageId, $"{strings.you_vote_player} {Players[targetId].NickName}");
+                                await PlayersCh.EditTo(playerId, messageId, $"{strings.you_vote_to_kill} {Players[targetId].NickName}");
                             else
-                                await PlayersCh.EditTo(playerId, messageId, strings.you_vote_to_self);
+                                await PlayersCh.EditTo(playerId, messageId, strings.you_vote_to_kill_self);
                         }
                     }
                 }   

MafiaTelegramBot/Game/GameRooms/GameRoom.Structure.cs

@@ -21,7 +21,7 @@ namespace MafiaTelegramBot.Game.GameRooms
 
         private Timer WaitingPlayers;
         
-        public readonly List<Player> VoteUpList = new();
+        public List<Player> VoteUpList = new();
         public readonly Dictionary<long, long> VoteKillList = new();
 
         public readonly MessageHandler MHandler;
@@ -71,9 +71,10 @@ namespace MafiaTelegramBot.Game.GameRooms
             {
                 if (IsDay && player.IsSpeaker) player.CurrentRole.TalkingActionComplete.Set();
                 if (IsDay && !player.IsSpeaker) player.CurrentRole.VoteActionComplete.Set();
+                if (!IsDay) await player.CurrentRole.SetNightTarget(-1);
                 VoteUpList.RemoveAll(p=> p.Id == player.Id);
                 VoteKillList.Remove(player.Id);
-                var voteKillCopy = VoteKillList;
+                var voteKillCopy = VoteKillList.ToList();
                 foreach (var (k, v) in voteKillCopy)
                     if (v == player.Id) VoteKillList.Remove(k);
                 PlayersRole[player.CurrentRole.RoleKey].Remove(player);

MafiaTelegramBot/Resources/strings.Designer.cs

@@ -896,5 +896,17 @@ namespace MafiaTelegramBot {
                 return ResourceManager.GetString("this_player_left_from_game", resourceCulture);
             }
         }
+        
+        internal static string you_vote_to_kill {
+            get {
+                return ResourceManager.GetString("you_vote_to_kill", resourceCulture);
+            }
+        }
+        
+        internal static string you_vote_to_kill_self {
+            get {
+                return ResourceManager.GetString("you_vote_to_kill_self", resourceCulture);
+            }
+        }
     }
 }

MafiaTelegramBot/Resources/strings.resx

@@ -444,4 +444,10 @@
     <data name="this_player_left_from_game" xml:space="preserve">
         <value>Этот игрок покинул игру</value>
     </data>
+    <data name="you_vote_to_kill" xml:space="preserve">
+        <value>Вы проголосовали за</value>
+    </data>
+    <data name="you_vote_to_kill_self" xml:space="preserve">
+        <value>Вы проголосовали за себя</value>
+    </data>
 </root>