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

feature/MAPG-235-basic-challenge-mode #48

Merged
balazs merged 43 commits from feature/MAPG-235-basic-challenge-mode into develop 2021-05-28 20:41:09 +02:00
Conversation 0 Commits 43 Files Changed 28 +19 -2
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b78d564f6f - Show all commits

11
public/static/js/game.js
View File

@ -341,6 +341,7 @@ const GameType = Object.freeze({ 'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2 });
}, },
disableRestrictions: function () { disableRestrictions: function () {
Game.panorama.setOptions({ Game.panorama.setOptions({
clickToGo: true, clickToGo: true,
linksControl: true, linksControl: true,
@ -350,6 +351,7 @@ const GameType = Object.freeze({ 'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2 });
document.getElementById('panningBlockerCover').style.display = null; document.getElementById('panningBlockerCover').style.display = null;
Game.startCountdown(0); Game.startCountdown(0);
Game.timeoutEnd = null;
}, },
transitToResultMap: function () { transitToResultMap: function () {
@ -649,11 +651,16 @@ const GameType = Object.freeze({ 'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2 });
}, },
guess: function () { guess: function () {
Game.disableRestrictions();
var data = new FormData(); var data = new FormData();
if (Game.timeoutEnd) {
var timeLeft = Math.ceil((Game.timeoutEnd - new Date()) / 1000);
data.append('timeLeft', timeLeft);
}
Game.disableRestrictions();
if (Game.guessMarker) { if (Game.guessMarker) {
var guessPosition = Game.guessMarker.getPosition().toJSON(); var guessPosition = Game.guessMarker.getPosition().toJSON();
Game.rounds[Game.rounds.length - 1].guessPosition = guessPosition; Game.rounds[Game.rounds.length - 1].guessPosition = guessPosition;

10
src/Controller/GameFlowController.php
View File

@ -381,9 +381,19 @@ class GameFlowController
$response['result'] = ['distance' => null, 'score' => 0]; $response['result'] = ['distance' => null, 'score' => 0];
} }
// save user relevant state of challenge
$userInChallenge->setCurrentRound($nextRound); $userInChallenge->setCurrentRound($nextRound);
if ($this->request->post('timeLeft')) {
$userInChallenge->setTimeLeft(intval($this->request->post('timeLeft')));
}
$this->pdm->saveToDb($userInChallenge); $this->pdm->saveToDb($userInChallenge);
if ($challenge->getTimeLimitType() === 'game' && $this->request->post('timeLeft')) {
$timeLimit = max(10, intval($this->request->post('timeLeft')));
$response['restrictions']['timeLimit'] = $timeLimit * 1000;
}
if(isset($response['history'][$currentRound]['allResults'])) { if(isset($response['history'][$currentRound]['allResults'])) {
$response['allResults'] = $response['history'][$currentRound]['allResults']; $response['allResults'] = $response['history'][$currentRound]['allResults'];
} }