developer/galaxy-game
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: race index by name

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
pkg/model/game/science.go
+37 -54
View File
@@ -1,6 +1,8 @@
package game
import (
"slices"
"github.com/google/uuid"
e "github.com/iliadenisov/galaxy/pkg/error"
)
@@ -24,61 +26,50 @@ type ScienceReport struct {
}
func (g Game) Sciences(raceName string) ([]Science, error) {
raceID, err := g.hostRaceID(raceName)
ri, err := g.raceIndex(raceName)
if err != nil {
return nil, err
}
return g.sciencesInternal(raceID)
return g.sciencesInternal(ri), nil
}
func (g Game) sciencesInternal(race uuid.UUID) ([]Science, error) {
for r := range g.Race {
if g.Race[r].ID == race {
return g.Race[r].Sciences, nil
}
}
return nil, e.NewGameStateError("Sciences: race %v not found", race)
func (g Game) sciencesInternal(ri int) []Science {
return g.Race[ri].Sciences
}
func (g Game) DeleteScience(raceName, typeName string) error {
raceID, err := g.hostRaceID(raceName)
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.deleteScienceInternal(raceID, typeName)
return g.deleteScienceInternal(ri, typeName)
}
func (g Game) deleteScienceInternal(race uuid.UUID, name string) error {
for r := range g.Race {
if g.Race[r].ID == race {
for sc := range g.Race[r].Sciences {
if g.Race[r].Sciences[sc].Name == name {
for pl := range g.Map.Planet {
if g.Map.Planet[pl].Production.Production == ResearchScience &&
g.Map.Planet[pl].Production.SubjectID != nil &&
*g.Map.Planet[pl].Production.SubjectID == g.Race[r].Sciences[sc].ID {
return e.NewDeleteSciencePlanetProductionError(g.Map.Planet[pl].Name)
}
}
g.Race[r].Sciences = append(g.Race[r].Sciences[:sc], g.Race[r].Sciences[sc+1:]...)
return nil
}
}
return e.NewEntityNotExistsError("science %w", name)
}
func (g Game) deleteScienceInternal(ri int, name string) error {
sc := slices.IndexFunc(g.Race[ri].Sciences, func(s Science) bool { return s.Name == name })
if sc < 0 {
return e.NewEntityNotExistsError("science %w", name)
}
return e.NewGameStateError("DeleteScience: race %v not found", race)
if pl := slices.IndexFunc(g.Map.Planet, func(p Planet) bool {
return p.Production.Production == ResearchScience &&
p.Production.SubjectID != nil &&
*p.Production.SubjectID == g.Race[ri].Sciences[sc].ID
}); pl >= 0 {
return e.NewDeleteSciencePlanetProductionError(g.Map.Planet[pl].Name)
}
g.Race[ri].Sciences = append(g.Race[ri].Sciences[:sc], g.Race[ri].Sciences[sc+1:]...)
return nil
}
func (g Game) CreateScience(raceName, typeName string, d, w, s, c float64) error {
raceID, err := g.hostRaceID(raceName)
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.createScienceInternal(raceID, typeName, d, w, s, c)
return g.createScienceInternal(ri, typeName, d, w, s, c)
}
func (g Game) createScienceInternal(race uuid.UUID, name string, d, w, s, c float64) error {
func (g Game) createScienceInternal(ri int, name string, d, w, s, c float64) error {
n, ok := validateTypeName(name)
if !ok {
return e.NewEntityTypeNameValidationError("%q", n)
@@ -99,26 +90,18 @@ func (g Game) createScienceInternal(race uuid.UUID, name string, d, w, s, c floa
if sum != 1 {
return e.NewScienceSumValuesError("D=%f W=%f S=%f C=%f sum=%f", d, w, s, c, sum)
}
for r := range g.Race {
if g.Race[r].ID == race {
for sc := range g.Race[r].Sciences {
if g.Race[r].Sciences[sc].Name == n {
return e.NewEntityTypeNameDuplicateError("science %w", g.Race[r].Sciences[sc].Name)
}
}
id := uuid.New()
g.Race[r].Sciences = append(g.Race[r].Sciences, Science{
ID: id,
ScienceReport: ScienceReport{
Name: n,
Drive: d,
Weapons: w,
Shields: s,
Cargo: c,
},
})
return nil
}
if sc := slices.IndexFunc(g.Race[ri].Sciences, func(s Science) bool { return s.Name == n }); sc >= 0 {
return e.NewEntityTypeNameDuplicateError("science %w", g.Race[ri].Sciences[sc].Name)
}
return e.NewGameStateError("CreateScience: race %v not found", race)
g.Race[ri].Sciences = append(g.Race[ri].Sciences, Science{
ID: uuid.New(),
ScienceReport: ScienceReport{
Name: n,
Drive: d,
Weapons: w,
Shields: s,
Cargo: c,
},
})
return nil
}