edit players list message

MafiaTelegramBot/Game/GameRooms/GameRoom.MessageHandler.cs

@@ -66,8 +66,8 @@ namespace MafiaTelegramBot.Game.GameRooms
                         ? knownRoles[players[i].Id]
                         : "";
                     message +=
-                        $"\n({players[i].TurnOrder}) " +
-                        $"{players[i].NickName} " +
+                        $"\n{(message == strings.players_list ? strings.next + " - " : "")}({players[i].TurnOrder}) " +
+                        $"{(players[i].Id == player.Id ? strings.you : players[i].NickName)} " +
                         $"({(players[i].IsAlive ? strings.alive : strings.died)}) " +
                         $"{role}";
                 }

MafiaTelegramBot/Game/GameRooms/GameRoom.Role.cs

@@ -167,12 +167,12 @@ namespace MafiaTelegramBot.Game.GameRooms
                     if (!Room.VoteKillList.ContainsKey(Player.Id) && Room.Players.ContainsKey(Player.Id))
                     {
                         var players = targets.Where(p => Room.Players.ContainsKey(p.Id)).ToArray();
-                        //players = new Player[0]; //skipping for tests
+                        players = new Player[0]; //TODO skipping for tests
                         if(players.Length == 0) await Room.PlayersCh.EditTo(Player.Id, message.MessageId, strings.nothing_to_choose);
                         else
                         {
                             var randomPlayer = players[Utilities.Rnd.Next(players.Length)];
-                            await Room.PutUpVote(Player.Id, randomPlayer.Id);
+                            await Room.PutUpVote(Player.Id, randomPlayer.Id, toKill: true);
                             await Room.PlayersCh.EditTo(Player.Id, message.MessageId, $"{strings.automatically_vote} ({randomPlayer.TurnOrder}) {randomPlayer.NickName}");
                         }
                     }

MafiaTelegramBot/Models/Inlines/ApplyRolesChangeQuery.cs

@@ -43,7 +43,11 @@ namespace MafiaTelegramBot.Models.Inlines
                             else _room.CustomRoomSettings[role]++;
                         }
                     }
-                    else if (_room.CustomRoomSettings[role] < _room.MaxPlayers) _room.CustomRoomSettings[role]++;
+                    else
+                    {
+                        if(!_room.CustomRoomSettings.ContainsKey(role)) _room.CustomRoomSettings.Add(role, 1);
+                        else if (_room.CustomRoomSettings[role] < _room.MaxPlayers) _room.CustomRoomSettings[role]++;
+                    }
                     break;
                 case "-":
                     if (_room.CustomRoomSettings.ContainsKey(role))

MafiaTelegramBot/Resources/strings.Designer.cs

@@ -1064,5 +1064,11 @@ namespace MafiaTelegramBot {
                 return ResourceManager.GetString("not_enogh_mafia", resourceCulture);
             }
         }
+        
+        internal static string next {
+            get {
+                return ResourceManager.GetString("next", resourceCulture);
+            }
+        }
     }
 }

MafiaTelegramBot/Resources/strings.resx

@@ -528,4 +528,7 @@
     <data name="not_enogh_mafia" xml:space="preserve">
         <value>Количество черных ролей меньше, чем необходимо</value>
     </data>
+    <data name="next" xml:space="preserve">
+        <value>Следующий</value>
+    </data>
 </root>