From e98d7d5e679e11deea656db3e9476303d1692e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20R=C3=A5dberg?= Date: Thu, 6 Jul 2023 23:01:19 +0200 Subject: [PATCH] small fix --- my-app/src/App.tsx | 2 +- .../src/Components/Buttons/ExtraCounter.tsx | 6 +++--- my-app/src/Components/PlayerMenu/Settings.tsx | 19 +++++++++---------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/my-app/src/App.tsx b/my-app/src/App.tsx index b8ea4ab..a6ad826 100644 --- a/my-app/src/App.tsx +++ b/my-app/src/App.tsx @@ -3,7 +3,7 @@ import './App.css'; import Counters from './Components/Counters/Counters'; import styled from 'styled-components'; import { Player } from './Types/Player'; -import { initialPlayers } from './Data/initialPlayers'; +import { initialPlayers } from './Data/getInitialPlayers'; const MainWrapper = styled.div` width: 100vmax; diff --git a/my-app/src/Components/Buttons/ExtraCounter.tsx b/my-app/src/Components/Buttons/ExtraCounter.tsx index 7a24ca2..9eb8603 100644 --- a/my-app/src/Components/Buttons/ExtraCounter.tsx +++ b/my-app/src/Components/Buttons/ExtraCounter.tsx @@ -22,10 +22,10 @@ export const CenteredText = styled.div` top: 50%; left: 50%; transform: translate(-50%, -50%); - font-size: 5vmin; + font-size: 7vmin; font-weight: bold; - text-shadow: -1px -1px 0 #ffffff, 1px -1px 0 #ffffff, -1px 1px 0 #ffffff, - 1px 1px 0 #ffffff; + -webkit-text-stroke: 2px #ffffff; /* Add a 2-pixel black stroke */ + -webkit-text-fill-color: #000000; color: #000000; user-select: none; -webkit-touch-callout: none; diff --git a/my-app/src/Components/PlayerMenu/Settings.tsx b/my-app/src/Components/PlayerMenu/Settings.tsx index f831f7f..7a5db1c 100644 --- a/my-app/src/Components/PlayerMenu/Settings.tsx +++ b/my-app/src/Components/PlayerMenu/Settings.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Player } from '../../Types/Player'; import * as S from './PlayerMenu.style'; -import { initialPlayers } from '../../Data/initialPlayers'; +import { initialPlayers } from '../../Data/getInitialPlayers'; type SettingsProps = { player: Player; @@ -40,14 +40,15 @@ const Settings = ({ player, opponents, onChange }: SettingsProps) => { opponents.forEach((opponent) => { // Only reset commander damage from the player that is being reset opponent.commanderDamage.forEach((commanderDamage) => { - if (commanderDamage.source === player.key) { - opponent.lifeTotal = - opponent.lifeTotal + - commanderDamage.damageTotal + - commanderDamage.partnerDamageTotal; - commanderDamage.damageTotal = 0; - commanderDamage.partnerDamageTotal = 0; + if (commanderDamage.source !== player.key) { + return; } + opponent.lifeTotal = + opponent.lifeTotal + + commanderDamage.damageTotal + + commanderDamage.partnerDamageTotal; + commanderDamage.damageTotal = 0; + commanderDamage.partnerDamageTotal = 0; }); onChange(opponent); }); @@ -56,9 +57,7 @@ const Settings = ({ player, opponents, onChange }: SettingsProps) => { }; const handleNewGame = () => { - //remove local storage localStorage.removeItem('players'); - //reload page window.location.reload(); };