Changeset aac3b2b

Timestamp:

07/07/22 23:53:57 (23 months ago)

Author:

anastasovv <simon@…>

Branches:

main

Children:

95ce58b

Parents:

189cd8f

Message:

Fixes to poker functionality

Files:

• components/poker/sections/Messages.jsx (modified) (1 diff)
• components/poker/sections/PickATable.jsx (modified) (1 diff)
• components/poker/sections/PlayButtons.jsx (modified) (1 diff)
• pages/api/poker/index.js (modified) (3 diffs)
• pages/api/poker/tableSpecific.js (modified) (9 diffs)
• pages/api/postgre/index.js (modified) (1 diff)

components/poker/sections/Messages.jsx

@@ -24 +24 @@
     return (
         <div className="pokerMessagesContainer">
-            { playerState.pokerGame.table.started && playerState.pokerGame.table.ended && playerState.pokerGame.table.winners.length === 1 && <p>Game over - {playerState.pokerGame.table.winners[0]?.displayName} won ${playerState.pokerGame.table.winners[0]?.wonAmount} with a {playerState.pokerGame.table.winners[0]?.hand?.hand} combination! Congratulations.</p> }
-            { playerState.pokerGame.table.started && playerState.pokerGame.table.ended && playerState.pokerGame.table.winners.length > 1 && <p>Game over - {playerState.pokerGame.table.winners.map(e=>e.displayName).join(", ")} drew!</p> }
-            { playerState.pokerGame.table.started && playerState.pokerGame.table.ended && <p>New game will start soon.</p> }
+            { playerState.pokerGame.table.ended && playerState.pokerGame.table.onlyOnePlayerLeft && <p>Game over - {playerState.pokerGame.table.winners[0]?.displayName} won ${playerState.pokerGame.table.winners[0]?.wonAmount} because everyone else folded! Congratulations.</p> }
+            { playerState.pokerGame.table.ended && !playerState.pokerGame.table.onlyOnePlayerLeft && playerState.pokerGame.table.winners.length === 1 && <p>Game over - {playerState.pokerGame.table.winners[0]?.displayName} won ${playerState.pokerGame.table.winners[0]?.wonAmount} with a {playerState.pokerGame.table.winners[0]?.hand?.hand} combination! Congratulations.</p> }
+            { playerState.pokerGame.table.ended && playerState.pokerGame.table.winners.length > 1 && <p>Game over - {playerState.pokerGame.table.winners.map(e=>e.displayName).join(", ")} drew!</p> }
+            { playerState.pokerGame.table.ended && <p>New game will start soon.</p> }
 
             { playerState.pokerGame.table.started && !playerState.pokerGame.table.ended && <p>Round {playerState.pokerGame.table.round}/4{roundMessage}</p> }
-            { !playerState.pokerGame.table.started && <p>Waiting for coordinator {playerState.pokerGame.table.creator} to start the game.</p> }
+            { !playerState.pokerGame.table.started && !playerState.pokerGame.table.ended && <p>Waiting for coordinator {playerState.pokerGame.table.creator} to start the game.</p> }
             { playerState.pokerGame.table.started && !playerState.pokerGame.table.ended && <p>{turnMessage}</p> }
             { playerState.pokerGame.table.started && !playerState.pokerGame.table.ended && <p>{callMessage}</p> }

components/poker/sections/PickATable.jsx

@@ -49 +49 @@
                 <h3>Pick a table:</h3>
                 <div onClick={(e) => joinATable(e)}>
-                    {playerState.pokerGame.tables.map(table => (
+                    {playerState.pokerGame.tables.filter(table=>table.started===false).map(table => (
                         <div data-table={table.id} key={table.id}>
                             <p data-table={table.id}>Table name: {table.name}</p>
                             <p data-table={table.id}>Creator: {table.creator}</p>
-                            <p data-table={table.id}>Players: {table.players.length}/8</p>
+                            <p data-table={table.id}>Players: {table.players.filter(e=>e.isGhost===false).length}/8</p>
                             <p data-table={table.id}>Join</p>
                         </div>

components/poker/sections/PlayButtons.jsx

@@ -60 +60 @@
     return (
       <div className="pokerPlayButtonsContainer">
-        {!playerState.pokerGame.table.started && playerState.pokerGame.player.isCoordinator && playerState.pokerGame.player.isSatDown && <button className="secondaryButton" onClick={() => startGame()}>Start game</button>}
+        {!playerState.pokerGame.table.started && !playerState.pokerGame.table.ended && playerState.pokerGame.player.isCoordinator && playerState.pokerGame.player.isSatDown && <button className="secondaryButton" onClick={() => startGame()}>Start game</button>}
         {!playerState.pokerGame.table.started && !playerState.pokerGame.player.isSatDown && <button className="secondaryButton" onClick={() => sitDown()}>Take a seat</button>}
       </div>

pages/api/poker/index.js

@@ -47 +47 @@
             },
         }],
+        onlyOnePlayerLeft: false,
         winners: [],
         splitWinners: false,
@@ -281 +282 @@
             const { success, table } = getTableAndPlayer(req.query.session_id)
 
-            if (success && !table.started) {
+            if (success && !table.started && !table.ended && table.players.filter(e=>e.isSatDown===true).length >= 2) {
                 table.players.forEach(player => {
                     axios.get(`${process.env.HOME_URL}/api/postgre/?action=check_if_logged_in&session_id=${player.id}`).then(postgreRes => {
@@ -342 +343 @@
                 player.isFolded = true;
 
-                if (table.players[table.turnIdx] !== undefined && table.players[table.turnIdx] === player) {
-                    setNextPlayerIdx(table.id);
+                if (table.started) {
+                    if (table.players[table.turnIdx] !== undefined && table.players[table.turnIdx] === player) {
+                        setNextPlayerIdx(table.id);
+                    }
+                }
+                else {
+                    table.players = table.players.filter(e=>e.isGhost === false);
                 }
             }

pages/api/poker/tableSpecific.js

@@ -62 +62 @@
     const tableIdx = tables.map(e=>e.id).indexOf(tableId);
 
-    if (tables[tableIdx] !== undefined) {
-        const table = tables[tableIdx];
+    if (tables[tableIdx] !== undefined && !tables[tableIdx].ended) {
+        const table = tables[tableIdx];
+
+        const remainingPlayers = table.players.filter(e=>e.isSatDown===true).filter(e=>e.isGhost===false);
+        if (remainingPlayers.length === 1) {
+            setWinnerDirect(table.id, remainingPlayers[0]);
+
+            return ;
+        }
+
+        const remainingPlayersWithCredits = table.players.filter(e=>e.isSatDown===true).filter(e=>e.isGhost===false).filter(e=>e.isFolded===false).filter(e=>e.credits > 0);
+        if (remainingPlayersWithCredits.length === 1) {
+            progressRoundTillTheEnd(table.id);
+
+            return ;
+        }
 
         if (table.turnTimeout !== null) clearTimeout(table.turnTimeout);
@@ -83 +97 @@
                         if (table.players[table.turnIdx] !== undefined) {
                             table.players[table.turnIdx].isFolded = true;
-
+                            
                             setNextPlayerIdx(table.id);
                         }
@@ -136 +150 @@
         table.ended = false;
         table.round = 0;
-        table.turnIdx = 0;
+        table.turnIdx = -1;
         table.turnTimeout = null;
         table.pot = 0;
@@ -143 +157 @@
         table.deck = [...deck];
 
-        table.players = table.players.filter(e=>e.isGhost === false);
-        table.players = table.players.filter(e=>e.credits >= 20);
+        table.players = table.players.filter(e=>e.isGhost === false).filter(e=>e.credits >= 20);
 
         table.players.forEach(player => {
@@ -157 +170 @@
             }
         })
+
+        table.onlyOnePlayerLeft = false;
         table.winners = [];
         table.splitWinners = false;
@@ -168 +183 @@
     if (tables[tableIdx] !== undefined) {
         const table = tables[tableIdx];
-
-        const satDownPlayers = table.players.filter(e => e.isSatDown === true);
-        const satDownCount = satDownPlayers.length;
 
         table.players.forEach(player => {
@@ -212 +224 @@
 }
 
+export function setWinnerDirect(tableId, player) {
+    const tableIdx = tables.map(e=>e.id).indexOf(tableId);
+
+    if (tables[tableIdx] !== undefined) {
+        const table = tables[tableIdx];
+
+        table.turnIdx = -1;
+        table.started = false;
+        table.ended = true;
+
+        table.onlyOnePlayerLeft = true;
+        table.winners = [player];
+
+        giveMoneyToTheWinners(table.id);
+    }
+}
+
 export function setWinner(tableId) {
     const tableIdx = tables.map(e=>e.id).indexOf(tableId);
@@ -259 +288 @@
 }
 
+export function progressRoundTillTheEnd(tableId) {
+    const tableIdx = tables.map(e=>e.id).indexOf(tableId);
+
+    if (tables[tableIdx] !== undefined) {
+        const table = tables[tableIdx];
+
+        while (table.round < 4) {
+            table.round++;
+            getCardsOnTable(table.id);
+        }
+
+        table.started = false;
+        table.ended = true;
+        if (table.ended && table.winners.length === 0) {
+            setWinner(table.id);
+        }
+    }
+}
+
 export function progressRoundIfNeeded(tableId) {
     const tableIdx = tables.map(e=>e.id).indexOf(tableId);
@@ -277 +325 @@
             }
             else {
+                table.started = false;
                 table.ended = true;
             }

pages/api/postgre/index.js

@@ -413 +413 @@
                     // Already logged in
                     res.json({
-                      success: false,
-                      message: 'You are already logged in',
+                      success: true,
+                      message: 'Login successful',
+                      session: session,
                     })
                   }