ryan/LifeTrinket
1
0
Fork 0
forked from external-repos/LifeTrinket
Code Pull Requests Activity

rename again

Browse Source
This commit is contained in:
Viktor Rådberg
2023-09-27 19:03:33 +02:00
parent 38acce206d
commit abae6f85e3
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Views/StartMenu/StartMenu.tsx
View File

@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { GridTemplateAreas } from '../../../Data/GridTemplateAreas'; import { GridTemplateAreas } from '../../../Data/GridTemplateAreas';
import { import {
InitialPlaySettings, InitialGameSettings,
createInitialPlayers, createInitialPlayers,
} from '../../../Data/getInitialPlayers'; } from '../../../Data/getInitialPlayers';
import { theme } from '../../../Data/theme'; import { theme } from '../../../Data/theme';
@@ -113,7 +113,7 @@ const Start = () => {
const [openModal, setOpenModal] = useState(false); const [openModal, setOpenModal] = useState(false);
const [keepAwake, setKeepAwake] = useState(true); const [keepAwake, setKeepAwake] = useState(true);
const [playerOptions, setPlayerOptions] = useState<InitialPlaySettings>( const [playerOptions, setPlayerOptions] = useState<InitialGameSettings>(
initialGameSettings || { initialGameSettings || {
numberOfPlayers: 4, numberOfPlayers: 4,
startingLifeTotal: 40, startingLifeTotal: 40,

6
src/Contexts/GlobalSettingsContext.tsx
View File

@@ -1,5 +1,5 @@
import { createContext } from 'react'; import { createContext } from 'react';
import { InitialPlaySettings } from '../Data/getInitialPlayers'; import { InitialGameSettings } from '../Data/getInitialPlayers';
export type GlobalSettingsContextType = { export type GlobalSettingsContextType = {
fullscreen: { fullscreen: {
@@ -18,8 +18,8 @@ export type GlobalSettingsContextType = {
goToStart: () => void; goToStart: () => void;
showPlay: boolean; showPlay: boolean;
setShowPlay: (showPlay: boolean) => void; setShowPlay: (showPlay: boolean) => void;
initialGameSettings: InitialPlaySettings | null; initialGameSettings: InitialGameSettings | null;
setInitialGameSettings: (initialGameSettings: InitialPlaySettings) => void; setInitialGameSettings: (initialGameSettings: InitialGameSettings) => void;
showStartingPlayer: boolean; showStartingPlayer: boolean;
setShowStartingPlayer: (showStartingPlayer: boolean) => void; setShowStartingPlayer: (showStartingPlayer: boolean) => void;
}; };

4
src/Data/getInitialPlayers.ts
View File

@@ -1,7 +1,7 @@
import { Player, Rotation } from '../Types/Player'; import { Player, Rotation } from '../Types/Player';
import { GridTemplateAreas } from './GridTemplateAreas'; import { GridTemplateAreas } from './GridTemplateAreas';
export type InitialPlaySettings = { export type InitialGameSettings = {
startingLifeTotal: number; startingLifeTotal: number;
useCommanderDamage: boolean; useCommanderDamage: boolean;
numberOfPlayers: number; numberOfPlayers: number;
@@ -197,7 +197,7 @@ export const createInitialPlayers = ({
startingLifeTotal, startingLifeTotal,
useCommanderDamage, useCommanderDamage,
gridAreas, gridAreas,
}: InitialPlaySettings): Player[] => { }: InitialGameSettings): Player[] => {
const players: Player[] = []; const players: Player[] = [];
const availableColors = [...presetColors]; // Create a copy of the colors array const availableColors = [...presetColors]; // Create a copy of the colors array
const firstPlayerIndex = Math.floor(Math.random() * numberOfPlayers); const firstPlayerIndex = Math.floor(Math.random() * numberOfPlayers);

4
src/Providers/GlobalSettingsProvider.tsx
View File

@@ -5,7 +5,7 @@ import {
} from '../Contexts/GlobalSettingsContext'; } from '../Contexts/GlobalSettingsContext';
import { useWakeLock } from 'react-screen-wake-lock'; import { useWakeLock } from 'react-screen-wake-lock';
import { useAnalytics } from '../Hooks/useAnalytics'; import { useAnalytics } from '../Hooks/useAnalytics';
import { InitialPlaySettings } from '../Data/getInitialPlayers'; import { InitialGameSettings } from '../Data/getInitialPlayers';
export const GlobalSettingsProvider = ({ export const GlobalSettingsProvider = ({
children, children,
@@ -23,7 +23,7 @@ export const GlobalSettingsProvider = ({
const [showStartingPlayer, setShowStartingPlayer] = useState(true); const [showStartingPlayer, setShowStartingPlayer] = useState(true);
const [initialGameSettings, setInitialGameSettings] = const [initialGameSettings, setInitialGameSettings] =
useState<InitialPlaySettings | null>( useState<InitialGameSettings | null>(
savedGameSettings ? JSON.parse(savedGameSettings) : null savedGameSettings ? JSON.parse(savedGameSettings) : null
); );

4
src/Providers/PlayersProvider.tsx
View File

@@ -2,7 +2,7 @@ import { ReactNode, useEffect } from 'react';
import { Player } from '../Types/Player'; import { Player } from '../Types/Player';
import { useMemo, useState } from 'react'; import { useMemo, useState } from 'react';
import { PlayersContextType, PlayersContext } from '../Contexts/PlayersContext'; import { PlayersContextType, PlayersContext } from '../Contexts/PlayersContext';
import { InitialPlaySettings } from '../Data/getInitialPlayers'; import { InitialGameSettings } from '../Data/getInitialPlayers';
export const PlayersProvider = ({ children }: { children: ReactNode }) => { export const PlayersProvider = ({ children }: { children: ReactNode }) => {
const savedPlayers = localStorage.getItem('players'); const savedPlayers = localStorage.getItem('players');
@@ -42,7 +42,7 @@ export const PlayersProvider = ({ children }: { children: ReactNode }) => {
const resetCurrentGame = () => { const resetCurrentGame = () => {
const savedGameSettings = localStorage.getItem('initialGameSettings'); const savedGameSettings = localStorage.getItem('initialGameSettings');
const initialGameSettings: InitialPlaySettings = savedGameSettings const initialGameSettings: InitialGameSettings = savedGameSettings
? JSON.parse(savedGameSettings) ? JSON.parse(savedGameSettings)
: null; : null;