Feature: Handle disabled game events

Author: g3force

internal/app/engine/engine.go

@@ -64,6 +64,14 @@ func NewEngine(gameConfig config.Game, engineConfig config.Engine) (e *Engine) {
 
 // Enqueue adds the change to the change queue
 func (e *Engine) Enqueue(change *statemachine.Change) {
+	if change.GetAddGameEvent() != nil {
+		for t, b := range e.config.GameEventBehavior {
+			if b == Config_GAME_EVENT_BEHAVIOR_OFF && change.GetAddGameEvent().GameEvent.Type.String() == t {
+				// disabled game event
+				return
+			}
+		}
+	}
 	if change.Revertible == nil {
 		change.Revertible = new(bool)
 		// Assume that changes from outside are by default revertible, except if the flag is already set
@@ -306,3 +314,8 @@ func (e *Engine) UpdateConfig(delta *Config) {
 		log.Printf("Could not write engine config: %v", err)
 	}
 }
+
+// IsGameEventEnabled returns true, if the game event type is not disabled
+func (e *Engine) IsGameEventEnabled(evenType state.GameEvent_Type) bool {
+	return e.config.GameEventBehavior[evenType.String()] != Config_GAME_EVENT_BEHAVIOR_OFF
+}

internal/app/engine/process_botremoved.go

@@ -8,6 +8,10 @@ import (
 )
 
 func (e *Engine) processBotNumber() {
+	if !e.IsGameEventEnabled(state.GameEvent_TOO_MANY_ROBOTS) {
+		return
+	}
+
 	for _, team := range state.BothTeams() {
 		e.processBotNumberPerTeam(team)
 	}

internal/app/engine/process_noprogress.go

@@ -45,9 +45,8 @@ func (d *NoProgressDetector) process() {
 	if timeSinceLastProgress > d.gcEngine.gameConfig.NoProgressTimeout[d.gcEngine.currentState.Division.Div()] {
 		duration := float32(timeSinceLastProgress.Seconds())
 		location := d.gcEngine.gcState.TrackerStateGc.Ball.Pos.ToVector2()
-		for _, team := range state.BothTeams() {
-			defenseArea := geom.NewDefenseArea(d.gcEngine.getGeometry(), *d.gcEngine.currentState.TeamState[team.String()].OnPositiveHalf)
-			if defenseArea.IsPointInside(d.gcEngine.gcState.TrackerStateGc.Ball.Pos.ToVector2()) {
+		if d.gcEngine.IsGameEventEnabled(state.GameEvent_KEEPER_HELD_BALL) {
+			if ok, team := d.isBallInAnyDefenseArea(); ok {
 				d.gcEngine.Enqueue(createGameEventChange(state.GameEvent_KEEPER_HELD_BALL, state.GameEvent{
 					Event: &state.GameEvent_KeeperHeldBall_{
 						KeeperHeldBall: &state.GameEvent_KeeperHeldBall{
@@ -60,13 +59,25 @@ func (d *NoProgressDetector) process() {
 				return
 			}
 		}
-		d.gcEngine.Enqueue(createGameEventChange(state.GameEvent_NO_PROGRESS_IN_GAME, state.GameEvent{
-			Event: &state.GameEvent_NoProgressInGame_{
-				NoProgressInGame: &state.GameEvent_NoProgressInGame{
-					Location: location,
-					Time:     &duration,
+		if d.gcEngine.IsGameEventEnabled(state.GameEvent_NO_PROGRESS_IN_GAME) {
+			d.gcEngine.Enqueue(createGameEventChange(state.GameEvent_NO_PROGRESS_IN_GAME, state.GameEvent{
+				Event: &state.GameEvent_NoProgressInGame_{
+					NoProgressInGame: &state.GameEvent_NoProgressInGame{
+						Location: location,
+						Time:     &duration,
+					},
 				},
-			},
-		}))
+			}))
+		}
+	}
+}
+
+func (d *NoProgressDetector) isBallInAnyDefenseArea() (bool, state.Team) {
+	for _, team := range state.BothTeams() {
+		defenseArea := geom.NewDefenseArea(d.gcEngine.getGeometry(), *d.gcEngine.currentState.TeamState[team.String()].OnPositiveHalf)
+		if defenseArea.IsPointInside(d.gcEngine.gcState.TrackerStateGc.Ball.Pos.ToVector2()) {
+			return true, team
+		}
 	}
+	return false, state.Team_UNKNOWN
 }