race quit, transfer state, refactor
This commit is contained in:
@@ -6,14 +6,6 @@ import (
|
||||
"github.com/iliadenisov/galaxy/internal/util"
|
||||
)
|
||||
|
||||
func (c *Controller) SendGroup(raceName string, groupIndex, planetNumber, quantity uint) error {
|
||||
ri, err := c.Cache.raceIndex(raceName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return c.Cache.SendGroup(ri, groupIndex, planetNumber, quantity)
|
||||
}
|
||||
|
||||
func (c *Cache) SendGroup(ri int, groupIndex, planetNumber, quantity uint) error {
|
||||
c.validateRaceIndex(ri)
|
||||
|
||||
@@ -29,7 +21,7 @@ func (c *Cache) SendGroup(ri int, groupIndex, planetNumber, quantity uint) error
|
||||
|
||||
sourcePlanet, ok := c.ShipGroup(sgi).AtPlanet()
|
||||
if !ok {
|
||||
return e.NewShipsBusyError()
|
||||
return e.NewShipsBusyError("state: %s", c.ShipGroup(sgi).State())
|
||||
}
|
||||
|
||||
if c.ShipGroup(sgi).Number < quantity {
|
||||
|
||||
Reference in New Issue
Block a user