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

wip: refactor controller

Browse Source
This commit is contained in:
Ilia Denisov
2026-01-14 22:17:24 +02:00
parent 1bfc9242af
commit fe8a8d4150
43 changed files with 4710 additions and 2188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/model/game/fleet.go
+222 -220
View File
@@ -1,14 +1,16 @@
package game
import (
"fmt"
"iter"
"math"
"slices"
import "github.com/google/uuid"
"github.com/google/uuid"
e "github.com/iliadenisov/galaxy/internal/error"
)
// import (
// "fmt"
// "iter"
// "math"
// "slices"
// "github.com/google/uuid"
// e "github.com/iliadenisov/galaxy/internal/error"
// )
type Fleet struct {
ID uuid.UUID `json:"id"`
@@ -16,231 +18,231 @@ type Fleet struct {
Name string `json:"name"`
}
func FleetState(g *Game, fleetID uuid.UUID) (ShipGroupState, *uint, *InSpace) {
fi := slices.IndexFunc(g.Fleets, func(f Fleet) bool { return f.ID == fleetID })
if fi < 0 {
panic("FleetState: fleet id not found: " + fleetID.String())
}
ri := slices.IndexFunc(g.Race, func(r Race) bool { return r.ID == g.Fleets[fi].OwnerID })
if ri < 0 {
panic("FleetState: race id not found: " + g.Fleets[fi].OwnerID.String())
}
var state *ShipGroupState
var onPlanet *uint
var is *InSpace
for sg := range FleetGroups(g, ri, fi) {
if state == nil {
s := sg.State()
state = &s
if planet, ok := sg.OnPlanet(); ok {
onPlanet = &planet
}
is = sg.StateInSpace
continue
}
if *state != sg.State() {
panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q has different states", g.Race[ri].Name, g.Fleets[fi].Name))
}
if planet, ok := sg.OnPlanet(); ok && onPlanet != nil && *onPlanet != planet {
for sg := range FleetGroups(g, ri, fi) {
fmt.Println("group", sg.Index, "fleet", sg.FleetID, g.Fleets[fi].Name, "state", sg.State(), "on", sg.Destination)
}
panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q are on different planets: %d <> %d", g.Race[ri].Name, g.Fleets[fi].Name, *onPlanet, planet))
}
if (is == nil && sg.StateInSpace != nil) || (is != nil && sg.StateInSpace == nil) {
panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q on_planet and in_space at the same time", g.Race[ri].Name, g.Fleets[fi].Name))
}
if is != nil && sg.StateInSpace != nil && !is.Equal(*sg.StateInSpace) {
panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q has different is_space states", g.Race[ri].Name, g.Fleets[fi].Name))
}
}
if state == nil {
panic(fmt.Sprintf("FleetState: race's %q fleet %q has no ships", g.Race[ri].Name, g.Fleets[fi].Name))
}
return *state, onPlanet, is
}
// func FleetState(g *Game, fleetID uuid.UUID) (ShipGroupState, *uint, *InSpace) {
// fi := slices.IndexFunc(g.Fleets, func(f Fleet) bool { return f.ID == fleetID })
// if fi < 0 {
// panic("FleetState: fleet id not found: " + fleetID.String())
// }
// ri := slices.IndexFunc(g.Race, func(r Race) bool { return r.ID == g.Fleets[fi].OwnerID })
// if ri < 0 {
// panic("FleetState: race id not found: " + g.Fleets[fi].OwnerID.String())
// }
// var state *ShipGroupState
// var onPlanet *uint
// var is *InSpace
// for sg := range FleetGroups(g, ri, fi) {
// if state == nil {
// s := sg.State()
// state = &s
// if planet, ok := sg.OnPlanet(); ok {
// onPlanet = &planet
// }
// is = sg.StateInSpace
// continue
// }
// if *state != sg.State() {
// panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q has different states", g.Race[ri].Name, g.Fleets[fi].Name))
// }
// if planet, ok := sg.OnPlanet(); ok && onPlanet != nil && *onPlanet != planet {
// for sg := range FleetGroups(g, ri, fi) {
// fmt.Println("group", sg.Index, "fleet", sg.FleetID, g.Fleets[fi].Name, "state", sg.State(), "on", sg.Destination)
// }
// panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q are on different planets: %d <> %d", g.Race[ri].Name, g.Fleets[fi].Name, *onPlanet, planet))
// }
// if (is == nil && sg.StateInSpace != nil) || (is != nil && sg.StateInSpace == nil) {
// panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q on_planet and in_space at the same time", g.Race[ri].Name, g.Fleets[fi].Name))
// }
// if is != nil && sg.StateInSpace != nil && !is.Equal(*sg.StateInSpace) {
// panic(fmt.Sprintf("FleetState: one or more ships in race's %q fleet %q has different is_space states", g.Race[ri].Name, g.Fleets[fi].Name))
// }
// }
// if state == nil {
// panic(fmt.Sprintf("FleetState: race's %q fleet %q has no ships", g.Race[ri].Name, g.Fleets[fi].Name))
// }
// return *state, onPlanet, is
// }
// TODO: Hello! Wanna know fleet's speed? Good. Implement & test this func first.
func (g Game) FleetSpeed(fl Fleet) float64 {
result := math.MaxFloat64
for sg := range g.ShipGroups {
if g.ShipGroups[sg].FleetID == nil || *g.ShipGroups[sg].FleetID != fl.ID {
continue
}
st := g.mustShipType(g.ShipGroups[sg].TypeID)
typeSpeed := g.ShipGroups[sg].Speed(st)
if typeSpeed < result {
result = typeSpeed
}
}
return result
}
// // TODO: Hello! Wanna know fleet's speed? Good. Implement & test this func first.
// func (g Game) FleetSpeed(fl Fleet) float64 {
// result := math.MaxFloat64
// for sg := range g.ShipGroups {
// if g.ShipGroups[sg].FleetID == nil || *g.ShipGroups[sg].FleetID != fl.ID {
// continue
// }
// st := g.mustShipType(g.ShipGroups[sg].TypeID)
// typeSpeed := g.ShipGroups[sg].Speed(st)
// if typeSpeed < result {
// result = typeSpeed
// }
// }
// return result
// }
func (g *Game) JoinShipGroupToFleet(raceName, fleetName string, group, count uint) error {
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.joinShipGroupToFleetInternal(ri, fleetName, group, count)
}
// func (g *Game) JoinShipGroupToFleet(raceName, fleetName string, group, count uint) error {
// ri, err := g.raceIndex(raceName)
// if err != nil {
// return err
// }
// return g.joinShipGroupToFleetInternal(ri, fleetName, group, count)
// }
func (g *Game) JoinFleets(raceName, fleetSourceName, fleetTargetName string) error {
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.joinFleetsInternal(ri, fleetSourceName, fleetTargetName)
}
// func (g *Game) JoinFleets(raceName, fleetSourceName, fleetTargetName string) error {
// ri, err := g.raceIndex(raceName)
// if err != nil {
// return err
// }
// return g.joinFleetsInternal(ri, fleetSourceName, fleetTargetName)
// }
func (g *Game) joinShipGroupToFleetInternal(ri int, fleetName string, groupIndex, quantity uint) (err error) {
name, ok := validateTypeName(fleetName)
if !ok {
return e.NewEntityTypeNameValidationError("%q", name)
}
sgi := -1
var maxIndex uint
for i, sg := range g.listIndexShipGroups(ri) {
if sgi < 0 && sg.Index == groupIndex {
sgi = i
}
if sg.Index > maxIndex {
maxIndex = sg.Index
}
}
if sgi < 0 {
return e.NewEntityNotExistsError("group #%d", groupIndex)
}
// func (g *Game) joinShipGroupToFleetInternal(ri int, fleetName string, groupIndex, quantity uint) (err error) {
// name, ok := validateTypeName(fleetName)
// if !ok {
// return e.NewEntityTypeNameValidationError("%q", name)
// }
// sgi := -1
// var maxIndex uint
// for i, sg := range g.listIndexShipGroups(ri) {
// if sgi < 0 && sg.Index == groupIndex {
// sgi = i
// }
// if sg.Index > maxIndex {
// maxIndex = sg.Index
// }
// }
// if sgi < 0 {
// return e.NewEntityNotExistsError("group #%d", groupIndex)
// }
if g.ShipGroups[sgi].State() != StateInOrbit {
return e.NewShipsBusyError()
}
// if g.ShipGroups[sgi].State() != StateInOrbit {
// return e.NewShipsBusyError()
// }
if g.ShipGroups[sgi].Number < quantity {
return e.NewJoinFleetGroupNumberNotEnoughError("%d<%d", g.ShipGroups[sgi].Number, quantity)
}
// if g.ShipGroups[sgi].Number < quantity {
// return e.NewJoinFleetGroupNumberNotEnoughError("%d<%d", g.ShipGroups[sgi].Number, quantity)
// }
fi := g.fleetIndex(ri, name)
if fi < 0 {
fi, err = g.createFleet(ri, name)
if err != nil {
return err
}
} else {
state, onPlanet, _ := FleetState(g, g.Fleets[fi].ID)
if state != StateInOrbit || *onPlanet != g.ShipGroups[sgi].Destination {
return e.NewShipsNotOnSamePlanetError("fleet: %s", fleetName)
}
}
// fi := g.fleetIndex(ri, name)
// if fi < 0 {
// fi, err = g.createFleet(ri, name)
// if err != nil {
// return err
// }
// } else {
// state, onPlanet, _ := FleetState(g, g.Fleets[fi].ID)
// if state != StateInOrbit || *onPlanet != g.ShipGroups[sgi].Destination {
// return e.NewShipsNotOnSamePlanetError("fleet: %s", fleetName)
// }
// }
// FIXME: if g.ShipGroups[sgi].FleetID != nil { // delete old fleet if empty, ALSO mind breaking group }
if quantity > 0 && quantity < g.ShipGroups[sgi].Number {
// nsgi, err := g.breakGroupSafe(ri, groupIndex, quantity)
// if err != nil {
// return err
// }
// sgi = nsgi
newGroup := g.ShipGroups[sgi]
newGroup.Number -= quantity
g.ShipGroups[sgi].Number = quantity
newGroup.Index = maxIndex + 1
g.ShipGroups = append(g.ShipGroups, newGroup)
}
// // FIXME: if g.ShipGroups[sgi].FleetID != nil { // delete old fleet if empty, ALSO mind breaking group }
// if quantity > 0 && quantity < g.ShipGroups[sgi].Number {
// // nsgi, err := g.breakGroupSafe(ri, groupIndex, quantity)
// // if err != nil {
// // return err
// // }
// // sgi = nsgi
// newGroup := g.ShipGroups[sgi]
// newGroup.Number -= quantity
// g.ShipGroups[sgi].Number = quantity
// newGroup.Index = maxIndex + 1
// g.ShipGroups = append(g.ShipGroups, newGroup)
// }
g.ShipGroups[sgi].FleetID = &g.Fleets[fi].ID
return nil
}
// g.ShipGroups[sgi].FleetID = &g.Fleets[fi].ID
// return nil
// }
func (g *Game) createFleet(ri int, name string) (int, error) {
n, ok := validateTypeName(name)
if !ok {
return 0, e.NewEntityTypeNameValidationError("%q", n)
}
if fl := g.fleetIndex(ri, n); fl >= 0 {
return 0, e.NewEntityTypeNameDuplicateError("fleet %w", g.Fleets[fl].Name)
}
fleets := slices.Clone(g.Fleets)
fleets = append(fleets, Fleet{
ID: uuid.New(),
OwnerID: g.Race[ri].ID,
Name: n,
})
g.Fleets = fleets
return len(g.Fleets) - 1, nil
}
// func (g *Game) createFleet(ri int, name string) (int, error) {
// n, ok := validateTypeName(name)
// if !ok {
// return 0, e.NewEntityTypeNameValidationError("%q", n)
// }
// if fl := g.fleetIndex(ri, n); fl >= 0 {
// return 0, e.NewEntityTypeNameDuplicateError("fleet %w", g.Fleets[fl].Name)
// }
// fleets := slices.Clone(g.Fleets)
// fleets = append(fleets, Fleet{
// ID: uuid.New(),
// OwnerID: g.Race[ri].ID,
// Name: n,
// })
// g.Fleets = fleets
// return len(g.Fleets) - 1, nil
// }
func (g *Game) joinFleetsInternal(ri int, fleetSourceName, fleetTargetName string) (err error) {
fiSource := g.fleetIndex(ri, fleetSourceName)
if fiSource < 0 {
return e.NewEntityNotExistsError("source fleet %s", fleetSourceName)
}
fiTarget := g.fleetIndex(ri, fleetTargetName)
if fiTarget < 0 {
return e.NewEntityNotExistsError("target fleet %s", fleetTargetName)
}
srcState, planet1, _ := FleetState(g, g.Fleets[fiSource].ID)
tgtState, planet2, _ := FleetState(g, g.Fleets[fiTarget].ID)
if srcState != StateInOrbit || srcState != tgtState || *planet1 != *planet2 {
return e.NewShipsNotOnSamePlanetError()
}
for sgi, sg := range g.listIndexShipGroups(ri) {
if sg.FleetID != nil && *sg.FleetID == g.Fleets[fiSource].ID {
g.ShipGroups[sgi].FleetID = &g.Fleets[fiTarget].ID
}
}
return g.deleteFleetSafe(ri, fleetSourceName)
}
// func (g *Game) joinFleetsInternal(ri int, fleetSourceName, fleetTargetName string) (err error) {
// fiSource := g.fleetIndex(ri, fleetSourceName)
// if fiSource < 0 {
// return e.NewEntityNotExistsError("source fleet %s", fleetSourceName)
// }
// fiTarget := g.fleetIndex(ri, fleetTargetName)
// if fiTarget < 0 {
// return e.NewEntityNotExistsError("target fleet %s", fleetTargetName)
// }
// srcState, planet1, _ := FleetState(g, g.Fleets[fiSource].ID)
// tgtState, planet2, _ := FleetState(g, g.Fleets[fiTarget].ID)
// if srcState != StateInOrbit || srcState != tgtState || *planet1 != *planet2 {
// return e.NewShipsNotOnSamePlanetError()
// }
// for sgi, sg := range g.listIndexShipGroups(ri) {
// if sg.FleetID != nil && *sg.FleetID == g.Fleets[fiSource].ID {
// g.ShipGroups[sgi].FleetID = &g.Fleets[fiTarget].ID
// }
// }
// return g.deleteFleetSafe(ri, fleetSourceName)
// }
func (g *Game) deleteFleetSafe(ri int, name string) error {
fi := g.fleetIndex(ri, name)
if fi < 0 {
return e.NewEntityNotExistsError("fleet %s", name)
}
for sgi := range g.ShipGroups {
if g.ShipGroups[sgi].FleetID != nil && *g.ShipGroups[sgi].FleetID == g.Fleets[fi].ID {
return e.NewEntityInUseError("fleet %s: race %s, group #%d", name, g.Race[ri].Name, g.ShipGroups[sgi].Number)
}
}
g.Fleets = append(g.Fleets[:fi], g.Fleets[fi+1:]...)
return nil
}
// func (g *Game) deleteFleetSafe(ri int, name string) error {
// fi := g.fleetIndex(ri, name)
// if fi < 0 {
// return e.NewEntityNotExistsError("fleet %s", name)
// }
// for sgi := range g.ShipGroups {
// if g.ShipGroups[sgi].FleetID != nil && *g.ShipGroups[sgi].FleetID == g.Fleets[fi].ID {
// return e.NewEntityInUseError("fleet %s: race %s, group #%d", name, g.Race[ri].Name, g.ShipGroups[sgi].Number)
// }
// }
// g.Fleets = append(g.Fleets[:fi], g.Fleets[fi+1:]...)
// return nil
// }
func (g Game) fleetIndex(ri int, name string) int {
return slices.IndexFunc(g.Fleets, func(f Fleet) bool { return f.OwnerID == g.Race[ri].ID && f.Name == name })
}
// func (g Game) fleetIndex(ri int, name string) int {
// return slices.IndexFunc(g.Fleets, func(f Fleet) bool { return f.OwnerID == g.Race[ri].ID && f.Name == name })
// }
func (g Game) listFleets(ri int) iter.Seq[Fleet] {
return func(yield func(Fleet) bool) {
for _, fl := range g.listIndexFleets(ri) {
if !yield(fl) {
return
}
}
}
}
// func (g Game) listFleets(ri int) iter.Seq[Fleet] {
// return func(yield func(Fleet) bool) {
// for _, fl := range g.listIndexFleets(ri) {
// if !yield(fl) {
// return
// }
// }
// }
// }
func (g Game) listIndexFleets(ri int) iter.Seq2[int, Fleet] {
return func(yield func(int, Fleet) bool) {
for i := range g.Fleets {
if g.Fleets[i].OwnerID == g.Race[ri].ID {
if !yield(i, g.Fleets[i]) {
return
}
}
}
}
}
// func (g Game) listIndexFleets(ri int) iter.Seq2[int, Fleet] {
// return func(yield func(int, Fleet) bool) {
// for i := range g.Fleets {
// if g.Fleets[i].OwnerID == g.Race[ri].ID {
// if !yield(i, g.Fleets[i]) {
// return
// }
// }
// }
// }
// }
func FleetGroups(g *Game, ri, fi int) iter.Seq[ShipGroup] {
if len(g.Fleets) < fi+1 {
panic(fmt.Sprintf("FleetGroups: game fleets index %d invalid: len=%d", fi, len(g.Fleets)))
}
return func(yield func(ShipGroup) bool) {
for sg := range g.listShipGroups(ri) {
if sg.FleetID != nil && *sg.FleetID == g.Fleets[fi].ID {
if !yield(sg) {
break
}
}
}
}
}
// func FleetGroups(g *Game, ri, fi int) iter.Seq[ShipGroup] {
// if len(g.Fleets) < fi+1 {
// panic(fmt.Sprintf("FleetGroups: game fleets index %d invalid: len=%d", fi, len(g.Fleets)))
// }
// return func(yield func(ShipGroup) bool) {
// for sg := range g.listShipGroups(ri) {
// if sg.FleetID != nil && *sg.FleetID == g.Fleets[fi].ID {
// if !yield(sg) {
// break
// }
// }
// }
// }
// }
internal/model/game/fleet_send.go
+68 -68
View File
@@ -1,80 +1,80 @@
package game
import (
"fmt"
"slices"
// import (
// "fmt"
// "slices"
e "github.com/iliadenisov/galaxy/internal/error"
"github.com/iliadenisov/galaxy/internal/util"
)
// e "github.com/iliadenisov/galaxy/internal/error"
// "github.com/iliadenisov/galaxy/internal/util"
// )
func (g *Game) SendFleet(raceName, fleetName string, planetNumber uint) error {
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
fi := g.fleetIndex(ri, fleetName)
if fi < 0 {
return e.NewEntityNotExistsError("fleet %q", fleetName)
}
return g.sendFleetInternal(ri, fi, planetNumber)
}
// func (g *Game) SendFleet(raceName, fleetName string, planetNumber uint) error {
// ri, err := g.raceIndex(raceName)
// if err != nil {
// return err
// }
// fi := g.fleetIndex(ri, fleetName)
// if fi < 0 {
// return e.NewEntityNotExistsError("fleet %q", fleetName)
// }
// return g.sendFleetInternal(ri, fi, planetNumber)
// }
func (g *Game) sendFleetInternal(ri, fi int, planetNumber uint) error {
state, sourcePlanet, _ := FleetState(g, g.Fleets[fi].ID)
if StateInOrbit != state && StateLaunched != state {
return e.NewShipsBusyError()
}
// func (g *Game) sendFleetInternal(ri, fi int, planetNumber uint) error {
// state, sourcePlanet, _ := FleetState(g, g.Fleets[fi].ID)
// if StateInOrbit != state && StateLaunched != state {
// return e.NewShipsBusyError()
// }
p1, ok := PlanetByNum(g, *sourcePlanet)
if !ok {
return e.NewGameStateError("source planet #%d does not exists", sourcePlanet)
}
p2, ok := PlanetByNum(g, planetNumber)
if !ok {
return e.NewEntityNotExistsError("destination planet #%d", planetNumber)
}
rangeToDestination := util.ShortDistance(g.Map.Width, g.Map.Height, p1.X, p1.Y, p2.X, p2.Y)
if rangeToDestination > g.Race[ri].FlightDistance() {
return e.NewSendUnreachableDestinationError("range=%.03f", rangeToDestination)
}
// p1, ok := PlanetByNum(g, *sourcePlanet)
// if !ok {
// return e.NewGameStateError("source planet #%d does not exists", sourcePlanet)
// }
// p2, ok := PlanetByNum(g, planetNumber)
// if !ok {
// return e.NewEntityNotExistsError("destination planet #%d", planetNumber)
// }
// rangeToDestination := util.ShortDistance(g.Map.Width, g.Map.Height, p1.X, p1.Y, p2.X, p2.Y)
// if rangeToDestination > g.Race[ri].FlightDistance() {
// return e.NewSendUnreachableDestinationError("range=%.03f", rangeToDestination)
// }
for sg := range FleetGroups(g, ri, fi) {
st, ok := ShipClass(g, ri, sg.TypeID)
if !ok {
return e.NewGameStateError("not found: ShipType ID=%v", sg.TypeID)
}
if st.DriveBlockMass() == 0 {
return e.NewSendShipHasNoDrivesError("Class=%s", st.Name)
}
}
// for sg := range FleetGroups(g, ri, fi) {
// st, ok := ShipClass(g, ri, sg.TypeID)
// if !ok {
// return e.NewGameStateError("not found: ShipType ID=%v", sg.TypeID)
// }
// if st.DriveBlockMass() == 0 {
// return e.NewSendShipHasNoDrivesError("Class=%s", st.Name)
// }
// }
if *sourcePlanet == planetNumber {
UnsendFleet(g, ri, fi)
return nil
}
// if *sourcePlanet == planetNumber {
// UnsendFleet(g, ri, fi)
// return nil
// }
LaunchFleet(g, ri, fi, planetNumber)
// LaunchFleet(g, ri, fi, planetNumber)
return nil
}
// return nil
// }
func LaunchFleet(g *Game, ri, fi int, destination uint) {
for sg := range FleetGroups(g, ri, fi) {
sgi := slices.IndexFunc(g.ShipGroups, func(s ShipGroup) bool { return sg.Index == s.Index })
if sgi < 0 {
panic(fmt.Sprintf("LauncgFleet: cannot find ship group index=%d", sg.Index))
}
g.ShipGroups[sgi] = LaunchShips(sg, destination)
}
}
// func LaunchFleet(g *Game, ri, fi int, destination uint) {
// for sg := range FleetGroups(g, ri, fi) {
// sgi := slices.IndexFunc(g.ShipGroups, func(s ShipGroup) bool { return sg.Index == s.Index })
// if sgi < 0 {
// panic(fmt.Sprintf("LauncgFleet: cannot find ship group index=%d", sg.Index))
// }
// g.ShipGroups[sgi] = LaunchShips(sg, destination)
// }
// }
func UnsendFleet(g *Game, ri, fi int) {
for sg := range FleetGroups(g, ri, fi) {
sgi := slices.IndexFunc(g.ShipGroups, func(s ShipGroup) bool { return sg.Index == s.Index })
if sgi < 0 {
panic(fmt.Sprintf("UnsendFleet: cannot find ship group index=%d", sg.Index))
}
g.ShipGroups[sgi] = UnsendShips(sg)
}
}
// func UnsendFleet(g *Game, ri, fi int) {
// for sg := range FleetGroups(g, ri, fi) {
// sgi := slices.IndexFunc(g.ShipGroups, func(s ShipGroup) bool { return sg.Index == s.Index })
// if sgi < 0 {
// panic(fmt.Sprintf("UnsendFleet: cannot find ship group index=%d", sg.Index))
// }
// g.ShipGroups[sgi] = UnsendShips(sg)
// }
// }
internal/model/game/fleet_send_test.go
+62 -62
View File
@@ -1,73 +1,73 @@
package game_test
import (
"slices"
"testing"
// import (
// "slices"
// "testing"
e "github.com/iliadenisov/galaxy/internal/error"
"github.com/iliadenisov/galaxy/internal/model/game"
"github.com/stretchr/testify/assert"
)
// e "github.com/iliadenisov/galaxy/internal/error"
// "github.com/iliadenisov/galaxy/internal/model/game"
// "github.com/stretchr/testify/assert"
// )
func TestSendFleet(t *testing.T) {
g := newGame()
// group #1 - in_orbit Planet_0
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 1))
// group #2 - in_space (later)
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3))
// group #3 - in_orbit Planet_0, unmovable
g.CreateShipType(Race_0.Name, "Fortress", 0, 30, 100, 0, 50)
assert.NoError(t, g.CreateShips(Race_0_idx, "Fortress", R0_Planet_0_num, 1))
// group #4 - in_orbit Planet_0
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 2))
// func TestSendFleet(t *testing.T) {
// g := newGame()
// // group #1 - in_orbit Planet_0
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 1))
// // group #2 - in_space (later)
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3))
// // group #3 - in_orbit Planet_0, unmovable
// g.CreateShipType(Race_0.Name, "Fortress", 0, 50, 30, 100, 0)
// assert.NoError(t, g.CreateShips(Race_0_idx, "Fortress", R0_Planet_0_num, 1))
// // group #4 - in_orbit Planet_0
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 2))
// ensure race has no Fleets
assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
// // ensure race has no Fleets
// assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
fleetSending := "R0_Fleet_one"
fleetInSpace := "R0_Fleet_inSpace"
fleetUnmovable := "R0_Fleet_unmovable"
// fleetSending := "R0_Fleet_one"
// fleetInSpace := "R0_Fleet_inSpace"
// fleetUnmovable := "R0_Fleet_unmovable"
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSending, 1, 0))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSending, 3, 0))
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSending, 1, 0))
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSending, 3, 0))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetInSpace, 2, 0))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetUnmovable, 3, 0))
// group #2 - in_space
g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetInSpace, 2, 0))
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetUnmovable, 3, 0))
// // group #2 - in_space
// g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
assert.ErrorContains(t,
g.SendFleet("UnknownRace", fleetSending, 2),
e.GenericErrorText(e.ErrInputUnknownRace))
assert.ErrorContains(t,
g.SendFleet(Race_0.Name, "UnknownFleet", 2),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.ErrorContains(t,
g.SendFleet(Race_0.Name, fleetInSpace, 2),
e.GenericErrorText(e.ErrShipsBusy))
assert.ErrorContains(t,
g.SendFleet(Race_0.Name, fleetSending, 200),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.ErrorContains(t,
g.SendFleet(Race_0.Name, fleetSending, 3),
e.GenericErrorText(e.ErrSendUnreachableDestination))
assert.ErrorContains(t,
g.SendFleet(Race_0.Name, fleetUnmovable, 2),
e.GenericErrorText(e.ErrSendShipHasNoDrives))
// assert.ErrorContains(t,
// g.SendFleet("UnknownRace", fleetSending, 2),
// e.GenericErrorText(e.ErrInputUnknownRace))
// assert.ErrorContains(t,
// g.SendFleet(Race_0.Name, "UnknownFleet", 2),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.ErrorContains(t,
// g.SendFleet(Race_0.Name, fleetInSpace, 2),
// e.GenericErrorText(e.ErrShipsBusy))
// assert.ErrorContains(t,
// g.SendFleet(Race_0.Name, fleetSending, 200),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.ErrorContains(t,
// g.SendFleet(Race_0.Name, fleetSending, 3),
// e.GenericErrorText(e.ErrSendUnreachableDestination))
// assert.ErrorContains(t,
// g.SendFleet(Race_0.Name, fleetUnmovable, 2),
// e.GenericErrorText(e.ErrSendShipHasNoDrives))
assert.NoError(t, g.SendFleet(Race_0.Name, fleetSending, 2))
fi := slices.IndexFunc(slices.Collect(g.ListFleets(Race_0_idx)), func(f game.Fleet) bool { return f.Name == fleetSending })
state, _, _ := game.FleetState(g, g.Fleets[fi].ID)
assert.Equal(t, game.StateLaunched, state)
for sg := range game.FleetGroups(g, Race_0_idx, fi) {
assert.Equal(t, game.StateLaunched, sg.State())
}
// assert.NoError(t, g.SendFleet(Race_0.Name, fleetSending, 2))
// fi := slices.IndexFunc(slices.Collect(g.ListFleets(Race_0_idx)), func(f game.Fleet) bool { return f.Name == fleetSending })
// state, _, _ := game.FleetState(g, g.Fleets[fi].ID)
// assert.Equal(t, game.StateLaunched, state)
// for sg := range game.FleetGroups(g, Race_0_idx, fi) {
// assert.Equal(t, game.StateLaunched, sg.State())
// }
assert.NoError(t, g.SendFleet(Race_0.Name, fleetSending, 0))
fi = slices.IndexFunc(slices.Collect(g.ListFleets(Race_0_idx)), func(f game.Fleet) bool { return f.Name == fleetSending })
state, _, _ = game.FleetState(g, g.Fleets[fi].ID)
assert.Equal(t, game.StateInOrbit, state)
for sg := range game.FleetGroups(g, Race_0_idx, fi) {
assert.Equal(t, game.StateInOrbit, sg.State())
}
}
// assert.NoError(t, g.SendFleet(Race_0.Name, fleetSending, 0))
// fi = slices.IndexFunc(slices.Collect(g.ListFleets(Race_0_idx)), func(f game.Fleet) bool { return f.Name == fleetSending })
// state, _, _ = game.FleetState(g, g.Fleets[fi].ID)
// assert.Equal(t, game.StateInOrbit, state)
// for sg := range game.FleetGroups(g, Race_0_idx, fi) {
// assert.Equal(t, game.StateInOrbit, sg.State())
// }
// }
internal/model/game/fleet_test.go
+113 -113
View File
@@ -1,136 +1,136 @@
package game_test
import (
"slices"
"testing"
// import (
// "slices"
// "testing"
e "github.com/iliadenisov/galaxy/internal/error"
"github.com/iliadenisov/galaxy/internal/model/game"
"github.com/stretchr/testify/assert"
)
// e "github.com/iliadenisov/galaxy/internal/error"
// "github.com/iliadenisov/galaxy/internal/model/game"
// "github.com/stretchr/testify/assert"
// )
func TestJoinShipGroupToFleet(t *testing.T) {
g := newGame()
var groupIndex uint = 1
// func TestJoinShipGroupToFleet(t *testing.T) {
// g := newGame()
// var groupIndex uint = 1
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, " ", groupIndex, 0),
e.GenericErrorText(e.ErrInputEntityTypeNameInvalid))
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, " ", groupIndex, 0),
// e.GenericErrorText(e.ErrInputEntityTypeNameInvalid))
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 0),
e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 0),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// creating ShipGroup
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 5))
// // creating ShipGroup
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 5))
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 6),
e.GenericErrorText(e.ErrJoinFleetGroupNumberNotEnough))
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 6),
// e.GenericErrorText(e.ErrJoinFleetGroupNumberNotEnough))
// ensure race has no Fleets
assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
// // ensure race has no Fleets
// assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
fleetOne := "R0_Fleet_one"
fleetTwo := "R0_Fleet_two"
// fleetOne := "R0_Fleet_one"
// fleetTwo := "R0_Fleet_two"
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
fleets := slices.Collect(g.ListFleets(Race_0_idx))
groups := slices.Collect(g.ListShipGroups(Race_0_idx))
assert.Len(t, groups, 1)
gi := 0
assert.Len(t, fleets, 1)
assert.Equal(t, fleets[0].Name, fleetOne)
state, _, _ := game.FleetState(g, fleets[0].ID)
assert.Equal(t, game.StateInOrbit, state)
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
// fleets := slices.Collect(g.ListFleets(Race_0_idx))
// groups := slices.Collect(g.ListShipGroups(Race_0_idx))
// assert.Len(t, groups, 1)
// gi := 0
// assert.Len(t, fleets, 1)
// assert.Equal(t, fleets[0].Name, fleetOne)
// state, _, _ := game.FleetState(g, fleets[0].ID)
// assert.Equal(t, game.StateInOrbit, state)
assert.NotNil(t, groups[gi].FleetID)
assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
// assert.NotNil(t, groups[gi].FleetID)
// assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
// create another ShipGroup
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3))
groupIndex = 2
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTwo, groupIndex, 2))
fleets = slices.Collect(g.ListFleets(Race_0_idx))
groups = slices.Collect(g.ListShipGroups(Race_0_idx))
assert.Len(t, groups, 3)
gi = 1
assert.Len(t, fleets, 2)
assert.Equal(t, fleets[1].Name, fleetTwo)
state, _, _ = game.FleetState(g, fleets[1].ID)
assert.Equal(t, game.StateInOrbit, state)
// // create another ShipGroup
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3))
// groupIndex = 2
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTwo, groupIndex, 2))
// fleets = slices.Collect(g.ListFleets(Race_0_idx))
// groups = slices.Collect(g.ListShipGroups(Race_0_idx))
// assert.Len(t, groups, 3)
// gi = 1
// assert.Len(t, fleets, 2)
// assert.Equal(t, fleets[1].Name, fleetTwo)
// state, _, _ = game.FleetState(g, fleets[1].ID)
// assert.Equal(t, game.StateInOrbit, state)
assert.NotNil(t, groups[gi].FleetID)
assert.Equal(t, fleets[1].ID, *groups[gi].FleetID)
assert.Equal(t, uint(2), groups[gi].Number)
assert.Equal(t, uint(2), groups[gi].Index)
// assert.NotNil(t, groups[gi].FleetID)
// assert.Equal(t, fleets[1].ID, *groups[gi].FleetID)
// assert.Equal(t, uint(2), groups[gi].Number)
// assert.Equal(t, uint(2), groups[gi].Index)
gi = 2
assert.Nil(t, groups[gi].FleetID)
assert.Equal(t, uint(1), groups[gi].Number)
assert.Equal(t, uint(3), groups[gi].Index)
// gi = 2
// assert.Nil(t, groups[gi].FleetID)
// assert.Equal(t, uint(1), groups[gi].Number)
// assert.Equal(t, uint(3), groups[gi].Index)
groupIndex = groups[gi].Index
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
fleets = slices.Collect(g.ListFleets(Race_0_idx))
assert.Len(t, fleets, 2)
groups = slices.Collect(g.ListShipGroups(Race_0_idx))
assert.NotNil(t, groups[gi].FleetID)
assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
state, _, _ = game.FleetState(g, fleets[0].ID)
assert.Equal(t, game.StateInOrbit, state)
// groupIndex = groups[gi].Index
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
// fleets = slices.Collect(g.ListFleets(Race_0_idx))
// assert.Len(t, fleets, 2)
// groups = slices.Collect(g.ListShipGroups(Race_0_idx))
// assert.NotNil(t, groups[gi].FleetID)
// assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
// state, _, _ = game.FleetState(g, fleets[0].ID)
// assert.Equal(t, game.StateInOrbit, state)
// group not In_Orbit
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 7))
gi = 3
g.ShipGroups[gi].StateInSpace = &game.InSpace{
Origin: 2,
Range: 1,
}
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
e.GenericErrorText(e.ErrShipsBusy))
g.ShipGroups[gi].StateInSpace = nil
// // group not In_Orbit
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 7))
// gi = 3
// g.ShipGroups[gi].StateInSpace = &game.InSpace{
// Origin: 2,
// Range: 1,
// }
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
// e.GenericErrorText(e.ErrShipsBusy))
// g.ShipGroups[gi].StateInSpace = nil
// existing fleet not on the same planet or in_orbit
g.ShipGroups[0].StateInSpace = &game.InSpace{
Origin: 2,
Range: 1,
}
g.ShipGroups[2].StateInSpace = g.ShipGroups[0].StateInSpace
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
}
// // existing fleet not on the same planet or in_orbit
// g.ShipGroups[0].StateInSpace = &game.InSpace{
// Origin: 2,
// Range: 1,
// }
// g.ShipGroups[2].StateInSpace = g.ShipGroups[0].StateInSpace
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
// e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
// }
func TestJoinFleets(t *testing.T) {
g := newGame()
// creating ShipGroup #1 at Planet_0
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 1)) // group #1
// creating ShipGroup #2 at Planet_2
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_2_num, 2)) // group #2
// creating ShipGroup #3 at Planet_0
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3)) // group #3
// func TestJoinFleets(t *testing.T) {
// g := newGame()
// // creating ShipGroup #1 at Planet_0
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 1)) // group #1
// // creating ShipGroup #2 at Planet_2
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_2_num, 2)) // group #2
// // creating ShipGroup #3 at Planet_0
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3)) // group #3
// ensure race has no Fleets
assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
// // ensure race has no Fleets
// assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
fleetPlanet2 := "R0_Fleet_On_Planet_2"
fleetSource := "R0_Fleet_one"
fleetTarget := "R0_Fleet_two"
// fleetPlanet2 := "R0_Fleet_On_Planet_2"
// fleetSource := "R0_Fleet_one"
// fleetTarget := "R0_Fleet_two"
assert.ErrorContains(t,
g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSource, 1, 0))
assert.ErrorContains(t,
g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTarget, 3, 0))
assert.NoError(t, g.JoinFleets(Race_0.Name, fleetSource, fleetTarget))
// assert.ErrorContains(t,
// g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSource, 1, 0))
// assert.ErrorContains(t,
// g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTarget, 3, 0))
// assert.NoError(t, g.JoinFleets(Race_0.Name, fleetSource, fleetTarget))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetPlanet2, 2, 0))
assert.ErrorContains(t,
g.JoinFleets(Race_0.Name, fleetPlanet2, fleetTarget),
e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
}
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetPlanet2, 2, 0))
// assert.ErrorContains(t,
// g.JoinFleets(Race_0.Name, fleetPlanet2, fleetTarget),
// e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
// }
internal/model/game/game_export_test.go
+5 -3
View File
@@ -3,15 +3,17 @@ package game
import "iter"
func (g *Game) CreateShips(ri int, shipTypeName string, planetNumber uint, quantity int) error {
return g.createShips(ri, shipTypeName, int(planetNumber), quantity)
return nil // g.createShips(ri, shipTypeName, int(planetNumber), quantity)
}
func (g Game) ListShipGroups(ri int) iter.Seq[ShipGroup] {
return g.listShipGroups(ri)
return func(yield func(ShipGroup) bool) {}
// return g.listShipGroups(ri)
}
func (g Game) ListFleets(ri int) iter.Seq[Fleet] {
return g.listFleets(ri)
return func(yield func(Fleet) bool) {}
// return g.listFleets(ri)
}
func (g Game) MustPlanetByNumber(num uint) Planet {
internal/model/game/game_test.go
+6 -6
View File
@@ -90,12 +90,12 @@ func newGame() *game.Game {
},
},
}
assertNoError(g.CreateShipType(Race_0.Name, Race_0_Gunship, 60, 30, 100, 0, 3))
assertNoError(g.CreateShipType(Race_0.Name, Race_0_Freighter, 8, 0, 2, 10, 0))
assertNoError(g.CreateShipType(Race_0.Name, ShipType_Cruiser, Cruiser.Drive, Cruiser.Weapons, Cruiser.Shields, Cruiser.Cargo, int(Cruiser.Armament)))
// assertNoError(g.CreateShipType(Race_0.Name, Race_0_Gunship, 60, 30, 100, 0, 3))
// assertNoError(g.CreateShipType(Race_0.Name, Race_0_Freighter, 8, 0, 2, 10, 0))
// assertNoError(g.CreateShipType(Race_0.Name, ShipType_Cruiser, Cruiser.Drive, Cruiser.Weapons, Cruiser.Shields, Cruiser.Cargo, int(Cruiser.Armament)))
assertNoError(g.CreateShipType(Race_1.Name, Race_1_Gunship, 60, 30, 100, 0, 3))
assertNoError(g.CreateShipType(Race_1.Name, Race_1_Freighter, 8, 0, 2, 10, 0))
assertNoError(g.CreateShipType(Race_1.Name, ShipType_Cruiser, 15, 15, 15, 0, 2)) // same name - different type (why.)
// assertNoError(g.CreateShipType(Race_1.Name, Race_1_Gunship, 60, 30, 100, 0, 3))
// assertNoError(g.CreateShipType(Race_1.Name, Race_1_Freighter, 8, 0, 2, 10, 0))
// assertNoError(g.CreateShipType(Race_1.Name, ShipType_Cruiser, 15, 15, 15, 0, 2)) // same name - different type (why.)
return g
}
internal/model/game/group.go
+472 -479
View File
File diff suppressed because it is too large Load Diff
internal/model/game/group_send.go
+77 -77
View File
@@ -1,93 +1,93 @@
package game
import (
"slices"
// import (
// "slices"
e "github.com/iliadenisov/galaxy/internal/error"
"github.com/iliadenisov/galaxy/internal/util"
)
// e "github.com/iliadenisov/galaxy/internal/error"
// "github.com/iliadenisov/galaxy/internal/util"
// )
func (g *Game) SendGroup(raceName string, groupIndex, planetNumber, quantity uint) error {
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.sendGroupInternal(ri, groupIndex, planetNumber, quantity)
}
// func (g *Game) SendGroup(raceName string, groupIndex, planetNumber, quantity uint) error {
// ri, err := g.raceIndex(raceName)
// if err != nil {
// return err
// }
// return g.sendGroupInternal(ri, groupIndex, planetNumber, quantity)
// }
func (g *Game) sendGroupInternal(ri int, groupIndex, planetNumber, quantity uint) error {
sgi := -1
for i, sg := range g.listIndexShipGroups(ri) {
if sgi < 0 && sg.Index == groupIndex {
sgi = i
}
}
if sgi < 0 {
return e.NewEntityNotExistsError("group #%d", groupIndex)
}
// func (g *Game) sendGroupInternal(ri int, groupIndex, planetNumber, quantity uint) error {
// sgi := -1
// for i, sg := range g.listIndexShipGroups(ri) {
// if sgi < 0 && sg.Index == groupIndex {
// sgi = i
// }
// }
// if sgi < 0 {
// return e.NewEntityNotExistsError("group #%d", groupIndex)
// }
var sti int
if sti = slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.ID == g.ShipGroups[sgi].TypeID }); sti < 0 {
// hard to test, need manual game data invalidation
return e.NewGameStateError("not found: ShipType ID=%v", g.ShipGroups[sgi].TypeID)
}
st := g.Race[ri].ShipTypes[sti]
// var sti int
// if sti = slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.ID == g.ShipGroups[sgi].TypeID }); sti < 0 {
// // hard to test, need manual game data invalidation
// return e.NewGameStateError("not found: ShipType ID=%v", g.ShipGroups[sgi].TypeID)
// }
// st := g.Race[ri].ShipTypes[sti]
if st.DriveBlockMass() == 0 {
return e.NewSendShipHasNoDrivesError()
}
// if st.DriveBlockMass() == 0 {
// return e.NewSendShipHasNoDrivesError()
// }
sourcePlanet, ok := g.ShipGroups[sgi].OnPlanet()
if !ok {
return e.NewShipsBusyError()
}
// sourcePlanet, ok := g.ShipGroups[sgi].OnPlanet()
// if !ok {
// return e.NewShipsBusyError()
// }
if g.ShipGroups[sgi].Number < quantity {
return e.NewBeakGroupNumberNotEnoughError("%d<%d", g.ShipGroups[sgi].Number, quantity)
}
// if g.ShipGroups[sgi].Number < quantity {
// return e.NewBeakGroupNumberNotEnoughError("%d<%d", g.ShipGroups[sgi].Number, quantity)
// }
p1, ok := PlanetByNum(g, sourcePlanet)
if !ok {
return e.NewGameStateError("source planet #%d does not exists", sourcePlanet)
}
p2, ok := PlanetByNum(g, planetNumber)
if !ok {
return e.NewEntityNotExistsError("destination planet #%d", planetNumber)
}
rangeToDestination := util.ShortDistance(g.Map.Width, g.Map.Height, p1.X, p1.Y, p2.X, p2.Y)
if rangeToDestination > g.Race[ri].FlightDistance() {
return e.NewSendUnreachableDestinationError("range=%.03f", rangeToDestination)
}
// p1, ok := PlanetByNum(g, sourcePlanet)
// if !ok {
// return e.NewGameStateError("source planet #%d does not exists", sourcePlanet)
// }
// p2, ok := PlanetByNum(g, planetNumber)
// if !ok {
// return e.NewEntityNotExistsError("destination planet #%d", planetNumber)
// }
// rangeToDestination := util.ShortDistance(g.Map.Width, g.Map.Height, p1.X, p1.Y, p2.X, p2.Y)
// if rangeToDestination > g.Race[ri].FlightDistance() {
// return e.NewSendUnreachableDestinationError("range=%.03f", rangeToDestination)
// }
if quantity > 0 && quantity < g.ShipGroups[sgi].Number {
nsgi, err := g.breakGroupSafe(ri, groupIndex, quantity)
if err != nil {
return err
}
sgi = nsgi
}
// if quantity > 0 && quantity < g.ShipGroups[sgi].Number {
// nsgi, err := g.breakGroupSafe(ri, groupIndex, quantity)
// if err != nil {
// return err
// }
// sgi = nsgi
// }
if sourcePlanet == planetNumber {
g.ShipGroups[sgi] = UnsendShips(g.ShipGroups[sgi])
g.joinEqualGroupsInternal(ri)
return nil
}
// if sourcePlanet == planetNumber {
// g.ShipGroups[sgi] = UnsendShips(g.ShipGroups[sgi])
// g.joinEqualGroupsInternal(ri)
// return nil
// }
g.ShipGroups[sgi] = LaunchShips(g.ShipGroups[sgi], planetNumber)
// g.ShipGroups[sgi] = LaunchShips(g.ShipGroups[sgi], planetNumber)
return nil
}
// return nil
// }
func LaunchShips(sg ShipGroup, destination uint) ShipGroup {
sg.StateInSpace = &InSpace{
Origin: sg.Destination,
}
sg.Destination = destination
return sg
}
// func LaunchShips(sg ShipGroup, destination uint) ShipGroup {
// sg.StateInSpace = &InSpace{
// Origin: sg.Destination,
// }
// sg.Destination = destination
// return sg
// }
func UnsendShips(sg ShipGroup) ShipGroup {
sg.Destination = sg.StateInSpace.Origin
sg.StateInSpace = nil
return sg
}
// func UnsendShips(sg ShipGroup) ShipGroup {
// sg.Destination = sg.StateInSpace.Origin
// sg.StateInSpace = nil
// return sg
// }
internal/model/game/group_send_test.go
+59 -59
View File
@@ -1,69 +1,69 @@
package game_test
import (
"slices"
"testing"
// import (
// "slices"
// "testing"
e "github.com/iliadenisov/galaxy/internal/error"
// e "github.com/iliadenisov/galaxy/internal/error"
"github.com/iliadenisov/galaxy/internal/model/game"
"github.com/stretchr/testify/assert"
)
// "github.com/iliadenisov/galaxy/internal/model/game"
// "github.com/stretchr/testify/assert"
// )
func TestSendGroup(t *testing.T) {
g := newGame()
// group #1 - in_orbit, free to upgrade
assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 10))
// group #2 - in_space
assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
// group #3 - in_orbit, unmovable
g.CreateShipType(Race_0.Name, "Fortress", 0, 30, 100, 0, 50)
assert.NoError(t, g.CreateShips(Race_0_idx, "Fortress", R0_Planet_0_num, 1))
// func TestSendGroup(t *testing.T) {
// g := newGame()
// // group #1 - in_orbit, free to upgrade
// assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 10))
// // group #2 - in_space
// assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
// g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
// // group #3 - in_orbit, unmovable
// g.CreateShipType(Race_0.Name, "Fortress", 0, 50, 30, 100, 0)
// assert.NoError(t, g.CreateShips(Race_0_idx, "Fortress", R0_Planet_0_num, 1))
assert.ErrorContains(t,
g.SendGroup("UnknownRace", 1, 2, 0),
e.GenericErrorText(e.ErrInputUnknownRace))
assert.ErrorContains(t,
g.SendGroup(Race_0.Name, 555, 2, 0),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.ErrorContains(t,
g.SendGroup(Race_0.Name, 1, 222, 0),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.ErrorContains(t,
g.SendGroup(Race_0.Name, 2, 1, 0),
e.GenericErrorText(e.ErrShipsBusy))
assert.ErrorContains(t,
g.SendGroup(Race_0.Name, 3, 2, 0),
e.GenericErrorText(e.ErrSendShipHasNoDrives))
assert.ErrorContains(t,
g.SendGroup(Race_0.Name, 1, 2, 100),
e.GenericErrorText(e.ErrBeakGroupNumberNotEnough))
assert.ErrorContains(t,
g.SendGroup(Race_0.Name, 1, 3, 0),
e.GenericErrorText(e.ErrSendUnreachableDestination))
// assert.ErrorContains(t,
// g.SendGroup("UnknownRace", 1, 2, 0),
// e.GenericErrorText(e.ErrInputUnknownRace))
// assert.ErrorContains(t,
// g.SendGroup(Race_0.Name, 555, 2, 0),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.ErrorContains(t,
// g.SendGroup(Race_0.Name, 1, 222, 0),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.ErrorContains(t,
// g.SendGroup(Race_0.Name, 2, 1, 0),
// e.GenericErrorText(e.ErrShipsBusy))
// assert.ErrorContains(t,
// g.SendGroup(Race_0.Name, 3, 2, 0),
// e.GenericErrorText(e.ErrSendShipHasNoDrives))
// assert.ErrorContains(t,
// g.SendGroup(Race_0.Name, 1, 2, 100),
// e.GenericErrorText(e.ErrBeakGroupNumberNotEnough))
// assert.ErrorContains(t,
// g.SendGroup(Race_0.Name, 1, 3, 0),
// e.GenericErrorText(e.ErrSendUnreachableDestination))
assert.NoError(t, g.SendGroup(Race_0.Name, 1, 2, 3)) // send 3 of 10
assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
assert.Equal(t, uint(7), g.ShipGroups[0].Number)
assert.Equal(t, game.StateInOrbit, g.ShipGroups[0].State())
assert.Equal(t, uint(3), g.ShipGroups[3].Number)
assert.Equal(t, game.StateLaunched, g.ShipGroups[3].State())
// assert.NoError(t, g.SendGroup(Race_0.Name, 1, 2, 3)) // send 3 of 10
// assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
// assert.Equal(t, uint(7), g.ShipGroups[0].Number)
// assert.Equal(t, game.StateInOrbit, g.ShipGroups[0].State())
// assert.Equal(t, uint(3), g.ShipGroups[3].Number)
// assert.Equal(t, game.StateLaunched, g.ShipGroups[3].State())
assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 2)) // un-send 2 of 3
assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
assert.Equal(t, uint(9), game.MustShipGroup(g, Race_0_idx, 5).Number)
assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())
assert.Equal(t, uint(1), game.MustShipGroup(g, Race_0_idx, 4).Number)
assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 4).State())
// assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 2)) // un-send 2 of 3
// assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
// assert.Equal(t, uint(9), game.MustShipGroup(g, Race_0_idx, 5).Number)
// assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())
// assert.Equal(t, uint(1), game.MustShipGroup(g, Race_0_idx, 4).Number)
// assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 4).State())
assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 0)) // un-send the rest 1
assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())
// assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 0)) // un-send the rest 1
// assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
// assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
// assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())
assert.NoError(t, g.SendGroup(Race_0.Name, 5, 2, 0))
assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 5).State())
}
// assert.NoError(t, g.SendGroup(Race_0.Name, 5, 2, 0))
// assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
// assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
// assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 5).State())
// }
internal/model/game/group_test.go
+514 -517
View File
File diff suppressed because it is too large Load Diff
internal/model/game/group_upgrade.go
+133 -136
View File
@@ -4,9 +4,6 @@ import (
"maps"
"math"
"slices"
"github.com/google/uuid"
e "github.com/iliadenisov/galaxy/internal/error"
)
type UpgradeCalc struct {
@@ -49,157 +46,157 @@ func GroupUpgradeCost(sg ShipGroup, st ShipType, drive, weapons, shields, cargo
return *uc
}
func (g *Game) UpgradeGroup(raceName string, groupIndex uint, techInput string, limitShips uint, limitLevel float64) error {
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.upgradeGroupInternal(ri, groupIndex, techInput, limitShips, limitLevel)
}
// func (g *Game) UpgradeGroup(raceName string, groupIndex uint, techInput string, limitShips uint, limitLevel float64) error {
// ri, err := g.raceIndex(raceName)
// if err != nil {
// return err
// }
// return g.upgradeGroupInternal(ri, groupIndex, techInput, limitShips, limitLevel)
// }
func (g *Game) upgradeGroupInternal(ri int, groupIndex uint, techInput string, limitShips uint, limitLevel float64) error {
sgi := -1
for i, sg := range g.listIndexShipGroups(ri) {
if sgi < 0 && sg.Index == groupIndex {
sgi = i
}
}
if sgi < 0 {
return e.NewEntityNotExistsError("group #%d", groupIndex)
}
// func (g *Game) upgradeGroupInternal(ri int, groupIndex uint, techInput string, limitShips uint, limitLevel float64) error {
// sgi := -1
// for i, sg := range g.listIndexShipGroups(ri) {
// if sgi < 0 && sg.Index == groupIndex {
// sgi = i
// }
// }
// if sgi < 0 {
// return e.NewEntityNotExistsError("group #%d", groupIndex)
// }
var sti int
if sti = slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.ID == g.ShipGroups[sgi].TypeID }); sti < 0 {
// hard to test, need manual game data invalidation
return e.NewGameStateError("not found: ShipType ID=%v", g.ShipGroups[sgi].TypeID)
}
st := g.Race[ri].ShipTypes[sti]
// var sti int
// if sti = slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.ID == g.ShipGroups[sgi].TypeID }); sti < 0 {
// // hard to test, need manual game data invalidation
// return e.NewGameStateError("not found: ShipType ID=%v", g.ShipGroups[sgi].TypeID)
// }
// st := g.Race[ri].ShipTypes[sti]
pl := slices.IndexFunc(g.Map.Planet, func(p Planet) bool { return p.Number == g.ShipGroups[sgi].Destination })
if pl < 0 {
return e.NewGameStateError("planet #%d", g.ShipGroups[sgi].Destination)
}
if g.Map.Planet[pl].Owner != uuid.Nil && g.Map.Planet[pl].Owner != g.Race[ri].ID {
return e.NewEntityNotOwnedError("planet #%d for upgrade group #%d", g.Map.Planet[pl].Number, groupIndex)
}
// pl := slices.IndexFunc(g.Map.Planet, func(p Planet) bool { return p.Number == g.ShipGroups[sgi].Destination })
// if pl < 0 {
// return e.NewGameStateError("planet #%d", g.ShipGroups[sgi].Destination)
// }
// if g.Map.Planet[pl].Owner != uuid.Nil && g.Map.Planet[pl].Owner != g.Race[ri].ID {
// return e.NewEntityNotOwnedError("planet #%d for upgrade group #%d", g.Map.Planet[pl].Number, groupIndex)
// }
if g.ShipGroups[sgi].State() != StateInOrbit && g.ShipGroups[sgi].State() != StateUpgrade {
return e.NewShipsBusyError()
}
// if g.ShipGroups[sgi].State() != StateInOrbit && g.ShipGroups[sgi].State() != StateUpgrade {
// return e.NewShipsBusyError()
// }
upgradeValidTech := map[string]Tech{
TechDrive.String(): TechDrive,
TechWeapons.String(): TechWeapons,
TechShields.String(): TechShields,
TechCargo.String(): TechCargo,
TechAll.String(): TechAll,
}
// upgradeValidTech := map[string]Tech{
// TechDrive.String(): TechDrive,
// TechWeapons.String(): TechWeapons,
// TechShields.String(): TechShields,
// TechCargo.String(): TechCargo,
// TechAll.String(): TechAll,
// }
techRequest, ok := upgradeValidTech[techInput]
if !ok {
return e.NewTechUnknownError(techInput)
}
// techRequest, ok := upgradeValidTech[techInput]
// if !ok {
// return e.NewTechUnknownError(techInput)
// }
var blockMasses map[Tech]float64 = map[Tech]float64{
TechDrive: st.DriveBlockMass(),
TechWeapons: st.WeaponsBlockMass(),
TechShields: st.ShieldsBlockMass(),
TechCargo: st.CargoBlockMass(),
}
// var blockMasses map[Tech]float64 = map[Tech]float64{
// TechDrive: st.DriveBlockMass(),
// TechWeapons: st.WeaponsBlockMass(),
// TechShields: st.ShieldsBlockMass(),
// TechCargo: st.CargoBlockMass(),
// }
switch {
case techRequest != TechAll && blockMasses[techRequest] == 0:
return e.NewUpgradeShipTechNotUsedError()
case techRequest == TechAll && limitLevel != 0:
return e.NewUpgradeParameterNotAllowedError("tech=%s max_level=%f", techRequest.String(), limitLevel)
}
// switch {
// case techRequest != TechAll && blockMasses[techRequest] == 0:
// return e.NewUpgradeShipTechNotUsedError()
// case techRequest == TechAll && limitLevel != 0:
// return e.NewUpgradeParameterNotAllowedError("tech=%s max_level=%f", techRequest.String(), limitLevel)
// }
targetLevel := make(map[Tech]float64)
var sumLevels float64
for _, tech := range []Tech{TechDrive, TechWeapons, TechShields, TechCargo} {
if techRequest == TechAll || tech == techRequest {
if g.Race[ri].TechLevel(tech) < limitLevel {
return e.NewUpgradeTechLevelInsufficientError("%s=%.03f < %.03f", tech.String(), g.Race[ri].TechLevel(tech), limitLevel)
}
targetLevel[tech] = FutureUpgradeLevel(g.Race[ri].TechLevel(tech), g.ShipGroups[sgi].TechLevel(tech), limitLevel)
} else {
targetLevel[tech] = CurrentUpgradingLevel(g.ShipGroups[sgi], tech)
}
sumLevels += targetLevel[tech]
}
// targetLevel := make(map[Tech]float64)
// var sumLevels float64
// for _, tech := range []Tech{TechDrive, TechWeapons, TechShields, TechCargo} {
// if techRequest == TechAll || tech == techRequest {
// if g.Race[ri].TechLevel(tech) < limitLevel {
// return e.NewUpgradeTechLevelInsufficientError("%s=%.03f < %.03f", tech.String(), g.Race[ri].TechLevel(tech), limitLevel)
// }
// targetLevel[tech] = FutureUpgradeLevel(g.Race[ri].TechLevel(tech), g.ShipGroups[sgi].TechLevel(tech), limitLevel)
// } else {
// targetLevel[tech] = CurrentUpgradingLevel(g.ShipGroups[sgi], tech)
// }
// sumLevels += targetLevel[tech]
// }
productionCapacity := PlanetProductionCapacity(g, g.Map.Planet[pl].Number)
if g.ShipGroups[sgi].State() == StateUpgrade {
// to calculate actual capacity we must substract upgrade cost of selected group, if is upgrade state
productionCapacity -= g.ShipGroups[sgi].StateUpgrade.Cost()
}
uc := GroupUpgradeCost(g.ShipGroups[sgi], st, targetLevel[TechDrive], targetLevel[TechWeapons], targetLevel[TechShields], targetLevel[TechCargo])
costForShip := uc.UpgradeCost(1)
if costForShip == 0 {
return e.NewUpgradeShipsAlreadyUpToDateError("%#v", targetLevel)
}
// productionCapacity := PlanetProductionCapacity(g, g.Map.Planet[pl].Number)
// if g.ShipGroups[sgi].State() == StateUpgrade {
// // to calculate actual capacity we must substract upgrade cost of selected group, if is upgrade state
// productionCapacity -= g.ShipGroups[sgi].StateUpgrade.Cost()
// }
// uc := GroupUpgradeCost(g.ShipGroups[sgi], st, targetLevel[TechDrive], targetLevel[TechWeapons], targetLevel[TechShields], targetLevel[TechCargo])
// costForShip := uc.UpgradeCost(1)
// if costForShip == 0 {
// return e.NewUpgradeShipsAlreadyUpToDateError("%#v", targetLevel)
// }
shipsToUpgrade := g.ShipGroups[sgi].Number
// НЕ БОЛЕЕ УКАЗАННОГО
if limitShips > 0 && shipsToUpgrade > limitShips {
shipsToUpgrade = limitShips
}
// shipsToUpgrade := g.ShipGroups[sgi].Number
// // НЕ БОЛЕЕ УКАЗАННОГО
// if limitShips > 0 && shipsToUpgrade > limitShips {
// shipsToUpgrade = limitShips
// }
maxUpgradableShips := uc.UpgradeMaxShips(productionCapacity)
// maxUpgradableShips := uc.UpgradeMaxShips(productionCapacity)
/*
1. считаем стоимость модернизации одного корабля
2. считаем сколько кораблей можно модернизировать
3. если не хватает даже на 1 корабль, ограничиваемся одним кораблём и пересчитываем коэффициент пропорционально массе блоков
4. иначе, считаем истинное количество кораблей с учётом ограничения maxShips
*/
blockMassSum := st.EmptyMass()
// /*
// 1. считаем стоимость модернизации одного корабля
// 2. считаем сколько кораблей можно модернизировать
// 3. если не хватает даже на 1 корабль, ограничиваемся одним кораблём и пересчитываем коэффициент пропорционально массе блоков
// 4. иначе, считаем истинное количество кораблей с учётом ограничения maxShips
// */
// blockMassSum := st.EmptyMass()
coef := productionCapacity / costForShip
if maxUpgradableShips == 0 {
if limitLevel > 0 {
return e.NewUpgradeInsufficientResourcesError("ship cost=%.03f L=%.03f", costForShip, productionCapacity)
}
sumLevels = sumLevels * coef
for tech := range targetLevel {
if blockMasses[tech] > 0 {
proportional := sumLevels * (blockMasses[tech] / blockMassSum)
targetLevel[tech] = proportional
}
}
maxUpgradableShips = 1
} else if maxUpgradableShips > shipsToUpgrade {
maxUpgradableShips = shipsToUpgrade
}
// coef := productionCapacity / costForShip
// if maxUpgradableShips == 0 {
// if limitLevel > 0 {
// return e.NewUpgradeInsufficientResourcesError("ship cost=%.03f L=%.03f", costForShip, productionCapacity)
// }
// sumLevels = sumLevels * coef
// for tech := range targetLevel {
// if blockMasses[tech] > 0 {
// proportional := sumLevels * (blockMasses[tech] / blockMassSum)
// targetLevel[tech] = proportional
// }
// }
// maxUpgradableShips = 1
// } else if maxUpgradableShips > shipsToUpgrade {
// maxUpgradableShips = shipsToUpgrade
// }
// sanity check
uc = GroupUpgradeCost(g.ShipGroups[sgi], st, targetLevel[TechDrive], targetLevel[TechWeapons], targetLevel[TechShields], targetLevel[TechCargo])
costForGroup := uc.UpgradeCost(maxUpgradableShips)
if costForGroup > productionCapacity {
e.NewGameStateError("cost recalculation: coef=%f cost(%d)=%f L=%f", coef, maxUpgradableShips, costForGroup, productionCapacity)
}
// // sanity check
// uc = GroupUpgradeCost(g.ShipGroups[sgi], st, targetLevel[TechDrive], targetLevel[TechWeapons], targetLevel[TechShields], targetLevel[TechCargo])
// costForGroup := uc.UpgradeCost(maxUpgradableShips)
// if costForGroup > productionCapacity {
// e.NewGameStateError("cost recalculation: coef=%f cost(%d)=%f L=%f", coef, maxUpgradableShips, costForGroup, productionCapacity)
// }
// break group if needed
if maxUpgradableShips < g.ShipGroups[sgi].Number {
if g.ShipGroups[sgi].State() == StateUpgrade {
return e.NewUpgradeGroupBreakNotAllowedError("ships=%d max=%d", g.ShipGroups[sgi].Number, maxUpgradableShips)
}
nsgi, err := g.breakGroupSafe(ri, groupIndex, maxUpgradableShips)
if err != nil {
return err
}
sgi = nsgi
}
// // break group if needed
// if maxUpgradableShips < g.ShipGroups[sgi].Number {
// if g.ShipGroups[sgi].State() == StateUpgrade {
// return e.NewUpgradeGroupBreakNotAllowedError("ships=%d max=%d", g.ShipGroups[sgi].Number, maxUpgradableShips)
// }
// nsgi, err := g.breakGroupSafe(ri, groupIndex, maxUpgradableShips)
// if err != nil {
// return err
// }
// sgi = nsgi
// }
// finally, fill group upgrade prefs
for tech := range targetLevel {
if targetLevel[tech] > 0 {
g.ShipGroups[sgi] = UpgradeGroupPreference(g.ShipGroups[sgi], st, tech, targetLevel[tech])
}
}
// // finally, fill group upgrade prefs
// for tech := range targetLevel {
// if targetLevel[tech] > 0 {
// g.ShipGroups[sgi] = UpgradeGroupPreference(g.ShipGroups[sgi], st, tech, targetLevel[tech])
// }
// }
return nil
}
// return nil
// }
func CurrentUpgradingLevel(sg ShipGroup, tech Tech) float64 {
if sg.StateUpgrade == nil {
internal/model/game/group_upgrade_test.go
+52 -54
View File
@@ -1,10 +1,8 @@
package game_test
import (
"slices"
"testing"
e "github.com/iliadenisov/galaxy/internal/error"
"github.com/iliadenisov/galaxy/internal/model/game"
"github.com/stretchr/testify/assert"
)
@@ -111,59 +109,59 @@ func TestUpgradeGroupPreference(t *testing.T) {
assert.Equal(t, 900., sg.StateUpgrade.Cost())
}
func TestUpgradeGroup(t *testing.T) {
g := newGame()
// group #1 - in_orbit, free to upgrade
assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 10))
// group #2 - in_space
assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
// group #3 - in_orbit, foreign planet
assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
g.ShipGroups[2].Destination = R1_Planet_1_num
// func TestUpgradeGroup(t *testing.T) {
// g := newGame()
// // group #1 - in_orbit, free to upgrade
// assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 10))
// // group #2 - in_space
// assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
// g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
// // group #3 - in_orbit, foreign planet
// assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
// g.ShipGroups[2].Destination = R1_Planet_1_num
assert.ErrorContains(t,
g.UpgradeGroup("UnknownRace", 1, "DRIVE", 0, 0),
e.GenericErrorText(e.ErrInputUnknownRace))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 555, "DRIVE", 0, 0),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 2, "DRIVE", 0, 0),
e.GenericErrorText(e.ErrShipsBusy))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 3, "DRIVE", 0, 0),
e.GenericErrorText(e.ErrInputEntityNotOwned))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 1, "GUN", 0, 0),
e.GenericErrorText(e.ErrInputTechUnknown))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 1, "CARGO", 0, 0),
e.GenericErrorText(e.ErrInputUpgradeShipTechNotUsed))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 1, "ALL", 0, 2.0),
e.GenericErrorText(e.ErrInputUpgradeParameterNotAllowed))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 0, 2.0),
e.GenericErrorText(e.ErrInputUpgradeTechLevelInsufficient))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 0, 1.1),
e.GenericErrorText(e.ErrInputUpgradeShipsAlreadyUpToDate))
// assert.ErrorContains(t,
// g.UpgradeGroup("UnknownRace", 1, "DRIVE", 0, 0),
// e.GenericErrorText(e.ErrInputUnknownRace))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 555, "DRIVE", 0, 0),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 2, "DRIVE", 0, 0),
// e.GenericErrorText(e.ErrShipsBusy))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 3, "DRIVE", 0, 0),
// e.GenericErrorText(e.ErrInputEntityNotOwned))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 1, "GUN", 0, 0),
// e.GenericErrorText(e.ErrInputTechUnknown))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 1, "CARGO", 0, 0),
// e.GenericErrorText(e.ErrInputUpgradeShipTechNotUsed))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 1, "ALL", 0, 2.0),
// e.GenericErrorText(e.ErrInputUpgradeParameterNotAllowed))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 0, 2.0),
// e.GenericErrorText(e.ErrInputUpgradeTechLevelInsufficient))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 0, 1.1),
// e.GenericErrorText(e.ErrInputUpgradeShipsAlreadyUpToDate))
g.Race[Race_0_idx].SetTechLevel(game.TechDrive, 10.0)
assert.Equal(t, 10.0, g.Race[Race_0_idx].TechLevel(game.TechDrive))
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 0, 10.0),
e.GenericErrorText(e.ErrUpgradeInsufficientResources))
// g.Race[Race_0_idx].SetTechLevel(game.TechDrive, 10.0)
// assert.Equal(t, 10.0, g.Race[Race_0_idx].TechLevel(game.TechDrive))
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 0, 10.0),
// e.GenericErrorText(e.ErrUpgradeInsufficientResources))
assert.NoError(t, g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 2, 1.2))
assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
assert.Equal(t, uint(8), g.ShipGroups[0].Number)
assert.Equal(t, uint(2), g.ShipGroups[3].Number)
assert.Equal(t, game.StateInOrbit, g.ShipGroups[0].State())
assert.Equal(t, game.StateUpgrade, g.ShipGroups[3].State())
// assert.NoError(t, g.UpgradeGroup(Race_0.Name, 1, "DRIVE", 2, 1.2))
// assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
// assert.Equal(t, uint(8), g.ShipGroups[0].Number)
// assert.Equal(t, uint(2), g.ShipGroups[3].Number)
// assert.Equal(t, game.StateInOrbit, g.ShipGroups[0].State())
// assert.Equal(t, game.StateUpgrade, g.ShipGroups[3].State())
assert.ErrorContains(t,
g.UpgradeGroup(Race_0.Name, 4, "DRIVE", 1, 1.3),
e.GenericErrorText(e.ErrInputUpgradeGroupBreakNotAllowed))
}
// assert.ErrorContains(t,
// g.UpgradeGroup(Race_0.Name, 4, "DRIVE", 1, 1.3),
// e.GenericErrorText(e.ErrInputUpgradeGroupBreakNotAllowed))
// }
internal/model/game/race.go
+70 -70
View File
@@ -1,10 +1,10 @@
package game
import (
"slices"
// "slices"
"github.com/google/uuid"
e "github.com/iliadenisov/galaxy/internal/error"
// e "github.com/iliadenisov/galaxy/internal/error"
)
type Race struct {
@@ -38,7 +38,7 @@ func (r Race) TechLevel(t Tech) float64 {
return r.Tech.Value(t)
}
// TODO: refactor to separate method with *Race as parameter
// TODO: remove func, move to Cache
func (r *Race) SetTechLevel(t Tech, v float64) {
r.Tech = r.Tech.Set(t, v)
}
@@ -51,74 +51,74 @@ func (r Race) VisibilityDistance() float64 {
return r.TechLevel(TechDrive) * 30
}
func (g Game) Relation(hostRace, opponentRace string) (RaceRelation, error) {
ri, err := g.raceIndex(hostRace)
if err != nil {
return RaceRelation{}, err
}
other, err := g.raceIndex(opponentRace)
if err != nil {
return RaceRelation{}, err
}
return g.relationInternal(ri, other)
}
// func (g Game) Relation(hostRace, opponentRace string) (RaceRelation, error) {
// ri, err := g.raceIndex(hostRace)
// if err != nil {
// return RaceRelation{}, err
// }
// other, err := g.raceIndex(opponentRace)
// if err != nil {
// return RaceRelation{}, err
// }
// return g.relationInternal(ri, other)
// }
func (g Game) UpdateRelation(race, opponent string, rel Relation) error {
ri, err := g.raceIndex(race)
if err != nil {
return err
}
var other int
if race == opponent {
other = ri
} else if other, err = g.raceIndex(opponent); err != nil {
return err
}
if err != nil {
return err
}
return g.updateRelationInternal(ri, other, rel)
}
// func (g Game) UpdateRelation(race, opponent string, rel Relation) error {
// ri, err := g.raceIndex(race)
// if err != nil {
// return err
// }
// var other int
// if race == opponent {
// other = ri
// } else if other, err = g.raceIndex(opponent); err != nil {
// return err
// }
// if err != nil {
// return err
// }
// return g.updateRelationInternal(ri, other, rel)
// }
func (g *Game) GiveVotes(race, recipient string) error {
ri, err := g.raceIndex(race)
if err != nil {
return err
}
rec, err := g.raceIndex(recipient)
if err != nil {
return err
}
g.Race[ri].Vote = g.Race[rec].ID
return nil
}
// func (g *Game) GiveVotes(race, recipient string) error {
// ri, err := g.raceIndex(race)
// if err != nil {
// return err
// }
// rec, err := g.raceIndex(recipient)
// if err != nil {
// return err
// }
// g.Race[ri].Vote = g.Race[rec].ID
// return nil
// }
func (g Game) relationInternal(ri, other int) (RaceRelation, error) {
if ri == other {
return RaceRelation{
RaceID: g.Race[ri].ID,
Relation: RelationPeace,
}, nil
}
rel := slices.IndexFunc(g.Race[ri].Relations, func(r RaceRelation) bool { return r.RaceID == g.Race[other].ID })
if rel < 0 {
return RaceRelation{}, e.NewGameStateError("Relation: opponent not found")
}
return g.Race[ri].Relations[rel], nil
}
// func (g Game) relationInternal(ri, other int) (RaceRelation, error) {
// if ri == other {
// return RaceRelation{
// RaceID: g.Race[ri].ID,
// Relation: RelationPeace,
// }, nil
// }
// rel := slices.IndexFunc(g.Race[ri].Relations, func(r RaceRelation) bool { return r.RaceID == g.Race[other].ID })
// if rel < 0 {
// return RaceRelation{}, e.NewGameStateError("Relation: opponent not found")
// }
// return g.Race[ri].Relations[rel], nil
// }
func (g Game) updateRelationInternal(ri, other int, rel Relation) error {
for o := range g.Race[ri].Relations {
switch {
case ri == other:
g.Race[ri].Relations[o].Relation = rel
case g.Race[ri].Relations[o].RaceID == g.Race[other].ID:
g.Race[ri].Relations[o].Relation = rel
return nil
}
}
if ri != other {
return e.NewGameStateError("UpdateRelation: opponent not found")
}
return nil
}
// func (g Game) updateRelationInternal(ri, other int, rel Relation) error {
// for o := range g.Race[ri].Relations {
// switch {
// case ri == other:
// g.Race[ri].Relations[o].Relation = rel
// case g.Race[ri].Relations[o].RaceID == g.Race[other].ID:
// g.Race[ri].Relations[o].Relation = rel
// return nil
// }
// }
// if ri != other {
// return e.NewGameStateError("UpdateRelation: opponent not found")
// }
// return nil
// }
internal/model/game/race_test.go
-21
View File
@@ -1,22 +1 @@
package game_test
import (
"testing"
e "github.com/iliadenisov/galaxy/internal/error"
"github.com/stretchr/testify/assert"
)
func TestGiveVotes(t *testing.T) {
g := newGame()
assert.Equal(t, g.Race[Race_0_idx].ID, g.Race[Race_0_idx].Vote)
assert.Equal(t, g.Race[Race_1_idx].ID, g.Race[Race_1_idx].Vote)
assert.NoError(t, g.GiveVotes(Race_0.Name, Race_1.Name))
assert.Equal(t, g.Race[Race_1_idx].ID, g.Race[Race_0_idx].Vote)
assert.Equal(t, g.Race[Race_1_idx].ID, g.Race[Race_1_idx].Vote)
assert.ErrorContains(t, g.GiveVotes("UnknownRace", Race_1.Name), e.GenericErrorText(e.ErrInputUnknownRace))
assert.ErrorContains(t, g.GiveVotes(Race_0.Name, "UnknownRace"), e.GenericErrorText(e.ErrInputUnknownRace))
}
internal/model/game/ship.go
+100 -100
View File
@@ -102,116 +102,116 @@ func (g Game) shipTypesInternal(ri int) []ShipType {
return g.Race[ri].ShipTypes
}
func (g Game) DeleteShipType(raceName, typeName string) error {
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
return g.deleteShipTypeInternal(ri, typeName)
}
// func (g Game) DeleteShipType(raceName, typeName string) error {
// ri, err := g.raceIndex(raceName)
// if err != nil {
// return err
// }
// return g.deleteShipTypeInternal(ri, typeName)
// }
func (g Game) deleteShipTypeInternal(ri int, name string) error {
st := slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.Name == name })
if st < 0 {
return e.NewEntityNotExistsError("ship type %w", name)
}
if pl := slices.IndexFunc(g.Map.Planet, func(p Planet) bool {
return p.Production.Type == ProductionShip &&
p.Production.SubjectID != nil &&
g.Race[ri].ShipTypes[st].ID == *p.Production.SubjectID
}); pl >= 0 {
return e.NewDeleteShipTypePlanetProductionError(g.Map.Planet[pl].Name)
}
for sg := range g.listShipGroups(ri) {
if sg.TypeID == g.Race[ri].ShipTypes[st].ID {
return e.NewDeleteShipTypeExistingGroupError("group: %v", sg.Index)
}
}
g.Race[ri].ShipTypes = append(g.Race[ri].ShipTypes[:st], g.Race[ri].ShipTypes[st+1:]...)
return nil
}
// func (g Game) deleteShipTypeInternal(ri int, name string) error {
// st := slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.Name == name })
// if st < 0 {
// return e.NewEntityNotExistsError("ship type %w", name)
// }
// if pl := slices.IndexFunc(g.Map.Planet, func(p Planet) bool {
// return p.Production.Type == ProductionShip &&
// p.Production.SubjectID != nil &&
// g.Race[ri].ShipTypes[st].ID == *p.Production.SubjectID
// }); pl >= 0 {
// return e.NewDeleteShipTypePlanetProductionError(g.Map.Planet[pl].Name)
// }
// for sg := range g.listShipGroups(ri) {
// if sg.TypeID == g.Race[ri].ShipTypes[st].ID {
// return e.NewDeleteShipTypeExistingGroupError("group: %v", sg.Index)
// }
// }
// g.Race[ri].ShipTypes = append(g.Race[ri].ShipTypes[:st], g.Race[ri].ShipTypes[st+1:]...)
// return nil
// }
// TODO: D A W S C
func (g Game) CreateShipType(raceName, typeName string, d, w, s, c float64, a int) error {
ri, err := g.raceIndex(raceName)
if err != nil {
return err
}
_, err = g.createShipTypeInternal(ri, typeName, d, w, s, c, a)
return err
}
// func (g Game) CreateShipType(raceName, typeName string, d, w, s, c float64, a int) error {
// ri, err := g.raceIndex(raceName)
// if err != nil {
// return err
// }
// _, err = g.createShipTypeInternal(ri, typeName, d, w, s, c, a)
// return err
// }
func (g Game) createShipTypeInternal(ri int, name string, d, w, s, c float64, a int) (int, error) {
if err := checkShipTypeValues(d, w, s, c, a); err != nil {
return -1, err
}
n, ok := validateTypeName(name)
if !ok {
return -1, e.NewEntityTypeNameValidationError("%q", n)
}
if st := slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.Name == name }); st >= 0 {
return -1, e.NewEntityTypeNameDuplicateError("ship type %w", g.Race[ri].ShipTypes[st].Name)
}
g.Race[ri].ShipTypes = append(g.Race[ri].ShipTypes, ShipType{
ID: uuid.New(),
ShipTypeReport: ShipTypeReport{
Name: n,
Drive: d,
Weapons: w,
Shields: s,
Cargo: c,
Armament: uint(a),
},
})
return len(g.Race[ri].ShipTypes) - 1, nil
}
// func (g Game) createShipTypeInternal(ri int, name string, d, w, s, c float64, a int) (int, error) {
// if err := checkShipTypeValues(d, w, s, c, a); err != nil {
// return -1, err
// }
// n, ok := validateTypeName(name)
// if !ok {
// return -1, e.NewEntityTypeNameValidationError("%q", n)
// }
// if st := slices.IndexFunc(g.Race[ri].ShipTypes, func(st ShipType) bool { return st.Name == name }); st >= 0 {
// return -1, e.NewEntityTypeNameDuplicateError("ship type %w", g.Race[ri].ShipTypes[st].Name)
// }
// g.Race[ri].ShipTypes = append(g.Race[ri].ShipTypes, ShipType{
// ID: uuid.New(),
// ShipTypeReport: ShipTypeReport{
// Name: n,
// Drive: d,
// Weapons: w,
// Shields: s,
// Cargo: c,
// Armament: uint(a),
// },
// })
// return len(g.Race[ri].ShipTypes) - 1, 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) 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()
}
// 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.Type == 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 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.Type == 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.ShipGroups {
if g.ShipGroups[sg].OwnerID == g.Race[ri].ID && g.ShipGroups[sg].TypeID == g.Race[ri].ShipTypes[st].ID {
g.ShipGroups[sg].TypeID = g.Race[ri].ShipTypes[tt].ID
}
}
// // switch ship groups to the new type
// for sg := range g.ShipGroups {
// if g.ShipGroups[sg].OwnerID == g.Race[ri].ID && g.ShipGroups[sg].TypeID == g.Race[ri].ShipTypes[st].ID {
// g.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:]...)
// // remove the source type
// g.Race[ri].ShipTypes = append(g.Race[ri].ShipTypes[:st], g.Race[ri].ShipTypes[st+1:]...)
return nil
}
// return nil
// }
func checkShipTypeValues(d, w, s, c float64, a int) error {
if !checkShipTypeValueDWSC(d) {