Suggest timeout, substitution, etc. during HALT before resume

Author: g3force

internal/app/engine/process_continue_next_action.go

@@ -71,27 +71,12 @@ func (e *Engine) nextActions() (actions []*ContinueAction, hints []*ContinueHint
 	}
 
 	if *e.currentState.Command.Type == state.Command_STOP || *e.currentState.Command.Type == state.Command_HALT {
-		newActions, newHints := e.actionsToContinueFromStop()
+		newActions, newHints := e.actionsDuringHaltAndStop()
 		actions = append(actions, newActions...)
 		hints = append(hints, newHints...)
-	} else {
-		// reset random placing team
-		e.randomPlacingTeam = state.Team_UNKNOWN
 	}
 
 	if *e.currentState.Command.Type == state.Command_HALT {
-		// disable continue actions that can't be used after halt
-		for _, action := range actions {
-			switch *action.Type {
-			case
-				ContinueAction_FORCE_START,
-				ContinueAction_FREE_KICK,
-				ContinueAction_NEXT_COMMAND,
-				ContinueAction_BALL_PLACEMENT_START:
-				*action.State = ContinueAction_DISABLED
-			}
-		}
-
 		continueFromHalt := createContinueAction(
 			ContinueAction_RESUME_FROM_HALT,
 			state.Team_UNKNOWN,
@@ -107,13 +92,36 @@ func (e *Engine) nextActions() (actions []*ContinueAction, hints []*ContinueHint
 			*continueFromHalt.State = ContinueAction_DISABLED
 		}
 
-		actions = append([]*ContinueAction{continueFromHalt}, actions...)
+		actions = append(actions, continueFromHalt)
+	}
+
+	if *e.currentState.Command.Type == state.Command_STOP || *e.currentState.Command.Type == state.Command_HALT {
+		newActions, newHints := e.actionsToContinueFromStop()
+		actions = append(actions, newActions...)
+		hints = append(hints, newHints...)
+	} else {
+		// reset random placing team
+		e.randomPlacingTeam = state.Team_UNKNOWN
+	}
+
+	if *e.currentState.Command.Type == state.Command_HALT {
+		// disable continue actions that can't be used after halt
+		for _, action := range actions {
+			switch *action.Type {
+			case
+				ContinueAction_FORCE_START,
+				ContinueAction_FREE_KICK,
+				ContinueAction_NEXT_COMMAND,
+				ContinueAction_BALL_PLACEMENT_START:
+				*action.State = ContinueAction_DISABLED
+			}
+		}
 	}
 
 	return
 }
 
-func (e *Engine) actionsToContinueFromStop() (actions []*ContinueAction, hints []*ContinueHint) {
+func (e *Engine) actionsDuringHaltAndStop() (actions []*ContinueAction, hints []*ContinueHint) {
 	for _, team := range state.BothTeams() {
 		if e.currentState.GameState.IsHalted() &&
 			e.currentState.HasGameEventByTeam(state.GameEvent_POSSIBLE_GOAL, team) &&
@@ -191,7 +199,10 @@ func (e *Engine) actionsToContinueFromStop() (actions []*ContinueAction, hints [
 			ContinueAction_READY_MANUAL,
 		))
 	}
+	return actions, hints
+}
 
+func (e *Engine) actionsToContinueFromStop() (actions []*ContinueAction, hints []*ContinueHint) {
 	if e.ballPlacementRequired() {
 		placingTeam := e.ballPlacementTeam()
 		if placingTeam.Known() {