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

feat: turn generate api

Browse Source
This commit is contained in:
IliaDenisov
2026-02-12 14:27:56 +03:00
parent 67f0fdef61
commit 87291d2760
16 changed files with 192 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/cache.go
+4
View File
@@ -28,6 +28,10 @@ func NewCache(g *game.Game) *Cache {
return c
}
func (c *Cache) StageCommand() {
c.g.Stage++
}
func (c Cache) Stage() uint {
return c.g.Stage
}
internal/controller/controller.go
+39 -13
View File
@@ -70,19 +70,31 @@ type Ctrl interface {
PlanetRouteRemove(actor, loadType string, origin uint) error
}
func GenerateGame(configure func(*Param), races []string) (ID uuid.UUID, err error) {
func GenerateGame(configure func(*Param), races []string) (s game.State, err error) {
ec, err := NewRepoController(configure)
if err != nil {
return uuid.Nil, err
return game.State{}, err
}
if err = ec.Repo.Lock(); err != nil {
return
}
defer func() {
err = errors.Join(err, ec.Repo.Release())
if err == nil {
s, err = GameState(configure)
}
}()
ID, err = NewGame(ec.Repo, races)
_, err = NewGame(ec.Repo, races)
return
}
func GenerateTurn(configure func(*Param)) (err error) {
ec, err := NewRepoController(configure)
if err != nil {
return err
}
err = ec.ExecuteLocked(func(c *Controller) error { return c.MakeTurn() })
return
}
@@ -96,6 +108,9 @@ func ExecuteCommand(configure func(*Param), consumer func(c Ctrl) error) (err er
func GameState(configure func(*Param)) (s game.State, err error) {
ec, err := NewRepoController(configure)
if err != nil {
return game.State{}, err
}
g, err := ec.Repo.LoadStateSafe()
if err != nil {
@@ -123,7 +138,7 @@ type RepoController struct {
Repo Repo
}
func (ec *RepoController) ExecuteCommand(consumer func(c *Controller) error) (err error) {
func (ec *RepoController) ExecuteLocked(consumer func(*Controller) error) (err error) {
if err := ec.Repo.Lock(); err != nil {
return err
}
@@ -136,15 +151,21 @@ func (ec *RepoController) ExecuteCommand(consumer func(c *Controller) error) (er
return err
}
err = consumer(NewGameController(g))
if err == nil {
g.Stage += 1
ec.Repo.SaveLastState(g)
}
err = consumer(ec.NewGameController(g))
return
}
func (ec *RepoController) ExecuteCommand(consumer func(*Controller) error) (err error) {
return ec.ExecuteLocked(func(c *Controller) error {
err = consumer(c)
if err == nil {
c.Cache.StageCommand()
err = c.saveState()
}
return err
})
}
func NewRepoController(config Configurer) (*RepoController, error) {
c := &Param{
StoragePath: ".",
@@ -161,14 +182,19 @@ func NewRepoController(config Configurer) (*RepoController, error) {
}, nil
}
func NewGameController(g *game.Game) *Controller {
func (ec *RepoController) NewGameController(g *game.Game) *Controller {
return &Controller{
Cache: NewCache(g),
RepoController: ec,
Cache: NewCache(g),
}
}
func (c *Controller) saveState() error {
return c.Repo.SaveLastState(c.Cache.g)
}
type Controller struct {
Repo Repo
*RepoController
Cache *Cache
}
internal/controller/controller_test.go
+11 -9
View File
@@ -129,17 +129,19 @@ func newGame() *game.Game {
}
func newCache() (*controller.Cache, *controller.Controller) {
ctl := controller.NewGameController(newGame())
c := ctl.Cache
assertNoError(c.ShipClassCreate(Race_0_idx, Race_0_Gunship, 60, 3, 30, 100, 0))
assertNoError(c.ShipClassCreate(Race_0_idx, Race_0_Freighter, 8, 0, 0, 2, 10))
assertNoError(c.ShipClassCreate(Race_0_idx, ShipType_Cruiser, Cruiser.Drive.F(), int(Cruiser.Armament), Cruiser.Weapons.F(), Cruiser.Shields.F(), Cruiser.Cargo.F()))
ctl := &controller.Controller{
RepoController: nil,
Cache: controller.NewCache(newGame()),
}
assertNoError(ctl.Cache.ShipClassCreate(Race_0_idx, Race_0_Gunship, 60, 3, 30, 100, 0))
assertNoError(ctl.Cache.ShipClassCreate(Race_0_idx, Race_0_Freighter, 8, 0, 0, 2, 10))
assertNoError(ctl.Cache.ShipClassCreate(Race_0_idx, ShipType_Cruiser, Cruiser.Drive.F(), int(Cruiser.Armament), Cruiser.Weapons.F(), Cruiser.Shields.F(), Cruiser.Cargo.F()))
assertNoError(c.ShipClassCreate(Race_1_idx, Race_1_Gunship, 60, 3, 30, 100, 0))
assertNoError(c.ShipClassCreate(Race_1_idx, Race_1_Freighter, 8, 0, 0, 2, 10))
assertNoError(c.ShipClassCreate(Race_1_idx, ShipType_Cruiser, 15, 2, 15, 15, 0)) // same name - different type (why.)
assertNoError(ctl.Cache.ShipClassCreate(Race_1_idx, Race_1_Gunship, 60, 3, 30, 100, 0))
assertNoError(ctl.Cache.ShipClassCreate(Race_1_idx, Race_1_Freighter, 8, 0, 0, 2, 10))
assertNoError(ctl.Cache.ShipClassCreate(Race_1_idx, ShipType_Cruiser, 15, 2, 15, 15, 0)) // same name - different type (why.)
return c, ctl
return ctl.Cache, ctl
}
func floatRef(v float64) *game.Float {
internal/controller/generate_game.go
+1
View File
@@ -61,6 +61,7 @@ func buildGameOnMap(races []string, m generator.Map) (*game.Game, error) {
ID: raceID,
Name: races[i],
VoteFor: raceID,
TTL: 10,
Tech: game.NewTechSet(),
}
gameMap.Planet = append(gameMap.Planet, NewPlanet(
internal/controller/generate_game_test.go
+9 -1
View File
@@ -3,6 +3,7 @@ package controller_test
import (
"fmt"
"path/filepath"
"strings"
"testing"
"github.com/google/uuid"
@@ -41,6 +42,7 @@ func TestNewGame(t *testing.T) {
for r := range g.Race {
assert.NotEqual(t, uuid.Nil, g.Race[r].ID)
assert.Equal(t, players-1, len(g.Race[r].Relations))
assert.Equal(t, uint(10), g.Race[r].TTL)
for i := range g.Race[r].Relations {
assert.NotEqual(t, uuid.Nil, g.Race[r].Relations[i].RaceID)
if g.Race[r].Relations[i].RaceID == g.Race[r].ID {
@@ -52,7 +54,13 @@ func TestNewGame(t *testing.T) {
numShuffled := false
for i := range g.Map.Planet {
numShuffled = numShuffled || g.Map.Planet[i].Number != uint(i)
p := &g.Map.Planet[i]
if strings.HasPrefix(p.Name, "HW") || strings.HasPrefix(p.Name, "DW") {
assert.True(t, p.Owned())
assert.NotNil(t, p.Owner)
assert.NotEqual(t, uuid.Nil, *p.Owner)
}
numShuffled = numShuffled || p.Number != uint(i)
}
assert.True(t, numShuffled)
internal/controller/generate_turn.go
+5 -5
View File
@@ -9,7 +9,7 @@ import (
"github.com/iliadenisov/galaxy/internal/model/report"
)
func MakeTurn(c *Controller, r Repo) error {
func (c *Controller) MakeTurn() error {
// Next turn
c.Cache.g.Turn += 1
c.Cache.g.Stage = 0
@@ -61,7 +61,7 @@ func MakeTurn(c *Controller, r Repo) error {
// Store bombings
bombingReport := make([]*report.Bombing, len(bombings))
if len(bombings) > 0 {
if err := r.SaveBombings(c.Cache.g.Turn, bombings); err != nil {
if err := c.Repo.SaveBombings(c.Cache.g.Turn, bombings); err != nil {
return err
}
for i := range bombings {
@@ -101,7 +101,7 @@ func MakeTurn(c *Controller, r Repo) error {
}
report := TransformBattle(c.Cache, b)
if err := r.SaveBattle(c.Cache.g.Turn, report, &battleMeta[i]); err != nil {
if err := c.Repo.SaveBattle(c.Cache.g.Turn, report, &battleMeta[i]); err != nil {
return err
}
battleReport[i] = report
@@ -112,12 +112,12 @@ func MakeTurn(c *Controller, r Repo) error {
c.Cache.DeleteKilledShipGroups()
// Store game state for the new turn and 'current' state as well
if err := r.SaveNewTurn(c.Cache.g.Turn, c.Cache.g); err != nil {
if err := c.Repo.SaveNewTurn(c.Cache.g.Turn, c.Cache.g); err != nil {
return err
}
for rep := range c.Cache.Report(c.Cache.g.Turn, battleReport, bombingReport) {
if err := r.SaveReport(c.Cache.g.Turn, rep); err != nil {
if err := c.Repo.SaveReport(c.Cache.g.Turn, rep); err != nil {
return err
}
}