[feature] Add autoContinue option, continue automatically if enabled

Author: g3force

internal/app/controller/controller.go

@@ -70,11 +70,6 @@ func (c *GameController) ProcessAutoRefRequests(request refproto.AutoRefToContro
 		event := Event{GameEvent: &GameEvent{Type: gameEventType, Details: details}}
 		c.OnNewEvent(event)
 	}
-	if request.State != nil {
-		if *request.State == refproto.AutoRefToControllerRequest_READY_TO_CONTINUE {
-			c.Engine.Continue()
-		}
-	}
 
 	return nil
 }

internal/app/controller/engine.go

@@ -332,14 +332,23 @@ func (e *Engine) processModify(m *EventModifyValue) error {
 	if m.Division != nil {
 		if *m.Division == DivA || *m.Division == DivB {
 			e.State.Division = *m.Division
-			log.Printf("Processed modification %v", m)
-			return nil
 		} else {
-			return errors.Errorf("Invalid divsion: %v", *m.Division)
+			return errors.Errorf("Invalid division: %v", *m.Division)
 		}
+	} else if m.AutoContinue != nil {
+		e.State.AutoContinue = *m.AutoContinue
+		if e.State.AutoContinue {
+			e.Continue()
+		}
+	} else if err := e.processTeamModify(m); err != nil {
+		return err
 	}
 
-	// process team-dependent modifies
+	log.Printf("Processed %v", m)
+	return nil
+}
+
+func (e *Engine) processTeamModify(m *EventModifyValue) error {
 	if m.ForTeam.Unknown() {
 		return errors.Errorf("Unknown team: %v", m.ForTeam)
 	}
@@ -390,7 +399,6 @@ func (e *Engine) processModify(m *EventModifyValue) error {
 	} else {
 		return errors.Errorf("Unknown modify: %v", m)
 	}
-	log.Printf("Processed %v", m)
 	return nil
 }
 
@@ -593,6 +601,8 @@ func (e *Engine) processGameEvent(event *GameEvent) error {
 		} else if e.State.GameState() != GameStateStopped {
 			e.SendCommand(CommandStop, "")
 		}
+	} else if e.State.AutoContinue && event.IsContinueGame() {
+		e.Continue()
 	}
 
 	log.Printf("Processed game event %v", event)

internal/app/controller/events.go

@@ -105,10 +105,16 @@ type EventModifyValue struct {
 	BallPlacementFailures *int                 `json:"ballPlacementFailures"`
 	CanPlaceBall          *bool                `json:"canPlaceBall"`
 	Division              *Division            `json:"division"`
+	AutoContinue          *bool                `json:"autoContinue"`
 }
 
 func (m EventModifyValue) String() string {
-	str := fmt.Sprintf("modify for %v:", m.ForTeam)
+	str := "modify"
+	if m.ForTeam != TeamUnknown {
+		str += fmt.Sprintf(" for team %v:", m.ForTeam)
+	} else {
+		str += ":"
+	}
 	if m.Goals != nil {
 		return fmt.Sprintf("%v Goals=%v", str, *m.Goals)
 	}
@@ -148,6 +154,9 @@ func (m EventModifyValue) String() string {
 	if m.Division != nil {
 		return fmt.Sprintf("%v Division=%v", str, *m.Division)
 	}
+	if m.AutoContinue != nil {
+		return fmt.Sprintf("%v AutoContinue=%v", str, *m.AutoContinue)
+	}
 	return fmt.Sprintf("%v undefined", str)
 }
 

internal/app/controller/gameEvent.go

@@ -144,6 +144,16 @@ func (e GameEvent) IsContinued() bool {
 	return false
 }
 
+// IsContinueGame checks if the game event should trigger continuing the game based on the current primary event
+func (e GameEvent) IsContinueGame() bool {
+	switch e.Type {
+	case GameEventPlacementSucceeded,
+		GameEventPrepared:
+		return true
+	}
+	return false
+}
+
 func (e GameEvent) ToProto() *refproto.GameEvent {
 	protoEvent := new(refproto.GameEvent)
 	switch e.Type {

internal/app/controller/state.go

@@ -256,6 +256,7 @@ type State struct {
 	TeamState        map[Team]*TeamInfo `json:"teamState"`
 	Division         Division           `json:"division"`
 	PlacementPos     *Location          `json:"placementPos"`
+	AutoContinue     bool               `json:"autoContinue"`
 }
 
 // NewState creates a new state, initialized for the start of a new game
@@ -278,6 +279,7 @@ func NewState() (s *State) {
 	s.TeamState[TeamBlue].OnPositiveHalf = !s.TeamState[TeamYellow].OnPositiveHalf
 
 	s.Division = DivA
+	s.AutoContinue = true
 
 	return
 }