feat: gamemaster

game/internal/controller/command.go

@@ -19,6 +19,15 @@ func (c Controller) RaceID(actor string) (uuid.UUID, error) {
 	return c.Cache.g.Race[ri].ID, nil
 }
 
+func (c Controller) RaceBanish(actor string) error {
+	ri, err := c.Cache.validRace(actor)
+	if err != nil {
+		return err
+	}
+	c.Cache.g.Race[ri].Extinct = true
+	return nil
+}
+
 func (c Controller) RaceQuit(actor string) error {
 	ri, err := c.Cache.validRace(actor)
 	if err != nil {

game/internal/controller/controller.go

@@ -134,6 +134,14 @@ func ValidateOrder(configure func(*Param), actor string, cmd ...order.DecodableC
 	return ec.validateOrder(actor, cmd...)
 }
 
+func BanishRace(configure func(*Param), actor string) error {
+	ec, err := NewRepoController(configure)
+	if err != nil {
+		return err
+	}
+	return ec.banishRace(actor)
+}
+
 func GameState(configure func(*Param)) (s game.State, err error) {
 	ec, err := NewRepoController(configure)
 	if err != nil {
@@ -146,10 +154,11 @@ func GameState(configure func(*Param)) (s game.State, err error) {
 	}
 
 	result := &game.State{
-		ID:      g.ID,
-		Turn:    g.Turn,
-		Stage:   g.Stage,
-		Players: make([]game.PlayerState, len(g.Race)),
+		ID:       g.ID,
+		Turn:     g.Turn,
+		Stage:    g.Stage,
+		Finished: g.Finished(),
+		Players:  make([]game.PlayerState, len(g.Race)),
 	}
 
 	planetCount := make(map[uuid.UUID]uint)
@@ -243,6 +252,16 @@ func (ec *RepoController) executeCommand(consumer func(*Controller) error) (err
 	})
 }
 
+func (ec *RepoController) banishRace(actor string) (err error) {
+	return ec.executeLocked(func(c *Controller) error {
+		err = c.RaceBanish(actor)
+		if err != nil {
+			return err
+		}
+		return c.saveState()
+	})
+}
+
 func (ec *RepoController) executeSafe(consumer func(uint, *Controller) error) (err error) {
 	g, err := ec.Repo.LoadStateSafe()
 	if err != nil {

game/internal/controller/race.go

@@ -118,7 +118,7 @@ func (c *Cache) raceTechLevel(ri int, t game.Tech, v float64) {
 
 func (c *Cache) TurnWipeExtinctRaces() {
 	for i := range c.listRaceActingIdx() {
-		if c.g.Race[i].TTL == 0 {
+		if (c.g.Race[i].Extinct && c.g.Race[i].TTL > 0) || (!c.g.Race[i].Extinct && c.g.Race[i].TTL == 0) {
 			c.wipeRace(i)
 		}
 	}