Dynamic number of players

2026-01-08 15:49:47 +01:00
parent 0ac2618f7d
commit cdb469456f
8 changed files with 204 additions and 114 deletions
@@ -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?
@@ -59,12 +59,7 @@ class GameResponseService

    private function getRechten(Player $player): array
    {
-        $settingName = match($player->getScreen()) {
-            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
-            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
-            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
-            default => null,
-        };
+        $settingName = SessionSettingType::tryFrom('RightsForPlayer' . $player->getScreen());

        if (!$settingName) {
            return [];
@@ -269,7 +264,7 @@ class GameResponseService
        if (isset($messageParts[1]) &&
                is_numeric($messageParts[1]) &&
                $messageParts[1] >= 1 &&
-                $messageParts[1] <= 3) {
+                $messageParts[1] <= $player->getSession()->getGame()->getNumberOfPlayers()) {

            $toSingle = true;
        }
@@ -309,12 +304,7 @@ class GameResponseService
        $screen = $player->getScreen();
        $session = $player->getSession();

-        $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) {
            return;
@@ -354,12 +344,7 @@ class GameResponseService
        if(in_array('verify', $rights))
            return;

-        $trackingSettingName = match ($player->getScreen()) {
-            1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
-            2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
-            3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
-            default => null,
-        };
+        $trackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $player->getScreen());

        if (!$trackingSettingName) {
            return;
@@ -389,7 +374,8 @@ class GameResponseService
    {
        $screen = $player->getScreen();
        $requiredTargets = [0]; // Everyone
-        for ($i = 1; $i <= 3; $i++) {
+        $numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
+        for ($i = 1; $i <= $numPlayers; $i++) {
            if ($i !== $screen) {
                $requiredTargets[] = $i;
            }
@@ -403,12 +389,7 @@ class GameResponseService
        }

        // Grant verify right
-        $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) {
            return;
@@ -480,12 +461,7 @@ class GameResponseService
        $screen = $player->getScreen();
        $session = $player->getSession();

-        $progressSettingName = match ($screen) {
-            1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
-            2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
-            3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
-            default => null,
-        };
+        $progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);

        if (!$progressSettingName) {
            return 'Error: Invalid player screen.';
@@ -505,12 +481,7 @@ class GameResponseService
            }

            $otherScreen = $otherPlayer->getScreen();
-            $codesSettingName = match ($otherScreen) {
-                1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
-                2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
-                3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
-                default => null,
-            };
+            $codesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $otherScreen);

            if (!$codesSettingName) {
                continue;
@@ -554,12 +525,7 @@ class GameResponseService
    private function grantVerificationRights(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) {
            return;
@@ -600,18 +566,18 @@ class GameResponseService
        }

        $allVerified = true;
-        foreach ([1, 2, 3] as $screen) {
-            $progressSettingName = match ($screen) {
-                1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
-                2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
-                3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
-                default => null,
-            };
+        foreach ($session->getPlayers() as $otherPlayer) {
+            $otherScreen = $otherPlayer->getScreen();
+            $progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $otherScreen);

-            $progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $player);
+            if (!$progressSettingName) {
+                continue;
+            }
+
+            $progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $otherPlayer);
            $progress = json_decode($progressSetting?->getValue() ?? '[]', true) ?? [];

-            if (count($progress) < 2) {
+            if (count($progress) < $session->getGame()->getNumberOfPlayers() - 1) {
                $allVerified = false;
                break;
            }
@@ -40,12 +40,7 @@ class PlayerService
    }

    public function getCurrentPwdOfPlayer(Player $player) : ?string {
-        $settingName = match($player->getScreen()) {
-            1 => SessionSettingType::PWD_FOR_PLAYER1,
-            2 => SessionSettingType::PWD_FOR_PLAYER2,
-            3 => SessionSettingType::PWD_FOR_PLAYER3,
-            default => null,
-        };
+        $settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());

        if (!$settingName) {
            return null;
@@ -57,12 +52,7 @@ class PlayerService

    public function saveCurrentPwdOfPlayer(Player $player, string $newLocation)
    {
-        $settingName = match($player->getScreen()) {
-            1 => SessionSettingType::PWD_FOR_PLAYER1,
-            2 => SessionSettingType::PWD_FOR_PLAYER2,
-            3 => SessionSettingType::PWD_FOR_PLAYER3,
-            default => null,
-        };
+        $settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());

        if (!$settingName) {
            return;