|
@@ -258,7 +258,7 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
private async Task<List<Player>> CalculateCandidates()
|
|
private async Task<List<Player>> CalculateCandidates()
|
|
{
|
|
{
|
|
var message = strings.results_of_voting;
|
|
var message = strings.results_of_voting;
|
|
- foreach (var (playerId, targetId) in VoteKillList)
|
|
|
|
|
|
+ foreach (var (playerId, targetId) in VoteKillList.Where(item => item.Value != 0))
|
|
message += $"\n({Players[playerId].TurnOrder}) {Players[playerId].NickName} {strings.vote_to} " +
|
|
message += $"\n({Players[playerId].TurnOrder}) {Players[playerId].NickName} {strings.vote_to} " +
|
|
$"({Players[targetId].TurnOrder}) {Players[targetId].NickName}";
|
|
$"({Players[targetId].TurnOrder}) {Players[targetId].NickName}";
|
|
if (message == strings.results_of_voting) message = strings.no_one_voted;
|
|
if (message == strings.results_of_voting) message = strings.no_one_voted;
|
|
@@ -281,7 +281,7 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
private async Task PutUpVote(long playerId, long targetId, int messageId, bool toKill = false)
|
|
private async Task PutUpVote(long playerId, long targetId, int messageId, bool toKill = false)
|
|
{
|
|
{
|
|
var player = Players[playerId];
|
|
var player = Players[playerId];
|
|
- if (targetId == 0)
|
|
|
|
|
|
+ if (targetId == 0 && VoteKillList.AddUniqueByKey(playerId, targetId))
|
|
{
|
|
{
|
|
if (!toKill) await PlayersCh.SendExcept(player.ChatId, $"{player.NickName} {strings.skip_vote}");
|
|
if (!toKill) await PlayersCh.SendExcept(player.ChatId, $"{player.NickName} {strings.skip_vote}");
|
|
await PlayersCh.EditTo(player.Id, messageId, strings.you_skip_vote);
|
|
await PlayersCh.EditTo(player.Id, messageId, strings.you_skip_vote);
|