esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

feature/avoid-repeating-places-in-game #38

Merged
balazs merged 14 commits from feature/avoid-repeating-places-in-game into develop 2021-05-09 10:58:54 +02:00
Conversation 1 Commits 14 Files Changed 10 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d8074977b - Show all commits

2
src/Controller/GameFlowController.php
View File

@ -253,7 +253,7 @@ class GameFlowController
private function startNewGame(array &$state, int $mapId): void private function startNewGame(array &$state, int $mapId): void
{ {
$session = $this->request->session(); $session = $this->request->session();
$userId = $session->get('userId'); // in case of multiplayer it will be null and handled the same way as for anonymous players $userId = $session->get('userId');
$places = $this->placeRepository->getRandomNPlaces($mapId, static::NUMBER_OF_ROUNDS, $userId); $places = $this->placeRepository->getRandomNPlaces($mapId, static::NUMBER_OF_ROUNDS, $userId);

4
src/Repository/PlaceRepository.php
View File

@ -31,9 +31,9 @@ class PlaceRepository
//TODO: use Map and User instead of id //TODO: use Map and User instead of id
public function getRandomNPlaces(int $mapId, int $n, ?int $userId): array public function getRandomNPlaces(int $mapId, int $n, ?int $userId): array
{ {
if(!isset($userId)) { // anonymous single player or multiplayer game if(!isset($userId)) { // anonymous single player
return $this->getRandomNForMapWithValidPano($mapId, $n); return $this->getRandomNForMapWithValidPano($mapId, $n);
} else { // authorized user } else { // authorized user or multiplayer game with selection based on what the host played before
$unvisitedPlaces = $this->getRandomUnvisitedNForMapWithValidPano($mapId, $n, $userId); $unvisitedPlaces = $this->getRandomUnvisitedNForMapWithValidPano($mapId, $n, $userId);
$oldPlaces = $this->getRandomOldNForMapWithValidPano($mapId, $n - count($unvisitedPlaces), $userId); $oldPlaces = $this->getRandomOldNForMapWithValidPano($mapId, $n - count($unvisitedPlaces), $userId);
return array_merge($unvisitedPlaces, $oldPlaces); return array_merge($unvisitedPlaces, $oldPlaces);