[feature] Add division switch

Author: g3force

config/ssl-game-controller.yaml

@@ -1,16 +1,17 @@
 publish:
   address: 224.5.23.1:10003
-global:
+game:
   yellow-card-duration: 2m
-normal:
-  half-duration: 5m
-  half-time-duration: 5m
-  timeout-duration: 5m
-  timeouts: 4
-  break-after: 5m
-overtime:
-  half-duration: 2m30s
-  half-time-duration: 2m
-  timeout-duration: 5m
-  timeouts: 2
-  break-after: 2m
+  default-division: Div A
+  normal:
+    half-duration: 5m
+    half-time-duration: 5m
+    timeout-duration: 5m
+    timeouts: 4
+    break-after: 5m
+  overtime:
+    half-duration: 2m30s
+    half-time-duration: 2m
+    timeout-duration: 5m
+    timeouts: 2
+    break-after: 2m

internal/app/controller/config.go

@@ -19,6 +19,7 @@ type ConfigSpecial 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"`
 }
@@ -74,6 +75,8 @@ func DefaultConfig() (c Config) {
 	c.Game.Overtime.TimeoutDuration = 5 * time.Minute
 	c.Game.Overtime.BreakAfter = 2 * time.Minute
 
+	c.Game.DefaultDivision = DivA
+
 	return
 }
 

internal/app/controller/engine.go

@@ -35,6 +35,7 @@ func (e *Engine) ResetGame() {
 	e.State.TeamState[TeamBlue].TimeoutsLeft = e.config.Normal.Timeouts
 	e.State.TeamState[TeamYellow].TimeoutsLeft = e.config.Normal.Timeouts
 	e.RefereeEvents = []RefereeEvent{}
+	e.State.Division = e.config.DefaultDivision
 }
 
 // Tick updates the times of the state and removes cards, if necessary
@@ -239,6 +240,18 @@ func (e *Engine) processCommand(c *EventCommand) error {
 }
 
 func (e *Engine) processModify(m *EventModifyValue) error {
+	// process team-independent modifies
+	if m.Division != nil {
+		if *m.Division == DivA || *m.Division == DivB {
+			e.State.Division = *m.Division
+			log.Printf("Processed modification %v", m)
+			return nil
+		} else {
+			return errors.Errorf("Invalid divsion: %v", *m.Division)
+		}
+	}
+
+	// process team-dependent modifies
 	if m.ForTeam.Unknown() {
 		return errors.Errorf("Unknown team: %v", m.ForTeam)
 	}

internal/app/controller/events.go

@@ -104,6 +104,7 @@ type EventModifyValue struct {
 	BotCollisions         *int                 `json:"botCollisions"`
 	BallPlacementFailures *int                 `json:"ballPlacementFailures"`
 	BotSpeedInfringements *int                 `json:"botSpeedInfringements"`
+	Division              *Division            `json:"division"`
 }
 
 func (m EventModifyValue) String() string {
@@ -144,6 +145,9 @@ func (m EventModifyValue) String() string {
 	if m.BotSpeedInfringements != nil {
 		return fmt.Sprintf("%v BotSpeedInfringements=%v", str, *m.BotSpeedInfringements)
 	}
+	if m.Division != nil {
+		return fmt.Sprintf("%v Division=%v", str, *m.Division)
+	}
 	return fmt.Sprintf("%v undefined", str)
 }
 

internal/app/controller/state.go

@@ -37,6 +37,13 @@ func (t Team) Known() bool {
 	return !t.Unknown()
 }
 
+type Division string
+
+const (
+	DivA Division = "Div A"
+	DivB Division = "Div B"
+)
+
 // Stage represents the different stages of a game
 type Stage string
 
@@ -221,6 +228,7 @@ type State struct {
 	MatchTimeStart   time.Time          `json:"matchTimeStart"`
 	MatchDuration    time.Duration      `json:"matchDuration"`
 	TeamState        map[Team]*TeamInfo `json:"teamState"`
+	Division         Division           `json:"division"`
 }
 
 // NewState creates a new state, initialized for the start of a new game
@@ -242,6 +250,8 @@ func NewState() (s *State) {
 	*s.TeamState[TeamBlue] = newTeamInfo()
 	s.TeamState[TeamBlue].OnPositiveHalf = !s.TeamState[TeamYellow].OnPositiveHalf
 
+	s.Division = DivA
+
 	return
 }
 

src/components/control/ControlMatch.vue

@@ -34,12 +34,23 @@
                   :disabled="forbidMatchControls || noNextStage">
             End of Game
         </b-button>
+        <div class="divisions btn-group-toggle btn-group">
+            <label :class="{btn:true, 'btn-secondary': true, active: isDivA}" @click="switchDivision('Div A')">Div
+                A</label>
+            <label :class="{btn:true, 'btn-secondary': true, active: !isDivA}" @click="switchDivision('Div B')">Div
+                B</label>
+        </div>
     </div>
 </template>
 
 <script>
     export default {
         name: "ControlMatch",
+        data() {
+            return {
+                selected: 'Div A',
+            }
+        },
         methods: {
             resetMatch: function () {
                 this.$socket.sendObj({
@@ -76,11 +87,19 @@
                     'stage': {'stageOperation': 'endGame'}
                 })
             },
+            switchDivision(division) {
+                this.$socket.sendObj({
+                    'modify': {'division': division}
+                })
+            }
         },
         computed: {
             state() {
                 return this.$store.state.refBoxState
             },
+            isDivA() {
+                return this.$store.state.refBoxState.division === 'Div A';
+            },
             halted() {
                 return this.state.command === 'halt';
             },
@@ -101,7 +120,7 @@
 </script>
 
 <style scoped>
-    button {
+    button, .divisions {
         margin: 0.5em;
     }
 </style>