Browse Source

In extended room re-check role applied

Tigran 4 years ago
parent
commit
f2343415d9

+ 1 - 1
MafiaTelegramBot/Game/GameRoles/CopRole.cs

@@ -19,7 +19,7 @@ namespace MafiaTelegramBot.Game.GameRoles
         public override async Task NightAction()
         {
             NightTargetId = -1;
-            NightTargetList = Room.Players.Values.Where(p => p.IsAlive && !KnownRoles.ContainsKey(p.Id)).ToList();
+            NightTargetList = Room.Players.Values.Where(p => p.IsAlive && (!KnownRoles.ContainsKey(p.Id) || Room.IsExtended)).ToList();
             var message = await Room.PlayersCh.SendTo(Player.ChatId, strings.choose_player_to_check_role, 
                 Keyboard.NightChooseTargetKeyboard(NightTargetList, Player.Id));
             MessageId = message.MessageId;

+ 1 - 1
MafiaTelegramBot/Game/GameRoles/DonRole.cs

@@ -21,7 +21,7 @@ namespace MafiaTelegramBot.Game.GameRoles
             NightTargetId = -1;
             Player.IsSpeaker = true;
             var alivePlayers = Room.Players.Values.Where(p => p.IsAlive).ToList();
-            NightTargetList = alivePlayers.Where(p => !KnownRoles.ContainsKey(p.Id)).ToList();
+            NightTargetList = alivePlayers.Where(p => p.IsAlive && (!KnownRoles.ContainsKey(p.Id) || Room.IsExtended)).ToList();
             
             var message = await Bot.SendWithMarkdown2(Player.ChatId, strings.choose_player_to_check_role, 
                 Keyboard.NightChooseTargetKeyboard(NightTargetList, Player.Id));

+ 1 - 1
MafiaTelegramBot/Game/GameRoles/LawyerRole.cs

@@ -19,7 +19,7 @@ namespace MafiaTelegramBot.Game.GameRoles
         public override async Task NightAction()
         {
             NightTargetId = -1;
-            NightTargetList = Room.Players.Values.Where(p => p.IsAlive && !KnownRoles.ContainsKey(p.Id)).ToList();
+            NightTargetList = Room.Players.Values.Where(p => p.IsAlive).ToList();
             var message = await Room.PlayersCh.SendTo(Player.ChatId, strings.choose_player_to_check_role, 
                 Keyboard.NightChooseTargetKeyboard(NightTargetList, Player.Id));
             MessageId = message.MessageId;

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

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MafiaTelegramBot.Game.GameRoles;
-using MafiaTelegramBot.Models;
 using MafiaTelegramBot.Resources;
 using Timer = System.Timers.Timer;