fix: score -1 if out of guesses
This commit is contained in:
parent
3ab9f195a3
commit
147cb22e88
|
@ -46,8 +46,11 @@ func (b *Board) AddWord(word string) string {
|
||||||
}
|
}
|
||||||
b.CurrentGuess += 1
|
b.CurrentGuess += 1
|
||||||
|
|
||||||
if len(correct) == 5 || b.CurrentGuess >= 6 {
|
if len(correct) == 5 {
|
||||||
b.Done = true
|
b.Done = true
|
||||||
|
} else if b.CurrentGuess >= 6 {
|
||||||
|
b.Done = true
|
||||||
|
b.CurrentGuess = -1
|
||||||
}
|
}
|
||||||
|
|
||||||
return ""
|
return ""
|
||||||
|
|
|
@ -35,7 +35,12 @@ func ToGame(b *game.Board) *Game {
|
||||||
Lines: []Line{},
|
Lines: []Line{},
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := 0; i < b.CurrentGuess; i++ {
|
to := b.CurrentGuess
|
||||||
|
if b.CurrentGuess == -1 {
|
||||||
|
to = 6
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < to; i++ {
|
||||||
g.Lines = append(g.Lines, Line{
|
g.Lines = append(g.Lines, Line{
|
||||||
Word: string(b.Guesses[i].Letters),
|
Word: string(b.Guesses[i].Letters),
|
||||||
Correct: b.Guesses[i].Correct,
|
Correct: b.Guesses[i].Correct,
|
||||||
|
|
4
main.go
4
main.go
|
@ -84,7 +84,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
// clear input
|
// clear input
|
||||||
m.buffer = []rune{}
|
m.buffer = []rune{}
|
||||||
|
|
||||||
// save if win
|
// save if done
|
||||||
if m.board.Done {
|
if m.board.Done {
|
||||||
err := score.SaveBoard(m.board)
|
err := score.SaveBoard(m.board)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -114,7 +114,7 @@ func (m model) View() string {
|
||||||
for i, guess := range m.board.Guesses {
|
for i, guess := range m.board.Guesses {
|
||||||
line := " "
|
line := " "
|
||||||
for j := 0; j < 5; j++ {
|
for j := 0; j < 5; j++ {
|
||||||
if i < m.board.CurrentGuess {
|
if i < m.board.CurrentGuess || m.board.CurrentGuess == -1 {
|
||||||
style := charEmptyStyle
|
style := charEmptyStyle
|
||||||
if util.ContainsInt(guess.Correct, j) {
|
if util.ContainsInt(guess.Correct, j) {
|
||||||
style = charCorrectStyle
|
style = charCorrectStyle
|
||||||
|
|
Loading…
Reference in New Issue