Add dummy mechanism

Author: pociej

lib/IMP.js

@@ -5,78 +5,78 @@
  *   https://opensource.org/licenses/MIT
  */
 
-export default function IMPs(score1, score2) {
-    const diff = Math.abs(score1 - score2); //score 1 is the teams score on table 1, score 2 the same teams score on table 2.
-    var points;
+// export default function IMPs(score1, score2) {
+//     const diff = Math.abs(score1 - score2); //score 1 is the teams score on table 1, score 2 the same teams score on table 2.
+//     var points;
 
-    if (diff < 20) {
-        return points = [0, 0]; //first number is IMP of the team whose score we entered, score 2 is the other teams IMP=
-    }
+//     if (diff < 20) {
+//         return points = [0, 0]; //first number is IMP of the team whose score we entered, score 2 is the other teams IMP=
+//     }
 
-        else if (diff >= 170 && diff <= 210) {
-            points= [5, 0];
-        }
+//         else if (diff >= 170 && diff <= 210) {
+//             points= [5, 0];
+//         }
 
-        else if (diff >= 220 && diff <= 260) {
-            points= [6, 0];
-        }
-        else if (diff >= 270 && diff <= 310) {
-            points= [7, 0];
-        }
+//         else if (diff >= 220 && diff <= 260) {
+//             points= [6, 0];
+//         }
+//         else if (diff >= 270 && diff <= 310) {
+//             points= [7, 0];
+//         }
 
-        else if (diff >= 320 && diff <= 360) {
-            points= [8, 0];
-        }
-        else if (diff >= 370 && diff <= 420) {
-            points= [9, 0];
-        }
-        else if (diff >= 430 && diff <= 490) {
-            points= [10, 0];
-        }
-        else if (diff >= 500 && diff <= 590) {
-            points= [11, 0];
-        }
-        else if (diff >= 600 && diff <= 740) {
-            points= [12, 0];
-        }
-        else if (diff >= 750 && diff <= 890) {
-            points= [13, 0];
-        }
-        else if (diff >= 900 && diff <= 1090) {
-            points= [14, 0];
-        }
-        else if (diff >= 1100 && diff <= 1290) {
-            points= [15, 0];
-        }
-        else if (diff >= 1300 && diff <= 1490) {
-            points= [16, 0];
-        }
-        else if (diff >= 1500 && diff <= 1740) {
-            points= [17, 0];
-        }
-        else if (diff >= 1750 && diff <= 1990) {
-            points= [18, 0];
-        }
-        else if (diff >= 2000 && diff <= 2240) {
-            points= [19, 0];
-        }
-        else if (diff >= 2250 && diff <= 2490) {
-            points= [20, 0];
-        }
-        else if (diff >= 2500 && diff <= 2990) {
-            points= [21, 0];
-        }
-        else if (diff >= 3000 && diff <= 3490) {
-            points= [22, 0];
-        }
-        else if (diff >= 3500 && diff <= 3990) {
-            points= [23, 0];
-        }
-        else{
-            points= [24, 0]
-        }
-        if(score2>score1){
-            points=points.reverse();
-        }
-        return points;
-    }
+//         else if (diff >= 320 && diff <= 360) {
+//             points= [8, 0];
+//         }
+//         else if (diff >= 370 && diff <= 420) {
+//             points= [9, 0];
+//         }
+//         else if (diff >= 430 && diff <= 490) {
+//             points= [10, 0];
+//         }
+//         else if (diff >= 500 && diff <= 590) {
+//             points= [11, 0];
+//         }
+//         else if (diff >= 600 && diff <= 740) {
+//             points= [12, 0];
+//         }
+//         else if (diff >= 750 && diff <= 890) {
+//             points= [13, 0];
+//         }
+//         else if (diff >= 900 && diff <= 1090) {
+//             points= [14, 0];
+//         }
+//         else if (diff >= 1100 && diff <= 1290) {
+//             points= [15, 0];
+//         }
+//         else if (diff >= 1300 && diff <= 1490) {
+//             points= [16, 0];
+//         }
+//         else if (diff >= 1500 && diff <= 1740) {
+//             points= [17, 0];
+//         }
+//         else if (diff >= 1750 && diff <= 1990) {
+//             points= [18, 0];
+//         }
+//         else if (diff >= 2000 && diff <= 2240) {
+//             points= [19, 0];
+//         }
+//         else if (diff >= 2250 && diff <= 2490) {
+//             points= [20, 0];
+//         }
+//         else if (diff >= 2500 && diff <= 2990) {
+//             points= [21, 0];
+//         }
+//         else if (diff >= 3000 && diff <= 3490) {
+//             points= [22, 0];
+//         }
+//         else if (diff >= 3500 && diff <= 3990) {
+//             points= [23, 0];
+//         }
+//         else{
+//             points= [24, 0]
+//         }
+//         if(score2>score1){
+//             points=points.reverse();
+//         }
+//         return points;
+//     }

