Reduce robot count to 2 in shootout

g3force · g3force · commit 3feed9df6f8e · 2021-06-23T13:03:06.000+02:00
diff --git a/internal/simctl/handler_robot_count.go b/internal/simctl/handler_robot_count.go
@@ -55,8 +55,17 @@ func (r *RobotCountHandler) handleRobotCount() {
 		}
 	}
 
-	r.updateRobotCount(blueRobots, int(*r.c.lastRefereeMsg.Blue.MaxAllowedBots), referee.Team_BLUE)
-	r.updateRobotCount(yellowRobots, int(*r.c.lastRefereeMsg.Yellow.MaxAllowedBots), referee.Team_YELLOW)
+	maxBlueRobots := int(*r.c.lastRefereeMsg.Blue.MaxAllowedBots)
+	maxYellowRobots := int(*r.c.lastRefereeMsg.Blue.MaxAllowedBots)
+
+	switch *r.c.lastRefereeMsg.Stage {
+	case referee.Referee_PENALTY_SHOOTOUT, referee.Referee_PENALTY_SHOOTOUT_BREAK:
+		maxBlueRobots = 2
+		maxYellowRobots = 2
+	}
+
+	r.updateRobotCount(blueRobots, maxBlueRobots, referee.Team_BLUE)
+	r.updateRobotCount(yellowRobots, maxYellowRobots, referee.Team_YELLOW)
 }
 
 func (r *RobotCountHandler) updateRobotCount(robots []*tracker.TrackedRobot, maxRobots int, team referee.Team) {

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,17 @@ func (r *RobotCountHandler) handleRobotCount() {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- r.updateRobotCount(blueRobots, int(*r.c.lastRefereeMsg.Blue.MaxAllowedBots), referee.Team_BLUE)`
`59`		`- r.updateRobotCount(yellowRobots, int(*r.c.lastRefereeMsg.Yellow.MaxAllowedBots), referee.Team_YELLOW)`
	`58`	`+ maxBlueRobots := int(*r.c.lastRefereeMsg.Blue.MaxAllowedBots)`
	`59`	`+ maxYellowRobots := int(*r.c.lastRefereeMsg.Blue.MaxAllowedBots)`
	`60`	`+`
	`61`	`+ switch *r.c.lastRefereeMsg.Stage {`
	`62`	`+ case referee.Referee_PENALTY_SHOOTOUT, referee.Referee_PENALTY_SHOOTOUT_BREAK:`
	`63`	`+ maxBlueRobots = 2`
	`64`	`+ maxYellowRobots = 2`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ r.updateRobotCount(blueRobots, maxBlueRobots, referee.Team_BLUE)`
	`68`	`+ r.updateRobotCount(yellowRobots, maxYellowRobots, referee.Team_YELLOW)`
`60`	`69`	`}`
`61`	`70`
`62`	`71`	`func (r RobotCountHandler) updateRobotCount(robots []tracker.TrackedRobot, maxRobots int, team referee.Team) {`