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

refactor: group uuid instead of index

Browse Source
This commit is contained in:
IliaDenisov
2026-02-10 20:54:43 +03:00
parent 6c8384ce7a
commit 56998d4c2d
26 changed files with 333 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/command.go
+16 -16
View File
@@ -78,7 +78,7 @@ func (c *Controller) ShipClassRemove(actor, typeName string) error {
return c.Cache.shipClassRemove(ri, typeName)
}
func (c *Controller) ShipGroupLoad(actor string, groupIndex uint, cargoType string, ships uint, quantity float64) error {
func (c *Controller) ShipGroupLoad(actor string, groupID uuid.UUID, cargoType string, ships uint, quantity float64) error {
ri, err := c.Cache.validActor(actor)
if err != nil {
return err
@@ -87,31 +87,31 @@ func (c *Controller) ShipGroupLoad(actor string, groupIndex uint, cargoType stri
if !ok {
return e.NewCargoTypeInvalidError(cargoType)
}
return c.Cache.shipGroupLoad(ri, groupIndex, ct, ships, quantity)
return c.Cache.shipGroupLoad(ri, groupID, ct, ships, quantity)
}
func (c *Controller) ShipGroupUnload(actor string, groupIndex uint, ships uint, quantity float64) error {
func (c *Controller) ShipGroupUnload(actor string, groupID uuid.UUID, ships uint, quantity float64) error {
ri, err := c.Cache.validActor(actor)
if err != nil {
return err
}
return c.Cache.shipGroupUnload(ri, groupIndex, ships, quantity)
return c.Cache.shipGroupUnload(ri, groupID, ships, quantity)
}
func (c *Controller) ShipGroupSend(actor string, groupIndex, planetNumber, quantity uint) error {
func (c *Controller) ShipGroupSend(actor string, groupID uuid.UUID, planetNumber, quantity uint) error {
ri, err := c.Cache.validActor(actor)
if err != nil {
return err
}
return c.Cache.shipGroupSend(ri, groupIndex, planetNumber, quantity)
return c.Cache.shipGroupSend(ri, groupID, planetNumber, quantity)
}
func (c *Controller) ShipGroupUpgrade(actor string, groupIndex uint, techInput string, limitShips uint, limitLevel float64) error {
func (c *Controller) ShipGroupUpgrade(actor string, groupID uuid.UUID, 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)
return c.Cache.shipGroupUpgrade(ri, groupID, techInput, limitShips, limitLevel)
}
func (c *Controller) ShipGroupMerge(actor string) error {
@@ -123,23 +123,23 @@ func (c *Controller) ShipGroupMerge(actor string) error {
return nil
}
func (c *Controller) ShipGroupBreak(actor string, groupIndex, quantity uint) error {
func (c *Controller) ShipGroupBreak(actor string, groupID uuid.UUID, quantity uint) error {
ri, err := c.Cache.validActor(actor)
if err != nil {
return err
}
return c.Cache.ShipGroupBreak(ri, groupIndex, quantity)
return c.Cache.ShipGroupBreak(ri, groupID, quantity)
}
func (c *Controller) ShipGroupDismantle(actor string, groupIndex, quantity uint) error {
func (c *Controller) ShipGroupDismantle(actor string, groupID uuid.UUID, quantity uint) error {
ri, err := c.Cache.validActor(actor)
if err != nil {
return err
}
return c.Cache.shipGroupDismantle(ri, groupIndex, quantity)
return c.Cache.shipGroupDismantle(ri, groupID, quantity)
}
func (c *Controller) ShipGroupTransfer(actor, acceptor string, groupIndex, quantity uint) error {
func (c *Controller) ShipGroupTransfer(actor, acceptor string, groupID uuid.UUID, quantity uint) error {
ri, err := c.Cache.validActor(actor)
if err != nil {
return err
@@ -148,15 +148,15 @@ func (c *Controller) ShipGroupTransfer(actor, acceptor string, groupIndex, quant
if err != nil {
return err
}
return c.Cache.shipGroupTransfer(ri, riAccept, groupIndex, quantity)
return c.Cache.shipGroupTransfer(ri, riAccept, groupID, quantity)
}
func (c *Controller) ShipGroupJoinFleet(actor, fleetName string, group, count uint) error {
func (c *Controller) ShipGroupJoinFleet(actor, fleetName string, groupID uuid.UUID, count uint) error {
ri, err := c.Cache.validActor(actor)
if err != nil {
return err
}
return c.Cache.ShipGroupJoinFleet(ri, fleetName, group, count)
return c.Cache.ShipGroupJoinFleet(ri, fleetName, groupID, count)
}
func (c *Controller) FleetMerge(actor, fleetSourceName, fleetTargetName string) error {