|
@@ -17,7 +17,7 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
protected bool IsRunning;
|
|
protected bool IsRunning;
|
|
public int MaxPlayers = 10;
|
|
public int MaxPlayers = 10;
|
|
private int _minPlayers = Constants.PLAYER_LIMITS_MIN;
|
|
private int _minPlayers = Constants.PLAYER_LIMITS_MIN;
|
|
- public bool IsPrivate { get; init; } = false;
|
|
|
|
|
|
+ public bool IsPrivate { get; init; }
|
|
public abstract bool IsExtended { get; protected set; }
|
|
public abstract bool IsExtended { get; protected set; }
|
|
public bool TimerEnabled { get; set; } = true;
|
|
public bool TimerEnabled { get; set; } = true;
|
|
public string RoomName { get; init; } = "NoNameRoom";
|
|
public string RoomName { get; init; } = "NoNameRoom";
|
|
@@ -42,7 +42,7 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
new Task(async () =>
|
|
new Task(async () =>
|
|
{
|
|
{
|
|
IsRunning = true;
|
|
IsRunning = true;
|
|
- await FirstDay();
|
|
|
|
|
|
+ await FirstNight();
|
|
await GameCycle();
|
|
await GameCycle();
|
|
await EndOfGame();
|
|
await EndOfGame();
|
|
}).Start();
|
|
}).Start();
|
|
@@ -58,8 +58,9 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
return resultCode;
|
|
return resultCode;
|
|
}
|
|
}
|
|
|
|
|
|
- private async Task FirstDay()
|
|
|
|
|
|
+ private async Task FirstNight()
|
|
{
|
|
{
|
|
|
|
+
|
|
await Task.Run(() => { });
|
|
await Task.Run(() => { });
|
|
}
|
|
}
|
|
|
|
|
|
@@ -118,7 +119,7 @@ namespace MafiaTelegramBot.Game.GameRooms
|
|
for (var i = 0; i < _turnOrder.Count; ++i)
|
|
for (var i = 0; i < _turnOrder.Count; ++i)
|
|
{
|
|
{
|
|
var user = _turnOrder.Dequeue();
|
|
var user = _turnOrder.Dequeue();
|
|
- var value = roles.Count == 1 ? 1 : random.Next(roles.Count - 1);
|
|
|
|
|
|
+ var value = random.Next(roles.Count);
|
|
var next = roles.GetAndRemove(value);
|
|
var next = roles.GetAndRemove(value);
|
|
user.CurrentRole = (Role.GetNewRoleInstance(next));
|
|
user.CurrentRole = (Role.GetNewRoleInstance(next));
|
|
_turnOrder.Enqueue(user);
|
|
_turnOrder.Enqueue(user);
|