Also reset geometry after game started

g3force · g3force · commit 4019524f8556 · 2021-06-22T19:38:28.000+02:00
diff --git a/internal/simctl/handler_geometry.go b/internal/simctl/handler_geometry.go
@@ -47,8 +47,8 @@ func (r *GeometryHandler) loadGeometry() {
 }
 
 func (r *GeometryHandler) handleGeometry() {
-	if *r.c.lastRefereeMsg.Stage != referee.Referee_NORMAL_FIRST_HALF_PRE {
-		// Only before the game starts
+	if *r.c.lastRefereeMsg.Command != referee.Referee_HALT {
+		// Only during HALT
 		return
 	}
 
@@ -57,7 +57,7 @@ func (r *GeometryHandler) handleGeometry() {
 		return
 	}
 
-	maxBots := *r.c.lastRefereeMsg.Yellow.MaxAllowedBots
+	maxBots := int(*r.c.lastRefereeMsg.Yellow.MaxAllowedBots) + len(r.c.lastRefereeMsg.Yellow.YellowCardTimes)
 	var geometry *vision.SSL_GeometryData
 	if maxBots == 6 {
 		geometry = r.geometryDivB

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ func (r *GeometryHandler) loadGeometry() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func (r *GeometryHandler) handleGeometry() {`
`50`		`- if *r.c.lastRefereeMsg.Stage != referee.Referee_NORMAL_FIRST_HALF_PRE {`
`51`		`- // Only before the game starts`
	`50`	`+ if *r.c.lastRefereeMsg.Command != referee.Referee_HALT {`
	`51`	`+ // Only during HALT`
`52`	`52`	`return`
`53`	`53`	`}`
`54`	`54`
`@@ -57,7 +57,7 @@ func (r *GeometryHandler) handleGeometry() {`
`57`	`57`	`return`
`58`	`58`	`}`
`59`	`59`
`60`		`- maxBots := *r.c.lastRefereeMsg.Yellow.MaxAllowedBots`
	`60`	`+ maxBots := int(*r.c.lastRefereeMsg.Yellow.MaxAllowedBots) + len(r.c.lastRefereeMsg.Yellow.YellowCardTimes)`
`61`	`61`	`var geometry *vision.SSL_GeometryData`
`62`	`62`	`if maxBots == 6 {`
`63`	`63`	`geometry = r.geometryDivB`