cmd: rename planet
This commit is contained in:
@@ -20,7 +20,9 @@ const (
|
|||||||
ErrInputUnknownOpponentRace
|
ErrInputUnknownOpponentRace
|
||||||
ErrInputEntityTypeNameInvalid
|
ErrInputEntityTypeNameInvalid
|
||||||
ErrInputEntityTypeNameDuplicate
|
ErrInputEntityTypeNameDuplicate
|
||||||
ErrInputEntityTypeNameNotExists
|
ErrInputEntityNotExists
|
||||||
|
ErrInputEntityNotOwned
|
||||||
|
ErrInputPlanetNumber
|
||||||
ErrInputDriveValue
|
ErrInputDriveValue
|
||||||
ErrInputWeaponsValue
|
ErrInputWeaponsValue
|
||||||
ErrInputShieldsValue
|
ErrInputShieldsValue
|
||||||
@@ -47,8 +49,12 @@ func GenericErrorText(code int) string {
|
|||||||
return "Name has invalid length or symbols"
|
return "Name has invalid length or symbols"
|
||||||
case ErrInputEntityTypeNameDuplicate:
|
case ErrInputEntityTypeNameDuplicate:
|
||||||
return "Name already exists"
|
return "Name already exists"
|
||||||
case ErrInputEntityTypeNameNotExists:
|
case ErrInputEntityNotExists:
|
||||||
return "Name not exists"
|
return "Entity does not exists"
|
||||||
|
case ErrInputEntityNotOwned:
|
||||||
|
return "Entity is not owned"
|
||||||
|
case ErrInputPlanetNumber:
|
||||||
|
return "Invalid Planet number"
|
||||||
case ErrInputDriveValue:
|
case ErrInputDriveValue:
|
||||||
return "Invalid Drive value"
|
return "Invalid Drive value"
|
||||||
case ErrInputWeaponsValue:
|
case ErrInputWeaponsValue:
|
||||||
|
|||||||
+10
-2
@@ -16,8 +16,16 @@ func NewEntityTypeNameDuplicateError(arg ...any) error {
|
|||||||
return newGenericError(ErrInputEntityTypeNameDuplicate, arg...)
|
return newGenericError(ErrInputEntityTypeNameDuplicate, arg...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewEntityTypeNameNotExistsError(arg ...any) error {
|
func NewEntityNotExistsError(arg ...any) error {
|
||||||
return newGenericError(ErrInputEntityTypeNameNotExists, arg...)
|
return newGenericError(ErrInputEntityNotExists, arg...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewEntityNotOwnedError(arg ...any) error {
|
||||||
|
return newGenericError(ErrInputEntityNotOwned, arg...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPlanetNumberError(arg ...any) error {
|
||||||
|
return newGenericError(ErrInputPlanetNumber, arg...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDriveValueError(arg ...any) error {
|
func NewDriveValueError(arg ...any) error {
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package game
|
||||||
|
|
||||||
|
import "github.com/iliadenisov/galaxy/pkg/model/game"
|
||||||
|
|
||||||
|
func RenamePlanet(configure func(*Param), race string, number int, name string) (err error) {
|
||||||
|
control(configure, func(c *ctrl) {
|
||||||
|
c.execute(func(r Repo, g game.Game) {
|
||||||
|
err = renamePlanet(r, g, race, number, name)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func renamePlanet(r Repo, g game.Game, race string, number int, name string) error {
|
||||||
|
if err := g.RenamePlanet(race, number, name); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return r.SaveState(g)
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package game_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"slices"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
e "github.com/iliadenisov/galaxy/pkg/error"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"github.com/iliadenisov/galaxy/pkg/game"
|
||||||
|
mg "github.com/iliadenisov/galaxy/pkg/model/game"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRenamePlanet(t *testing.T) {
|
||||||
|
g(t, func(p func(*game.Param), g func() mg.Game) {
|
||||||
|
cg := g()
|
||||||
|
var number int
|
||||||
|
var owner uuid.UUID
|
||||||
|
for pl := range cg.Map.Planet {
|
||||||
|
if cg.Map.Planet[pl].Owner != uuid.Nil {
|
||||||
|
number = int(cg.Map.Planet[pl].Number)
|
||||||
|
owner = cg.Map.Planet[pl].Owner
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var race string
|
||||||
|
for r := range cg.Race {
|
||||||
|
if cg.Race[r].ID == owner {
|
||||||
|
race = cg.Race[r].Name
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newName := "Some-New-Name"
|
||||||
|
err := game.RenamePlanet(p, race, number, newName)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
cg = g()
|
||||||
|
pi := slices.IndexFunc(cg.Map.Planet, func(pl mg.Planet) bool { return pl.Owner == owner && pl.Number == uint(number) })
|
||||||
|
assert.GreaterOrEqual(t, pi, 0)
|
||||||
|
assert.Equal(t, "Some-New-Name", cg.Map.Planet[pi].Name)
|
||||||
|
|
||||||
|
ri := slices.IndexFunc(cg.Race, func(r mg.Race) bool { return r.Name != race })
|
||||||
|
assert.GreaterOrEqual(t, ri, 0)
|
||||||
|
otherRace := cg.Race[ri].Name
|
||||||
|
|
||||||
|
err = game.RenamePlanet(p, unknownRaceName, number, newName) // TODO: test actual rip race
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownHostRace))
|
||||||
|
err = game.RenamePlanet(p, race, number, "")
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityTypeNameInvalid))
|
||||||
|
err = game.RenamePlanet(p, race, -1, newName)
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputPlanetNumber))
|
||||||
|
err = game.RenamePlanet(p, race, 100500, newName)
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotExists))
|
||||||
|
err = game.RenamePlanet(p, otherRace, number, newName)
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotOwned))
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -15,7 +15,9 @@ func TestCreateScience(t *testing.T) {
|
|||||||
typeName := "First Step"
|
typeName := "First Step"
|
||||||
g(t, func(p func(*game.Param), g func() mg.Game) {
|
g(t, func(p func(*game.Param), g func() mg.Game) {
|
||||||
err := game.DeleteScience(p, race, typeName)
|
err := game.DeleteScience(p, race, typeName)
|
||||||
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityTypeNameNotExists))
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotExists))
|
||||||
|
err = game.CreateScience(p, unknownRaceName, " "+typeName+" ", 1, 0, 0, 0) // TODO: test on dead race
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownHostRace))
|
||||||
err = game.CreateScience(p, race, " "+typeName+" ", 1, 0, 0, 0)
|
err = game.CreateScience(p, race, " "+typeName+" ", 1, 0, 0, 0)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
sc, err := g().Sciences(race)
|
sc, err := g().Sciences(race)
|
||||||
@@ -27,6 +29,8 @@ func TestCreateScience(t *testing.T) {
|
|||||||
assert.Equal(t, sc[0].Shields, 0.)
|
assert.Equal(t, sc[0].Shields, 0.)
|
||||||
assert.Equal(t, sc[0].Cargo, 0.)
|
assert.Equal(t, sc[0].Cargo, 0.)
|
||||||
// TODO: test with existing ship group
|
// TODO: test with existing ship group
|
||||||
|
err = game.DeleteScience(p, unknownRaceName, typeName) // TODO: test with actial rip race
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownHostRace))
|
||||||
err = game.DeleteScience(p, race, typeName)
|
err = game.DeleteScience(p, race, typeName)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
sc, err = g().Sciences(race)
|
sc, err = g().Sciences(race)
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ func TestCreateShipType(t *testing.T) {
|
|||||||
typeName := "Drone"
|
typeName := "Drone"
|
||||||
g(t, func(p func(*game.Param), g func() mg.Game) {
|
g(t, func(p func(*game.Param), g func() mg.Game) {
|
||||||
err := game.DeleteShipType(p, race, typeName)
|
err := game.DeleteShipType(p, race, typeName)
|
||||||
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityTypeNameNotExists))
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotExists))
|
||||||
|
err = game.CreateShipType(p, unknownRaceName, " "+typeName+" ", 1, 0, 0, 0, 0) // TODO: test on dead race
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownHostRace))
|
||||||
err = game.CreateShipType(p, race, " "+typeName+" ", 1, 0, 0, 0, 0)
|
err = game.CreateShipType(p, race, " "+typeName+" ", 1, 0, 0, 0, 0)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
st, err := g().ShipTypes(race)
|
st, err := g().ShipTypes(race)
|
||||||
@@ -28,6 +30,8 @@ func TestCreateShipType(t *testing.T) {
|
|||||||
assert.Equal(t, st[0].Cargo, 0.)
|
assert.Equal(t, st[0].Cargo, 0.)
|
||||||
assert.Equal(t, st[0].Armament, uint(0))
|
assert.Equal(t, st[0].Armament, uint(0))
|
||||||
// TODO: test with existing ship group
|
// TODO: test with existing ship group
|
||||||
|
err = game.DeleteShipType(p, unknownRaceName, typeName) // TODO: test on dead race
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownHostRace))
|
||||||
err = game.DeleteShipType(p, race, typeName)
|
err = game.DeleteShipType(p, race, typeName)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
st, err = g().ShipTypes(race)
|
st, err = g().ShipTypes(race)
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package game_test
|
|||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
e "github.com/iliadenisov/galaxy/pkg/error"
|
||||||
|
|
||||||
"github.com/iliadenisov/galaxy/pkg/game"
|
"github.com/iliadenisov/galaxy/pkg/game"
|
||||||
mg "github.com/iliadenisov/galaxy/pkg/model/game"
|
mg "github.com/iliadenisov/galaxy/pkg/model/game"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
@@ -17,6 +19,11 @@ func TestDeclarePeaceAndWarSingle(t *testing.T) {
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, mg.RelationWar, r.Relation)
|
assert.Equal(t, mg.RelationWar, r.Relation)
|
||||||
|
|
||||||
|
r, err = g().Relation(unknownRaceName, opponentRace) // TODO: test on dead race
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownHostRace))
|
||||||
|
r, err = g().Relation(hostRace, unknownRaceName) // TODO: test on dead race
|
||||||
|
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownOpponentRace))
|
||||||
|
|
||||||
assert.NoError(t, game.DeclarePeace(f, hostRace, opponentRace))
|
assert.NoError(t, game.DeclarePeace(f, hostRace, opponentRace))
|
||||||
r, err = g().Relation(hostRace, opponentRace)
|
r, err = g().Relation(hostRace, opponentRace)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
@@ -11,7 +11,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
testRaceCount = 20
|
testRaceCount = 20
|
||||||
|
unknownRaceName = "Race_RIP"
|
||||||
)
|
)
|
||||||
|
|
||||||
func raceNum(i int) string {
|
func raceNum(i int) string {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"math"
|
"math"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
|
e "github.com/iliadenisov/galaxy/pkg/error"
|
||||||
)
|
)
|
||||||
|
|
||||||
type UnidentifiedPlanet struct {
|
type UnidentifiedPlanet struct {
|
||||||
@@ -74,3 +75,32 @@ func (p *Planet) IncreasePopulation() {
|
|||||||
p.Population -= extraPopulation
|
p.Population -= extraPopulation
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (g Game) RenamePlanet(raceName string, planetNumber int, typeName string) error {
|
||||||
|
raceID, err := g.hostRaceID(raceName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return g.renamePlanetInternal(raceID, planetNumber, typeName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g Game) renamePlanetInternal(race uuid.UUID, number int, name string) error {
|
||||||
|
n, ok := validateTypeName(name)
|
||||||
|
if !ok {
|
||||||
|
return e.NewEntityTypeNameValidationError("%q", n)
|
||||||
|
}
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return e.NewEntityNotExistsError("planet #%d", number)
|
||||||
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ func (g Game) deleteScienceInternal(race uuid.UUID, name string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return e.NewEntityTypeNameNotExistsError("science %w", name)
|
return e.NewEntityNotExistsError("science %w", name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return e.NewGameStateError("DeleteScience: race %v not found", race)
|
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)
|
return g.createScienceInternal(raceID, typeName, d, w, s, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g Game) createScienceInternal(race uuid.UUID, n string, d, w, s, c float64) error {
|
func (g Game) createScienceInternal(race uuid.UUID, name string, d, w, s, c float64) error {
|
||||||
name, ok := validateTypeName(n)
|
n, ok := validateTypeName(name)
|
||||||
if !ok {
|
if !ok {
|
||||||
return e.NewEntityTypeNameValidationError("%q", name)
|
return e.NewEntityTypeNameValidationError("%q", n)
|
||||||
}
|
}
|
||||||
if d < 0 {
|
if d < 0 {
|
||||||
return e.NewDriveValueError(d)
|
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 {
|
for r := range g.Race {
|
||||||
if g.Race[r].ID == race {
|
if g.Race[r].ID == race {
|
||||||
for sc := range g.Race[r].Sciences {
|
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)
|
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{
|
g.Race[r].Sciences = append(g.Race[r].Sciences, Science{
|
||||||
ID: id,
|
ID: id,
|
||||||
ScienceReport: ScienceReport{
|
ScienceReport: ScienceReport{
|
||||||
Name: name,
|
Name: n,
|
||||||
Drive: d,
|
Drive: d,
|
||||||
Weapons: w,
|
Weapons: w,
|
||||||
Shields: s,
|
Shields: s,
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ func (g Game) deleteShipTypeInternal(race uuid.UUID, name string) error {
|
|||||||
return nil
|
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)
|
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)
|
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 {
|
if err := checkShipTypeValues(d, w, s, c, a); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
name, ok := validateTypeName(n)
|
n, ok := validateTypeName(name)
|
||||||
if !ok {
|
if !ok {
|
||||||
return e.NewEntityTypeNameValidationError("%q", name)
|
return e.NewEntityTypeNameValidationError("%q", n)
|
||||||
}
|
}
|
||||||
for r := range g.Race {
|
for r := range g.Race {
|
||||||
if g.Race[r].ID == race {
|
if g.Race[r].ID == race {
|
||||||
for st := range g.Race[r].ShipTypes {
|
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)
|
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{
|
g.Race[r].ShipTypes = append(g.Race[r].ShipTypes, ShipType{
|
||||||
ID: id,
|
ID: id,
|
||||||
ShipTypeReport: ShipTypeReport{
|
ShipTypeReport: ShipTypeReport{
|
||||||
Name: name,
|
Name: n,
|
||||||
Drive: d,
|
Drive: d,
|
||||||
Weapons: w,
|
Weapons: w,
|
||||||
Shields: s,
|
Shields: s,
|
||||||
|
|||||||
Reference in New Issue
Block a user