web/wordle-clone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed the main dictionary file

Browse source 
Set the guess limit at 6
Added 7 letter words
This commit is contained in:
Leon Mika 2025-03-14 21:33:44 +11:00
parent 947ed37974
commit 1367d99446
8 changed files with 1201 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
cmd/prep-words/main.go
View file

@ -5,7 +5,9 @@ import (
"bytes"
"encoding/json"
"flag"
"fmt"
"github.com/PuerkitoBio/goquery"
"github.com/bitfield/script"
gonanoid "github.com/matoous/go-nanoid"
"log"
"math/rand/v2"
@ -17,6 +19,8 @@ import (
"time"
)
const maxWordLength = 7
var validWordRegex = regexp.MustCompile(`^[a-z]+$`)
type wordList struct {
@ -46,7 +50,7 @@ func main() {
return
}
if len(w) >= 4 && len(w) <= 6 {
if len(w) >= 4 && len(w) <= maxWordLength {
wordSet[word] = true
}
}); err != nil {
@ -81,7 +85,7 @@ func main() {
pattern[i] = i
}
for x := 4; x < r.IntN(8)+4; x++ {
for x := 12; x < r.IntN(8)+16; x++ {
r.Shuffle(len(pattern), func(i, j int) {
pattern[i], pattern[j] = pattern[j], pattern[i]
})
@ -109,7 +113,7 @@ func scanSuitableWords(dictDir string, withWord func(word string)) error {
return err
}
if err := scanSuitableWordsFromEnGB(filepath.Join(dictDir, "en_GB.dic"), withWord); err != nil {
if err := scanSuitableWordsFromEnGB(filepath.Join(dictDir, "en_GB.dic"), filepath.Join(dictDir, "en_GB.aff"), withWord); err != nil {
return err
}
@ -149,35 +153,14 @@ func scanSuitableWordsFromOxford3000(dictFile string, withWord func(word string)
return scanner.Err()
}
func scanSuitableWordsFromEnGB(dictFile string, withWord func(word string)) error {
f, err := os.Open(dictFile)
func scanSuitableWordsFromEnGB(dictFile, affFile string, withWord func(word string)) error {
words, err := script.Exec(fmt.Sprintf("unmunch '%v' '%v'", dictFile, affFile)).String()
if err != nil {
return err
}
defer f.Close()
scanner := bufio.NewScanner(f)
for scanner.Scan() {
isSuitable := true
breakpoint := len(scanner.Text())
for i, r := range scanner.Text() {
if r == '/' {
breakpoint = i
break
}
if r < 'a' || r > 'z' {
isSuitable = false
break
}
}
if isSuitable {
word := scanner.Text()[:breakpoint]
withWord(word)
} else {
}
for _, word := range strings.Split(words, "\n") {
withWord(word)
}
return scanner.Err()
return nil
}

4
dict/README.md
View file

@ -2,8 +2,12 @@ oxford-word-list.htm
Taken from https://www.oxfordwordlist.com/pages/report.asp
en_GB.dic
en_GB.aff
This is a Hunspell dictionary taken from this location:
https://archive.netbsd.org/pub/pkgsrc-archive/distfiles/2019Q4/hunspell-dictionaries/en_GB-20061130/en_GB.zip
The possible set of words is produced by running it through "unmunch" as per this Stack Overflow answer:
https://stackoverflow.com/questions/42566916/how-to-obtain-all-possible-words-from-given-hunspell-dictionary
The_Oxford_3000.txt
https://github.com/sapbmw/The-Oxford-3000/blob/master/The_Oxford_3000.txt

1150
dict/en_GB.aff Normal file
View file

File diff suppressed because it is too large Load diff

4
go.mod
View file

@ -5,6 +5,10 @@ go 1.23.3
require (
github.com/PuerkitoBio/goquery v1.10.2 // indirect
github.com/andybalholm/cascadia v1.3.3 // indirect
github.com/bitfield/script v0.24.0 // indirect
github.com/itchyny/gojq v0.12.13 // indirect
github.com/itchyny/timefmt-go v0.1.5 // indirect
github.com/matoous/go-nanoid v1.5.1 // indirect
golang.org/x/net v0.35.0 // indirect
mvdan.cc/sh/v3 v3.7.0 // indirect
)

8
go.sum
View file

@ -2,7 +2,13 @@ github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9Hq
github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
github.com/bitfield/script v0.24.0 h1:ic0Tbx+2AgRtkGGIcUyr+Un60vu4WXvqFrCSumf+T7M=
github.com/bitfield/script v0.24.0/go.mod h1:fv+6x4OzVsRs6qAlc7wiGq8fq1b5orhtQdtW0dwjUHI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/itchyny/gojq v0.12.13 h1:IxyYlHYIlspQHHTE0f3cJF0NKDMfajxViuhBLnHd/QU=
github.com/itchyny/gojq v0.12.13/go.mod h1:JzwzAqenfhrPUuwbmEz3nu3JQmFLlQTQMUcOdnu/Sf4=
github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@ -71,3 +77,5 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=

2
site/assets/data/shuffle_pattern.json
View file

File diff suppressed because one or more lines are too long

2
site/assets/data/words.json
View file

File diff suppressed because one or more lines are too long

38
site/assets/scripts/models/gamecontroller.js
View file

@ -26,7 +26,7 @@ class ProgressionState {
let prog = {
shuffleId: shuffleId,
wordLength: 4,
wordIndex: {"4": 0, "5": 0, "6": 0},
wordIndex: {"4": 0, "5": 0, "6": 0, "7": 0},
currentGuesses: []
};
localStorage.setItem('progression', JSON.stringify(prog));
@ -53,7 +53,7 @@ export class GameController {
}
this._currentWord = await this._wordSource.getCurrentWord(prog);
this._guesses = Math.max(this._currentWord.length, 5) + 1;
this._guesses = 6;
console.log("The current word: " + this._currentWord);
}
@ -88,13 +88,17 @@ export class GameController {
// Increment the progress
let prog = this._progressionState.getProgression();
prog.wordIndex[prog.wordLength + ""] += 1;
prog.wordLength = (((Math.random() * 23) | 0) / 10 | 0) + 4;
//prog.wordLength = (((Math.random() * 23) | 0) / 10 | 0) + 4;
prog.wordLength = ((Math.random() * 4) | 0) + 4;
prog.currentGuesses = [];
prog.wasWin = false;
this._progressionState.saveProgression(prog);
this._currentWord = await this._wordSource.getCurrentWord(prog);
this._guesses = Math.max(this._currentWord.length, 5) + 1;
//this._guesses = Math.max(this._currentWord.length, 5) + 1;
this._guesses = 6;
return true;
}
@ -145,19 +149,19 @@ export class GameController {
let misses = {};
let hits = {};
if (this._currentWord.length <= 5) {
if (!this._wordSource.isWord(guess)) {
hits = {};
for (let i = 0; i < guess.length; i++) {
hits[guess[i]] = MARKERS.ATTEMPTED;
}
return {
hits: hits,
guessResult: GUESS_RESULT.FOUL,
};
}
}
// if (this._currentWord.length <= 5) {
// if (!this._wordSource.isWord(guess)) {
// hits = {};
// for (let i = 0; i < guess.length; i++) {
// hits[guess[i]] = MARKERS.ATTEMPTED;
// }
//
// return {
// hits: hits,
// guessResult: GUESS_RESULT.FOUL,
// };
// }
// }
for (let i = 0; i < guess.length; i++) {
if (guess[i] == this._currentWord[i]) {