Only raise TOO_MANY_ROBOTS game event while running

Author: g3force

internal/app/engine/engine.go

@@ -34,6 +34,7 @@ type Engine struct {
 	mutex                    sync.Mutex
 	noProgressDetector       NoProgressDetector
 	ballPlacementCoordinator BallPlacementCoordinator
+	botNumberProcessor       BotNumberProcessor
 	tickChanProvider         func() <-chan time.Time
 }
 
@@ -59,6 +60,7 @@ func NewEngine(gameConfig config.Game, engineConfig config.Engine) (e *Engine) {
 	e.trackerLastUpdate = map[string]time.Time{}
 	e.noProgressDetector = NoProgressDetector{gcEngine: e}
 	e.ballPlacementCoordinator = BallPlacementCoordinator{gcEngine: e}
+	e.botNumberProcessor = BotNumberProcessor{gcEngine: e}
 	e.tickChanProvider = func() <-chan time.Time {
 		return time.After(25 * time.Millisecond)
 	}

internal/app/engine/process_botremoved.go

@@ -7,13 +7,32 @@ import (
 	"time"
 )
 
-func (e *Engine) processBotNumber() {
-	if !e.IsGameEventEnabled(state.GameEvent_TOO_MANY_ROBOTS) {
+type BotNumberProcessor struct {
+	gcEngine *Engine
+	lastTime *time.Time
+}
+
+func (p *BotNumberProcessor) processBotNumber() {
+
+	if !p.gcEngine.currentState.Command.IsRunning() ||
+		!p.gcEngine.IsGameEventEnabled(state.GameEvent_TOO_MANY_ROBOTS) {
+		p.lastTime = nil
+		return
+	}
+
+	if p.lastTime == nil {
+		p.lastTime = new(time.Time)
+		*p.lastTime = p.gcEngine.timeProvider()
+		return
+	}
+
+	timeSinceLastProgress := p.gcEngine.timeProvider().Sub(*p.lastTime)
+	if timeSinceLastProgress < 2*time.Second {
 		return
 	}
 
 	for _, team := range state.BothTeams() {
-		e.processBotNumberPerTeam(team)
+		p.gcEngine.processBotNumberPerTeam(team)
 	}
 }
 

internal/app/engine/process_tick.go

@@ -60,7 +60,7 @@ func (e *Engine) processTick() {
 	e.noProgressDetector.process()
 	e.ballPlacementCoordinator.process()
 	e.processContinue()
-	e.processBotNumber()
+	e.botNumberProcessor.processBotNumber()
 	e.processPenalty()
 	e.processProposals()
 	e.processTrackerSources()