bugfix: No proposal/majority for GC internal game events

Some events assume they get applied and will be thrown repeatedly otherwise.

Author: g3force

config/engine.yaml

@@ -13,27 +13,18 @@
     "BOT_INTERFERED_PLACEMENT": "BEHAVIOR_ACCEPT",
     "BOT_KICKED_BALL_TOO_FAST": "BEHAVIOR_ACCEPT",
     "BOT_PUSHED_BOT": "BEHAVIOR_ACCEPT",
-    "BOT_SUBSTITUTION": "BEHAVIOR_ACCEPT",
     "BOT_TIPPED_OVER": "BEHAVIOR_ACCEPT",
     "BOT_TOO_FAST_IN_STOP": "BEHAVIOR_ACCEPT",
     "BOUNDARY_CROSSING": "BEHAVIOR_ACCEPT",
-    "CHALLENGE_FLAG": "BEHAVIOR_ACCEPT",
     "DEFENDER_IN_DEFENSE_AREA": "BEHAVIOR_ACCEPT",
     "DEFENDER_TOO_CLOSE_TO_KICK_POINT": "BEHAVIOR_ACCEPT",
-    "EMERGENCY_STOP": "BEHAVIOR_ACCEPT",
     "GOAL": "BEHAVIOR_ACCEPT",
     "INVALID_GOAL": "BEHAVIOR_ACCEPT",
     "KEEPER_HELD_BALL": "BEHAVIOR_ACCEPT",
-    "MULTIPLE_CARDS": "BEHAVIOR_ACCEPT",
-    "MULTIPLE_FOULS": "BEHAVIOR_ACCEPT",
     "NO_PROGRESS_IN_GAME": "BEHAVIOR_ACCEPT",
     "PENALTY_KICK_FAILED": "BEHAVIOR_ACCEPT",
-    "PLACEMENT_FAILED": "BEHAVIOR_ACCEPT",
     "PLACEMENT_SUCCEEDED": "BEHAVIOR_ACCEPT",
-    "POSSIBLE_GOAL": "BEHAVIOR_ACCEPT",
-    "TOO_MANY_ROBOTS": "BEHAVIOR_ACCEPT",
-    "UNSPORTING_BEHAVIOR_MAJOR": "BEHAVIOR_ACCEPT",
-    "UNSPORTING_BEHAVIOR_MINOR": "BEHAVIOR_ACCEPT"
+    "POSSIBLE_GOAL": "BEHAVIOR_ACCEPT"
   },
   "autoRefConfigs": {
   }

internal/app/engine/config.go

@@ -13,7 +13,7 @@ import (
 func DefaultConfig() (c Config) {
 	c.AutoRefConfigs = map[string]*AutoRefConfig{}
 	c.GameEventBehavior = map[string]Config_Behavior{}
-	for _, event := range state.AllGameEvents() {
+	for _, event := range state.GameEventsForBehaviorConfig() {
 		c.GameEventBehavior[event.String()] = Config_BEHAVIOR_ACCEPT
 	}
 	return

internal/app/engine/engine.go

@@ -84,7 +84,7 @@ func (e *Engine) filterGameEvent(change *statemachine.Change) *statemachine.Chan
 	gameEvent := change.GetAddGameEvent().GameEvent
 	behavior := e.config.GameEventBehavior[gameEvent.Type.String()]
 	switch behavior {
-	case Config_BEHAVIOR_ACCEPT:
+	case Config_BEHAVIOR_ACCEPT, Config_BEHAVIOR_UNKNOWN:
 		return change
 	case Config_BEHAVIOR_ACCEPT_MAJORITY, Config_BEHAVIOR_PROPOSE_ONLY:
 		timestamp, _ := ptypes.TimestampProto(e.timeProvider())
@@ -110,8 +110,6 @@ func (e *Engine) filterGameEvent(change *statemachine.Change) *statemachine.Chan
 		}
 	case Config_BEHAVIOR_IGNORE:
 		log.Printf("Ignoring game event: %v", *gameEvent)
-	case Config_BEHAVIOR_UNKNOWN:
-		log.Printf("Behavior for event %v unknown", *gameEvent.Type)
 	}
 	return nil
 }

internal/app/engine/proposals.go

@@ -36,7 +36,7 @@ func (e *Engine) EnqueueGameEvent(gameEvent *state.GameEvent) {
 				},
 			},
 		})
