Feat: Allow changing max robots in UI

Author: g3force

frontend/src/components/start/MaxRobotsPerTeamInput.vue

@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import {computed, inject} from "vue";
+import NumberInput from "@/components/common/NumberInput.vue";
+import {useMatchStateStore} from "@/store/matchState";
+import type {ControlApi} from "@/providers/controlApi";
+
+const store = useMatchStateStore()
+const control = inject<ControlApi>('control-api')
+
+const model = computed(() => {
+  return store.matchState.maxBotsPerTeam
+})
+
+const updateValue = (value: number | undefined) => {
+  if (value !== undefined) {
+    control?.UpdateMatchConfig({
+      maxRobotsPerTeam: value,
+    })
+  }
+}
+
+</script>
+
+<template>
+  <NumberInput
+      :modelValue="model"
+      label="Max robots"
+      @update:model-value="updateValue"
+  />
+</template>

frontend/src/helpers/ChangeDetails.ts

@@ -158,6 +158,8 @@ function configChangeTitle(config: Change_UpdateConfig): string {
     return `First kick-off team: ${config.firstKickoffTeam}`
   } else if (config.division !== undefined && config.division !== 'DIV_UNKNOWN') {
     return `Division: ${config.division}`
+  } else if (config.maxRobotsPerTeam !== undefined) {
+    return `Max Robots: ${config.maxRobotsPerTeam}`
   } else if (config.matchType !== undefined) {
     return `Match type: ${config.matchType}`
   }

frontend/src/proto/ssl_gc_change.ts

@@ -126,6 +126,8 @@ export interface Change_UpdateConfig {
   firstKickoffTeam?: Team;
   /** The match type */
   matchType?: MatchType;
+  /** The number of robots per team */
+  maxRobotsPerTeam?: number;
 }
 
 /** Update the current state of a team (all fields that should be updated are set) */
@@ -485,6 +487,7 @@ export const Change_UpdateConfig = {
       division: isSet(object.division) ? divisionFromJSON(object.division) : Division.DIV_UNKNOWN,
       firstKickoffTeam: isSet(object.firstKickoffTeam) ? teamFromJSON(object.firstKickoffTeam) : Team.UNKNOWN,
       matchType: isSet(object.matchType) ? matchTypeFromJSON(object.matchType) : MatchType.UNKNOWN_MATCH,
+      maxRobotsPerTeam: isSet(object.maxRobotsPerTeam) ? Number(object.maxRobotsPerTeam) : undefined,
     };
   },
 
@@ -493,6 +496,7 @@ export const Change_UpdateConfig = {
     message.division !== undefined && (obj.division = divisionToJSON(message.division));
     message.firstKickoffTeam !== undefined && (obj.firstKickoffTeam = teamToJSON(message.firstKickoffTeam));
     message.matchType !== undefined && (obj.matchType = matchTypeToJSON(message.matchType));
+    message.maxRobotsPerTeam !== undefined && (obj.maxRobotsPerTeam = message.maxRobotsPerTeam);
     return obj;
   },
 };

frontend/src/proto/ssl_gc_state.ts

@@ -254,6 +254,8 @@ export interface State {
   readyContinueTime?: Date;
   shootoutState?: ShootoutState;
   statusMessage?: string;
+  /** The maximum number of bots per team (overwrites the division config) */
+  maxBotsPerTeam?: number;
 }
 
 export interface State_TeamStateEntry {
@@ -514,6 +516,7 @@ export const State = {
       readyContinueTime: isSet(object.readyContinueTime) ? fromJsonTimestamp(object.readyContinueTime) : undefined,
       shootoutState: isSet(object.shootoutState) ? ShootoutState.fromJSON(object.shootoutState) : undefined,
       statusMessage: isSet(object.statusMessage) ? String(object.statusMessage) : "",
+      maxBotsPerTeam: isSet(object.maxBotsPerTeam) ? Number(object.maxBotsPerTeam) : 0,
     };
   },
 
@@ -559,6 +562,7 @@ export const State = {
     message.shootoutState !== undefined &&
       (obj.shootoutState = message.shootoutState ? ShootoutState.toJSON(message.shootoutState) : undefined);
     message.statusMessage !== undefined && (obj.statusMessage = message.statusMessage);
+    message.maxBotsPerTeam !== undefined && (obj.maxBotsPerTeam = Math.round(message.maxBotsPerTeam));
     return obj;
   },
 };

frontend/src/views/StartView.vue

@@ -14,6 +14,7 @@ import FirstKickOffInput from "@/components/team/FirstKickOffInput.vue";
 import FieldHalfInput from "@/components/team/FieldHalfInput.vue";
 import StageInput from "@/components/start/StageInput.vue";
 import {teams} from "@/helpers";
