Skip to content

Commit d1ba275

Browse files
committed
all: fix lint errors
1 parent 5d45821 commit d1ba275

File tree

8 files changed

+22
-13
lines changed

8 files changed

+22
-13
lines changed

cmd/giu-game/tic-tac-go.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package main
33
import (
44
"bytes"
55
_ "embed"
6-
"github.com/gucio321/tic-tac-go/pkg/game"
76
"image"
87
"image/png"
98
"log"
109

10+
"github.com/gucio321/tic-tac-go/pkg/game"
11+
1112
"github.com/AllenDang/giu"
1213

1314
"github.com/gucio321/tic-tac-go/pkg/giuwidget"

internal/terminalgame/menu/menu.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package menu
33
import (
44
"errors"
55
"fmt"
6-
"github.com/gucio321/go-clear"
76
"log"
87
"math/rand"
98
"runtime"
109
"strconv"
1110
"strings"
1211
"time"
1312

13+
"github.com/gucio321/go-clear"
14+
1415
"github.com/jaytaylor/html2text"
1516
"github.com/pkg/browser"
1617
"github.com/russross/blackfriday"

pkg/core/pcplayer/pc_player_engine.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@ import (
1313

1414
var _ player.Player = &PCPlayer{}
1515

16+
// PCPlayer is a simple-AI logic used in Tic-Tac-Go for calculating PC-player's move.
1617
type PCPlayer struct {
1718
b *board.Board
1819
pcLetter letter.Letter
1920
}
2021

22+
// NewPCPlayer creates new PCPlayer instance.
2123
func NewPCPlayer(b *board.Board, pcLetter letter.Letter) *PCPlayer {
2224
rand.Seed(time.Now().UnixNano())
25+
2326
return &PCPlayer{
2427
b: b,
2528
pcLetter: pcLetter,
@@ -41,11 +44,11 @@ func (p *PCPlayer) String() string {
4144
// - take opponent's opposite corner
4245
// - take center
4346
// - take random side
44-
// nolint:gocognit,gocyclo // https://github.com/gucio321/tic-tac-go/issues/154
4547
func (p PCPlayer) GetMove() (i int) {
4648
return p.getPCMove(p.b)
4749
}
4850

51+
// nolint:gocyclo // https://github.com/gucio321/tic-tac-go/issues/154
4952
func (p *PCPlayer) getPCMove(gameBoard *board.Board) (i int) {
5053
playerLetter := p.pcLetter.Opposite()
5154

@@ -143,7 +146,7 @@ func (p *PCPlayer) getPCMove(gameBoard *board.Board) (i int) {
143146
panic("Tic-Tac-Go: pcplayer.GetPCMove(...): cannot determinate pc move - board is full")
144147
}
145148

146-
func (p *PCPlayer) canWin(baseBoard *board.Board, player letter.Letter) (canWin bool, results []int) {
149+
func (p *PCPlayer) canWin(baseBoard *board.Board, playerLetter letter.Letter) (canWin bool, results []int) {
147150
results = make([]int, 0)
148151

149152
for i := 0; i < baseBoard.Width()*baseBoard.Height(); i++ {
@@ -153,9 +156,9 @@ func (p *PCPlayer) canWin(baseBoard *board.Board, player letter.Letter) (canWin
153156

154157
fictionBoard := baseBoard.Copy()
155158

156-
fictionBoard.SetIndexState(i, player)
159+
fictionBoard.SetIndexState(i, playerLetter)
157160

158-
if ok, _ := fictionBoard.IsWinner(player); ok {
161+
if ok, _ := fictionBoard.IsWinner(playerLetter); ok {
159162
results = append(results, i)
160163
}
161164
}
@@ -192,7 +195,7 @@ the O-player will not be able to keep X from winning.
192195
+---+---+---+---+---+
193196
O-player lost.
194197
*/
195-
func (p *PCPlayer) canWinTwoMoves(gameBoard *board.Board, player letter.Letter) (result []int) {
198+
func (p *PCPlayer) canWinTwoMoves(gameBoard *board.Board, playerLetter letter.Letter) (result []int) {
196199
result = make([]int, 0)
197200

198201
// nolint:gomnd // look a scheme above - in the second one, the chain is by 2 less than max
@@ -215,7 +218,7 @@ searching:
215218
switch gameBoard.GetIndexState(potentialPlace[i]) {
216219
case letter.LetterNone:
217220
gaps = append(gaps, potentialPlace[i])
218-
case player.Opposite(): // operation already blocked
221+
case playerLetter.Opposite(): // operation already blocked
219222
continue searching
220223
}
221224
}

pkg/core/players/player/player.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
)
66

7+
// Player is an interface implemented by any further Player implementations.
78
type Player interface {
89
GetMove() int
910
fmt.Stringer

pkg/core/players/players.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ func Create(playerX, playerO player.Player) *Players {
2626
return result
2727
}
2828

29-
// PlayerX returns player1.
29+
// PlayerX returns X player.
3030
func (p *Players) PlayerX() player.Player {
3131
return p.playerX
3232
}
3333

34-
// Player2 returns player2.
34+
// PlayerO returns O player.
3535
func (p *Players) PlayerO() player.Player {
3636
return p.playerO
3737
}
3838

39-
// Current returns current player's letter
39+
// Current returns current player's letter.
4040
func (p *Players) Current() letter.Letter {
4141
return p.current
4242
}
@@ -53,7 +53,7 @@ func (p *Players) CurrentPlayer() player.Player {
5353
return nil
5454
}
5555

56-
// Move returns a current player's move.
56+
// GetMove returns a current player's move.
5757
func (p *Players) GetMove() int {
5858
return p.CurrentPlayer().GetMove()
5959
}

pkg/game/playerType.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package game
22

3+
// PlayerType represents type of player (human or Computer).
34
type PlayerType byte
45

6+
// player types.
57
const (
68
PlayerTypeHuman PlayerType = iota
79
PlayerTypePC

pkg/giuwidget/state.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package giuwidget
22

33
import (
44
"github.com/AllenDang/giu"
5+
56
"github.com/gucio321/tic-tac-go/pkg/core/board/letter"
67

78
"github.com/gucio321/tic-tac-go/pkg/core/board"

pkg/giuwidget/widget.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
package giuwidget
33

44
import (
5-
"github.com/gucio321/tic-tac-go/pkg/game"
65
"image/color"
76
"math"
87
"strconv"
@@ -11,6 +10,7 @@ import (
1110
"golang.org/x/image/colornames"
1211

1312
"github.com/gucio321/tic-tac-go/pkg/core/board/letter"
13+
"github.com/gucio321/tic-tac-go/pkg/game"
1414
)
1515

1616
const id = "Tic-Tac-Go-game"

0 commit comments

Comments
 (0)