✨ (sudoku-game): add cursor and input logic

Author: yuanyu90221

README.md

@@ -4,4 +4,8 @@ This is a implementation sudoku game with golang
 
 # 執行畫面
 
-![sudoku-game-play](sudoku-game-play.png)
+初始畫面
+![sudoku-game-play](sudoku-game-play.png)
+
+游標輸入
+![sudoku-game-play-with-cursor](sudoku-game-play-with-cursor.png)

internal/game/board.go

@@ -3,7 +3,7 @@ package game
 import "fmt"
 
 // 檢查 row, col 位置是否可以放置 num
-func (board *Board) isSafe(row, col, num int) bool {
+func (board *Board) IsSafe(row, col, num int) bool {
 	// 檢查行與列是否有放相同的值
 	for i := 0; i < BoardSize; i++ {
 		if board.Cells[row][i].Value == num ||
@@ -23,10 +23,6 @@ func (board *Board) isSafe(row, col, num int) bool {
 		}
 	}
 
-	// 檢查 num 值介於 1 到 9
-	if num < 1 || num > 9 {
-		return false
-	}
 	return true
 }
 

internal/game/board_test.go

@@ -54,7 +54,7 @@ func TestIsSafe(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			board := tt.setup()
-			got := board.isSafe(tt.targetCoord.Row, tt.targetCoord.Col, tt.targetValue)
+			got := board.IsSafe(tt.targetCoord.Row, tt.targetCoord.Col, tt.targetValue)
 			assert.Equal(t, tt.want, got)
 		})
 	}

internal/game/puzzle.go

