Dynamic number of players
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user