+import MaxRobotsPerTeamInput from "@/components/start/MaxRobotsPerTeamInput.vue";
 </script>
 
 <template>
@@ -77,6 +78,7 @@ import {teams} from "@/helpers";
     <q-separator spaced/>
 
     <div class="row justify-evenly">
+      <MaxRobotsPerTeamInput/>
       <StageInput/>
       <div class="q-pa-md">
         <EndMatchButton/>

internal/app/engine/engine.go

@@ -240,6 +240,9 @@ func (e *Engine) Start() error {
 
 	initializeAddedTeamInfoFields(e.currentState.TeamInfo(state.Team_BLUE))
 	initializeAddedTeamInfoFields(e.currentState.TeamInfo(state.Team_YELLOW))
+	if e.currentState.MaxBotsPerTeam == nil {
+		e.currentState.MaxBotsPerTeam = new(int32)
+	}
 
 	e.stateMachine.Geometry = e.gameConfig.DefaultGeometry[e.currentState.Division.Div()]
 	log.Printf("Loaded default geometry for DivA: %+v", e.stateMachine.Geometry)
@@ -459,10 +462,11 @@ func (e *Engine) initialStateFromStore() *state.State {
 func (e *Engine) createInitialState() (s *state.State) {
 	s = state.NewState()
 	s.Division = state.ToDiv(e.gameConfig.DefaultDivision)
+	*s.MaxBotsPerTeam = e.gameConfig.MaxBots[e.gameConfig.DefaultDivision]
 	for _, team := range state.BothTeams() {
 		*s.TeamInfo(team).TimeoutsLeft = e.gameConfig.Normal.Timeouts
 		s.TeamInfo(team).TimeoutTimeLeft = durationpb.New(e.gameConfig.Normal.TimeoutDuration)
-		*s.TeamInfo(team).MaxAllowedBots = e.gameConfig.MaxBots[e.gameConfig.DefaultDivision]
+		*s.TeamInfo(team).MaxAllowedBots = *s.MaxBotsPerTeam
 		*s.TeamInfo(team).ChallengeFlags = e.gameConfig.ChallengeFlags
 		*s.TeamInfo(team).BotSubstitutionsLeft = e.gameConfig.BotSubstitutionBudget
 	}

internal/app/state/ssl_gc_state.pb.go

@@ -20,6 +20,7 @@ func NewState() (s *State) {
 	s.Division = new(Division)
 	s.FirstKickoffTeam = new(Team)
 	s.MatchType = new(MatchType)
+	s.MaxBotsPerTeam = new(int32)
 
 	*s.MatchType = MatchType_UNKNOWN_MATCH
 	*s.Stage = Referee_NORMAL_FIRST_HALF_PRE

internal/app/state/state.go

@@ -28,10 +28,10 @@ func (s *StateMachine) processChangeYellowCardOver(newState *state.State) (chang
 
 func (s *StateMachine) updateMaxBots(newState *state.State) {
 	for _, team := range state.BothTeams() {
-		max := s.gameConfig.MaxBots[newState.Division.Div()]
+		maxBots := *newState.MaxBotsPerTeam
 		yellowCards := activeYellowCards(newState.TeamInfo(team).YellowCards)
 		redCards := int32(len(newState.TeamInfo(team).RedCards))
-		*newState.TeamInfo(team).MaxAllowedBots = max - yellowCards - redCards
+		*newState.TeamInfo(team).MaxAllowedBots = maxBots - yellowCards - redCards
 	}
 }
 

internal/app/statemachine/change_cards.go

@@ -9,6 +9,7 @@ func (s *StateMachine) processChangeUpdateConfig(newState *state.State, change *
 	if change.Division != nil {
 		log.Printf("Change division to %v", *change.Division)
 		newState.Division = change.Division
+		*newState.MaxBotsPerTeam = s.gameConfig.MaxBots[change.Division.Div()]
 		s.updateMaxBots(newState)
 		s.Geometry = s.gameConfig.DefaultGeometry[change.Division.Div()]
 		log.Printf("Updated geometry to %+v", s.Geometry)
@@ -30,5 +31,15 @@ func (s *StateMachine) processChangeUpdateConfig(newState *state.State, change *
 		log.Printf("Change match type to %s", change.MatchType.String())
 		newState.MatchType = change.MatchType
 	}
+	if change.MaxRobotsPerTeam != nil {
+		maxRobots := change.MaxRobotsPerTeam.GetValue()
+		if maxRobots <= 0 {
+			log.Printf("Ignoring invalid max robots per team: %d", maxRobots)
+		} else {
+			log.Printf("Change max robots per team to %d", maxRobots)
+			*newState.MaxBotsPerTeam = maxRobots
+			s.updateMaxBots(newState)
+		}
+	}
 	return
 }