trucoshi 7.0.0-alpha.2 → 7.0.0-rc.2

package/dist/lib/classes/Deck.js

@@ -44,13 +44,17 @@ export function dealCards(table, deck) {
             playerHands[player.idx] = [...(playerHands[player.idx] || []), deck.takeCard()];
         }
     }
-    if (cheat_lots_of_flowers && table.forehandIdx % 2 === 0) {
+    if (cheat_lots_of_flowers) {
         deck.shuffle(players[0].idx);
         for (const player of players) {
-            const first = deck.takeCard();
-            const second = deck.pick(deck.cards.find((c) => c.charAt(1) === first.charAt(1)));
-            const third = deck.pick(deck.cards.find((c) => c.charAt(1) === first.charAt(1)));
-            playerHands[player.idx] = [first, second, third];
+            if (Math.random() > 0.50) {
+                const first = deck.takeCard();
+                const second = deck.pick(deck.cards.find((c) => c.charAt(1) === first.charAt(1)));
+                const third = deck.pick(deck.cards.find((c) => c.charAt(1) === first.charAt(1)));
+                playerHands[player.idx] = [first, second, third];
+                continue;
+            }
+            playerHands[player.idx] = deck.takeThree();
         }
     }
     for (const [key, player] of table.players.entries()) {

package/dist/lib/utils.d.ts

@@ -1,6 +1,5 @@
 import { IRound } from "../truco";
-import { ICard, IPlayer } from "../types";
-export declare function calculateFlorPoints(player: IPlayer): number;
+import { ICard } from "../types";
 export declare function getMaxNumberIndex<T = number>(array: Array<T>): number;
 export declare function getMinNumberIndex<T = number>(array: Array<T>): number;
 export declare function getCardValue(card: ICard): number;

package/dist/lib/utils.js

@@ -1,21 +1,4 @@
-import { splitCardvalues } from "../truco";
 import { CARDS } from "./constants";
-// Calculates the Flor points for a player's hand.
-// Returns the sum of the envidoValue of three cards of the same suit plus 20, or 0 if no Flor exists.
-export function calculateFlorPoints(player) {
-    if (!player.hasFlor) {
-        return 0;
-    }
-    const hand = [...player.hand, ...player.usedHand].map(splitCardvalues);
-    // Verify that all cards share the same suit (should be true if player.hasFlor is set)
-    const sameSuit = hand.every((card) => card.palo === hand[0].palo);
-    if (!sameSuit) {
-        return 0;
-    }
-    // Sum the envidoValue of all cards (figures are 0)
-    const points = hand.reduce((sum, card) => sum + card.value, 20);
-    return points;
-}
 export function getMaxNumberIndex(array) {
     return array.reduce((accumulator, current, index) => {
         return current > array[accumulator] ? index : accumulator;

package/dist/types.d.ts

@@ -39,6 +39,16 @@ export interface ISaidCommand {
     player: IPlayer | IPublicPlayer;
     command: ECommand | number;
 }
+export interface IMatchFlorBattle {
+    matchSessionId: string;
+    playersWithFlor: {
+        idx: number;
+        cards?: ICard[];
+        points: number;
+    }[];
+    winnerTeamIdx: 0 | 1 | null;
+    winner: IPublicPlayer | null;
+}
 export interface IMatchPreviousHand {
     envido: {
         winner: IPublicPlayer;
@@ -48,6 +58,7 @@ export interface IMatchPreviousHand {
         };
     } | null;
     flor: {
+        winner: IPublicPlayer | null;
         data: Array<{
             idx: number;
             value: number;
@@ -64,6 +75,7 @@ export interface IPublicMatch {
     busy: boolean;
     state: EMatchState;
     handState: EHandState | null;
+    florBattle: IMatchFlorBattle | null;
     winner: ITeam | null;
     matchSessionId: string;
     ownerKey: string;
@@ -144,6 +156,7 @@ export declare enum EHandState {
     WAITING_ENVIDO_ANSWER = "WAITING_ENVIDO_ANSWER",
     WAITING_ENVIDO_POINTS_ANSWER = "WAITING_ENVIDO_POINTS_ANSWER",
     WAITING_FLOR_ANSWER = "WAITING_FLOR_ANSWER",
+    DISPLAY_FLOR_BATTLE = "DISPLAY_FLOR_BATTLE",
     BEFORE_FINISHED = "BEFORE_FINISHED",
     FINISHED = "FINISHED"
 }
@@ -270,7 +283,11 @@ export interface IPlayer {
     turnExpiresAt: number | null;
     turnExtensionExpiresAt: number | null;
     hasFlor: boolean;
-    hasSaidFlorPoints: boolean;
+    flor: {
+        value: number;
+        cards: ICard[];
+    } | null;
+    hasSaidFlor: boolean;
     hasSaidEnvidoPoints: boolean;
     isEnvidoTurn: boolean;
     isOwner: boolean;
@@ -278,7 +295,7 @@ export interface IPlayer {
     abandoned: boolean;
     ready: boolean;
     saidEnvidoPoints(): void;
-    saidFlorPoints(): void;
+    saidFlor(): void;
     resetCommands(): void;
     calculateEnvido(): Array<{
         value: number;

package/dist/types.js

@@ -52,6 +52,7 @@ export var EHandState;
     EHandState["WAITING_ENVIDO_ANSWER"] = "WAITING_ENVIDO_ANSWER";
     EHandState["WAITING_ENVIDO_POINTS_ANSWER"] = "WAITING_ENVIDO_POINTS_ANSWER";
     EHandState["WAITING_FLOR_ANSWER"] = "WAITING_FLOR_ANSWER";
+    EHandState["DISPLAY_FLOR_BATTLE"] = "DISPLAY_FLOR_BATTLE";
     EHandState["BEFORE_FINISHED"] = "BEFORE_FINISHED";
     EHandState["FINISHED"] = "FINISHED";
 })(EHandState || (EHandState = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-rc.2",
   "description": "Lightning Truco Server",
   "main": "dist/types.js",
   "license": "GPL-3.0",