lib/VP.js

@@ -1,21 +1,21 @@
-/* Copyright 2020 Daniel Bohm & Patrik Perger and the Bridge Hackathon Contributors
-*
-*   Use of this source code is governed by an MIT-style
-*   license that can be found in the LICENSE file or at
-*   https://opensource.org/licenses/MIT
-*/
+// /* Copyright 2020 Daniel Bohm & Patrik Perger and the Bridge Hackathon Contributors
+// *
+// *   Use of this source code is governed by an MIT-style
+// *   license that can be found in the LICENSE file or at
+// *   https://opensource.org/licenses/MIT
+// */
 
-export default function vp(M, no_boards) { //M=margin, no_boards= number of boards
+// export default function vp(M, no_boards) { //M=margin, no_boards= number of boards
 
-    const B = 15 * (Math.pow(no_boards, 0.5));
-    const Tau = (Math.pow(5, 0.5) - 1) / 2;
-    VPW = 10 + 10 * ((1 - Math.pow(Tau, (3 * M / B))) / (1 - Math.pow(Tau, 3))); //source: https://www.bridgebase.com/forums/topic/55389-wbf-vp-scale-changes/page__p__667202#entry667202
-    if (VPW > 20) {
-        VPW = 20;
-    }
-    VPL = 20 - VPW;
-    
-    return[VPW.toFixed(2),VPL.toFixed(2)] //VPW=VP of winner, VPL= VP of loser
-}
+//     const B = 15 * (Math.pow(no_boards, 0.5));
+//     const Tau = (Math.pow(5, 0.5) - 1) / 2;
+//     VPW = 10 + 10 * ((1 - Math.pow(Tau, (3 * M / B))) / (1 - Math.pow(Tau, 3))); //source: https://www.bridgebase.com/forums/topic/55389-wbf-vp-scale-changes/page__p__667202#entry667202
+//     if (VPW > 20) {
+//         VPW = 20;
+//     }
+//     VPL = 20 - VPW;
+
+//     return[VPW.toFixed(2),VPL.toFixed(2)] //VPW=VP of winner, VPL= VP of loser
+// }
 
 

lib/moves/bid.js

@@ -1,7 +1,22 @@
 import { SPECIAL_BIDS } from '../SpecialBids.js';
+import { arePartners, POSITIONS } from '../positions.js';
+import { _ } from 'lodash';
+
+const getDeclarer = function (bidding) {
+  const lastRegularBid = _.findLast(bidding, (bid) => {
+    return !!bid.suit;
+  });
+  return _.get(lastRegularBid, 'position', null);
+};
+
+const getDummy = function (declarerPosition) {
+  if (!declarerPosition) return null;
+  return _.keys(POSITIONS).find(p => {
+    return arePartners(p, declarerPosition);
+  })
+};
 
 export const bid = function (G, ctx, bid) {
-  console.log("bid", bid);
   let contract = Object.assign({}, G.contract);
   switch (bid.bid) {
     case SPECIAL_BIDS.PASS:
@@ -14,7 +29,11 @@ export const bid = function (G, ctx, bid) {
       break;
     default:
       contract = bid;
+
       break;
   };
-  return { ...G, bidding: [...G.bidding, bid], contract };
+  const declarer = getDeclarer([...G.bidding, bid]);
+  const dummy = getDummy(declarer);
+  console.log("bid", bid);
+  return { ...G, bidding: [...G.bidding, bid], dummy, declarer, contract };
 };

lib/moves/getTrickWinner.js

@@ -19,7 +19,6 @@ export const getTrickWinner = ({ trick, trump }) => {
     });
     return power_a === power_b ? b.card.value - a.card.value : power_b - power_a
   });
-  console.log(sorted);
   return sorted[0].position;
 };
 

lib/moves/playCard.js

@@ -1,22 +1,31 @@
 import { _ } from 'lodash';
 import { getTrickWinner } from './getTrickWinner.js';
