Feature/game score tracking (#48 )

update deps (#40 )
* update deps * fix lint
2025-11-18 16:58:01 +00:00 · 2025-11-17 19:53:17 +01:00 · 2025-02-22 12:15:28 +01:00 · 2025-02-22 11:45:35 +01:00 · 2024-09-22 09:57:55 +02:00 · 2024-09-22 09:57:02 +02:00
26 changed files with 4369 additions and 3708 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "life-trinket",
  "private": true,
-  "version": "0.9.99",
+  "version": "1.0.2",
  "type": "commonjs",
  "engines": {
    "node": ">=20",
@@ -17,39 +17,39 @@
    "deploy": "bun run build && firebase deploy --only hosting"
  },
  "dependencies": {
-    "firebase": "^10.3.0",
+    "firebase": "^10.14.1",
    "ga-4-react": "^0.1.281",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
    "react-screen-wake-lock": "^3.0.2",
-    "react-swipeable": "^7.0.1",
-    "react-twc": "^1.3.0",
-    "semver": "^7.6.2",
-    "zod": "^3.22.4"
+    "react-swipeable": "^7.0.2",
+    "react-twc": "^1.4.2",
+    "semver": "^7.7.1",
+    "zod": "^3.24.2"
  },
  "devDependencies": {
-    "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.5",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.0",
    "@savvywombat/tailwindcss-grid-areas": "^4.0.0",
    "@svgr/cli": "^8.1.0",
-    "@types/react": "^18.3.1",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^18.3.18",
+    "@types/react-dom": "^18.3.5",
    "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
-    "@vitejs/plugin-react-swc": "^3.6.0",
-    "autoprefixer": "^10.4.19",
-    "eslint": "^8.45.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@vitejs/plugin-react-swc": "^3.8.0",
+    "autoprefixer": "^10.4.20",
+    "eslint": "^8.57.1",
    "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.6",
-    "firebase-tools": "^13.7.5",
+    "eslint-plugin-react-refresh": "^0.4.19",
+    "firebase-tools": "^13.31.2",
    "install": "^0.13.0",
-    "postcss": "^8.4.38",
+    "postcss": "^8.5.3",
    "prettier": "2.8.8",
    "prop-types": "^15.8.1",
-    "tailwindcss": "^3.4.3",
-    "typescript": "^5.4.5",
-    "vite": "^5.2.10",
-    "vite-plugin-pwa": "^0.20.0"
+    "tailwindcss": "^3.4.17",
+    "typescript": "^5.7.3",
+    "vite": "^5.4.14",
+    "vite-plugin-pwa": "^0.20.5"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/Components/Buttons/CommanderDamage.tsx
+++ b/src/Components/Buttons/CommanderDamage.tsx
@@ -30,7 +30,7 @@ const CommanderDamageButton = twc.button<RotationButtonProps>((props) => [
 ]);

 const CommanderDamageTextContainer = twc.div<RotationDivProps>((props) => [
-  'relative top-1/2 left-1/2 tabular-nums pointer-events-none select-none webkit-user-select-none',
+  'relative -translate-y-1/2 top-1/2 left-1/2 tabular-nums pointer-events-none select-none webkit-user-select-none',
  props.$rotation === Rotation.SideFlipped || props.$rotation === Rotation.Side
    ? 'rotate-[270deg]'
    : '',
--- a/src/Components/Dialogs/InfoDialog.tsx
+++ b/src/Components/Dialogs/InfoDialog.tsx
@@ -3,6 +3,7 @@ import {
  CommanderTax,
  Energy,
  Experience,
+  Monarch,
  PartnerTax,
  Poison,
 } from '../../Icons/generated';
@@ -108,6 +109,9 @@ export const InfoDialog = ({
            <li className="flex items-center">
              <Experience className="size-6" /> - Experience
            </li>
+            <li className="flex items-center">
+              <Monarch className="size-6" /> - Monarch
+            </li>
          </ul>

          <h3 className="text-lg font-bold mb-2">Other functionality</h3>
--- a/src/Components/Dialogs/SettingsDialog.tsx
+++ b/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
--- a/src/Components/GameOver/GameOver.tsx
+++ b/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>
+  );
+};
--- a/src/Components/LifeCounter/Health.tsx
+++ b/src/Components/LifeCounter/Health.tsx
@@ -1,8 +1,10 @@
 import { useEffect, useRef, useState } from 'react';
 import { twc } from 'react-twc';
+import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
 import { Player, Rotation } from '../../Types/Player';
 import { RotationDivProps } from '../Buttons/CommanderDamage';
 import LifeCounterButton from '../Buttons/LifeCounterButton';
+import { MonarchCrown } from '../Misc/MonarchCrown';
 import { OutlinedText } from '../Misc/OutlinedText';

 const LifeContainer = twc.div<RotationDivProps>((props) => [
@@ -33,7 +35,7 @@ const RecentDifference = twc.div`
  absolute min-w-[20vmin] drop-shadow-none text-center bg-interface-recentDifference-background tabular-nums rounded-full p-[6px 12px] text-[8vmin] text-interface-recentDifference-text animate-fadeOut 

  top-1/4 left-[50%] -translate-x-1/2
-  data-[isSide=true]:top-1/3 data-[isSide=true]:translate-x-1/4 data-[isSide=true]:translate-y-1/2 data-[isSide=true]:rotate-[270deg] data-[isSide=true]:left-auto
+  data-[is-side=true]:top-1/3 data-[is-side=true]:translate-x-1/4 data-[is-side=true]:translate-y-1/2 data-[is-side=true]:rotate-[270deg] data-[is-side=true]:left-auto
  `;

 type HealthProps = {
@@ -53,6 +55,8 @@ const Health = ({
  const [fontSize, setFontSize] = useState(16);
  const textContainerRef = useRef<HTMLDivElement | null>(null);

+  const { settings } = useGlobalSettings();
+
  useEffect(() => {
    if (!textContainerRef.current) {
      return;
@@ -104,6 +108,8 @@ const Health = ({

  return (
    <LifeContainer $rotation={player.settings.rotation}>
+      {settings.useMonarch && <MonarchCrown player={player} />}
+
      <LifeCounterButton
        player={player}
        setLifeTotal={handleLifeChange}
@@ -111,29 +117,32 @@ const Health = ({
        increment={-1}
      />

-      {player.name && isSide ? (
-        <div className="size-full relative flex items-center justify-start">
-          <div className="fixed flex justify-center -rotate-90 left-[5.4vmax] ">
+      <div
+        data-is-side={isSide}
+        className="size-full absolute flex items-start justify-center pointer-events-none webkit-user-select-none
+                data-[is-side=true]:items-center data-[is-side=true]:justify-start
+                "
+      >
+        {player.name && isSide ? (
+          <div className="fixed flex justify-center -rotate-90 left-[5.4vmax]">
            <div
              data-contrast={player.iconTheme}
-              className="absolute text-[4vmin] opacity-50 font-bold
+              className="absolute text-[4vmin] opacity-50 font-bold text-center text-nowrap
              data-[contrast=dark]:text-icons-dark data-[contrast=light]:text-icons-light"
            >
              {player.name}
            </div>
          </div>
-        </div>
-      ) : (
-        <div className="w-full h-full relative flex items-start justify-center">
+        ) : (
          <div
            data-contrast={player.iconTheme}
-            className="absolute text-[4vmin] -top-[1.1vmin] opacity-50 font-bold
+            className="absolute text-[4vmin] -top-[1.1vmin] opacity-50 font-bold text-center
            data-[contrast=dark]:text-icons-dark data-[contrast=light]:text-icons-light"
          >
            {player.name}
          </div>
-        </div>
-      )}
+        )}
+      </div>

      <TextWrapper>
        <LifeCounterTextContainer
@@ -148,7 +157,7 @@ const Health = ({
            {player.lifeTotal}
          </OutlinedText>
          {recentDifference !== 0 && (
-            <RecentDifference data-isSide={isSide} key={differenceKey}>
+            <RecentDifference data-is-side={isSide} key={differenceKey}>
              {recentDifference > 0 ? '+' : ''}
              {recentDifference}
            </RecentDifference>
--- a/src/Components/LifeCounter/LifeCounter.tsx
+++ b/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={() => {
@@ -238,11 +275,14 @@ const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
          recentDifference={recentDifference}
          handleLifeChange={handleLifeChange}
        />
+
        <ExtraCountersBar player={player} />
        <PlayerMenu
          isShown={showPlayerMenu}
          player={player}
          setShowPlayerMenu={setShowPlayerMenu}
+          onForfeit={toggleGameLost}
+          totalPlayers={opponents.length + 1}
        />
      </LifeCounterWrapper>
    </LifeCounterContentWrapper>
--- a/src/Components/Misc/IconCheckbox.tsx
+++ b/src/Components/Misc/IconCheckbox.tsx
@@ -14,7 +14,7 @@ export const IconCheckbox = ({
  className?: string;
 }) => {
  return (
-    <div className={className}>
+    <div className={className} >
      <label>
        <input
          name={name}
--- a/src/Components/Misc/MonarchCrown.tsx
+++ b/src/Components/Misc/MonarchCrown.tsx
@@ -0,0 +1,67 @@
+import { usePlayers } from '../../Hooks/usePlayers';
+import { Monarch } from '../../Icons/generated';
+import { Player, Rotation } from '../../Types/Player';
+import { IconCheckbox } from './IconCheckbox';
+
+export const MonarchCrown = ({ player }: { player: Player }) => {
+  const { players, setPlayers } = usePlayers();
+
+  const iconSize =
+    player.settings.rotation === Rotation.SideFlipped ||
+    player.settings.rotation === Rotation.Side
+      ? '5vmax'
+      : '10vmin';
+
+  const rotationIsSide =
+    player.settings.rotation === Rotation.SideFlipped ||
+    player.settings.rotation === Rotation.Side;
+
+  return (
+    <div
+      data-rotation-is-side={rotationIsSide}
+      className="absolute w-full h-full flex items-start justify-center pointer-events-none z-[1]
+      data-[rotation-is-side=true]:justify-start data-[rotation-is-side=true]:items-center
+      "
+    >
+      <div
+        data-rotation-is-side={rotationIsSide}
+        className="data-[rotation-is-side=true]:-rotate-90"
+      >
+        <IconCheckbox
+          className="pointer-events-all"
+          name="useMonarch"
+          checked={player.isMonarch}
+          icon={<Monarch size={iconSize} color={player.color} stroke="white" />}
+          checkedIcon={
+            <div>
+              <Monarch
+                size={iconSize}
+                stroke="white"
+                className="absolute blur z-[-1] text-icons-gold"
+              />
+              <Monarch
+                size={iconSize}
+                stroke="white"
+                className="text-icons-gold"
+              />
+            </div>
+          }
+          onChange={(e) => {
+            const updatedPlayer = { ...player, isMonarch: e.target.checked };
+
+            const updatedPlayers = players.map((p) => {
+              if (p.index === player.index) {
+                return updatedPlayer;
+              }
+              return { ...p, isMonarch: false };
+            });
+
+            setPlayers(updatedPlayers);
+          }}
+          aria-checked={player.isMonarch}
+          aria-label="Monarch"
+        />
+      </div>
+    </div>
+  );
+};
--- a/src/Components/Misc/TextComponents.tsx
+++ b/src/Components/Misc/TextComponents.tsx
@@ -2,5 +2,4 @@ import { twc } from 'react-twc';

 export const Paragraph = twc.p`text-text-primary`;

-// eslint-disable-next-line react-refresh/only-export-components
 export const H1 = twc.h1`text-text-primary;`;
--- a/src/Components/Players/PlayerMenu.tsx
+++ b/src/Components/Players/PlayerMenu.tsx
@@ -11,10 +11,12 @@ import {
  Experience,
  FullscreenOff,
  FullscreenOn,
+  Monarch,
  NameTag,
  PartnerTax,
  Poison,
  ResetGame,
+  Skull,
 } from '../../Icons/generated';
 import { Player, Rotation } from '../../Types/Player';
 import { PreStartMode } from '../../Types/Settings';
@@ -89,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,
@@ -110,11 +117,13 @@ const PlayerMenu = ({
    wakeLock,
    goToStart,
    settings,
+    setSettings,
    setPlaying,
    setRandomizingPlayer,
    saveCurrentGame,
    initialGameSettings,
    setPreStartCompleted,
+    gameScore,
  } = useGlobalSettings();

  const analytics = useAnalytics();
@@ -157,7 +166,7 @@ const PlayerMenu = ({
  };

  const handleGoToStart = () => {
-    saveCurrentGame({ players, initialGameSettings });
+    saveCurrentGame({ players, initialGameSettings, gameScore });
    goToStart();
    setRandomizingPlayer(true);
  };
@@ -360,6 +369,36 @@ const PlayerMenu = ({
                aria-label="Experience"
              />
            </div>
+            <div>
+              <IconCheckbox
+                name="useMonarch"
+                checked={settings.useMonarch}
+                icon={
+                  <Monarch
+                    size={extraCountersSize}
+                    color="black"
+                    stroke="white"
+                    strokeWidth={2.5}
+                  />
+                }
+                checkedIcon={
+                  <Monarch
+                    size={extraCountersSize}
+                    color={player.color}
+                    stroke="white"
+                    strokeWidth={2.5}
+                  />
+                }
+                onChange={(e) => {
+                  analytics.trackEvent('toggle_monarch', {
+                    checked: e.target.checked,
+                  });
+                  setSettings({ ...settings, useMonarch: e.target.checked });
+                }}
+                aria-checked={settings.useMonarch}
+                aria-label="Monarch"
+              />
+            </div>
          </TogglesSection>
          <ButtonsSections>
            <button
@@ -447,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>

@@ -527,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>
  );
--- a/src/Components/Players/Players.tsx
+++ b/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 &&
--- a/src/Components/ScoreDisplay/ScoreDisplay.tsx
+++ b/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>
+  );
+};
--- a/src/Components/Views/Play.tsx
+++ b/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 { initialGameSettings, playing, settings, preStartCompleted } =
+  const { players, setPlayers, resetCurrentGame, setStartingPlayerIndex } = usePlayers();
+  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>
  );
 };
--- a/src/Components/Views/StartMenu/StartMenu.tsx
+++ b/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;
-                <span className="text-xs">
-                  ({savedGame.players.length}&nbsp;
-                  {savedGame.players.length > 1 ? 'players' : 'player'})
-                </span>
+                <div className="flex flex-col items-center">
+                  <div>
+                    RESUME&nbsp;
+                    <span className="text-xs">
+                      ({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>
--- a/src/Contexts/GlobalSettingsContext.tsx
+++ b/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 =
--- a/src/Data/getInitialPlayers.ts
+++ b/src/Data/getInitialPlayers.ts
@@ -231,6 +231,7 @@ export const createInitialPlayers = ({
      isStartingPlayer: false,
      isSide: rotation === Rotation.Side || rotation === Rotation.SideFlipped,
      name: '',
+      isMonarch: false,
    };

    players.push(player);
--- a/src/Icons/generated/Monarch.tsx
+++ b/src/Icons/generated/Monarch.tsx
@@ -0,0 +1,34 @@
+import PropTypes from 'prop-types';
+import { SVGProps } from 'react';
+interface SVGRProps {
+  title?: string;
+  titleId?: string;
+  size?: string;
+}
+const Monarch = ({
+  title,
+  titleId,
+  ...props
+}: SVGProps<SVGSVGElement> & SVGRProps) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={props.size || 16}
+      height={props.size || 16}
+      fill="none"
+      viewBox="0 0 52 52"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        fill="currentColor"
+        d="M46.163 38.82s-8.614 2.73-14.234 3.106c-2.508.167-3.918 0-6.429 0-2.51 0-3.921.167-6.429 0-5.62-.376-14.234-3.107-14.234-3.107s.637-3.944.459-6.471C5.053 28.888 3 24.038 3 24.038s2.897 2.25 4.592 1.294C9.78 24.098 10.5 20 10.5 20s3.006 6.024 7 5.332c2.386-.414 3.327-1.974 4.5-4.016.97-1.69 1.27-4.827 1.27-4.827l1.77-4.827L25.5 10l.46 1.662 1.77 4.827s.3 3.136 1.27 4.827c1.173 2.042 2.388 3.353 4.5 4.016 4.051 1.273 7-5.332 7-5.332s.72 4.098 2.908 5.332c1.695.956 4.592-1.294 4.592-1.294s-2.053 4.85-2.296 8.31c-.178 2.527.46 6.471.46 6.471"
+      />
+    </svg>
+  );
+};
+Monarch.propTypes = {
+  title: PropTypes.string,
+};
+export default Monarch;
--- a/src/Icons/generated/index.ts
+++ b/src/Icons/generated/index.ts
@@ -10,6 +10,7 @@ export { default as FullscreenOn } from './FullscreenOn';
 export { default as Info } from './Info';
 export { default as LittleGuy } from './LittleGuy';
 export { default as Logo } from './Logo';
+export { default as Monarch } from './Monarch';
 export { default as NameTag } from './NameTag';
 export { default as PartnerTax } from './PartnerTax';
 export { default as Poison } from './Poison';
--- a/src/Icons/svgs/Monarch.svg
+++ b/src/Icons/svgs/Monarch.svg
@@ -0,0 +1,3 @@
+<svg width="52" height="52" viewBox="0 0 52 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M46.1633 38.8191C46.1633 38.8191 37.5494 41.5504 31.9286 41.9256C29.421 42.093 28.0105 41.9256 25.5 41.9256C22.9895 41.9256 21.579 42.093 19.0714 41.9256C13.4506 41.5504 4.83673 38.8191 4.83673 38.8191C4.83673 38.8191 5.47353 34.8751 5.29592 32.3476C5.05284 28.8883 3 24.0377 3 24.0377C3 24.0377 5.89664 26.2882 7.59184 25.332C9.77975 24.0978 10.5 20 10.5 20C10.5 20 13.5058 26.0243 17.5 25.332C19.886 24.9184 20.8269 23.3583 22 21.3158C22.9708 19.6255 23.2704 16.4887 23.2704 16.4887L25.0408 11.6616L25.5 10L25.9592 11.6616L27.7296 16.4887C27.7296 16.4887 28.0292 19.6255 29 21.3158C30.1731 23.3583 31.3881 24.6686 33.5 25.332C37.5515 26.6047 40.5 20 40.5 20C40.5 20 41.2203 24.0978 43.4082 25.332C45.1034 26.2882 48 24.0377 48 24.0377C48 24.0377 45.9472 28.8883 45.7041 32.3476C45.5265 34.8751 46.1633 38.8191 46.1633 38.8191Z" fill="currentColor"/>
+</svg>
--- a/src/Providers/GlobalSettingsProvider.tsx
+++ b/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,16 +95,17 @@ export const GlobalSettingsProvider = ({
    );
  };

-  const removeLocalStorage = async () => {
-    localStorage.removeItem('initialGameSettings');
-    localStorage.removeItem('players');
-    localStorage.removeItem('playing');
-    localStorage.removeItem('showPlay');
-    localStorage.removeItem('preStartComplete');
-
-    setPlaying(false);
-    setShowPlay(false);
-    setPreStartCompleted(false);
+  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
@@ -177,6 +179,21 @@ export const GlobalSettingsProvider = ({
  }

  const ctxValue = useMemo((): GlobalSettingsContextType => {
+    const removeLocalStorage = async () => {
+      localStorage.removeItem('initialGameSettings');
+      localStorage.removeItem('players');
+      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 () => {
      const currentPlayers = localStorage.getItem('players');

@@ -292,13 +309,15 @@ export const GlobalSettingsProvider = ({
      setPreStartCompleted: setPreStartCompletedAndLocalStorage,
      savedGame,
      saveCurrentGame: setCurrentGameAndLocalStorage,
-
      version: {
        installedVersion: import.meta.env.VITE_APP_VERSION,
        remoteVersion,
        isLatest: isLatestVersion,
        checkForNewVersion,
      },
+      gameScore,
+      setGameScore: setGameScoreAndLocalStorage,
+      resetGameScore,
    };
  }, [
    isFullscreen,
@@ -317,6 +336,7 @@ export const GlobalSettingsProvider = ({
    remoteVersion,
    isLatestVersion,
    analytics,
+    gameScore,
  ]);

  return (
--- a/src/Providers/PlayersProvider.tsx
+++ b/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) => {
--- a/src/Types/Player.ts
+++ b/src/Types/Player.ts
@@ -7,6 +7,7 @@ export type Player = {
  commanderDamage: CommanderDamage[];
  extraCounters: ExtraCounter[];
  isStartingPlayer: boolean;
+  isMonarch: boolean;
  hasLost: boolean;
  isSide: boolean;
  name: string;
--- a/src/Types/Settings.ts
+++ b/src/Types/Settings.ts
@@ -26,6 +26,8 @@ export type Settings = {
  goFullscreenOnStart: boolean;
  preStartMode: PreStartMode;
  showAnimations: boolean;
+  useMonarch: boolean;
+  showMatchScore: boolean;
 };

 export type InitialGameSettings = {
@@ -59,6 +61,8 @@ export const settingsSchema = z.object({
  goFullscreenOnStart: z.boolean(),
  preStartMode: z.nativeEnum(PreStartMode),
  showAnimations: z.boolean(),
+  useMonarch: z.boolean().default(false),
+  showMatchScore: z.boolean().default(true),
 });

 export const defaultSettings: Settings = {
@@ -68,4 +72,6 @@ export const defaultSettings: Settings = {
  showPlayerMenuCog: true,
  preStartMode: PreStartMode.None,
  showAnimations: true,
+  useMonarch: false,
+  showMatchScore: true,
 };
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -20,6 +20,7 @@ export const baseColors = {
  icons: {
    dark: '#000000',
    light: '#F9FFE3',
+    gold: '#FFD700',
  },
  text: {
    primary: '#F9FFE3',
Author	SHA1	Message	Date
Viktor Rådberg	ca4e3edb5f	Feature/game score tracking (#48 )	2025-11-17 19:53:17 +01:00
Viktor Rådberg	c6039c2a53	update deps (#40 ) * update deps * fix lint	2025-02-22 12:15:28 +01:00
Viktor Rådberg	6d6da2ad79	fix commander damage text not being centered on chrome (#39 )	2025-02-22 11:45:35 +01:00
Vikeo	51acebb50e	bump settings	2024-09-22 09:57:55 +02:00
Viktor Rådberg	35c1cac691	Add Monarch support (#37 ) * wip * cleanup * monarch button * use monarch button * last cleanup * fix lint * fix lint	2024-09-22 09:57:02 +02:00