fix commander damage lose check

This commit is contained in:
Viktor Rådberg
2023-09-01 20:22:48 +02:00
parent 51b4cb9923
commit 23684bd090
3 changed files with 10 additions and 9 deletions

View File

@@ -226,15 +226,18 @@ interface LifeCounterProps {
} }
const hasCommanderDamageReached21 = (player: Player) => { const hasCommanderDamageReached21 = (player: Player) => {
const commanderDamageTotal = player.commanderDamage.reduce( const commanderDamageTotals = player.commanderDamage.map(
(totalDamage, commander) => totalDamage + commander.damageTotal, (commanderDamage) => commanderDamage.damageTotal
0
); );
const partnerDamageTotal = player.commanderDamage.reduce(
(totalDamage, commander) => totalDamage + commander.partnerDamageTotal, const partnerDamageTotals = player.commanderDamage.map(
0 (commanderDamage) => commanderDamage.partnerDamageTotal
);
return (
commanderDamageTotals.some((damageTotal) => damageTotal >= 21) ||
partnerDamageTotals.some((partnerDamageTotal) => partnerDamageTotal >= 21)
); );
return commanderDamageTotal >= 21 || partnerDamageTotal >= 21;
}; };
const playerCanLose = (player: Player) => { const playerCanLose = (player: Player) => {

View File

@@ -78,7 +78,6 @@ const PlayerMenu = ({
resetCurrentGame, resetCurrentGame,
}: PlayerMenuProps) => { }: PlayerMenuProps) => {
const handleOnClick = () => { const handleOnClick = () => {
console.log('hej');
setShowPlayerMenu(false); setShowPlayerMenu(false);
}; };

View File

@@ -166,7 +166,6 @@ const Start = ({
size="2rem" size="2rem"
style={{ position: 'absolute', top: '1rem', left: '1rem' }} style={{ position: 'absolute', top: '1rem', left: '1rem' }}
onClick={() => { onClick={() => {
console.log('lmao');
setOpenModal(!openModal); setOpenModal(!openModal);
}} }}
/> />