feat: command types list

2026-02-10 07:49:12 +02:00
parent d9c8de27e5
commit 83bcdcbc49
15 changed files with 184 additions and 163 deletions
@@ -54,12 +54,109 @@ func (c Controller) UpdateRelation(actor, acceptor string, v string) error {
 	return c.Cache.UpdateRelation(ri, other, rel)
 }

+func (c *Controller) CreateShipType(actor, typeName string, drive float64, ammo int, weapons, shileds, cargo float64) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.ShipClassCreate(ri, typeName, drive, ammo, weapons, shileds, cargo)
+}
+
+func (c *Controller) MergeShipType(actor, name, targetName string) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.shipClassMerge(ri, name, targetName)
+}
+
+func (c *Controller) DeleteShipType(actor, typeName string) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.shipClassRemove(ri, typeName)
+}
+
+func (c *Controller) LoadCargo(actor string, groupIndex uint, cargoType string, ships uint, quantity float64) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	ct, ok := game.CargoTypeSet[cargoType]
+	if !ok {
+		return e.NewCargoTypeInvalidError(cargoType)
+	}
+	return c.Cache.shipGroupLoad(ri, groupIndex, ct, ships, quantity)
+}
+
+func (c *Controller) UnloadCargo(actor string, groupIndex uint, ships uint, quantity float64) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.shipGroupUnload(ri, groupIndex, ships, quantity)
+}
+
+func (c *Controller) SendGroup(actor string, groupIndex, planetNumber, quantity uint) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.shipGroupSend(ri, groupIndex, planetNumber, quantity)
+}
+
+func (c *Controller) UpgradeGroup(actor string, groupIndex uint, techInput string, limitShips uint, limitLevel float64) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.shipGroupUpgrade(ri, groupIndex, techInput, limitShips, limitLevel)
+}
+
+func (c *Controller) JoinEqualGroups(actor string) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	c.Cache.shipGroupMerge(ri)
+	return nil
+}
+
+func (c *Controller) BreakGroup(actor string, groupIndex, quantity uint) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.ShipGroupBreak(ri, groupIndex, quantity)
+}
+
+func (c *Controller) DisassembleGroup(actor string, groupIndex, quantity uint) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.shipGroupDismantle(ri, groupIndex, quantity)
+}
+
+func (c *Controller) TransferGroup(actor, acceptor string, groupIndex, quantity uint) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	riAccept, err := c.Cache.validRace(acceptor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.shipGroupTransfer(ri, riAccept, groupIndex, quantity)
+}
+
 func (c *Controller) JoinShipGroupToFleet(actor, fleetName string, group, count uint) error {
 	ri, err := c.Cache.validActor(actor)
 	if err != nil {
 		return err
 	}
-	return c.Cache.JoinShipGroupToFleet(ri, fleetName, group, count)
+	return c.Cache.ShipGroupJoinFleet(ri, fleetName, group, count)
 }

 func (c *Controller) JoinFleets(actor, fleetSourceName, fleetTargetName string) error {
@@ -67,7 +164,7 @@ func (c *Controller) JoinFleets(actor, fleetSourceName, fleetTargetName string)
 	if err != nil {
 		return err
 	}
-	return c.Cache.JoinFleets(ri, fleetSourceName, fleetTargetName)
+	return c.Cache.fleetMerge(ri, fleetSourceName, fleetTargetName)
 }

 func (c *Controller) SendFleet(actor, fleetName string, planetNumber uint) error {
@@ -79,7 +176,23 @@ func (c *Controller) SendFleet(actor, fleetName string, planetNumber uint) error
 	if !ok {
 		return e.NewEntityNotExistsError("fleet %q", fleetName)
 	}
-	return c.Cache.SendFleet(ri, fi, planetNumber)
+	return c.Cache.FleetSend(ri, fi, planetNumber)
+}
+
+func (c *Controller) CreateScience(actor, typeName string, drive, weapons, shields, cargo float64) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.ScienceCreate(ri, typeName, drive, weapons, shields, cargo)
+}
+
+func (c *Controller) DeleteScience(actor, typeName string) error {
+	ri, err := c.Cache.validActor(actor)
+	if err != nil {
+		return err
+	}
+	return c.Cache.ScienceRemove(ri, typeName)
 }

 func (c *Controller) RenamePlanet(actor string, planetNumber int, typeName string) error {
@@ -87,7 +200,7 @@ func (c *Controller) RenamePlanet(actor string, planetNumber int, typeName strin
 	if err != nil {
 		return err
 	}
-	return c.Cache.RenamePlanet(ri, planetNumber, typeName)
+	return c.Cache.PlanetRename(ri, planetNumber, typeName)
 }

 func (c *Controller) PlanetProduction(actor string, planetNumber int, prodType, subject string) error {
@@ -116,7 +229,7 @@ func (c *Controller) PlanetProduction(actor string, planetNumber int, prodType,
 	default:
 		return e.NewProductionInvalidError(prodType)
 	}
-	return c.Cache.PlanetProduction(ri, planetNumber, prod, subject)
+	return c.Cache.PlanetProduce(ri, planetNumber, prod, subject)
 }

 func (c *Controller) SetRoute(actor, loadType string, origin, destination uint) error {
@@ -128,7 +241,7 @@ func (c *Controller) SetRoute(actor, loadType string, origin, destination uint)
 	if !ok {
 		return e.NewCargoTypeInvalidError(loadType)
 	}
-	return c.Cache.SetRoute(ri, rt, origin, destination)
+	return c.Cache.PlanetRouteSet(ri, rt, origin, destination)
 }

 func (c *Controller) RemoveRoute(actor, loadType string, origin uint) error {
@@ -140,118 +253,5 @@ func (c *Controller) RemoveRoute(actor, loadType string, origin uint) error {
 	if !ok {
 		return e.NewCargoTypeInvalidError(loadType)
 	}
-	return c.Cache.RemoveRoute(ri, rt, origin)
-}
-
-func (c *Controller) CreateScience(actor, typeName string, drive, weapons, shields, cargo float64) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.CreateScience(ri, typeName, drive, weapons, shields, cargo)
-}
-
-func (c *Controller) DeleteScience(actor, typeName string) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.DeleteScience(ri, typeName)
-}
-
-func (c *Controller) CreateShipType(actor, typeName string, drive float64, ammo int, weapons, shileds, cargo float64) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.CreateShipType(ri, typeName, drive, ammo, weapons, shileds, cargo)
-}
-
-func (c *Controller) MergeShipType(actor, name, targetName string) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.MergeShipType(ri, name, targetName)
-}
-
-func (c *Controller) DeleteShipType(actor, typeName string) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.DeleteShipType(ri, typeName)
-}
-
-func (c *Controller) SendGroup(actor string, groupIndex, planetNumber, quantity uint) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.SendGroup(ri, groupIndex, planetNumber, quantity)
-}
-
-func (c *Controller) UpgradeGroup(actor string, groupIndex uint, techInput string, limitShips uint, limitLevel float64) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.UpgradeGroup(ri, groupIndex, techInput, limitShips, limitLevel)
-}
-
-func (c *Controller) JoinEqualGroups(actor string) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	c.Cache.JoinEqualGroups(ri)
-	return nil
-}
-
-func (c *Controller) BreakGroup(actor string, groupIndex, quantity uint) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.BreakGroup(ri, groupIndex, quantity)
-}
-
-func (c *Controller) DisassembleGroup(actor string, groupIndex, quantity uint) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.DisassembleGroup(ri, groupIndex, quantity)
-}
-
-func (c *Controller) LoadCargo(actor string, groupIndex uint, cargoType string, ships uint, quantity float64) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	ct, ok := game.CargoTypeSet[cargoType]
-	if !ok {
-		return e.NewCargoTypeInvalidError(cargoType)
-	}
-	return c.Cache.LoadCargo(ri, groupIndex, ct, ships, quantity)
-}
-
-func (c *Controller) UnloadCargo(actor string, groupIndex uint, ships uint, quantity float64) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.UnloadCargo(ri, groupIndex, ships, quantity)
-}
-
-func (c *Controller) TransferGroup(actor, acceptor string, groupIndex, quantity uint) error {
-	ri, err := c.Cache.validActor(actor)
-	if err != nil {
-		return err
-	}
-	riAccept, err := c.Cache.validRace(acceptor)
-	if err != nil {
-		return err
-	}
-	return c.Cache.TransferGroup(ri, riAccept, groupIndex, quantity)
+	return c.Cache.PlanetRouteRemove(ri, rt, origin)
 }