diff --git a/src/Components/Misc/InfoModal.tsx b/src/Components/Misc/InfoModal.tsx index 5f417bf..6edcaf7 100644 --- a/src/Components/Misc/InfoModal.tsx +++ b/src/Components/Misc/InfoModal.tsx @@ -1,6 +1,7 @@ import { Modal } from '@mui/material'; -import { theme } from '../../Data/theme'; import { twc } from 'react-twc'; +import { Separator } from './Separator'; +import { Paragraph } from './TextComponents'; export const ModalWrapper = twc.div`absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[80vw] h-[85vh] bg-background-default p-4 overflow-scroll rounded-2xl border-none text-text-primary`; @@ -14,14 +15,14 @@ export const InfoModal = ({ isOpen, closeModal }: InfoModalProps) => {
-

📋 Usage Guide

-

+

📋 Usage Guide

+ + There are some controls that you might not know about, so here's a short list of them. -

- -

Life counter

-
    + +

    Life counter

    +
    • Tap on a player's + or - button to add or subtract 1 life. @@ -32,8 +33,10 @@ export const InfoModal = ({ isOpen, closeModal }: InfoModalProps) => {
    -

    Commander damage and other counters

    -
      +

      + Commander damage and other counters +

      +
      • Tap on the counter to add{' '} 1 counter. @@ -44,33 +47,21 @@ export const InfoModal = ({ isOpen, closeModal }: InfoModalProps) => {
      -

      Other

      -

      +

      Other

      + When a player is at or below 0 life, has taken{' '} 21 or more Commander Damage or has{' '} 10 or more poison counters, a button with a skull - will appear on that player's card. -

      -

      - Tap on the button to mark that player as lost, dimming their player + will appear on that player's card. Tapping it will dim the player's card. -

      +
-
-
+
Visit my {' '} GitHub{' '} diff --git a/src/Components/Misc/SettingsModal.tsx b/src/Components/Misc/SettingsModal.tsx index 791dea2..4b39f93 100644 --- a/src/Components/Misc/SettingsModal.tsx +++ b/src/Components/Misc/SettingsModal.tsx @@ -69,7 +69,8 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => { -

⚙️ Settings ⚙️

+

⚙️ Settings ⚙️

+ Show Start Player diff --git a/src/Components/Views/StartMenu/StartMenu.tsx b/src/Components/Views/StartMenu/StartMenu.tsx index cfa5762..bcfca26 100644 --- a/src/Components/Views/StartMenu/StartMenu.tsx +++ b/src/Components/Views/StartMenu/StartMenu.tsx @@ -20,7 +20,7 @@ import { LayoutOptions } from './LayoutOptions'; const MainWrapper = twc.div`w-[100dvw] h-fit pb-14 overflow-hidden items-center flex flex-col`; -const StartButtonFooter = twc.div`fixed bottom-4 z-1`; +const StartButtonFooter = twc.div`w-full max-w-[548px] fixed bottom-4 z-1 items-center flex flex-col px-4`; const ToggleButtonsWrapper = twc.div`flex flex-row justify-between items-center`; @@ -174,87 +174,88 @@ const Start = () => { Life Trinket - - Number of Players - { - setPlayerOptions({ - ...playerOptions, - numberOfPlayers: value as number, - orientation: Orientation.Landscape, - }); - }} - /> - Starting Health - - setPlayerOptions({ - ...playerOptions, - startingLifeTotal: value as number, - orientation: Orientation.Landscape, - }) - } - /> +
+ + Number of Players + { + setPlayerOptions({ + ...playerOptions, + numberOfPlayers: value as number, + orientation: Orientation.Landscape, + }); + }} + /> + Starting Health + + setPlayerOptions({ + ...playerOptions, + startingLifeTotal: value as number, + orientation: Orientation.Landscape, + }) + } + /> - - - Commander - { - if (value) { + + + Commander + { + if (value) { + setPlayerOptions({ + ...playerOptions, + useCommanderDamage: value, + numberOfPlayers: 4, + startingLifeTotal: 40, + orientation: Orientation.Landscape, + }); + return; + } setPlayerOptions({ ...playerOptions, useCommanderDamage: value, - numberOfPlayers: 4, - startingLifeTotal: 40, + numberOfPlayers: 2, + startingLifeTotal: 20, orientation: Orientation.Landscape, }); - return; - } - setPlayerOptions({ - ...playerOptions, - useCommanderDamage: value, - numberOfPlayers: 2, - startingLifeTotal: 20, - orientation: Orientation.Landscape, - }); + }} + /> + + - + > +   Other settings + + - Layout - {/* Layout + {/* @@ -266,32 +267,32 @@ const Start = () => { }) } /> */} - { - setPlayerOptions({ - ...playerOptions, - orientation, - }); - }} - /> - - - {!isPWA && ( -

- If you're on iOS, this page works better if you{' '} - hide the toolbar or{' '} - add the app to your home screen. -

- )} + { + setPlayerOptions({ + ...playerOptions, + orientation, + }); + }} + /> + + {!isPWA && ( +

+ If you're on iOS, this page works better if you{' '} + hide the toolbar or{' '} + add the app to your home screen. +

+ )} +
diff --git a/tailwind.config.ts b/tailwind.config.ts index 9bd7948..6dcf605 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -95,15 +95,3 @@ export default { }, plugins: [tailwindcssGridAreas], } satisfies Config; - -// const fadeOut = keyframes` -// 0% { -// opacity: 1; -// } -// 33% { -// opacity: 0.6; -// } -// 100% { -// opacity: 0; -// } -// `;