[feature] Move steps/boundaries of multiple* events to config

Author: g3force

config/ssl-game-controller.yaml

@@ -9,6 +9,9 @@ server:
     trusted-keys-dir: config/trusted_keys/team
 game:
   yellow-card-duration: 2m
+  multiple-card-step: 3
+  multiple-foul-step: 3
+  multiple-placement-failures: 5
   default-division: DivA
   normal:
     half-duration: 5m

internal/app/controller/config.go

@@ -29,12 +29,15 @@ type ConfigGeometry struct {
 
 // ConfigGame holds configs that are valid for the whole game
 type ConfigGame struct {
-	YellowCardDuration time.Duration                `yaml:"yellow-card-duration"`
-	DefaultDivision    Division                     `yaml:"default-division"`
-	Normal             ConfigSpecial                `yaml:"normal"`
-	Overtime           ConfigSpecial                `yaml:"overtime"`
-	TeamChoiceTimeout  time.Duration                `yaml:"team-choice-timeout"`
-	DefaultGeometry    map[Division]*ConfigGeometry `yaml:"default-geometry"`
+	YellowCardDuration        time.Duration                `yaml:"yellow-card-duration"`
+	DefaultDivision           Division                     `yaml:"default-division"`
+	Normal                    ConfigSpecial                `yaml:"normal"`
+	Overtime                  ConfigSpecial                `yaml:"overtime"`
+	TeamChoiceTimeout         time.Duration                `yaml:"team-choice-timeout"`
+	DefaultGeometry           map[Division]*ConfigGeometry `yaml:"default-geometry"`
+	MultipleCardStep          int                          `yaml:"multiple-card-step"`
+	MultipleFoulStep          int                          `yaml:"multiple-foul-step"`
+	MultiplePlacementFailures int                          `yaml:"multiple-placement-failures"`
 }
 
 // ConfigPublish holds configs for publishing the state and commands to the teams
@@ -94,6 +97,9 @@ func LoadConfig(fileName string) (config Config, err error) {
 func DefaultConfig() (c Config) {
 	c.Publish.Address = "224.5.23.1:10003"
 	c.Game.YellowCardDuration = 2 * time.Minute
+	c.Game.MultipleCardStep = 3
+	c.Game.MultipleFoulStep = 3
+	c.Game.MultiplePlacementFailures = 5
 
 	c.Game.Normal.HalfDuration = 5 * time.Minute
 	c.Game.Normal.HalfTimeDuration = 5 * time.Minute

internal/app/controller/engine.go

@@ -590,7 +590,7 @@ func (e *Engine) processGameEvent(event *GameEvent) error {
 }
 
 func (e *Engine) FoulCounterIncremented(team Team) {
-	if e.State.TeamState[team].FoulCounter%3 == 0 {
+	if e.State.TeamState[team].FoulCounter%e.config.MultipleFoulStep == 0 {
 		teamProto := team.toProto()
 		event := GameEvent{Type: GameEventMultipleFouls,
 			Details: GameEventDetails{MultipleFouls: &refproto.GameEvent_MultipleFouls{ByTeam: &teamProto}}}
@@ -602,7 +602,7 @@ func (e *Engine) FoulCounterIncremented(team Team) {
 
 func (e *Engine) CardNumberIncremented(team Team) {
 	cards := e.State.TeamState[team].YellowCards + e.State.TeamState[team].RedCards
-	if cards%3 == 0 {
+	if cards%e.config.MultipleCardStep == 0 {
 		teamProto := team.toProto()
 		event := GameEvent{Type: GameEventMultipleCards,
 			Details: GameEventDetails{MultipleCards: &refproto.GameEvent_MultipleCards{ByTeam: &teamProto}}}
@@ -613,7 +613,7 @@ func (e *Engine) CardNumberIncremented(team Team) {
 }
 
 func (e *Engine) PlacementFailuresIncremented(team Team) {
-	if e.State.TeamState[team].BallPlacementFailures >= 5 {
+	if e.State.TeamState[team].BallPlacementFailures >= e.config.MultiplePlacementFailures {
 		teamProto := team.toProto()
 		event := GameEvent{Type: GameEventMultiplePlacementFailures,
 			Details: GameEventDetails{MultiplePlacementFailures: &refproto.GameEvent_MultiplePlacementFailures{ByTeam: &teamProto}}}