|
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
|
|
|
using MafiaTelegramBot.DataBase;
|
|
|
using MafiaTelegramBot.Models;
|
|
|
using MafiaTelegramBot.Resources;
|
|
|
-using Telegram.Bot.Types.ReplyMarkups;
|
|
|
using MafiaTelegramBot.Extensions;
|
|
|
|
|
|
namespace MafiaTelegramBot.Game
|
|
@@ -138,13 +137,12 @@ namespace MafiaTelegramBot.Game
|
|
|
await Task.Run(() =>
|
|
|
{
|
|
|
var random = new Random();
|
|
|
- var settingsCopy = Settings.ToDictionary(
|
|
|
- entry => entry.Key,
|
|
|
- entry => entry.Value);
|
|
|
- for (int i = 0; i < _turnOrder.Count; ++i)
|
|
|
+ for (var i = 0; i < _turnOrder.Count; ++i)
|
|
|
{
|
|
|
var user = _turnOrder.Dequeue();
|
|
|
- user.SetRole(settingsCopy.GetRole(random.Next(settingsCopy.Count)));
|
|
|
+ var roles = new List<Roles>();
|
|
|
+ foreach (var (key, value) in Settings) roles.AddTimes(key, value);
|
|
|
+ user.SetRole(roles.GetAndRemove(random.Next(roles.Count)));
|
|
|
_turnOrder.Enqueue(user);
|
|
|
}
|
|
|
});
|