From 147cb22e88bc5c7806e99356cf578ab901e0e703 Mon Sep 17 00:00:00 2001 From: Jake Walker Date: Wed, 26 Jan 2022 10:28:13 +0000 Subject: [PATCH] fix: score -1 if out of guesses --- game/board.go | 5 ++++- game/score/score.go | 7 ++++++- main.go | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/game/board.go b/game/board.go index 3840941..e6ec4b5 100644 --- a/game/board.go +++ b/game/board.go @@ -46,8 +46,11 @@ func (b *Board) AddWord(word string) string { } b.CurrentGuess += 1 - if len(correct) == 5 || b.CurrentGuess >= 6 { + if len(correct) == 5 { b.Done = true + } else if b.CurrentGuess >= 6 { + b.Done = true + b.CurrentGuess = -1 } return "" diff --git a/game/score/score.go b/game/score/score.go index 68f51f1..b194369 100644 --- a/game/score/score.go +++ b/game/score/score.go @@ -35,7 +35,12 @@ func ToGame(b *game.Board) *Game { 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{ Word: string(b.Guesses[i].Letters), Correct: b.Guesses[i].Correct, diff --git a/main.go b/main.go index b9e051a..798eb3f 100644 --- a/main.go +++ b/main.go @@ -84,7 +84,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { // clear input m.buffer = []rune{} - // save if win + // save if done if m.board.Done { err := score.SaveBoard(m.board) if err != nil { @@ -114,7 +114,7 @@ func (m model) View() string { for i, guess := range m.board.Guesses { line := " " for j := 0; j < 5; j++ { - if i < m.board.CurrentGuess { + if i < m.board.CurrentGuess || m.board.CurrentGuess == -1 { style := charEmptyStyle if util.ContainsInt(guess.Correct, j) { style = charCorrectStyle