fix: High score check on face cards

fixes #21

Author: devklick

src/utilities/deckUtilities.test.ts

@@ -10,7 +10,7 @@ describe("deckUtilities", () => {
         cards: [
           {
             card: { facing: "Up", rank: "Ace", suit: "Club" },
-            rankRelativeValueUsed: Math.min(
+            rankGlobalValueUsed: Math.min(
               ...CardRankMetadataMap["Ace"].relativeValues
             ),
             rankValueUsed: Math.min(...CardRankMetadataMap["Ace"].values),
@@ -22,7 +22,7 @@ describe("deckUtilities", () => {
         cards: [
           {
             card: { facing: "Up", rank: "Ace", suit: "Diamond" },
-            rankRelativeValueUsed: Math.min(
+            rankGlobalValueUsed: Math.min(
               ...CardRankMetadataMap["Ace"].relativeValues
             ),
             rankValueUsed: Math.min(...CardRankMetadataMap["Ace"].values),
@@ -51,7 +51,7 @@ describe("deckUtilities", () => {
       it("Should return Dealer when dealer has more cards than player", () => {
         dealerHand.cards.push({
           card: { facing: "Up", rank: "Eight", suit: "Diamond" },
-          rankRelativeValueUsed: 8,
+          rankGlobalValueUsed: 8,
           rankValueUsed: 8,
         });
         dealerHand.score = playerHand.score;
@@ -63,7 +63,7 @@ describe("deckUtilities", () => {
       it("Should return Player when player has more cards than player", () => {
         playerHand.cards.push({
           card: { facing: "Up", rank: "Eight", suit: "Diamond" },
-          rankRelativeValueUsed: 8,
+          rankGlobalValueUsed: 8,
           rankValueUsed: 8,
         });
         playerHand.score = dealerHand.score;
@@ -77,12 +77,12 @@ describe("deckUtilities", () => {
       it("Should return Dealer when dealers high card is greater than players", () => {
         dealerHand.cards.push({
           card: { facing: "Up", rank: "Eight", suit: "Diamond" },
-          rankRelativeValueUsed: 8,
+          rankGlobalValueUsed: 8,
           rankValueUsed: 8,
         });
         playerHand.cards.push({
           card: { facing: "Up", rank: "Seven", suit: "Diamond" },
-          rankRelativeValueUsed: 7,
+          rankGlobalValueUsed: 7,
           rankValueUsed: 7,
         });
         dealerHand.score = playerHand.score;
@@ -94,12 +94,12 @@ describe("deckUtilities", () => {
       it("Should return Player when player has more cards than player", () => {
         dealerHand.cards.push({
           card: { facing: "Up", rank: "Seven", suit: "Diamond" },
-          rankRelativeValueUsed: 7,
+          rankGlobalValueUsed: 7,
           rankValueUsed: 7,
         });
         playerHand.cards.push({
           card: { facing: "Up", rank: "Eight", suit: "Diamond" },
-          rankRelativeValueUsed: 8,
+          rankGlobalValueUsed: 8,
           rankValueUsed: 8,
         });
         playerHand.score = dealerHand.score;

src/utilities/deckUtilities.ts

@@ -100,7 +100,7 @@ export const generateDeck = (
 export interface CardValue {
   card: CardObject;
   rankValueUsed: number;
-  rankRelativeValueUsed: number;
+  rankGlobalValueUsed: number;
 }
 export interface BestHand {
   score: number;
@@ -125,12 +125,12 @@ export const calculateBestHand = (cards: CardObject[]): BestHand => {
     }
 
     const cardValue = Math.max(...CardRankMetadataMap[card.rank].values);
-    const cardRelativeValue = Math.max(
+    const cardGlobalValue = Math.max(
       ...CardRankMetadataMap[card.rank].relativeValues
     );
     bestHand.cards.push({
       card,
-      rankRelativeValueUsed: cardRelativeValue,
+      rankGlobalValueUsed: cardGlobalValue,
       rankValueUsed: cardValue,
     });
     bestHand.score += cardValue;
@@ -197,17 +197,15 @@ export const determineWinner = (
 };
 
 const getHighestCardValue = (cards: CardValue[]) => {
-  return cards.sort((a, b) => b.rankValueUsed - a.rankValueUsed)[0];
+  return cards.sort((a, b) => b.rankGlobalValueUsed - a.rankGlobalValueUsed)[0];
 };
 
 const getHighCardWinner = (
   playerCards: CardValue[],
   dealerCards: CardValue[]
 ): GameResult | null => {
-  const playerHighCard = getHighestCardValue(playerCards).rankValueUsed;
-  console.log("playerHighCard", playerHighCard);
-  const dealerHighCard = getHighestCardValue(dealerCards).rankValueUsed;
-  console.log("dealerHighCard", dealerHighCard);
+  const playerHighCard = getHighestCardValue(playerCards).rankGlobalValueUsed;
+  const dealerHighCard = getHighestCardValue(dealerCards).rankGlobalValueUsed;
 
   const winner = getPlayerWithHighestValue(playerHighCard, dealerHighCard);
   if (!winner) return null;