-	case AutoRefConfig_BEHAVIOR_ACCEPT:
+	case AutoRefConfig_BEHAVIOR_ACCEPT, AutoRefConfig_BEHAVIOR_UNKNOWN:
 		e.Enqueue(&statemachine.Change{
 			Origin: &changeOriginEngine,
 			Change: &statemachine.Change_AddGameEvent{

internal/app/rcon/server_autoref.go

@@ -92,7 +92,7 @@ func (s *AutoRefServer) handleClientConnection(conn net.Conn) {
 	if _, ok := s.gcEngine.GetConfig().AutoRefConfigs[client.id]; !ok {
 		cfg := new(engine.AutoRefConfig)
 		cfg.GameEventBehavior = map[string]engine.AutoRefConfig_Behavior{}
-		for _, event := range state.AllGameEvents() {
+		for _, event := range state.GameEventsForBehaviorConfig() {
 			cfg.GameEventBehavior[event.String()] = engine.AutoRefConfig_BEHAVIOR_ACCEPT
 		}
 		s.gcEngine.UpdateConfig(&engine.Config{

internal/app/state/gameevent.go

@@ -44,25 +44,40 @@ func (m GameEvent) SetByTeam(team Team) {
 	return
 }
 
-// AllGameEvents returns a list with all known game event types
-func AllGameEvents() (a []GameEvent_Type) {
+// GameEventsForBehaviorConfig returns a list with all game event types that should have configurable behavior
+func GameEventsForBehaviorConfig() (a []GameEvent_Type) {
 	for t := range GameEvent_Type_name {
 		eventType := GameEvent_Type(t)
 		switch eventType {
-		case GameEvent_UNKNOWN_GAME_EVENT_TYPE,
-			GameEvent_PREPARED,
-			GameEvent_INDIRECT_GOAL,
-			GameEvent_CHIPPED_GOAL,
-			GameEvent_KICK_TIMEOUT,
-			GameEvent_ATTACKER_TOUCHED_OPPONENT_IN_DEFENSE_AREA,
-			GameEvent_ATTACKER_TOUCHED_OPPONENT_IN_DEFENSE_AREA_SKIPPED,
-			GameEvent_BOT_CRASH_UNIQUE_SKIPPED,
-			GameEvent_BOT_PUSHED_BOT_SKIPPED,
-			GameEvent_DEFENDER_IN_DEFENSE_AREA_PARTIALLY,
-			GameEvent_MULTIPLE_PLACEMENT_FAILURES:
-			// ignore
-		default:
+		case
+			GameEvent_BALL_LEFT_FIELD_TOUCH_LINE,
+			GameEvent_BALL_LEFT_FIELD_GOAL_LINE,
+			GameEvent_AIMLESS_KICK,
+			GameEvent_ATTACKER_TOO_CLOSE_TO_DEFENSE_AREA,
+			GameEvent_DEFENDER_IN_DEFENSE_AREA,
+			GameEvent_BOUNDARY_CROSSING,
+			GameEvent_KEEPER_HELD_BALL,
+			GameEvent_BOT_DRIBBLED_BALL_TOO_FAR,
+			GameEvent_BOT_PUSHED_BOT,
+			GameEvent_BOT_HELD_BALL_DELIBERATELY,
+			GameEvent_BOT_TIPPED_OVER,
+			GameEvent_ATTACKER_TOUCHED_BALL_IN_DEFENSE_AREA,
+			GameEvent_BOT_KICKED_BALL_TOO_FAST,
+			GameEvent_BOT_CRASH_UNIQUE,
+			GameEvent_BOT_CRASH_DRAWN,
+			GameEvent_DEFENDER_TOO_CLOSE_TO_KICK_POINT,
+			GameEvent_BOT_TOO_FAST_IN_STOP,
+			GameEvent_BOT_INTERFERED_PLACEMENT,
+			GameEvent_POSSIBLE_GOAL,
+			GameEvent_GOAL,
+			GameEvent_INVALID_GOAL,
+			GameEvent_ATTACKER_DOUBLE_TOUCHED_BALL,
+			GameEvent_PLACEMENT_SUCCEEDED,
+			GameEvent_PENALTY_KICK_FAILED,
+			GameEvent_NO_PROGRESS_IN_GAME:
 			a = append(a, eventType)
+		default:
+			// ignore
 		}
 	}
 	return