cmd: merge ship types

This commit is contained in:
Ilia Denisov
2025-10-02 23:22:44 +03:00
parent cafdd10bab
commit 33efa86065
5 changed files with 109 additions and 0 deletions
+6
View File
@@ -13,12 +13,14 @@ const (
ErrDeleteShipTypeExistingGroup = 5000 ErrDeleteShipTypeExistingGroup = 5000
ErrDeleteShipTypePlanetProduction = 5001 ErrDeleteShipTypePlanetProduction = 5001
ErrDeleteSciencePlanetProduction = 5002 ErrDeleteSciencePlanetProduction = 5002
ErrMergeShipTypeNotEqual = 5003
) )
const ( const (
ErrInputUnknownRace int = 3000 + iota ErrInputUnknownRace int = 3000 + iota
ErrInputEntityTypeNameInvalid ErrInputEntityTypeNameInvalid
ErrInputEntityTypeNameDuplicate ErrInputEntityTypeNameDuplicate
ErrInputEntityTypeNameEquality
ErrInputEntityNotExists ErrInputEntityNotExists
ErrInputEntityNotOwned ErrInputEntityNotOwned
ErrInputPlanetNumber ErrInputPlanetNumber
@@ -47,6 +49,8 @@ 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 ErrInputEntityTypeNameEquality:
return "Names should differ"
case ErrInputEntityNotExists: case ErrInputEntityNotExists:
return "Entity does not exists" return "Entity does not exists"
case ErrInputEntityNotOwned: case ErrInputEntityNotOwned:
@@ -77,6 +81,8 @@ func GenericErrorText(code int) string {
return "Science proportions sum should be equal 1" return "Science proportions sum should be equal 1"
case ErrInputProductionInvalid: case ErrInputProductionInvalid:
return "Invalid Production type" return "Invalid Production type"
case ErrMergeShipTypeNotEqual:
return "Source and target ship types are not the same"
default: default:
return fmt.Sprintf("Undescribed error with code %d", code) return fmt.Sprintf("Undescribed error with code %d", code)
} }
+8
View File
@@ -12,6 +12,10 @@ func NewEntityTypeNameDuplicateError(arg ...any) error {
return newGenericError(ErrInputEntityTypeNameDuplicate, arg...) return newGenericError(ErrInputEntityTypeNameDuplicate, arg...)
} }
func NewEntityTypeNameEqualityError(arg ...any) error {
return newGenericError(ErrInputEntityTypeNameEquality, arg...)
}
func NewEntityNotExistsError(arg ...any) error { func NewEntityNotExistsError(arg ...any) error {
return newGenericError(ErrInputEntityNotExists, arg...) return newGenericError(ErrInputEntityNotExists, arg...)
} }
@@ -59,3 +63,7 @@ func NewScienceSumValuesError(arg ...any) error {
func NewProductionInvalidError(arg ...any) error { func NewProductionInvalidError(arg ...any) error {
return newGenericError(ErrInputProductionInvalid, arg...) return newGenericError(ErrInputProductionInvalid, arg...)
} }
func NewMergeShipTypeNotEqualError(arg ...any) error {
return newGenericError(ErrMergeShipTypeNotEqual, arg...)
}
+16
View File
@@ -18,6 +18,22 @@ func createShipType(r Repo, g game.Game, race, typeName string, d, w, s, c float
return r.SaveState(g) return r.SaveState(g)
} }
func MergeShipType(configure func(*Param), race, source, target string) (err error) {
control(configure, func(c *ctrl) {
c.execute(func(r Repo, g game.Game) {
err = mergeShipType(r, g, race, source, target)
})
})
return
}
func mergeShipType(r Repo, g game.Game, race, source, target string) error {
if err := g.MergeShipType(race, source, target); err != nil {
return err
}
return r.SaveState(g)
}
func DeleteShipType(configure func(*Param), race, typeName string) (err error) { func DeleteShipType(configure func(*Param), race, typeName string) (err error) {
control(configure, func(c *ctrl) { control(configure, func(c *ctrl) {
c.execute(func(r Repo, g game.Game) { c.execute(func(r Repo, g game.Game) {
+24
View File
@@ -91,3 +91,27 @@ func TestCreateShipTypeValidation(t *testing.T) {
} }
}) })
} }
func TestMergeShipType(t *testing.T) {
race := "race_01"
g(t, func(p func(*game.Param), g func() mg.Game) {
err := game.CreateShipType(p, race, "Drone", 1, 0, 0, 0, 0)
assert.NoError(t, err)
err = game.CreateShipType(p, race, "Spy", 1, 0, 0, 0, 0)
assert.NoError(t, err)
err = game.CreateShipType(p, race, "Cruiser", 15, 15, 15, 0, 1)
assert.NoError(t, err)
err = game.MergeShipType(p, race, "Sky", "Drone")
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotExists))
err = game.MergeShipType(p, race, "Spy", "Freighter")
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotExists))
err = game.MergeShipType(p, race, "Spy", "Drone")
assert.NoError(t, err)
st, err := g().ShipTypes(race)
assert.NoError(t, err)
assert.Len(t, st, 2)
err = game.MergeShipType(p, race, "Drone", "Cruiser")
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrMergeShipTypeNotEqual))
// TODO: test group/production changed
})
}
+55
View File
@@ -44,6 +44,14 @@ type Fleet struct {
ShipGroups []ShipGroup `json:"group"` ShipGroups []ShipGroup `json:"group"`
} }
func (st ShipType) Equal(o ShipType) bool {
return st.Drive == o.Drive &&
st.Weapons == o.Weapons &&
st.Armament == o.Armament &&
st.Shields == o.Shields &&
st.Cargo == o.Cargo
}
func (st ShipType) EmptyMass() float64 { func (st ShipType) EmptyMass() float64 {
shipMass := st.Drive + st.Shields + st.Cargo + st.WeaponsMass() shipMass := st.Drive + st.Shields + st.Cargo + st.WeaponsMass()
return shipMass return shipMass
@@ -197,6 +205,53 @@ func (g Game) createShipTypeInternal(ri int, name string, d, w, s, c float64, a
return nil return nil
} }
func (g Game) MergeShipType(race, name, targetName string) error {
ri, err := g.raceIndex(race)
if err != nil {
return err
}
return g.mergeShipTypeInternal(ri, name, targetName)
}
func (g Game) mergeShipTypeInternal(ri int, name, targetName string) error {
st := slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.Name == name })
if st < 0 {
return e.NewEntityNotExistsError("source ship type %w", name)
}
if name == targetName {
return e.NewEntityTypeNameEqualityError("ship type %q", targetName)
}
tt := slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.Name == targetName })
if tt < 0 {
return e.NewEntityNotExistsError("target ship type %w", name)
}
if !g.Race[ri].ShipTypes[st].Equal(g.Race[ri].ShipTypes[tt]) {
return e.NewMergeShipTypeNotEqualError()
}
// switch planet productions to the new type
for pl := range g.Map.Planet {
if g.Map.Planet[pl].Owner == g.Race[ri].ID &&
g.Map.Planet[pl].Production.Production == ProductionShip &&
g.Map.Planet[pl].Production.SubjectID != nil &&
*g.Map.Planet[pl].Production.SubjectID == g.Race[ri].ShipTypes[st].ID {
g.Map.Planet[pl].Production.SubjectID = &g.Race[ri].ShipTypes[tt].ID
}
}
// switch ship groups to the new type
for sg := range g.Race[ri].ShipGroups {
if g.Race[ri].ShipGroups[sg].TypeID == g.Race[ri].ShipTypes[st].ID {
g.Race[ri].ShipGroups[sg].TypeID = g.Race[ri].ShipTypes[tt].ID
}
}
// remove the source type
g.Race[ri].ShipTypes = append(g.Race[ri].ShipTypes[:st], g.Race[ri].ShipTypes[st+1:]...)
return nil
}
func checkShipTypeValues(d, w, s, c float64, a int) error { func checkShipTypeValues(d, w, s, c float64, a int) error {
if !checkShipTypeValueDWSC(d) { if !checkShipTypeValueDWSC(d) {
return e.NewDriveValueError(d) return e.NewDriveValueError(d)