Update geometry and bot number according to new rules

Author: g3force

config/ssl-game-controller.yaml

@@ -2,6 +2,7 @@ time-acquisition-mode: system
 network:
   publish-address: 224.5.23.1:10003
   vision-address: 224.5.23.2:10006
+  tracker-address: 224.5.23.2:10010
 server:
   auto-ref:
     address: :10007
@@ -16,7 +17,7 @@ server:
 game:
   state-store-file: state-store.json.stream
   yellow-card-duration: 2m
-  multiple-card-step: 3
+  multiple-card-step: 2
   multiple-foul-step: 3
   multiple-placement-failures: 5
   auto-ref-proposal-timeout: 5s
@@ -52,10 +53,10 @@ game:
     DIV_A:
       field-length: 12.0
       field-width: 9.0
-      defense-area-depth: 1.2
-      defense-area-width: 2.4
+      defense-area-depth: 1.8
+      defense-area-width: 3.6
       penalty-kick-dist-to-goal: 8.0
-      goal-width: 1.2
+      goal-width: 1.8
       placement-offset-touch-line: 0.2
       placement-offset-goal-line: 0.2
       placement-offset-goal-line-goal-kick: 1.0
@@ -72,5 +73,5 @@ game:
       placement-offset-goal-line-goal-kick: 1.0
       placement-offset-defense-area: 1.0
   max-bots:
-    DIV_A: 8
+    DIV_A: 11
     DIV_B: 6

internal/app/config/config.go

@@ -153,7 +153,7 @@ func DefaultControllerConfig() (c Controller) {
 	c.Game.StateStoreFile = "state-store.json.stream"
 	c.Game.YellowCardDuration = 2 * time.Minute
 	c.Game.TeamChoiceTimeout = 200 * time.Millisecond
-	c.Game.MultipleCardStep = 3
+	c.Game.MultipleCardStep = 2
 	c.Game.MultipleFoulStep = 3
 	c.Game.MultiplePlacementFailures = 5
 	c.Game.AutoRefProposalTimeout = 5 * time.Second
@@ -194,10 +194,10 @@ func DefaultControllerConfig() (c Controller) {
 	c.Game.DefaultGeometry[DivA] = Geometry{
 		FieldLength:                     12,
 		FieldWidth:                      9,
-		DefenseAreaDepth:                1.2,
-		DefenseAreaWidth:                2.4,
+		DefenseAreaDepth:                1.8,
+		DefenseAreaWidth:                3.6,
 		PenaltyKickDistToGoal:           8.0,
-		GoalWidth:                       1.2,
+		GoalWidth:                       1.8,
 		PlacementOffsetTouchLine:        0.2,
 		PlacementOffsetGoalLine:         0.2,
 		PlacementOffsetGoalLineGoalKick: 1.0,
@@ -216,7 +216,7 @@ func DefaultControllerConfig() (c Controller) {
 		PlacementOffsetDefenseArea:      1.0,
 	}
 
-	c.Game.MaxBots = map[Division]int32{DivA: 8, DivB: 6}
+	c.Game.MaxBots = map[Division]int32{DivA: 11, DivB: 6}
 
 	c.TimeAcquisitionMode = TimeAcquisitionModeSystem
 

internal/app/config/testdata/config.yaml

@@ -17,7 +17,7 @@ server:
 game:
   state-store-file: state-store.json.stream
   yellow-card-duration: 2m
-  multiple-card-step: 3
+  multiple-card-step: 2
   multiple-foul-step: 3
   multiple-placement-failures: 5
   auto-ref-proposal-timeout: 5s
@@ -53,10 +53,10 @@ game:
     DIV_A:
       field-length: 12.0
       field-width: 9.0
-      defense-area-depth: 1.2
-      defense-area-width: 2.4
+      defense-area-depth: 1.8
+      defense-area-width: 3.6
       penalty-kick-dist-to-goal: 8.0
-      goal-width: 1.2
+      goal-width: 1.8
       placement-offset-touch-line: 0.2
       placement-offset-goal-line: 0.2
       placement-offset-goal-line-goal-kick: 1.0
@@ -73,5 +73,5 @@ game:
       placement-offset-goal-line-goal-kick: 1.0
       placement-offset-defense-area: 1.0
   max-bots:
-    DIV_A: 8
+    DIV_A: 11
     DIV_B: 6

internal/app/statemachine/change_cards.go

@@ -6,7 +6,7 @@ import (
 )
 
 func (s *StateMachine) processChangeAddYellowCard(newState *state.State, change *AddYellowCard) (changes []*Change) {
-	if activeYellowCards(newState.TeamInfo(*change.ForTeam).YellowCards) >= 2 {
+	if activeYellowCards(newState.TeamInfo(*change.ForTeam).YellowCards) >= s.gameConfig.MultipleCardStep {
 		changes = append(changes, s.multipleYellowCardsChange(*change.ForTeam))
 	} else {
 		newState.TeamInfo(*change.ForTeam).AddYellowCard(s.gameConfig.YellowCardDuration, change.CausedByGameEvent)