cmd: rename planet
This commit is contained in:
@@ -64,7 +64,7 @@ func (g Game) deleteScienceInternal(race uuid.UUID, name string) error {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return e.NewEntityTypeNameNotExistsError("science %w", name)
|
||||
return e.NewEntityNotExistsError("science %w", name)
|
||||
}
|
||||
}
|
||||
return e.NewGameStateError("DeleteScience: race %v not found", race)
|
||||
@@ -78,10 +78,10 @@ func (g Game) CreateScience(raceName, typeName string, d, w, s, c float64) error
|
||||
return g.createScienceInternal(raceID, typeName, d, w, s, c)
|
||||
}
|
||||
|
||||
func (g Game) createScienceInternal(race uuid.UUID, n string, d, w, s, c float64) error {
|
||||
name, ok := validateTypeName(n)
|
||||
func (g Game) createScienceInternal(race uuid.UUID, name string, d, w, s, c float64) error {
|
||||
n, ok := validateTypeName(name)
|
||||
if !ok {
|
||||
return e.NewEntityTypeNameValidationError("%q", name)
|
||||
return e.NewEntityTypeNameValidationError("%q", n)
|
||||
}
|
||||
if d < 0 {
|
||||
return e.NewDriveValueError(d)
|
||||
@@ -102,7 +102,7 @@ func (g Game) createScienceInternal(race uuid.UUID, n string, d, w, s, c float64
|
||||
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 {
|
||||
if g.Race[r].Sciences[sc].Name == n {
|
||||
return e.NewEntityTypeNameDuplicateError("science %w", g.Race[r].Sciences[sc].Name)
|
||||
}
|
||||
}
|
||||
@@ -110,7 +110,7 @@ func (g Game) createScienceInternal(race uuid.UUID, n string, d, w, s, c float64
|
||||
g.Race[r].Sciences = append(g.Race[r].Sciences, Science{
|
||||
ID: id,
|
||||
ScienceReport: ScienceReport{
|
||||
Name: name,
|
||||
Name: n,
|
||||
Drive: d,
|
||||
Weapons: w,
|
||||
Shields: s,
|
||||
|
||||
Reference in New Issue
Block a user