From 23684bd0903af6453a4fd329e2200cb0a1dcfa6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20R=C3=A5dberg?= <thevikeo@gmail.com>
Date: Fri, 1 Sep 2023 20:22:48 +0200
Subject: [PATCH] fix commander damage lose check

---
 src/Components/LifeCounter/LifeCounter.tsx   | 17 ++++++++++-------
 src/Components/PlayerMenu/PlayerMenu.tsx     |  1 -
 src/Components/Views/StartMenu/StartMenu.tsx |  1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Components/LifeCounter/LifeCounter.tsx b/src/Components/LifeCounter/LifeCounter.tsx
index 3d3a172..00b4ab7 100644
--- a/src/Components/LifeCounter/LifeCounter.tsx
+++ b/src/Components/LifeCounter/LifeCounter.tsx
@@ -226,15 +226,18 @@ interface LifeCounterProps {
 }
 
 const hasCommanderDamageReached21 = (player: Player) => {
-  const commanderDamageTotal = player.commanderDamage.reduce(
-    (totalDamage, commander) => totalDamage + commander.damageTotal,
-    0
+  const commanderDamageTotals = player.commanderDamage.map(
+    (commanderDamage) => commanderDamage.damageTotal
   );
-  const partnerDamageTotal = player.commanderDamage.reduce(
-    (totalDamage, commander) => totalDamage + commander.partnerDamageTotal,
-    0
+
+  const partnerDamageTotals = player.commanderDamage.map(
+    (commanderDamage) => commanderDamage.partnerDamageTotal
+  );
+
+  return (
+    commanderDamageTotals.some((damageTotal) => damageTotal >= 21) ||
+    partnerDamageTotals.some((partnerDamageTotal) => partnerDamageTotal >= 21)
   );
-  return commanderDamageTotal >= 21 || partnerDamageTotal >= 21;
 };
 
 const playerCanLose = (player: Player) => {
diff --git a/src/Components/PlayerMenu/PlayerMenu.tsx b/src/Components/PlayerMenu/PlayerMenu.tsx
index c9aa201..15a07d4 100644
--- a/src/Components/PlayerMenu/PlayerMenu.tsx
+++ b/src/Components/PlayerMenu/PlayerMenu.tsx
@@ -78,7 +78,6 @@ const PlayerMenu = ({
   resetCurrentGame,
 }: PlayerMenuProps) => {
   const handleOnClick = () => {
-    console.log('hej');
     setShowPlayerMenu(false);
   };
 
diff --git a/src/Components/Views/StartMenu/StartMenu.tsx b/src/Components/Views/StartMenu/StartMenu.tsx
index 608c6e7..3c98708 100644
--- a/src/Components/Views/StartMenu/StartMenu.tsx
+++ b/src/Components/Views/StartMenu/StartMenu.tsx
@@ -166,7 +166,6 @@ const Start = ({
         size="2rem"
         style={{ position: 'absolute', top: '1rem', left: '1rem' }}
         onClick={() => {
-          console.log('lmao');
           setOpenModal(!openModal);
         }}
       />