add small delay in multimatch and multipoint games, and dont redirect…

… back to swiss on final game if possible
Mind-Sports-Games · Feb 5, 2025 · d468e2c · d468e2c
1 parent 4a90fd9
commit d468e2c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/ui/draughtsround/src/view/button.ts b/ui/draughtsround/src/view/button.ts
@@ -306,7 +306,8 @@ export function backToTournament(ctrl: RoundController): VNode | undefined {
 
 export function backToSwiss(ctrl: RoundController): VNode | undefined {
   const d = ctrl.data;
-  if (d.swiss?.running && (d.swiss?.isBestOfX || d.swiss?.isPlayX)) {
+  const moreGamesInMultiMatch = d.game.multiMatch.index < ctrl.data.swiss?.nbGamesPerRound;
+  if (d.swiss?.running && moreGamesInMultiMatch) {
     ctrl.setRedirecting();
     setTimeout(() => {
       location.href = '/swiss/' + d.swiss?.id;

diff --git a/ui/game/src/interfaces.ts b/ui/game/src/interfaces.ts
@@ -175,6 +175,7 @@ export interface Swiss {
   running?: boolean;
   isBestOfX?: boolean;
   isPlayX?: boolean;
+  nbGamesPerRound?: number;
   isMultiPoint?: boolean;
   ranks?: TournamentRanks;
 }

diff --git a/ui/round/src/view/button.ts b/ui/round/src/view/button.ts
@@ -443,10 +443,15 @@ export function backToTournament(ctrl: RoundController): VNode | undefined {
 
 export function backToSwiss(ctrl: RoundController): VNode | undefined {
   const d = ctrl.data;
-  if (d.swiss?.running && (d.swiss?.isBestOfX || d.swiss?.isPlayX || d.swiss?.isMultiPoint)) {
+  const mps = ctrl.finalMultiPointState();
+  const moreGamesInMultiMatch = d.game.multiMatch.index < ctrl.data.swiss?.nbGamesPerRound;
+  const moreGamesInMultiPoint = mps && mps.p1 < mps.target && mps.p2 < mps.target;
+  if (d.swiss?.running && (moreGamesInMultiMatch || moreGamesInMultiPoint)) {
     ctrl.setRedirecting();
-    location.href = '/swiss/' + d.swiss?.id;
-    return undefined;
+    setTimeout(() => {
+      location.href = '/swiss/' + d.swiss?.id;
+      return undefined;
+    }, 2500);
   }
   return d.swiss?.running
     ? h('div.follow-up', [