linting + solving linting

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0 # this is optional, use `pre-commit autoupdate` to get the latest rev!
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace

Taskfile.dist.yaml

@@ -0,0 +1,15 @@
+version: '3'
+
+tasks:
+  default:
+    cmds:
+      - go run .
+  build:
+    cmds:
+      - mkdir -p builds
+      - rm builds/* || true
+      - go tool dist list | grep -v android | grep -v ios | grep -v wasip1 | awk -F '/' '{printf "echo Compiling %s/%s; env CGO_ENABLED=1 GOOS=%s GOARCH=%s go build -o builds/rowboz.%s-%s\n",$1,$2,$1,$2,$1,$2 }' | sh
+      - for i in `ls builds/*windows*`; do mv -v $i $i.exe; done
+  lint:
+    cmds:
+      - golangci-lint run

build.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-mkdir -p builds
-
-rm builds/*
-
-go tool dist list | grep -v android | grep -v ios | grep -v wasip1 | awk -F '/' '{printf "echo Compiling %s/%s; env CGO_ENABLED=1 GOOS=%s GOARCH=%s go build -o builds/rowboz.%s-%s\n",$1,$2,$1,$2,$1,$2 }' | sh
-
-cd builds
-for i in `ls *windows*`; do mv -v $i $i.exe; done

robots/game.go

@@ -99,7 +99,7 @@ func (game *Game) gameDirector() {
 
 		// Draw stuff last
 		game.drawScore()
-		game.drawDebug()
+		//game.drawDebug()
 
 		// Draw the screen
 		game.screen.Show()

robots/render.go

@@ -1,7 +1,6 @@
 package robots
 
 import (
-	"runtime"
 	"strconv"
 )
 
@@ -42,26 +41,28 @@ func (game *Game) drawBox() {
 }
 
 // drawCoords Print the coordinates of the player
-func (game *Game) drawCoords() {
-	var x, y int = 25, 24
-	for _, r := range []rune("[ x:" + strconv.FormatInt(int64(game.player.position.x), 10) + " y:" + strconv.FormatInt(int64(game.player.position.y), 10) + " ]") {
-		game.screen.SetContent(x, y-1, r, nil, game.style)
-		x++
-	}
-}
+// func (game *Game) drawCoords() {
+// 	var x, y int = 25, 24
+// 	for _, r := range []rune("[ x:" + strconv.FormatInt(int64(game.player.position.x), 10) + " y:" + strconv.FormatInt(int64(game.player.position.y), 10) + " ]") {
+// 		game.screen.SetContent(x, y-1, r, nil, game.style)
+// 		x++
+// 	}
+// }
 
-func (game *Game) drawDebug() {
-	var x, y int = 40, 24
-	for _, r := range []rune("[ NumGoRoutine: " + strconv.FormatInt(int64(runtime.NumGoroutine()), 10) + " Bots: " + strconv.FormatInt(int64(len(game.robots)), 10) + " ]") {
-		game.screen.SetContent(x, y-1, r, nil, game.style)
-		x++
-	}
-}
+// func (game *Game) drawDebug() {
+// 	var x, y int = 40, 24
+// 	for _, r := range []rune("[ NumGoRoutine: " + strconv.FormatInt(int64(runtime.NumGoroutine()), 10) + " Bots: " + strconv.FormatInt(int64(len(game.robots)), 10) + " ]") {
+// 		game.screen.SetContent(x, y-1, r, nil, game.style)
+// 		x++
+// 	}
+// }
 
 func (game *Game) drawScore() {
 	var x, y int = 5, 24
-	for _, r := range []rune("[ Score: " + strconv.FormatInt(int64(game.player.score), 10) + " Level: " + strconv.FormatInt(int64(game.level), 10) + " ]") {
-		game.screen.SetContent(x, y-1, r, nil, game.style)
+	content := "[ Score: " + strconv.FormatInt(int64(game.player.score), 10) + " Level: " + strconv.FormatInt(int64(game.level), 10) + " ]"
+
+	for i := 0; i < len(content); i++ {
+		game.screen.SetContent(x, y-1, rune(content[i]), nil, game.style)
 		x++
 	}
 }