[feature] Store first kickoff team and update next command during pre's

Author: g3force

internal/app/controller/engine.go

@@ -16,6 +16,7 @@ import (
 type GameControllerState struct {
 	Division               config.Division                     `json:"division" yaml:"division"`
 	AutoContinue           bool                                `json:"autoContinue" yaml:"autoContinue"`
+	FirstKickoffTeam       Team                                `json:"firstKickoffTeam" yaml:"firstKickoffTeam"`
 	GameEventBehavior      map[GameEventType]GameEventBehavior `json:"gameEventBehavior" yaml:"gameEventBehavior"`
 	GameEventProposals     []*GameEventProposal                `json:"gameEventProposals" yaml:"gameEventProposals"`
 	AutoRefsConnected      []string                            `json:"autoRefsConnected" yaml:"autoRefsConnected"`
@@ -29,6 +30,7 @@ func NewGameControllerState() (s *GameControllerState) {
 
 	s.Division = config.DivA
 	s.AutoContinue = true
+	s.FirstKickoffTeam = TeamYellow
 
 	s.GameEventBehavior = map[GameEventType]GameEventBehavior{}
 	for _, event := range AllGameEvents() {
@@ -113,6 +115,8 @@ func (e *Engine) ResetGame() {
 		e.State.TeamState[team].TimeoutsLeft = e.config.Normal.Timeouts
 		e.State.TeamState[team].MaxAllowedBots = e.config.MaxBots[e.GcState.Division]
 	}
+
+	e.updateNextCommandForStage()
 }
 
 // Update updates times and triggers events if needed
@@ -535,6 +539,9 @@ func (e *Engine) processModify(m *EventModifyValue) error {
 		}
 	} else if m.AutoContinue != nil {
 		e.GcState.AutoContinue = *m.AutoContinue
+	} else if m.FirstKickoffTeam != nil {
+		e.GcState.FirstKickoffTeam = Team(*m.FirstKickoffTeam)
+		e.updateNextCommandForStage()
 	} else if m.GameEventBehavior != nil {
 		e.GcState.GameEventBehavior[m.GameEventBehavior.GameEventType] = m.GameEventBehavior.GameEventBehavior
 	} else if m.RemoveGameEvent != nil {
@@ -670,6 +677,20 @@ func (e *Engine) updateStage(stage Stage) {
 	}
 
 	e.State.Stage = stage
+
+	e.updateNextCommandForStage()
+}
+
+func (e *Engine) updateNextCommandForStage() {
+	switch e.State.Stage {
+	case StagePreGame, StageOvertimeFirstHalfPre:
+		e.State.NextCommand = CommandKickoff
+		e.State.NextCommandFor = e.GcState.FirstKickoffTeam
+
+	case StageSecondHalfPre, StageOvertimeSecondHalfPre:
+		e.State.NextCommand = CommandKickoff
+		e.State.NextCommandFor = e.GcState.FirstKickoffTeam.Opposite()
+	}
 }
 
 func (e *Engine) updatePreStages() {

internal/app/controller/events.go

@@ -117,6 +117,7 @@ type EventModifyValue struct {
 	CanPlaceBall          *bool                         `json:"canPlaceBall,omitempty" yaml:"canPlaceBall"`
 	Division              *config.Division              `json:"division,omitempty" yaml:"division"`
 	AutoContinue          *bool                         `json:"autoContinue,omitempty" yaml:"autoContinue"`
+	FirstKickoffTeam      *string                       `json:"firstKickoffTeam,omitempty" yaml:"firstKickoffTeam"`
 	GameEventBehavior     *EventModifyGameEventBehavior `json:"gameEventBehavior,omitempty" yaml:"gameEventBehavior"`
 	BotSubstitutionIntend *bool                         `json:"botSubstitutionIntend,omitempty" yaml:"botSubstitutionIntend"`
 	RemoveGameEvent       *int                          `json:"removeGameEvent,omitempty" yaml:"removeGameEvent"`

src/components/common/DualSwitch.vue

@@ -0,0 +1,65 @@
+<template>
+    <div class="switch btn-group-toggle btn-group">
+        <label v-b-tooltip.hover
+               :title="leftTitle"
+               :class="{btn:true, 'btn-active': (selectedValue === leftValue), 'btn-passive': (selectedValue !== leftValue)}"
+               @click="callback(leftValue)"
+               :disabled="disabled">
+            {{leftLabel}}
+        </label>
+        <label v-b-tooltip.hover
+               :title="rightTitle"
+               :class="{btn:true, 'btn-active': (selectedValue === rightValue), 'btn-passive': (selectedValue !== rightValue)}"
+               @click="callback(rightValue)"
+               :disabled="disabled">
+            {{rightLabel}}
+        </label>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "DualSwitch",
+        props: {
+            leftTitle: String,
+            leftLabel: String,
+            leftValue: String,
+            rightTitle: String,
+            rightLabel: String,
+            rightValue: String,
+            callback: {
+                type: Function,
+                default: function () {
+                }
+            },
+            selectedValue: {
+                type: String,
+                default: ''
+            },
+            disabled: {
+                type: Boolean,
+                default: false
+            },
+        }
+    }
+</script>
+
+<style scoped>
+
+    button, .switch {
+        margin: 0.5em;
+    }
+
+    .btn-active {
+        background-color: green;
+        border-color: green;
+        color: white;
+    }
+
+    .btn-passive {
+        background-color: red;
+        border-color: red;
+        color: white;
+    }
+
+</style>

src/components/settings/MatchSettings.vue

@@ -1,5 +1,17 @@
 <template>
     <div>
+        <p>
+            <label>First kickoff team: </label>
+            <DualSwitch
+                    left-label="Yellow"
+                    left-value="Yellow"
+                    right-label="Blue"
+                    right-value="Blue"
+                    :callback="switchFirstKickoffTeam"
+                    :selected-value="firstKickoffTeam"
+            />
+        </p>
+
         <b-button v-b-tooltip.hover title="Switch the colors of the teams, keep everything else"
                   v-on:click="switchColor"
                   :disabled="forbidMatchControls">
@@ -12,17 +24,15 @@
             Switch sides
         </b-button>
 
-        <div class="divisions btn-group-toggle btn-group">
-            <label :class="{btn:true, 'btn-secondary': true, active: isDivA, disabled: forbidMatchControls}"
-                   @click="switchDivision('DivA')"
-                   :disabled="forbidMatchControls">
-                Div A
-            </label>
-            <label :class="{btn:true, 'btn-secondary': true, active: !isDivA, disabled: forbidMatchControls}"
-                   @click="switchDivision('DivB')">
-                Div B
-            </label>
-        </div>
+        <DualSwitch
+                left-label="Div A"
+                left-value="DivA"
+                right-label="Div B"
+                right-value="DivB"
+                :callback="switchDivision"
+                :selected-value="division"
+                :disabled="forbidMatchControls"
+        />
 
         <b-button v-b-tooltip.hover title="Start a new match by resetting everything"
                   v-on:click="showMsgBoxConfirmResetGame">
@@ -32,11 +42,16 @@
 </template>
 
 <script>
+    import TeamSelection from "../common/TeamSelection";
+    import DualSwitch from "../common/DualSwitch";
     export default {
         name: "MatchSettings",
+        components: {DualSwitch, TeamSelection},
         data() {
             return {
-                selected: 'DivA',
+                kickoffTeamSelectionModel: {
+                    team: null,
+                }
             }
         },
         methods: {
@@ -55,9 +70,14 @@
                     'trigger': {'triggerType': 'switchSides'}
                 })
             },
-            switchDivision(division) {
+            switchDivision(div) {
                 this.$socket.sendObj({
-                    'modify': {'division': division}
+                    'modify': {'division': div}
+                })
+            },
+            switchFirstKickoffTeam(team) {
+                this.$socket.sendObj({
+                    'modify': {'firstKickoffTeam': team}
                 })
             },
             showMsgBoxConfirmResetGame() {
@@ -86,8 +106,11 @@
             state() {
                 return this.$store.state.refBoxState
             },
-            isDivA() {
-                return this.$store.state.gcState.division === 'DivA';
+            firstKickoffTeam() {
+                return this.$store.state.gcState.firstKickoffTeam;
+            },
+            division() {
+                return this.$store.state.gcState.division;
             },
             halted() {
                 return this.state.command === 'halt';