|
@@ -1,6 +1,7 @@
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using System.Threading.Tasks;
|
|
|
|
+using MafiaTelegramBot.DataBase.EntityDao;
|
|
using MafiaTelegramBot.Game;
|
|
using MafiaTelegramBot.Game;
|
|
using MafiaTelegramBot.Game.GameRoles;
|
|
using MafiaTelegramBot.Game.GameRoles;
|
|
using MafiaTelegramBot.Game.GameRooms;
|
|
using MafiaTelegramBot.Game.GameRooms;
|
|
@@ -25,6 +26,9 @@ namespace MafiaTelegramBot.Controllers
|
|
: new NormalGameRoom {Owner = creator, RoomName = roomName, IsPrivate = isPrivate};
|
|
: new NormalGameRoom {Owner = creator, RoomName = roomName, IsPrivate = isPrivate};
|
|
OpenedGames.Add(roomKey, room);
|
|
OpenedGames.Add(roomKey, room);
|
|
room.Players.Add(creator.Id, creator);
|
|
room.Players.Add(creator.Id, creator);
|
|
|
|
+
|
|
|
|
+ UserDao.GetPlayerById(creator.Id).Result.StopTimer();
|
|
|
|
+
|
|
return ResultCode.CodeOk;
|
|
return ResultCode.CodeOk;
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -39,6 +43,9 @@ namespace MafiaTelegramBot.Controllers
|
|
if (OpenedGames[roomKey].IsFilled()) return ResultCode.RoomIsFilled;
|
|
if (OpenedGames[roomKey].IsFilled()) return ResultCode.RoomIsFilled;
|
|
if (!player.SetRoomName(roomName)) return ResultCode.UserAlreadyInGame;
|
|
if (!player.SetRoomName(roomName)) return ResultCode.UserAlreadyInGame;
|
|
OpenedGames[roomKey].Players.Add(player.Id, player);
|
|
OpenedGames[roomKey].Players.Add(player.Id, player);
|
|
|
|
+
|
|
|
|
+ UserDao.GetPlayerById(player.Id).Result.StopTimer();
|
|
|
|
+
|
|
await OpenedGames[roomKey].PlayersCh.SendExcept(player.Id, $"{player.NickName} {strings.connected_to_game}");
|
|
await OpenedGames[roomKey].PlayersCh.SendExcept(player.Id, $"{player.NickName} {strings.connected_to_game}");
|
|
return ResultCode.CodeOk;
|
|
return ResultCode.CodeOk;
|
|
});
|
|
});
|
|
@@ -62,6 +69,9 @@ namespace MafiaTelegramBot.Controllers
|
|
player.CurrentRole = new NoneRole();
|
|
player.CurrentRole = new NoneRole();
|
|
player.TurnOrder = -1;
|
|
player.TurnOrder = -1;
|
|
OpenedGames[roomKey].Players.Remove(player.Id);
|
|
OpenedGames[roomKey].Players.Remove(player.Id);
|
|
|
|
+
|
|
|
|
+ UserDao.GetPlayerById(player.Id).Result.StartTimer();
|
|
|
|
+
|
|
var message = OpenedGames[roomKey].Owner.Id == player.Id
|
|
var message = OpenedGames[roomKey].Owner.Id == player.Id
|
|
? $"{player.NickName} \\({strings.room_owner}\\) {strings.leave_from_game}"
|
|
? $"{player.NickName} \\({strings.room_owner}\\) {strings.leave_from_game}"
|
|
: $"{player.NickName} {strings.leave_from_game}";
|
|
: $"{player.NickName} {strings.leave_from_game}";
|