This commit is contained in:
parent
af1c5ace72
commit
947ed37974
3 changed files with 79 additions and 26 deletions
|
|
@ -68,12 +68,15 @@ export class GameController {
|
|||
return this._guesses;
|
||||
}
|
||||
|
||||
currentGuesses() {
|
||||
currentState() {
|
||||
let prog = this._progressionState.getProgression();
|
||||
if (!prog || !prog.currentGuesses) {
|
||||
return [];
|
||||
}
|
||||
return prog.currentGuesses;
|
||||
return {
|
||||
wasWin: prog.wasWin,
|
||||
currentGuesses: prog.currentGuesses
|
||||
};
|
||||
}
|
||||
|
||||
currentWord() {
|
||||
|
|
@ -87,7 +90,7 @@ export class GameController {
|
|||
prog.wordIndex[prog.wordLength + ""] += 1;
|
||||
prog.wordLength = (((Math.random() * 23) | 0) / 10 | 0) + 4;
|
||||
prog.currentGuesses = [];
|
||||
|
||||
prog.wasWin = false;
|
||||
this._progressionState.saveProgression(prog);
|
||||
|
||||
this._currentWord = await this._wordSource.getCurrentWord(prog);
|
||||
|
|
@ -110,7 +113,23 @@ export class GameController {
|
|||
|
||||
return hints;
|
||||
}
|
||||
|
||||
|
||||
submitGuess(guess) {
|
||||
guess = guess.toLowerCase();
|
||||
|
||||
let results = this.checkGuess(guess);
|
||||
|
||||
// Add this guess to the progression state
|
||||
if (results.guessResult !== GUESS_RESULT.FOUL) {
|
||||
let prog = this._progressionState.getProgression();
|
||||
prog.currentGuesses.push(guess);
|
||||
prog.wasWin = results.guessResult === GUESS_RESULT.WIN;
|
||||
this._progressionState.saveProgression(prog);
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
checkGuess(guess) {
|
||||
this._checkHasStarted();
|
||||
|
||||
|
|
@ -182,11 +201,6 @@ export class GameController {
|
|||
guessResult = GUESS_RESULT.MISS;
|
||||
}
|
||||
|
||||
// Add this guess to the progression state
|
||||
let prog = this._progressionState.getProgression();
|
||||
prog.currentGuesses.push(guess);
|
||||
this._progressionState.saveProgression(prog);
|
||||
|
||||
return {
|
||||
guessResult: guessResult,
|
||||
hits: hits,
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ export class WordSource {
|
|||
|
||||
async needToResetProgression(prog) {
|
||||
await this._fetchAllWordsIfNecessary();
|
||||
return (!prog.shuffleId) || this._pattern.id !== prog.shuffleId;
|
||||
return !prog || !prog.shuffleId || this._pattern.id !== prog.shuffleId;
|
||||
}
|
||||
|
||||
async getPattenShuffleID() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue