Feature/game score tracking (#48)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "life-trinket",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "commonjs",
   "engines": {
     "node": ">=20",

src/Components/Dialogs/SettingsDialog.tsx

@@ -242,6 +242,23 @@ export const SettingsDialog = ({
           </ul>
         </Description>
       </SettingContainer>
+      <SettingContainer>
+        <ToggleContainer>
+          <label>Show Match Score</label>
+          <ToggleButton
+            checked={settings.showMatchScore}
+            onChange={() => {
+              setSettings({
+                ...settings,
+                showMatchScore: !settings.showMatchScore,
+              });
+            }}
+          />
+        </ToggleContainer>
+        <Description>
+          Shows a score badge on each player's card to track wins across multiple games.
+        </Description>
+      </SettingContainer>
       <Separator height="1px" />
       <div className="flex w-full justify-center">
         <button

src/Components/GameOver/GameOver.tsx

@@ -0,0 +1,85 @@
+import { twc } from 'react-twc';
+import { Player } from '../../Types/Player';
+
+const Overlay = twc.div`
+  fixed top-0 left-0 w-[100dvmax] h-[100dvmin]
+  bg-black/80 backdrop-blur-sm
+  flex items-center justify-center
+  z-50
+`;
+
+const Modal = twc.div`
+  bg-background-default
+  rounded-2xl p-8
+  max-w-md w-[90%]
+  shadow-2xl
+  flex flex-col gap-6
+`;
+
+const Title = twc.h2`
+  text-[7vmin] font-bold text-center
+  text-text-primary
+  -mb-4
+`;
+
+const ButtonContainer = twc.div`
+  flex flex-col gap-3
+`;
+
+const WinnerName = twc.div`
+  text-[6vmin] font-bold text-center
+  py-[2vmin] px-[3vmin] rounded-xl
+  text-white
+  mb-0
+`;
+
+const PrimaryButton = twc.button`
+  py-[2vmin] px-[3vmin] rounded-xl
+  text-[4vmin] font-semibold
+  bg-interface-primary
+  text-white
+  transition-all duration-200
+  hover:scale-105 active:scale-95
+  border-3 border-white/50
+  shadow-lg shadow-interface-primary/50
+`;
+
+const SecondaryButton = twc.button`
+  py-[2vmin] px-[3vmin] rounded-xl
+  text-[4vmin] font-semibold
+  bg-secondary-main
+  text-text-primary
+  transition-all duration-200
+  hover:scale-105 active:scale-95
+  border-3 border-primary-main
+  shadow-lg shadow-secondary-main/50
+`;
+
+type GameOverProps = {
+  winner: Player;
+  onStartNextGame: () => void;
+  onStay: () => void;
+};
+
+export const GameOver = ({
+  winner,
+  onStartNextGame,
+  onStay,
+}: GameOverProps) => {
+  return (
+    <Overlay>
+      <Modal>
+        <Title>Winner</Title>
+        <WinnerName style={{ backgroundColor: winner.color }}>
+          {winner.name || `Player ${winner.index + 1}`}
+        </WinnerName>
+        <ButtonContainer>
+          <SecondaryButton onClick={onStartNextGame}>
+            Start Next Game
+          </SecondaryButton>
+          <PrimaryButton onClick={onStay}>Close</PrimaryButton>
+        </ButtonContainer>
+      </Modal>
+    </Overlay>
+  );
+};

src/Components/LifeCounter/LifeCounter.tsx

@@ -24,6 +24,27 @@ const SettingsButtonTwc = twc.button<RotationButtonProps>((props) => [
     : 'top-1/4 right-[1vmax]',
 ]);
 
+type MatchScoreBadgeProps = RotationDivProps & {
+  $useCommanderDamage: boolean;
+};
+
+const MatchScoreBadge = twc.div<MatchScoreBadgeProps>((props) => [
+  'absolute flex items-center justify-center',
+  'bg-black/70 backdrop-blur-sm',
+  'rounded-full',
+  'w-[5vmin] h-[5vmin]',
+  'text-white font-bold',
+  'text-[3vmin]',
+  'z-[1]',
+  'pointer-events-none',
+  'select-none webkit-user-select-none',
+  props.$rotation === Rotation.Side || props.$rotation === Rotation.SideFlipped
+    ? `left-[6.5vmax] bottom-[1vmax]`
+    : props.$useCommanderDamage
+    ? 'left-[0.5vmax] top-[11.5vmin]'
+    : 'left-[0.5vmax] top-[1vmax]',
+]);
+
 type SettingsButtonProps = {
   onClick: () => void;
   rotation: Rotation;
@@ -98,11 +119,12 @@ type LifeCounterProps = {
   player: Player;
   opponents: Player[];
   isStartingPlayer?: boolean;
+  matchScore?: number;
 };
 
 const RECENT_DIFFERENCE_TTL = 3_000;
 
-const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
+const LifeCounter = ({ player, opponents, matchScore }: LifeCounterProps) => {
   const { updatePlayer, updateLifeTotal } = usePlayers();
   const { settings, playing } = useGlobalSettings();
   const recentDifferenceTimerRef = useRef<NodeJS.Timeout | undefined>(
@@ -215,6 +237,21 @@ const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
           key={player.index}
           handleLifeChange={handleLifeChange}
         />
+        {matchScore !== undefined && matchScore > 0 && (
+          <MatchScoreBadge
+            $rotation={player.settings.rotation}
+            $useCommanderDamage={player.settings.useCommanderDamage}
+            style={{
+              rotate:
+                player.settings.rotation === Rotation.Side ||
+                player.settings.rotation === Rotation.SideFlipped
+                  ? `-90deg`
+                  : '0deg',
+            }}
+          >
+            {matchScore}
+          </MatchScoreBadge>
+        )}
         {settings.showPlayerMenuCog && (
           <SettingsButton
             onClick={() => {
@@ -244,6 +281,8 @@ const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
           isShown={showPlayerMenu}
           player={player}
           setShowPlayerMenu={setShowPlayerMenu}
+          onForfeit={toggleGameLost}
+          totalPlayers={opponents.length + 1}
         />
       </LifeCounterWrapper>
     </LifeCounterContentWrapper>

src/Components/Players/PlayerMenu.tsx

@@ -16,6 +16,7 @@ import {
   PartnerTax,
   Poison,
   ResetGame,
+  Skull,
 } from '../../Icons/generated';
 import { Player, Rotation } from '../../Types/Player';
 import { PreStartMode } from '../../Types/Settings';
@@ -90,16 +91,21 @@ type PlayerMenuProps = {
   player: Player;
   setShowPlayerMenu: (showPlayerMenu: boolean) => void;
   isShown: boolean;
+  onForfeit?: () => void;
+  totalPlayers: number;
 };
 
 const PlayerMenu = ({
   player,
   setShowPlayerMenu,
   isShown,
+  onForfeit,
+  totalPlayers,
 }: PlayerMenuProps) => {
   const settingsContainerRef = useRef<HTMLDivElement | null>(null);
   const resetGameDialogRef = useRef<HTMLDialogElement | null>(null);
   const endGameDialogRef = useRef<HTMLDialogElement | null>(null);
+  const forfeitGameDialogRef = useRef<HTMLDialogElement | null>(null);
 
   const { isSide } = useSafeRotate({
     rotation: player.settings.rotation,
@@ -117,6 +123,7 @@ const PlayerMenu = ({
     saveCurrentGame,
     initialGameSettings,
     setPreStartCompleted,
+    gameScore,
   } = useGlobalSettings();
 
   const analytics = useAnalytics();
@@ -159,7 +166,7 @@ const PlayerMenu = ({
   };
 
   const handleGoToStart = () => {
-    saveCurrentGame({ players, initialGameSettings });
+    saveCurrentGame({ players, initialGameSettings, gameScore });
     goToStart();
     setRandomizingPlayer(true);
   };
@@ -479,6 +486,32 @@ const PlayerMenu = ({
             >
               <ResetGame size={iconSize} />
             </button>
+
+            <button
+              style={{
+                cursor: 'pointer',
+                userSelect: 'none',
+                fontSize: buttonFontSize,
+                padding: '2px',
+              }}
+              className="text-red-500"
+              onClick={() => {
+                if (totalPlayers === 2) {
+                  forfeitGameDialogRef.current?.show();
+                } else {
+                  if (onForfeit) {
+                    analytics.trackEvent('forfeit_game', {
+                      player: player.index,
+                    });
+                    onForfeit();
+                    setShowPlayerMenu(false);
+                  }
+                }
+              }}
+              aria-label="Forfeit Game"
+            >
+              <Skull size={iconSize} />
+            </button>
           </ButtonsSections>
         </BetterRowContainer>
 
@@ -559,6 +592,48 @@ const PlayerMenu = ({
             </div>
           </div>
         </dialog>
+
+        <dialog
+          ref={forfeitGameDialogRef}
+          className="z-[999] size-full bg-background-settings overflow-y-scroll"
+          onClick={() => forfeitGameDialogRef.current?.close()}
+        >
+          <div className="flex size-full items-center justify-center">
+            <div className="flex flex-col justify-center p-4 gap-2 bg-background-default rounded-xl border-none">
+              <h1
+                className="text-center text-text-primary"
+                style={{ fontSize: extraCountersSize }}
+              >
+                Forfeit Game?
+              </h1>
+              <div className="flex justify-evenly gap-2">
+                <button
+                  className="bg-primary-main border border-primary-dark text-text-primary rounded-lg flex-grow"
+                  style={{ fontSize: iconSize }}
+                  onClick={() => forfeitGameDialogRef.current?.close()}
+                >
+                  No
+                </button>
+                <button
+                  className="bg-primary-main border border-primary-dark text-text-primary rounded-lg flex-grow"
+                  onClick={() => {
+                    if (onForfeit) {
+                      analytics.trackEvent('forfeit_game', {
+                        player: player.index,
+                      });
+                      onForfeit();
+                      setShowPlayerMenu(false);
+                      forfeitGameDialogRef.current?.close();
+                    }
+                  }}
+                  style={{ fontSize: iconSize }}
+                >
+                  Yes
+                </button>
+              </div>
+            </div>
+          </div>
+        </dialog>
       </SettingsContainer>
     </PlayerMenuWrapper>
   );

src/Components/Players/Players.tsx

@@ -31,7 +31,7 @@ const PlayersWrapper = twc.div`w-full h-full bg-black`;
 export const Players = ({ gridLayout }: { gridLayout: GridLayout }) => {
   const { players } = usePlayers();
 
-  const { playing, settings, preStartCompleted } = useGlobalSettings();
+  const { playing, settings, preStartCompleted, gameScore } = useGlobalSettings();
 
   return (
     <PlayersWrapper>
@@ -48,6 +48,11 @@ export const Players = ({ gridLayout }: { gridLayout: GridLayout }) => {
                 opponents={players.filter(
                   (opponent) => opponent.index !== player.index
                 )}
+                matchScore={
+                  settings.showMatchScore
+                    ? gameScore[player.index]
+                    : undefined
+                }
               />
 
               {settings.preStartMode === PreStartMode.RandomKing &&

src/Components/ScoreDisplay/ScoreDisplay.tsx

@@ -0,0 +1,71 @@
+import { twc } from 'react-twc';
+import { Player } from '../../Types/Player';
+import { GameScore } from '../../Contexts/GlobalSettingsContext';
+
+const ScoreContainer = twc.div`
+  absolute bottom-4 left-1/2 -translate-x-1/2
+  bg-background-default/90 backdrop-blur-sm
+  rounded-lg p-4
+  shadow-lg
+  z-40
+  min-w-[200px]
+`;
+
+const Title = twc.h3`
+  text-sm font-semibold text-text-secondary
+  uppercase tracking-wide mb-3
+`;
+
+const ScoreList = twc.div`
+  flex flex-col gap-2
+`;
+
+const ScoreItem = twc.div`
+  flex items-center justify-between gap-4
+`;
+
+const PlayerInfo = twc.div`
+  flex items-center gap-2
+`;
+
+const PlayerColor = twc.div`
+  w-4 h-4 rounded-full
+`;
+
+const PlayerName = twc.span`
+  text-text-primary font-medium
+`;
+
+const Score = twc.span`
+  text-text-primary font-bold text-lg
+`;
+
+type ScoreDisplayProps = {
+  players: Player[];
+  gameScore: GameScore;
+};
+
+export const ScoreDisplay = ({ players, gameScore }: ScoreDisplayProps) => {
+  const hasAnyScore = Object.values(gameScore).some((score) => score > 0);
+
+  if (!hasAnyScore) {
+    return null;
+  }
+
+  return (
+    <ScoreContainer>
+      <Title>Match Score</Title>
+      <ScoreList>
+        {players.map((player) => (
+          <ScoreItem key={player.index}>
+            <PlayerInfo>
+              <PlayerColor style={{ backgroundColor: player.color }} />
+              <PlayerName>{player.name || `Player ${player.index + 1}`}</PlayerName>
+            </PlayerInfo>
+            <Score>{gameScore[player.index] || 0}</Score>
+          </ScoreItem>
+        ))}
+      </ScoreList>
+    </ScoreContainer>
+  );
+};

src/Components/Views/Play.tsx

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { twc } from 'react-twc';
 import { twGridTemplateAreas } from '../../../tailwind.config';
 import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
@@ -6,6 +6,7 @@ import { usePlayers } from '../../Hooks/usePlayers';
 import { Orientation, PreStartMode } from '../../Types/Settings';
 import { Players } from '../Players/Players';
 import { PreStart } from '../PreStartGame/PreStart';
+import { GameOver } from '../GameOver/GameOver';
 
 const MainWrapper = twc.div`w-[100dvmax] h-[100dvmin] overflow-hidden, setPlayers`;
 
@@ -14,9 +15,10 @@ type GridTemplateAreasKeys = keyof typeof twGridTemplateAreas;
 export type GridLayout = `grid-areas-${GridTemplateAreasKeys}`;
 
 export const Play = () => {
-  const { players, setPlayers } = usePlayers();
+  const { players, setPlayers, resetCurrentGame, setStartingPlayerIndex } = usePlayers();
-  const { initialGameSettings, playing, settings, preStartCompleted } =
+  const { initialGameSettings, playing, settings, preStartCompleted, gameScore, setGameScore } =
     useGlobalSettings();
+  const [winner, setWinner] = useState<number | null>(null);
 
   let gridLayout: GridLayout;
   switch (players.length) {
@@ -94,6 +96,57 @@ export const Play = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  // Check for game over when only one player remains
+  useEffect(() => {
+    if (players.length < 2 || winner !== null || !settings.showMatchScore) {
+      return;
+    }
+
+    const activePlayers = players.filter((p) => !p.hasLost);
+
+    // If only one player is alive, they are the winner
+    if (activePlayers.length === 1) {
+      setWinner(activePlayers[0].index);
+    }
+  }, [players, winner, settings.showMatchScore]);
+
+  const handleStartNextGame = () => {
+    if (winner === null) return;
+
+    // Update score
+    const newScore = { ...gameScore };
+    newScore[winner] = (newScore[winner] || 0) + 1;
+    setGameScore(newScore);
+
+    // Set the loser as the starting player for next game
+    const loserIndex = players.find((p) => p.index !== winner)?.index ?? 0;
+    setStartingPlayerIndex(loserIndex);
+
+    // Reset game
+    resetCurrentGame();
+    setWinner(null);
+  };
+
+  const handleStay = () => {
+    if (winner === null) return;
+
+    // Update score
+    const newScore = { ...gameScore };
+    newScore[winner] = (newScore[winner] || 0) + 1;
+    setGameScore(newScore);
+
+    // Reset hasLost state for all players
+    setPlayers(
+      players.map((p) => ({
+        ...p,
+        hasLost: false,
+      }))
+    );
+
+    // Clear winner to allow new game over detection
+    setWinner(null);
+  };
+
   return (
     <MainWrapper>
       {players.length > 1 &&
@@ -103,6 +156,14 @@ export const Play = () => {
         settings.showStartingPlayer && <PreStart />}
 
       <Players gridLayout={gridLayout} />
+
+      {winner !== null && (
+        <GameOver
+          winner={players[winner]}
+          onStartNextGame={handleStartNextGame}
+          onStay={handleStay}
+        />
+      )}
     </MainWrapper>
   );
 };

src/Components/Views/StartMenu/StartMenu.tsx

@@ -64,6 +64,7 @@ const Start = () => {
     setPlaying,
     savedGame,
     saveCurrentGame,
+    setGameScore,
   } = useGlobalSettings();
 
   const infoDialogRef = useRef<HTMLDialogElement | null>(null);
@@ -213,6 +214,9 @@ const Start = () => {
 
     setInitialGameSettings(savedGame.initialGameSettings);
     setPlayers(savedGame.players);
+    if (savedGame.gameScore) {
+      setGameScore(savedGame.gameScore);
+    }
     saveCurrentGame(null);
     setRandomizingPlayer(false);
     setShowPlay(true);
@@ -407,15 +411,31 @@ const Start = () => {
             {savedGame && (
               <button
                 className="flex flex-grow basis-0 justify-center self-center items-center bg-secondary-main px-3 py-2 rounded-md text-text-primary min-w-[150px]
-              
+
               duration-200 ease-in-out shadow-[1px_2px_4px_0px_rgba(0,0,0,0.3)] hover:bg-secondary-dark font-bold"
                 onClick={doResumeGame}
               >
-                RESUME&nbsp;
+                <div className="flex flex-col items-center">
-                <span className="text-xs">
+                  <div>
-                  ({savedGame.players.length}&nbsp;
+                    RESUME&nbsp;
-                  {savedGame.players.length > 1 ? 'players' : 'player'})
+                    <span className="text-xs">
-                </span>
+                      ({savedGame.players.length}&nbsp;
+                      {savedGame.players.length > 1 ? 'players' : 'player'})
+                    </span>
+                  </div>
+                  {savedGame.gameScore && Object.keys(savedGame.gameScore).length > 0 && (
+                    <div className="text-xs opacity-75">
+                      Score: {Object.entries(savedGame.gameScore)
+                        .map(([playerIndex, score]) => {
+                          const player = savedGame.players.find(
+                            (p) => p.index === Number(playerIndex)
+                          );
+                          return `${player?.name || `P${Number(playerIndex) + 1}`}: ${score}`;
+                        })
+                        .join(' | ')}
+                    </div>
+                  )}
+                </div>
               </button>
             )}
           </StartButtonFooter>

src/Contexts/GlobalSettingsContext.tsx

@@ -12,8 +12,13 @@ type Version = {
 export type SavedGame = {
   initialGameSettings: InitialGameSettings;
   players: Player[];
+  gameScore?: GameScore;
 } | null;
 
+export type GameScore = {
+  [playerIndex: number]: number;
+};
+
 export type GlobalSettingsContextType = {
   fullscreen: {
     isFullscreen: boolean;
@@ -45,6 +50,9 @@ export type GlobalSettingsContextType = {
   version: Version;
   savedGame: SavedGame;
   saveCurrentGame: (currentGame: SavedGame) => void;
+  gameScore: GameScore;
+  setGameScore: (score: GameScore) => void;
+  resetGameScore: () => void;
 };
 
 export const GlobalSettingsContext =

src/Providers/GlobalSettingsProvider.tsx

@@ -1,6 +1,7 @@
 import { ReactNode, useEffect, useMemo, useState } from 'react';
 import { useWakeLock } from 'react-screen-wake-lock';
 import {
+  GameScore,
   GlobalSettingsContext,
   GlobalSettingsContextType,
   SavedGame,
@@ -94,6 +95,19 @@ export const GlobalSettingsProvider = ({
     );
   };
 
+  const savedGameScore = localStorage.getItem('gameScore');
+  const [gameScore, setGameScore] = useState<GameScore>(
+    savedGameScore ? JSON.parse(savedGameScore) : {}
+  );
+  const setGameScoreAndLocalStorage = (score: GameScore) => {
+    setGameScore(score);
+    localStorage.setItem('gameScore', JSON.stringify(score));
+  };
+  const resetGameScore = () => {
+    setGameScore({});
+    localStorage.removeItem('gameScore');
+  };
+
   // Set settings if they are not valid
   useEffect(() => {
     // If there are no saved settings, set default settings
@@ -171,11 +185,13 @@ export const GlobalSettingsProvider = ({
       localStorage.removeItem('playing');
       localStorage.removeItem('showPlay');
       localStorage.removeItem('preStartComplete');
+      localStorage.removeItem('gameScore');
 
       setPlaying(false);
       setShowPlay(false);
       setPreStartCompleted(false);
       setSettings({ ...settings, useMonarch: false });
+      setGameScore({});
     };
 
     const goToStart = async () => {
@@ -299,6 +315,9 @@ export const GlobalSettingsProvider = ({
         isLatest: isLatestVersion,
         checkForNewVersion,
       },
+      gameScore,
+      setGameScore: setGameScoreAndLocalStorage,
+      resetGameScore,
     };
   }, [
     isFullscreen,
@@ -317,6 +336,7 @@ export const GlobalSettingsProvider = ({
     remoteVersion,
     isLatestVersion,
     analytics,
+    gameScore,
   ]);
 
   return (

src/Providers/PlayersProvider.tsx

@@ -61,7 +61,11 @@ export const PlayersProvider = ({ children }: { children: ReactNode }) => {
         return;
       }
 
-      const newStartingPlayerIndex = Math.floor(Math.random() * players.length);
+      // Use the saved starting player index if available, otherwise random
+      const newStartingPlayerIndex =
+        startingPlayerIndex >= 0
+          ? startingPlayerIndex
+          : Math.floor(Math.random() * players.length);
 
       players.forEach((player: Player) => {
         player.commanderDamage.map((damage) => {

src/Types/Settings.ts

@@ -27,6 +27,7 @@ export type Settings = {
   preStartMode: PreStartMode;
   showAnimations: boolean;
   useMonarch: boolean;
+  showMatchScore: boolean;
 };
 
 export type InitialGameSettings = {
@@ -61,6 +62,7 @@ export const settingsSchema = z.object({
   preStartMode: z.nativeEnum(PreStartMode),
   showAnimations: z.boolean(),
   useMonarch: z.boolean().default(false),
+  showMatchScore: z.boolean().default(true),
 });
 
 export const defaultSettings: Settings = {
@@ -71,4 +73,5 @@ export const defaultSettings: Settings = {
   preStartMode: PreStartMode.None,
   showAnimations: true,
   useMonarch: false,
+  showMatchScore: true,
 };