aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fischer@muhq.space>2025-06-06 16:40:58 -0500
committerFlorian Fischer <florian.fischer@muhq.space>2025-06-06 16:40:58 -0500
commit88c6df9aed06a53edd6ef463dd1daf877b85ed0a (patch)
tree847b6a0548aae239032f3d7b91a3f217c793aebc
parent470c7bf6aea3f8d30eb10532bab6439ad07f08f9 (diff)
downloadmuhqs-game-88c6df9aed06a53edd6ef463dd1daf877b85ed0a.tar.gz
muhqs-game-88c6df9aed06a53edd6ef463dd1daf877b85ed0a.zip
use constant exportet errors
-rw-r--r--go/game/ai.go6
-rw-r--r--go/game/set.go8
2 files changed, 8 insertions, 6 deletions
diff --git a/go/game/ai.go b/go/game/ai.go
index c55218e3..4860a13d 100644
--- a/go/game/ai.go
+++ b/go/game/ai.go
@@ -109,6 +109,8 @@ func selectRandomTargets(rand *rand.Rand, targets *Targets) error {
return nil
}
+var ErrNoPath = errors.New("no path found")
+
func (m *Map) generateMapGraphFor(u *Unit) *dijkstra.Graph {
graph := dijkstra.NewGraph()
for _, t := range m.AllTiles() {
@@ -179,7 +181,7 @@ func findPathTo(graph *dijkstra.Graph, u *Unit, pos Position) (dijkstra.BestPath
func findPathToPermanent(graph *dijkstra.Graph, m *Map, u *Unit, target Permanent) (*dijkstra.BestPath, error) {
if target.Tile() == nil {
- return nil, errors.New("no path found")
+ return nil, ErrNoPath
}
var bestPathToUnit *dijkstra.BestPath = nil
@@ -198,7 +200,7 @@ func findPathToPermanent(graph *dijkstra.Graph, m *Map, u *Unit, target Permanen
if bestPathToUnit != nil {
return bestPathToUnit, nil
} else {
- return nil, errors.New("no path found")
+ return nil, ErrNoPath
}
}
diff --git a/go/game/set.go b/go/game/set.go
index fe25e3a1..c4733423 100644
--- a/go/game/set.go
+++ b/go/game/set.go
@@ -2,7 +2,6 @@ package game
import (
"errors"
- "fmt"
"log"
"net/http"
"path"
@@ -25,6 +24,8 @@ const (
Exp1
)
+var ErrUnknownSet = errors.New("Unknown set")
+
func (si SetIdentifier) String() string {
switch si {
case Base:
@@ -119,7 +120,6 @@ func (set SetIdentifier) CardPaths() []string {
}
func SetListToSets(setList string) ([]SetIdentifier, error) {
- var err error
sets := []SetIdentifier{}
setList = strings.Replace(setList, " ", "", 0)
setsRaw := strings.Split(setList, ",")
@@ -128,8 +128,8 @@ func SetListToSets(setList string) ([]SetIdentifier, error) {
if found {
sets = append(sets, set)
} else {
- err = errors.New(fmt.Sprintf("Unknown set: %s", set))
+ return sets, ErrUnknownSet
}
}
- return sets, err
+ return sets, nil
}