feat: more validators
This commit is contained in:
@@ -83,7 +83,7 @@ func (c *Controller) ShipGroupLoad(actor string, groupID uuid.UUID, cargoType st
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
ct, ok := game.CargoTypeSet[cargoType]
|
||||
ct, ok := game.CargoTypeSet[strings.ToLower(cargoType)]
|
||||
if !ok {
|
||||
return e.NewCargoTypeInvalidError(cargoType)
|
||||
}
|
||||
@@ -151,12 +151,12 @@ func (c *Controller) ShipGroupTransfer(actor, acceptor string, groupID uuid.UUID
|
||||
return c.Cache.shipGroupTransfer(ri, riAccept, groupID, quantity)
|
||||
}
|
||||
|
||||
func (c *Controller) ShipGroupJoinFleet(actor, fleetName string, groupID uuid.UUID, count uint) error {
|
||||
func (c *Controller) ShipGroupJoinFleet(actor, fleetName string, groupID uuid.UUID, quantity uint) error {
|
||||
ri, err := c.Cache.validActor(actor)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return c.Cache.ShipGroupJoinFleet(ri, fleetName, groupID, count)
|
||||
return c.Cache.ShipGroupJoinFleet(ri, fleetName, groupID, quantity)
|
||||
}
|
||||
|
||||
func (c *Controller) FleetMerge(actor, fleetSourceName, fleetTargetName string) error {
|
||||
@@ -195,12 +195,12 @@ func (c *Controller) ScienceRemove(actor, typeName string) error {
|
||||
return c.Cache.ScienceRemove(ri, typeName)
|
||||
}
|
||||
|
||||
func (c *Controller) PlanetRename(actor string, planetNumber int, typeName string) error {
|
||||
func (c *Controller) PlanetRename(actor string, planetNumber int, name string) error {
|
||||
ri, err := c.Cache.validActor(actor)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return c.Cache.PlanetRename(ri, planetNumber, typeName)
|
||||
return c.Cache.PlanetRename(ri, planetNumber, name)
|
||||
}
|
||||
|
||||
func (c *Controller) PlanetProduce(actor string, planetNumber int, prodType, subject string) error {
|
||||
@@ -237,7 +237,7 @@ func (c *Controller) PlanetRouteSet(actor, loadType string, origin, destination
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
rt, ok := game.RouteTypeSet[loadType]
|
||||
rt, ok := game.RouteTypeSet[strings.ToLower(loadType)]
|
||||
if !ok {
|
||||
return e.NewCargoTypeInvalidError(loadType)
|
||||
}
|
||||
@@ -249,7 +249,7 @@ func (c *Controller) PlanetRouteRemove(actor, loadType string, origin uint) erro
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
rt, ok := game.RouteTypeSet[loadType]
|
||||
rt, ok := game.RouteTypeSet[strings.ToLower(loadType)]
|
||||
if !ok {
|
||||
return e.NewCargoTypeInvalidError(loadType)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user