[bugfix] Reset bot substitution trigger after first continuation

botSubstitution will be called after a tooManyRobots event, when trying
to continue the game. The GC does not know if the robots have been
substituted, so on the second continue trigger, it should go on with the
game.

Author: g3force

internal/app/controller/state.go

@@ -44,6 +44,7 @@ func (t Team) Known() bool {
 	return !t.Unknown()
 }
 
+// toProto converts the Team to a protobuf Team
 func (t Team) toProto() refproto.Team {
 	if t == TeamYellow {
 		return refproto.Team_YELLOW
@@ -53,6 +54,17 @@ func (t Team) toProto() refproto.Team {
 	return refproto.Team_UNKNOWN
 }
 
+// Is returns true, if the team is equal to given team, respecting unknown and both accordingly
+func (t Team) Is(team Team) bool {
+	if team == TeamUnknown {
+		return false
+	}
+	if t == TeamBoth {
+		return true
+	}
+	return t == team
+}
+
 // NewTeam creates a team from a protobuf team. Its either a single team or unknown. Not both.
 func NewTeam(team refproto.Team) Team {
 	if team == refproto.Team_YELLOW {
@@ -464,7 +476,10 @@ func (s State) BotSubstitutionIntend() Team {
 		if event.Type == GameEventTooManyRobots {
 			blue = blue || event.ByTeam() == TeamBlue
 			yellow = yellow || event.ByTeam() == TeamYellow
-			break
+		} else if event.Type == GameEventBotSubstitution {
+			// reset after a sub substitution event
+			blue = false
+			yellow = false
 		}
 	}
 

internal/app/controller/testdata/engine_test_gameevent_bot_substitution.yaml

@@ -0,0 +1,76 @@
+initialState:
+  stage: First Half
+  command: stop
+  division: DivA
+  gameEvents:
+    - type: ballLeftFieldGoalLine
+      details:
+        ballleftfieldgoalline:
+          byteam: 1 # Yellow
+          bybot: 0
+          location:
+            x: 6.0
+            y: 4.0
+transitions:
+  - event:
+      gameEvent:
+        type: tooManyRobots
+        details:
+          toomanyrobots:
+            byteam: 1 # Yellow
+    expectedStateDiff:
+      command: stop
+      nextCommand: direct
+      nextCommandFor: Blue
+      placementPos:
+        x: 5.8
+        y: 4.3
+      gameEvents:
+        - type: ballLeftFieldGoalLine
+          details:
+            ballleftfieldgoalline:
+              byteam: 1 # Yellow
+              bybot: 0
+              location:
+                x: 6.0
+                y: 4.0
+        - type: tooManyRobots
+          details:
+            toomanyrobots:
+              byteam: 1 # Yellow
+  - event:
+      trigger:
+        type: continue
+    expectedStateDiff:
+      command: halt
+      placementPos:
+        x: 5.8
+        y: 4.3
+      gameEvents:
+        - type: ballLeftFieldGoalLine
+          details:
+            ballleftfieldgoalline:
+              byteam: 1 # Yellow
+              bybot: 0
+              location:
+                x: 6.0
+                y: 4.0
+        - type: tooManyRobots
+          details:
+            toomanyrobots:
+              byteam: 1 # Yellow
+        - type: botSubstitution
+          details:
+            botsubstitution:
+              byteam: 1 # Yellow
+  - event:
+      trigger:
+        type: continue
+    expectedStateDiff:
+      command: direct
+      commandFor: Blue
+      nextCommand: ""
+      nextCommandFor: ""
+      gameEvents: []
+      currentActionDeadline: "2010-01-01T00:00:05Z"
+      currentActionTimeRemaining: 5s