Dynamic number of players
This commit is contained in:
@@ -67,13 +67,10 @@ final class GameDashboardService
|
||||
$player = new Player();
|
||||
$player->setUser($user);
|
||||
$player->setSession($session);
|
||||
$player->setScreen(1);
|
||||
|
||||
$this->entityManager->persist($session);
|
||||
$this->entityManager->persist($player);
|
||||
|
||||
$this->initializePlayerSettings($player);
|
||||
|
||||
$this->entityManager->flush();
|
||||
|
||||
return $session;
|
||||
@@ -104,17 +101,15 @@ final class GameDashboardService
|
||||
}
|
||||
|
||||
$playerCount = count($session->getPlayers());
|
||||
if ($playerCount >= 3) {
|
||||
if ($playerCount >= $session->getGame()->getNumberOfPlayers()) {
|
||||
return false; // Session full
|
||||
}
|
||||
|
||||
$player = new Player();
|
||||
$player->setUser($user);
|
||||
$player->setSession($session);
|
||||
$player->setScreen($playerCount + 1);
|
||||
|
||||
$this->entityManager->persist($player);
|
||||
$this->initializePlayerSettings($player);
|
||||
|
||||
$this->entityManager->flush();
|
||||
|
||||
@@ -170,12 +165,7 @@ final class GameDashboardService
|
||||
private function initializePlayerSettings(Player $player): void
|
||||
{
|
||||
$screen = $player->getScreen();
|
||||
$rightsSettingName = match ($screen) {
|
||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
|
||||
|
||||
if ($rightsSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
@@ -186,12 +176,7 @@ final class GameDashboardService
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$pwdSettingName = match ($screen) {
|
||||
1 => SessionSettingType::PWD_FOR_PLAYER1,
|
||||
2 => SessionSettingType::PWD_FOR_PLAYER2,
|
||||
3 => SessionSettingType::PWD_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$pwdSettingName = SessionSettingType::tryFrom('PwdForPlayer' . $screen);
|
||||
|
||||
if ($pwdSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
@@ -202,12 +187,7 @@ final class GameDashboardService
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$chatTrackingSettingName = match ($screen) {
|
||||
1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
|
||||
2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
|
||||
3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$chatTrackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $screen);
|
||||
|
||||
if ($chatTrackingSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
@@ -218,16 +198,12 @@ final class GameDashboardService
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$verifyCodesSettingName = match ($screen) {
|
||||
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
|
||||
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
|
||||
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$verifyCodesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
|
||||
|
||||
if ($verifyCodesSettingName) {
|
||||
$codes = [];
|
||||
for ($i = 1; $i <= 3; $i++) {
|
||||
$numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
|
||||
for ($i = 1; $i <= $numPlayers; $i++) {
|
||||
if ($i !== $screen) {
|
||||
$codes[$i] = bin2hex(random_bytes(3)); // 6 characters code
|
||||
}
|
||||
@@ -241,12 +217,7 @@ final class GameDashboardService
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$verificationProgressSettingName = match ($screen) {
|
||||
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$verificationProgressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);
|
||||
|
||||
if ($verificationProgressSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
@@ -258,6 +229,34 @@ final class GameDashboardService
|
||||
}
|
||||
}
|
||||
|
||||
public function startSession(Session $session): bool
|
||||
{
|
||||
if ($session->getStatus() !== SessionStatus::CREATED) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$players = $session->getPlayers()->toArray();
|
||||
if (count($players) < $session->getGame()->getNumberOfPlayers()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Shuffle players to assign random screens
|
||||
shuffle($players);
|
||||
|
||||
foreach ($players as $index => $player) {
|
||||
$screen = $index + 1;
|
||||
$player->setScreen($screen);
|
||||
$this->initializePlayerSettings($player);
|
||||
$this->entityManager->persist($player);
|
||||
}
|
||||
|
||||
$session->setStatus(SessionStatus::READY);
|
||||
$this->entityManager->persist($session);
|
||||
$this->entityManager->flush();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
|
||||
{
|
||||
// Security check: is user part of this session?
|
||||
|
||||
Reference in New Issue
Block a user