forked from external-repos/LifeTrinket
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba9ca354fc |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "life-trinket",
|
"name": "life-trinket",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.9.5",
|
"version": "0.9.6",
|
||||||
"type": "commonjs",
|
"type": "commonjs",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18",
|
"node": ">=18",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Checkbox } from '@mui/material';
|
|||||||
import { useRef } from 'react';
|
import { useRef } from 'react';
|
||||||
import { twc } from 'react-twc';
|
import { twc } from 'react-twc';
|
||||||
import { theme } from '../../Data/theme';
|
import { theme } from '../../Data/theme';
|
||||||
|
import { useAnalytics } from '../../Hooks/useAnalytics';
|
||||||
import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
|
import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
|
||||||
import { usePlayers } from '../../Hooks/usePlayers';
|
import { usePlayers } from '../../Hooks/usePlayers';
|
||||||
import { useSafeRotate } from '../../Hooks/useSafeRotate';
|
import { useSafeRotate } from '../../Hooks/useSafeRotate';
|
||||||
@@ -17,8 +18,8 @@ import {
|
|||||||
ResetGame,
|
ResetGame,
|
||||||
} from '../../Icons/generated';
|
} from '../../Icons/generated';
|
||||||
import { Player, Rotation } from '../../Types/Player';
|
import { Player, Rotation } from '../../Types/Player';
|
||||||
|
import { PreStartMode } from '../../Types/Settings';
|
||||||
import { RotationDivProps } from '../Buttons/CommanderDamage';
|
import { RotationDivProps } from '../Buttons/CommanderDamage';
|
||||||
import { useAnalytics } from '../../Hooks/useAnalytics';
|
|
||||||
|
|
||||||
const PlayerMenuWrapper = twc.div`
|
const PlayerMenuWrapper = twc.div`
|
||||||
flex
|
flex
|
||||||
@@ -112,6 +113,7 @@ const PlayerMenu = ({
|
|||||||
setRandomizingPlayer,
|
setRandomizingPlayer,
|
||||||
saveCurrentGame,
|
saveCurrentGame,
|
||||||
initialGameSettings,
|
initialGameSettings,
|
||||||
|
setPreStartCompleted,
|
||||||
} = useGlobalSettings();
|
} = useGlobalSettings();
|
||||||
|
|
||||||
const analytics = useAnalytics();
|
const analytics = useAnalytics();
|
||||||
@@ -133,8 +135,14 @@ const PlayerMenu = ({
|
|||||||
const handleResetGame = () => {
|
const handleResetGame = () => {
|
||||||
resetCurrentGame();
|
resetCurrentGame();
|
||||||
setShowPlayerMenu(false);
|
setShowPlayerMenu(false);
|
||||||
|
|
||||||
setPlaying(false);
|
setPlaying(false);
|
||||||
setRandomizingPlayer(true);
|
|
||||||
|
if (settings.preStartMode === PreStartMode.RandomKing) {
|
||||||
|
setRandomizingPlayer(true);
|
||||||
|
setPreStartCompleted(false);
|
||||||
|
}
|
||||||
|
|
||||||
analytics.trackEvent('reset_game');
|
analytics.trackEvent('reset_game');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ export const Play = () => {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
players.length > 1 &&
|
||||||
!preStartCompleted &&
|
!preStartCompleted &&
|
||||||
settings.preStartMode !== PreStartMode.None &&
|
settings.preStartMode !== PreStartMode.None &&
|
||||||
!playing &&
|
!playing &&
|
||||||
|
|||||||
Reference in New Issue
Block a user