-
+import { playerIdToPosition } from '../positions.js';
 export const playCard = (G, ctx, card) => {
   //TODO check if card is allowed to play 
+  const currentCard = { card, position: ctx.currentPlayer };
 
   //for some reason [...G.tricks] tdoesnt work here .... somthing with proxy i guess 
   let tricks = JSON.parse(JSON.stringify(G.tricks));
   let hands = JSON.parse(JSON.stringify(G.hands));
+  let winner = '';
+  let lastTrick = _.last(tricks);
+  let next = null;
+
+  let wasDummyPlaying = G.isDummyPlaying;
+  let isDummyPlaying = false;
+
+  let position = playerIdToPosition(next);
+  if (position === G.dummy) {
+    isDummyPlaying = true;
+  }
   hands = _.keys(hands).reduce((result, hand) => {
     result[hand] = hands[hand].filter((c) => {
       return !(c.suit === card.suit && c.value === card.value)
     });
     return result;
   }, {});
-  console.log("hands", hands);
-  let winner = '';
-  const lastTrick = _.last(tricks);
-  const currentCard = { card, position: ctx.currentPlayer };
+
   if (lastTrick.cards.length === 4) {
     tricks = [...tricks, { cards: [currentCard] }];
   } else {
@@ -26,7 +35,17 @@ export const playCard = (G, ctx, card) => {
     tricks = [...tricks, lastTrick]
   };
 
-  return { ...G, tricks, hands };
+  lastTrick = _.last(tricks);
+  if (lastTrick.cards.length < 4) {
+    next = (ctx.playOrderPos + 1) % ctx.numPlayers;
+  } else {
+    next = Number(lastTrick.winner);
+  };
+  position = playerIdToPosition(next);
+  if (position === G.dummy) {
+    isDummyPlaying = true;
+  }
+  return { ...G, tricks, hands, isDummyPlaying, wasDummyPlaying };
 };
 
 

lib/phases.js

@@ -4,12 +4,13 @@ import { _ } from "lodash";
 import { SPECIAL_BIDS } from "./SpecialBids.js";
 import { getLastNotPassBid } from "./bidding.js";
 import { TurnOrder } from 'boardgame.io/core';
-import { positionKey } from "/imports/lib/positions.js";
+import { positionKey, playerIdToPosition, positionToPlayerId } from "./positions.js";
 export const PHASE_BIDDING = "PHASE_BIDDING";
 export const PHASE_DECLARE = "PHASE_DECLARE";
 
 
 const getFirstLeadPosition = function (G) {
+  console.log("F", G.bidding);
   return (positionKey[_.last(G.bidding).position] + 2) % 4;
 };
 
@@ -19,15 +20,15 @@ export const phases = {
       moveLimit: 1,
       order: {
         first: (G, ctx) => {
-          return positionKey[G.dealer]
+          return positionToPlayerId(G.dealer);
         },
         next: (G, ctx) => (ctx.playOrderPos + 1) % ctx.numPlayers,
         playOrder: (G, ctx) => ['0', '1', '2', '3']
       },
     },
     moves: { bid },
     endIf: (G) => {
-      return (
+      const shouldFinish =
         //four passes
         (G.bidding.length === 4 &&
           _.every(
@@ -39,7 +40,7 @@ export const phases = {
             _.takeRight(G.bidding, 3),
             (e) => e.bid === SPECIAL_BIDS.PASS
           ))
-      );
+      return shouldFinish;
     },
     start: true,
     next: PHASE_DECLARE,
@@ -52,19 +53,30 @@ export const phases = {
         // This is called at the beginning of the phase.
         first: (G, ctx) => {
           const a = getFirstLeadPosition(G);
-          return 0;
+          console.log("FIRST LEAD", a);
+          return getFirstLeadPosition(G);
         },
 
         // Get the next value of playOrderPos.
         // This is called at the end of each turn.
         // The phase ends if this returns undefined.
         next: (G, ctx) => {
           const lastTrick = _.last(G.tricks);
+          let next = null;
           if (lastTrick.cards.length < 4) {
-            return (ctx.playOrderPos + 1) % ctx.numPlayers;
+            console.log('Gchecking in next', G.wasDummyPlaying, ctx.playOrderPos);
+            next = (ctx.playOrderPos + (G.wasDummyPlaying ? 3 : 1)) % ctx.numPlayers;
           } else {
-            return Number(lastTrick.winner);
+            next = Number(lastTrick.winner);
+          };
+          const position = playerIdToPosition(next);
+          console.log("position", position, G.dummy);
+          if (position === G.dummy) {
+            console.log("NEXT TO PLAY", positionToPlayerId(G.declarer));
+            return positionToPlayerId(G.declarer);
           }
+          console.log("NEXT", next);
+          return next;
         },
 
 

lib/positions.js

@@ -53,13 +53,13 @@ export const playerIdToPosition = (playerId) => {
   })
 };
 
-export const positionToTablePosition = (position, playerPotion) => {
+export const positionToTablePosition = (position, playerPosition) => {
   const getPositionIndex = pos => _.findIndex(_.keys(POSITIONS), p => {
     return p === pos;
   });
   const playerPositionIndex = getPositionIndex(playerPosition);
   const positionIndex = getPositionIndex(position);
-  return _.keys(TABLE_POSITIONS)[(4 + playerPositionIndex - positionIndex) % 4];
+  return _.keys(TABLE_POSITIONS)[(4 + positionIndex - playerPositionIndex) % 4];
 };
 
 export const tablePositionToPosition = (position, playerPosition) => {