Tweaks for team settings.

Half-Shot · Jan 9, 2025 · f4a73bd · f4a73bd
1 parent cf5a13d
commit f4a73bd
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 21 deletions.
diff --git a/src/frontend/components/menus/lobby.tsx b/src/frontend/components/menus/lobby.tsx
@@ -99,9 +99,12 @@ export function ActiveLobby({
     [proposedTeams, storedLocalTeams],
   );
 
+  // @ts-ignore
+  const nextTeamGroup: TeamGroup = TeamGroup[useMemo(() => Object.values(TeamGroup).find(v => !proposedTeams.some(t => t.group === v)) as string ?? TeamGroup.Red, [proposedTeams])];
+
   const addTeam = useCallback(
     (_evt: MouseEvent, team: StoredTeam) => {
-      gameInstance.addProposedTeam(team, MAX_WORMS).catch((ex) => {
+      gameInstance.addProposedTeam(team, MAX_WORMS, nextTeamGroup).catch((ex) => {
         logger.warning("Failed to add team", team, ex);
         setError("Failed to add team");
       });
@@ -119,13 +122,14 @@ export function ActiveLobby({
     [gameInstance],
   );
 
-
   const viableToStart = useMemo(() =>
-    gameInstance.isHost && members.length >= 2 && proposedTeams.length >= 2 &&
-      proposedTeams.reduce<Partial<Record<TeamGroup, number>>>((v, o) => ({
+    gameInstance.isHost &&
+    members.length >= 2 &&
+    proposedTeams.length >= 2 &&
+      Object.keys(proposedTeams.reduce<Partial<Record<TeamGroup, number>>>((v, o) => ({
         ...v,
       [o.group]: (v[o.group] ?? 0) + 1
-    }), { })
+    }), { })).length >= 2
   , [gameInstance, members, proposedTeams]);
 
   const lobbyLink = `${window.location.origin}${window.location.pathname}?gameRoomId=${encodeURIComponent(gameInstance.roomId)}`;
@@ -187,20 +191,16 @@ export function ActiveLobby({
                 }
                 const onRemoveTeam = () => removeTeam(t);
                 const incrementWormCount = () => {
-                  const newWormCount =
+                  const wormCount =
                     t.wormCount >= MAX_WORMS ? 1 : t.wormCount + 1;
-                  gameInstance.addProposedTeam(t, newWormCount, t.group);
+                  gameInstance.updateProposedTeam(t, { wormCount });
                 };
                 const changeTeamColor = () => {
-                  let newGroup = t.group + 1;
-                  if (TeamGroup[newGroup] === undefined) {
-                    newGroup = TeamGroup.Red;
+                  let teamGroup = t.group + 1;
+                  if (TeamGroup[teamGroup] === undefined) {
+                    teamGroup = TeamGroup.Red;
                   }
-                  gameInstance.addProposedTeam(
-                    t,
-                    t.wormCount,
-                    newGroup as TeamGroup,
-                  );
+                  gameInstance.updateProposedTeam(t, { teamGroup });
                 };
                 return (
                   <li key={t.name}>

diff --git a/src/net/client.ts b/src/net/client.ts
@@ -168,9 +168,9 @@ export class NetGameInstance {
   }
 
   public async addProposedTeam(
-    proposedTeam: StoredTeam | ProposedTeam,
+    proposedTeam: StoredTeam,
     wormCount: number,
-    teamGroup: TeamGroup = TeamGroup.Red,
+    teamGroup: TeamGroup,
   ) {
     await this.client.client.sendStateEvent(
       this.roomId,
@@ -179,15 +179,29 @@ export class NetGameInstance {
         ...proposedTeam,
         group: teamGroup,
         wormCount,
-        playerUserId:
-          "playerUserId" in proposedTeam
-            ? proposedTeam.playerUserId
-            : this.client.userId,
+        playerUserId: this.client.userId,
         // TODO: What should the proper stateKey be?
       },
       `${this.client.userId.slice(1)}/${proposedTeam.name}`,
     );
   }
+
+
+  public async updateProposedTeam(
+    proposedTeam: ProposedTeam,
+    updates: { wormCount?: number, teamGroup?: TeamGroup},
+  ) {
+    await this.client.client.sendStateEvent(
+      this.roomId,
+      GameProposedTeamEventType,
+      {
+        ...proposedTeam,
+        ...(updates.teamGroup !== undefined && { group: updates.teamGroup }),
+        ...(updates.wormCount !== undefined && { wormCount: updates.wormCount })
+      },
+      `${proposedTeam.playerUserId.slice(1)}/${proposedTeam.name}`,
+    );
+  }
 
   public async removeProposedTeam(proposedTeam: ProposedTeam) {
     await this.client.client.sendStateEvent(