@@ -20,7 +20,7 @@ func (board *Board) presetBoard() bool {
 	// 隨機取值出來填寫
 	for _, digit := range digitsShuffled() {
 		// 確認 digit 是否可以填入 row, col
-		if board.isSafe(row, col, digit) {
+		if board.IsSafe(row, col, digit) {
 			// 先填入 row, col 為 digit
 			board.Cells[row][col].Type = Preset
 			board.Cells[row][col].Value = digit
@@ -54,7 +54,7 @@ func solveCount(board *Board, limit int) int {
 	// 開始試著填入值找到解答
 	count := 0
 	for _, digit := range digitsShuffled() {
-		if board.isSafe(row, col, digit) {
+		if board.IsSafe(row, col, digit) {
 			// 先填入 row, col 為 digit
 			board.Cells[row][col].Type = Preset
 			board.Cells[row][col].Value = digit

internal/game/sudoku.go

@@ -7,7 +7,9 @@ const (
 
 // Board - 盤面
 type Board struct {
-	Cells [BoardSize][BoardSize]*Cell
+	Cells     [BoardSize][BoardSize]*Cell
+	CursorRow int
+	CursorCol int
 }
 
 // NewBoard 建立一個空的數獨盤面
@@ -32,3 +34,31 @@ func NewGame() *Game {
 		Board: NewBoard(),
 	}
 }
+
+func (board *Board) IncreaseCursorRow() {
+	if board.CursorRow < BoardSize-1 {
+		board.CursorRow++
+		return
+	}
+}
+
+func (board *Board) DecreaseCursorRow() {
+	if board.CursorRow >= 1 {
+		board.CursorRow--
+		return
+	}
+}
+
+func (board *Board) IncreaseCursorCol() {
+	if board.CursorCol < BoardSize-1 {
+		board.CursorCol++
+		return
+	}
+}
+
+func (board *Board) DecreaseCursorCol() {
+	if board.CursorCol >= 1 {
+		board.CursorCol--
+		return
+	}
+}

internal/layout/cursor-control.go

@@ -0,0 +1,27 @@
+package layout
+
+import (
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
+)
+
+// DetectCursor - 游標移動
+func (gameLayout *GameLayout) DetectCursor() {
+	// 游標移動偵測
+	if inpututil.IsKeyJustPressed(ebiten.KeyArrowUp) {
+		gameLayout.gameInstance.Board.DecreaseCursorRow()
+		return
+	}
+	if inpututil.IsKeyJustPressed(ebiten.KeyArrowDown) {
+		gameLayout.gameInstance.Board.IncreaseCursorRow()
+		return
+	}
+	if inpututil.IsKeyJustPressed(ebiten.KeyArrowLeft) {
+		gameLayout.gameInstance.Board.DecreaseCursorCol()
+		return
+	}
+	if inpututil.IsKeyJustPressed(ebiten.KeyArrowRight) {
+		gameLayout.gameInstance.Board.IncreaseCursorCol()
+		return
+	}
+}

internal/layout/input-control.go

@@ -0,0 +1,44 @@
+package layout
+
+import (
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
+	"github.com/leetcode-golang-classroom/sudoku-game/internal/game"
+)
+
+// DetectInput - 處理鍵盤輸入
+func (gameLayout *GameLayout) DetectInput() {
+	board := gameLayout.gameInstance.Board
+	targetRow := board.CursorRow
+	targetCol := board.CursorCol
+	targetCell := board.Cells[targetRow][targetCol]
+	// 偵測合法數字輸入
+	// 數字輸入
+	for key := ebiten.KeyDigit1; key <= ebiten.KeyDigit9; key++ {
+		if inpututil.IsKeyJustPressed(key) {
+			if targetCell.Type != game.Preset {
+				value := int(key - ebiten.KeyDigit0)
+				// 檢查輸入的值是否為放入是否能會造成 Conflict
+				if !board.IsSafe(targetRow, targetCol, value) {
+					// 標示為 Conflict Input
+					board.Cells[targetRow][targetCol].Type = game.InputConflict
+				} else {
+					board.Cells[targetRow][targetCol].Type = game.Input
+				}
+				// 更新輸入
+				board.Cells[targetRow][targetCol].Value = value
+			}
+			return
+		}
+	}
+
+	// 清除輸入
+	if inpututil.IsKeyJustPressed(ebiten.Key0) || inpututil.IsKeyJustPressed(ebiten.KeyDelete) {
+		if targetCell.Type != game.Preset {
+			// 清空目前 Cell 的值
+			board.Cells[targetRow][targetCol].Value = 0
+			board.Cells[targetRow][targetCol].Type = game.Empty
+		}
+		return
+	}
+}

internal/layout/layout.go

@@ -24,18 +24,42 @@ type GameLayout struct {
 }
 
 func (gameLayout *GameLayout) Update() error {
+	gameLayout.DetectCursor()
+	gameLayout.DetectInput()
 	return nil
 }
 
 func (gameLayout *GameLayout) Draw(screen *ebiten.Image) {
 	// 畫出基本背景
 	gameLayout.drawBoardBackground(screen)
+	// // 畫出 cursor
+	gameLayout.drawCursor(screen)
 	// 根據遊戲狀態來畫出盤面
 	gameLayout.drawCellValuesOnBoard(screen)
 	// 畫出盤面格線
 	gameLayout.drawLinesOnBoard(screen)
 }
 
+func (gameLayout *GameLayout) drawCursor(screen *ebiten.Image) {
+	cursorBgColor := color.RGBA{0xff, 0, 0, 128}
+	targetRow := gameLayout.gameInstance.Board.CursorRow
+	targetCol := gameLayout.gameInstance.Board.CursorCol
+	if gameLayout.gameInstance.Board.Cells[targetRow][targetCol].Type == game.Preset {
+		cursorBgColor = color.RGBA{0xff, 0xff, 0, 128}
+	}
+	if gameLayout.gameInstance.Board.Cells[targetRow][targetCol].Type == game.Input {
+		cursorBgColor = color.RGBA{0x00, 0xff, 0x00, 128}
+	}
+	if gameLayout.gameInstance.Board.Cells[targetRow][targetCol].Type == game.InputConflict {
+		cursorBgColor = color.RGBA{0x00, 0xff, 0xff, 128}
+	}
+	gameLayout.drawCellBackground(screen,
+		gameLayout.gameInstance.Board.CursorRow,
+		gameLayout.gameInstance.Board.CursorCol,
+		cursorBgColor,
+	)
+}
+
 // drawBoardBackground - 畫出盤面背景顏色
 func (gameLayout *GameLayout) drawBoardBackground(screen *ebiten.Image) {
 	boardBgColor := color.RGBA{0xFF, 0xFF, 0xFF, 0xFF}
@@ -50,8 +74,13 @@ func (gameLayout *GameLayout) drawCellValuesOnBoard(screen *ebiten.Image) {
 	for row := 0; row < game.BoardSize; row++ {
 		for col := 0; col < game.BoardSize; col++ {
 			// draw preset value
-			if board.Cells[row][col].Type == game.Preset {
-				gameLayout.drawCellBackground(screen, row, col, getTileBgColor(board.Cells[row][col].Type))
+			if board.Cells[row][col].Type == game.Preset ||
+				board.Cells[row][col].Type == game.Input ||
+				board.Cells[row][col].Type == game.InputConflict {
+				if row != gameLayout.gameInstance.Board.CursorRow ||
+					col != gameLayout.gameInstance.Board.CursorCol {
+					gameLayout.drawCellBackground(screen, row, col, getTileBgColor(board.Cells[row][col].Type))
+				}
 				gameLayout.drawCellValue(screen, row, col, board.Cells[row][col].Value,
 					getTileColor(board.Cells[row][col].Type),
 				)