diff --git a/src/Components/Views/StartMenu/StartMenu.tsx b/src/Components/Views/StartMenu/StartMenu.tsx index ec2b542..e3f5806 100644 --- a/src/Components/Views/StartMenu/StartMenu.tsx +++ b/src/Components/Views/StartMenu/StartMenu.tsx @@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'; import styled from 'styled-components'; import { GridTemplateAreas } from '../../../Data/GridTemplateAreas'; import { - InitialPlaySettings, + InitialGameSettings, createInitialPlayers, } from '../../../Data/getInitialPlayers'; import { theme } from '../../../Data/theme'; @@ -113,7 +113,7 @@ const Start = () => { const [openModal, setOpenModal] = useState(false); const [keepAwake, setKeepAwake] = useState(true); - const [playerOptions, setPlayerOptions] = useState( + const [playerOptions, setPlayerOptions] = useState( initialGameSettings || { numberOfPlayers: 4, startingLifeTotal: 40, diff --git a/src/Contexts/GlobalSettingsContext.tsx b/src/Contexts/GlobalSettingsContext.tsx index 27edeeb..1b44527 100644 --- a/src/Contexts/GlobalSettingsContext.tsx +++ b/src/Contexts/GlobalSettingsContext.tsx @@ -1,5 +1,5 @@ import { createContext } from 'react'; -import { InitialPlaySettings } from '../Data/getInitialPlayers'; +import { InitialGameSettings } from '../Data/getInitialPlayers'; export type GlobalSettingsContextType = { fullscreen: { @@ -18,8 +18,8 @@ export type GlobalSettingsContextType = { goToStart: () => void; showPlay: boolean; setShowPlay: (showPlay: boolean) => void; - initialGameSettings: InitialPlaySettings | null; - setInitialGameSettings: (initialGameSettings: InitialPlaySettings) => void; + initialGameSettings: InitialGameSettings | null; + setInitialGameSettings: (initialGameSettings: InitialGameSettings) => void; showStartingPlayer: boolean; setShowStartingPlayer: (showStartingPlayer: boolean) => void; }; diff --git a/src/Data/getInitialPlayers.ts b/src/Data/getInitialPlayers.ts index 3111b9d..e457229 100644 --- a/src/Data/getInitialPlayers.ts +++ b/src/Data/getInitialPlayers.ts @@ -1,7 +1,7 @@ import { Player, Rotation } from '../Types/Player'; import { GridTemplateAreas } from './GridTemplateAreas'; -export type InitialPlaySettings = { +export type InitialGameSettings = { startingLifeTotal: number; useCommanderDamage: boolean; numberOfPlayers: number; @@ -197,7 +197,7 @@ export const createInitialPlayers = ({ startingLifeTotal, useCommanderDamage, gridAreas, -}: InitialPlaySettings): Player[] => { +}: InitialGameSettings): Player[] => { const players: Player[] = []; const availableColors = [...presetColors]; // Create a copy of the colors array const firstPlayerIndex = Math.floor(Math.random() * numberOfPlayers); diff --git a/src/Providers/GlobalSettingsProvider.tsx b/src/Providers/GlobalSettingsProvider.tsx index df4d639..cd9e1e6 100644 --- a/src/Providers/GlobalSettingsProvider.tsx +++ b/src/Providers/GlobalSettingsProvider.tsx @@ -5,7 +5,7 @@ import { } from '../Contexts/GlobalSettingsContext'; import { useWakeLock } from 'react-screen-wake-lock'; import { useAnalytics } from '../Hooks/useAnalytics'; -import { InitialPlaySettings } from '../Data/getInitialPlayers'; +import { InitialGameSettings } from '../Data/getInitialPlayers'; export const GlobalSettingsProvider = ({ children, @@ -23,7 +23,7 @@ export const GlobalSettingsProvider = ({ const [showStartingPlayer, setShowStartingPlayer] = useState(true); const [initialGameSettings, setInitialGameSettings] = - useState( + useState( savedGameSettings ? JSON.parse(savedGameSettings) : null ); diff --git a/src/Providers/PlayersProvider.tsx b/src/Providers/PlayersProvider.tsx index 053fe73..97c1e77 100644 --- a/src/Providers/PlayersProvider.tsx +++ b/src/Providers/PlayersProvider.tsx @@ -2,7 +2,7 @@ import { ReactNode, useEffect } from 'react'; import { Player } from '../Types/Player'; import { useMemo, useState } from 'react'; import { PlayersContextType, PlayersContext } from '../Contexts/PlayersContext'; -import { InitialPlaySettings } from '../Data/getInitialPlayers'; +import { InitialGameSettings } from '../Data/getInitialPlayers'; export const PlayersProvider = ({ children }: { children: ReactNode }) => { const savedPlayers = localStorage.getItem('players'); @@ -42,7 +42,7 @@ export const PlayersProvider = ({ children }: { children: ReactNode }) => { const resetCurrentGame = () => { const savedGameSettings = localStorage.getItem('initialGameSettings'); - const initialGameSettings: InitialPlaySettings = savedGameSettings + const initialGameSettings: InitialGameSettings = savedGameSettings ? JSON.parse(savedGameSettings) : null;