Tigran %!s(int64=4) %!d(string=hai) anos
pai
achega
3fb3b0c1de

+ 6 - 6
MafiaTelegramBot/Game/GameRooms/GameRoom.GameProcess.cs

@@ -193,7 +193,7 @@ namespace MafiaTelegramBot.Game.GameRooms
                             : $"{Players[id].NickName} {strings.will_be_killed}";
                             await PlayersCh.SendTo(id, alive ? strings.you_will_be_ressurected : strings.you_will_be_killed);
                         }
-                message += mafiaNotAgree;
+                message += '\n' + mafiaNotAgree;
                 await PlayersCh.SendSticker(Stickers.Sticker["Day"]);
                 await PlayersCh.Send(message);
             });
@@ -203,14 +203,14 @@ namespace MafiaTelegramBot.Game.GameRooms
         {
             await Task.Run( async () =>
             {
-                VoteUpList.Clear();
-                VoteKillList.Clear();
                 foreach (var contender in contenders) await contender.CurrentRole.DefenceAction();
                 var votersPlayers = Players.Values.Where(p => p.IsAlive).ToArray();
                 Timer votingTimer = new() {Interval = 10 * 1000, AutoReset = false};
                 var resetEvent = new ManualResetEvent(false);
                 votingTimer.Elapsed += (_, _) => resetEvent.Set();
                 List<Message> messagesToDelete = new();
+                VoteUpList.Clear();
+                VoteKillList.Clear();
                 foreach (var player in votersPlayers)
                     messagesToDelete.Add(await PlayersCh.SendTo(player.ChatId, strings.you_have_ten_seconds,  
                         Keyboard.VoteKeyboard(contenders, player.Id, vote: Callback.VoteToKill)));
@@ -276,7 +276,7 @@ namespace MafiaTelegramBot.Game.GameRooms
             if (targetId == 0)
             {
                 if (!toKill) await PlayersCh.SendExcept(player.ChatId, $"{player.NickName} {strings.skip_vote}");
-                await PlayersCh.EditTo(player.ChatId, messageId, strings.you_skip_vote);
+                await PlayersCh.EditTo(player.Id, messageId, strings.you_skip_vote);
             }
             else
             {
@@ -286,12 +286,12 @@ namespace MafiaTelegramBot.Game.GameRooms
                 if (playerId != targetId)
                 {
                     if (!toKill) await PlayersCh.SendExcept(player.ChatId, $"{player.NickName} {strings.put_up_vote_to} {target.NickName}");
-                    await PlayersCh.EditTo(player.ChatId, messageId, $"{strings.you_vote_player} {target.NickName}");
+                    await PlayersCh.EditTo(player.Id, messageId, $"{strings.you_vote_player} {target.NickName}");
                 }
                 else
                 {
                     if (!toKill) await PlayersCh.SendExcept(player.ChatId, $"{player.NickName} {strings.vote_to_self}");
-                    await PlayersCh.EditTo(player.ChatId, messageId, strings.you_vote_to_self);
+                    await PlayersCh.EditTo(player.Id, messageId, strings.you_vote_to_self);
                 } 
             }
         }

+ 0 - 1
MafiaTelegramBot/Game/GameRooms/GameRoom.Role.cs

@@ -111,7 +111,6 @@ namespace MafiaTelegramBot.Game.GameRooms
                 VoteActionComplete.WaitOne();
                 VoteActionComplete.Reset();
                 voteTimer.Stop();
-                if(message!=null) await Bot.Get().DeleteMessageAsync(Player.ChatId, message.MessageId);
             }
             
             public async Task DefenceAction()