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

race quit, transfer state, refactor

Browse Source
This commit is contained in:
Ilia Denisov
2026-02-07 01:59:11 +02:00
parent 43ba5eb07c
commit fc73cbf83a
27 changed files with 520 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/ship_class.go
-33
View File
@@ -11,14 +11,6 @@ import (
"github.com/iliadenisov/galaxy/internal/util"
)
func (c *Controller) CreateShipType(raceName, typeName string, drive float64, ammo int, weapons, shileds, cargo float64) error {
ri, err := c.Cache.raceIndex(raceName)
if err != nil {
return err
}
return c.Cache.CreateShipType(ri, typeName, drive, ammo, weapons, shileds, cargo)
}
func (c *Cache) CreateShipType(ri int, typeName string, drive float64, ammo int, weapons, shileds, cargo float64) error {
c.validateRaceIndex(ri)
if err := checkShipTypeValues(drive, ammo, weapons, shileds, cargo); err != nil {
@@ -45,14 +37,6 @@ func (c *Cache) CreateShipType(ri int, typeName string, drive float64, ammo int,
return nil
}
func (c *Controller) MergeShipType(race, name, targetName string) error {
ri, err := c.Cache.raceIndex(race)
if err != nil {
return err
}
return c.Cache.MergeShipType(ri, name, targetName)
}
func (c *Cache) MergeShipType(ri int, name, targetName string) error {
c.validateRaceIndex(ri)
st, sti, ok := c.ShipClass(ri, name)
@@ -101,14 +85,6 @@ func (c *Cache) MergeShipType(ri int, name, targetName string) error {
return nil
}
func (c *Controller) DeleteShipType(raceName, typeName string) error {
ri, err := c.Cache.raceIndex(raceName)
if err != nil {
return err
}
return c.Cache.DeleteShipType(ri, typeName)
}
func (c *Cache) DeleteShipType(ri int, name string) error {
c.validateRaceIndex(ri)
st, i, ok := c.ShipClass(ri, name)
@@ -136,15 +112,6 @@ func (c *Cache) DeleteShipType(ri int, name string) error {
return nil
}
// ShipTypes used for tests only
func (c *Controller) ShipTypes(race string) ([]*game.ShipType, error) {
ri, err := c.Cache.raceIndex(race)
if err != nil {
return nil, err
}
return c.Cache.ShipTypes(ri), nil
}
// ShipTypes used for tests only
func (c *Cache) ShipTypes(ri int) []*game.ShipType {
c.validateRaceIndex(ri)