cmd: rename planet
This commit is contained in:
@@ -177,7 +177,7 @@ func (g Game) deleteShipTypeInternal(race uuid.UUID, name string) error {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return e.NewEntityTypeNameNotExistsError("ship type %w", name)
|
||||
return e.NewEntityNotExistsError("ship type %w", name)
|
||||
}
|
||||
}
|
||||
return e.NewGameStateError("DeleteShipType: race %v not found", race)
|
||||
@@ -191,18 +191,18 @@ func (g Game) CreateShipType(raceName, typeName string, d, w, s, c float64, a in
|
||||
return g.createShipTypeInternal(raceID, typeName, d, w, s, c, a)
|
||||
}
|
||||
|
||||
func (g Game) createShipTypeInternal(race uuid.UUID, n string, d, w, s, c float64, a int) error {
|
||||
func (g Game) createShipTypeInternal(race uuid.UUID, name string, d, w, s, c float64, a int) error {
|
||||
if err := checkShipTypeValues(d, w, s, c, a); err != nil {
|
||||
return err
|
||||
}
|
||||
name, ok := validateTypeName(n)
|
||||
n, ok := validateTypeName(name)
|
||||
if !ok {
|
||||
return e.NewEntityTypeNameValidationError("%q", name)
|
||||
return e.NewEntityTypeNameValidationError("%q", n)
|
||||
}
|
||||
for r := range g.Race {
|
||||
if g.Race[r].ID == race {
|
||||
for st := range g.Race[r].ShipTypes {
|
||||
if g.Race[r].ShipTypes[st].Name == name {
|
||||
if g.Race[r].ShipTypes[st].Name == n {
|
||||
return e.NewEntityTypeNameDuplicateError("ship type %w", g.Race[r].ShipTypes[st].Name)
|
||||
}
|
||||
}
|
||||
@@ -210,7 +210,7 @@ func (g Game) createShipTypeInternal(race uuid.UUID, n string, d, w, s, c float6
|
||||
g.Race[r].ShipTypes = append(g.Race[r].ShipTypes, ShipType{
|
||||
ID: id,
|
||||
ShipTypeReport: ShipTypeReport{
|
||||
Name: name,
|
||||
Name: n,
|
||||
Drive: d,
|
||||
Weapons: w,
|
||||
Shields: s,
|
||||
|
||||
Reference in New Issue
Block a user