From ba9ca354fca0a67c3500373d46f9bb264a32b33a Mon Sep 17 00:00:00 2001 From: Vikeo Date: Mon, 1 Apr 2024 18:48:06 +0200 Subject: [PATCH] fix crown being visible after reset --- package.json | 2 +- src/Components/Players/PlayerMenu.tsx | 12 ++++++++++-- src/Components/Views/Play.tsx | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 0075fa7..25334e8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "life-trinket", "private": true, - "version": "0.9.5", + "version": "0.9.6", "type": "commonjs", "engines": { "node": ">=18", diff --git a/src/Components/Players/PlayerMenu.tsx b/src/Components/Players/PlayerMenu.tsx index 88d1e6a..fccfc9e 100644 --- a/src/Components/Players/PlayerMenu.tsx +++ b/src/Components/Players/PlayerMenu.tsx @@ -2,6 +2,7 @@ import { Checkbox } from '@mui/material'; import { useRef } from 'react'; import { twc } from 'react-twc'; import { theme } from '../../Data/theme'; +import { useAnalytics } from '../../Hooks/useAnalytics'; import { useGlobalSettings } from '../../Hooks/useGlobalSettings'; import { usePlayers } from '../../Hooks/usePlayers'; import { useSafeRotate } from '../../Hooks/useSafeRotate'; @@ -17,8 +18,8 @@ import { ResetGame, } from '../../Icons/generated'; import { Player, Rotation } from '../../Types/Player'; +import { PreStartMode } from '../../Types/Settings'; import { RotationDivProps } from '../Buttons/CommanderDamage'; -import { useAnalytics } from '../../Hooks/useAnalytics'; const PlayerMenuWrapper = twc.div` flex @@ -112,6 +113,7 @@ const PlayerMenu = ({ setRandomizingPlayer, saveCurrentGame, initialGameSettings, + setPreStartCompleted, } = useGlobalSettings(); const analytics = useAnalytics(); @@ -133,8 +135,14 @@ const PlayerMenu = ({ const handleResetGame = () => { resetCurrentGame(); setShowPlayerMenu(false); + setPlaying(false); - setRandomizingPlayer(true); + + if (settings.preStartMode === PreStartMode.RandomKing) { + setRandomizingPlayer(true); + setPreStartCompleted(false); + } + analytics.trackEvent('reset_game'); }; diff --git a/src/Components/Views/Play.tsx b/src/Components/Views/Play.tsx index bb65b56..ead190c 100644 --- a/src/Components/Views/Play.tsx +++ b/src/Components/Views/Play.tsx @@ -95,6 +95,7 @@ export const Play = () => { }, []); if ( + players.length > 1 && !preStartCompleted && settings.preStartMode !== PreStartMode.None && !playing &&