|
@@ -1,4 +1,3 @@
|
|
-using System;
|
|
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading;
|
|
@@ -290,8 +289,8 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
else
|
|
else
|
|
{
|
|
{
|
|
var target = Players[targetId];
|
|
var target = Players[targetId];
|
|
- VoteUpList.Add(target);
|
|
|
|
- if (toKill) VoteKillList.Add(playerId, targetId);
|
|
|
|
|
|
+ if(!toKill) VoteUpList.AddUnique(target);
|
|
|
|
+ else if(VoteKillList.AddUniqueByKey(playerId, targetId)) VoteUpList.Add(target);
|
|
if (playerId != targetId)
|
|
if (playerId != targetId)
|
|
{
|
|
{
|
|
if (!toKill) await PlayersCh.SendExcept(player.ChatId, $"{player.NickName} {strings.put_up_vote_to} {target.NickName}");
|
|
if (!toKill) await PlayersCh.SendExcept(player.ChatId, $"{player.NickName} {strings.put_up_vote_to} {target.NickName}");
|
|
@@ -320,8 +319,7 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
await PlayersCh.Send(strings.mafia_won, exceptDied: false);
|
|
await PlayersCh.Send(strings.mafia_won, exceptDied: false);
|
|
await PlayersCh.SendSticker(Stickers.Sticker["MafiaWins"]);
|
|
await PlayersCh.SendSticker(Stickers.Sticker["MafiaWins"]);
|
|
}
|
|
}
|
|
- if (PlayersRole.ContainsKey(Roles.Fool))
|
|
|
|
- PlayersRole[Roles.Fool][0].CurrentRole.IsWon();
|
|
|
|
|
|
+ if (PlayersRole.ContainsKey(Roles.Fool)) await PlayersRole[Roles.Fool][0].CurrentRole.IsWon();
|
|
var rolesMessage = strings.in_this_game_roles;
|
|
var rolesMessage = strings.in_this_game_roles;
|
|
var sortedPLayers = Players.Values.ToList();
|
|
var sortedPLayers = Players.Values.ToList();
|
|
sortedPLayers.Sort((x, y) => x.TurnOrder - y.TurnOrder);
|
|
sortedPLayers.Sort((x, y) => x.TurnOrder - y.TurnOrder);
|