refactor: race index by name

This commit is contained in:
Ilia Denisov
2025-10-02 22:41:04 +03:00
parent 0890bf3009
commit cafdd10bab
10 changed files with 129 additions and 210 deletions
+12 -13
View File
@@ -2,6 +2,7 @@ package game
import (
"math"
"slices"
"github.com/google/uuid"
e "github.com/iliadenisov/galaxy/pkg/error"
@@ -77,14 +78,14 @@ func (p *Planet) IncreasePopulation() {
}
func (g Game) RenamePlanet(raceName string, planetNumber int, typeName string) error {
raceID, err := g.hostRaceID(raceName)
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.renamePlanetInternal(raceID, planetNumber, typeName)
return g.renamePlanetInternal(ri, planetNumber, typeName)
}
func (g Game) renamePlanetInternal(race uuid.UUID, number int, name string) error {
func (g Game) renamePlanetInternal(ri int, number int, name string) error {
n, ok := validateTypeName(name)
if !ok {
return e.NewEntityTypeNameValidationError("%q", n)
@@ -92,15 +93,13 @@ func (g Game) renamePlanetInternal(race uuid.UUID, number int, name string) erro
if number < 0 {
return e.NewPlanetNumberError(number)
}
num := uint(number)
for pl := range g.Map.Planet {
if g.Map.Planet[pl].Number == num {
if g.Map.Planet[pl].Owner != race {
return e.NewEntityNotOwnedError("planet %#d", num)
}
g.Map.Planet[pl].Name = n
return nil
}
pl := slices.IndexFunc(g.Map.Planet, func(p Planet) bool { return p.Number == uint(number) })
if pl < 0 {
return e.NewEntityNotExistsError("planet #%d", number)
}
return e.NewEntityNotExistsError("planet #%d", number)
if g.Map.Planet[pl].Owner != g.Race[ri].ID {
return e.NewEntityNotOwnedError("planet %#d", number)
}
g.Map.Planet[pl].Name = n
return nil
}