[rules] Add new division-specific timeout times to config

Author: g3force

config/ssl-game-controller.yaml

@@ -21,10 +21,13 @@ game:
   multiple-placement-failures: 5
   auto-ref-proposal-timeout: 5s
   default-division: DIV_A
-  free-kick-time:
+  prepare-timeout: 10s
+  free-kick-timeout:
+    DIV_A: 5s
+    DIV_B: 10s
+  no-progress-timeout:
     DIV_A: 5s
     DIV_B: 10s
-  general-time: 10s
   ball-placement-time: 30s
   ball-placement-time-top-up: 10s
   normal:

internal/app/config/config.go

@@ -45,8 +45,9 @@ type Game struct {
 	MultiplePlacementFailures int32                      `yaml:"multiple-placement-failures"`
 	MaxBots                   map[Division]int32         `yaml:"max-bots"`
 	AutoRefProposalTimeout    time.Duration              `yaml:"auto-ref-proposal-timeout"`
-	FreeKickTime              map[Division]time.Duration `yaml:"free-kick-time"`
-	GeneralTime               time.Duration              `yaml:"general-time"`
+	PrepareTimeout            time.Duration              `yaml:"prepare-timeout"`
+	FreeKickTimeout           map[Division]time.Duration `yaml:"free-kick-timeout"`
+	NoProgressTimeout         map[Division]time.Duration `yaml:"no-progress-timeout"`
 	BallPlacementTime         time.Duration              `yaml:"ball-placement-time"`
 	BallPlacementTimeTopUp    time.Duration              `yaml:"ball-placement-time-top-up"`
 	StateStoreFile            string                     `yaml:"state-store-file"`
@@ -148,8 +149,9 @@ func DefaultControllerConfig() (c Controller) {
 	c.Game.MultipleFoulStep = 3
 	c.Game.MultiplePlacementFailures = 5
 	c.Game.AutoRefProposalTimeout = 5 * time.Second
-	c.Game.GeneralTime = time.Second * 10
-	c.Game.FreeKickTime = map[Division]time.Duration{DivA: time.Second * 5, DivB: time.Second * 10}
+	c.Game.PrepareTimeout = time.Second * 10
+	c.Game.FreeKickTimeout = map[Division]time.Duration{DivA: time.Second * 5, DivB: time.Second * 10}
+	c.Game.NoProgressTimeout = map[Division]time.Duration{DivA: time.Second * 5, DivB: time.Second * 10}
 	c.Game.BallPlacementTime = time.Second * 30
 	c.Game.BallPlacementTimeTopUp = time.Second * 10
 

internal/app/config/testdata/config.yaml

@@ -21,10 +21,13 @@ game:
   multiple-placement-failures: 5
   auto-ref-proposal-timeout: 5s
   default-division: DIV_A
-  free-kick-time:
+  prepare-timeout: 10s
+  free-kick-timeout:
+    DIV_A: 5s
+    DIV_B: 10s
+  no-progress-timeout:
     DIV_A: 5s
     DIV_B: 10s
-  general-time: 10s
   ball-placement-time: 30s
   ball-placement-time-top-up: 10s
   normal:

internal/app/statemachine/change_command.go

@@ -13,9 +13,9 @@ func (s *StateMachine) NewCommand(newState *state.State, newCommand *NewCommand)
 	case state.Command_BALL_PLACEMENT:
 		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.BallPlacementTime)
 	case state.Command_DIRECT, state.Command_INDIRECT:
-		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.FreeKickTime[newState.Division.Div()])
+		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.FreeKickTimeout[newState.Division.Div()])
 	case state.Command_KICKOFF, state.Command_PENALTY:
-		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.GeneralTime)
+		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.PrepareTimeout)
 	case state.Command_TIMEOUT:
 		*newState.TeamInfo(*newState.Command.ForTeam).TimeoutsLeft--
 	}

internal/app/statemachine/change_gameevent.go

@@ -143,7 +143,7 @@ func (s *StateMachine) AddGameEvent(newState *state.State, change *AddGameEvent)
 	// defender too close to kick point
 	if *gameEvent.Type == state.GameEvent_DEFENDER_TOO_CLOSE_TO_KICK_POINT {
 		log.Printf("Reset current action time because defender of team %v was too close to kick point", byTeam)
-		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.GeneralTime)
+		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.PrepareTimeout)
 	}
 
 	// stop the game if needed

internal/app/statemachine/statemachine_test.go

@@ -35,7 +35,7 @@ func Test_Statemachine(t *testing.T) {
 				}},
 			wantNewState: func(s *state.State) {
 				s.Command = state.NewCommand(state.Command_DIRECT, state.Team_BLUE)
-				s.CurrentActionTimeRemaining = ptypes.DurationProto(gameConfig.FreeKickTime[config.DivA])
+				s.CurrentActionTimeRemaining = ptypes.DurationProto(gameConfig.FreeKickTimeout[config.DivA])
 			},
 		},
 		{