trucoshi 0.0.4 → 0.0.5

package/src/lib/types.ts

@@ -1,3 +1,4 @@
+import { IGameLoop } from "."
 import { CARDS } from "./constants"
 
 export type ICard = keyof typeof CARDS
@@ -18,7 +19,13 @@ export interface IPlayer {
   teamIdx: number
   id: string
   hand: Array<ICard>
+  commands: Array<ECommand>
   usedHand: Array<ICard>
+  disabled: boolean
+  ready: boolean
+  enable(): void
+  disable(): void
+  setReady(ready: boolean): void
   setHand(hand: Array<ICard>): Array<ICard>
   useCard(idx: number): ICard | null
 }
@@ -27,6 +34,8 @@ export interface ITeam {
   _players: Map<string, IPlayer>
   players: Array<IPlayer>
   points: TeamPoints
+  isTeamDisabled(): boolean
+  disable(player: IPlayer): boolean
   addPoints(matchPoint: number, points: number): TeamPoints
 }
 
@@ -62,6 +71,8 @@ export interface RoundPoints {
 }
 
 export enum ESayCommand {
+  QUIERO = "QUIERO",
+  NO_QUIERO = "NO_QUIERO",
   TRUCO = "TRUCO",
   MAZO = "MAZO",
   FLOR = "FLOR",
@@ -77,9 +88,21 @@ export enum EEnvidoCommand {
 
 export type ECommand = ESayCommand | EEnvidoCommand
 
-export interface TrucoState {
+export interface ITruco {
   state: 1 | 2 | 3 | 4
   teamIdx: 0 | 1 | null
+  answer: boolean | null
+  turn: number
+  players: Array<IPlayer>
+  currentPlayer: IPlayer | null
+  generator: Generator<ITruco, void, unknown>
+  sayTruco(teamIdx: 0 | 1, players: Array<IPlayer>): ITruco
+  setPlayers(players: Array<IPlayer>): void
+  setAnswer(answer: boolean | null): ITruco
+  setTurn(turn: number): number
+  setTeam(idx: 0 | 1): 0 | 1
+  setCurrentPlayer(player: IPlayer | null): IPlayer | null
+  getNextPlayer(): IteratorResult<ITruco, ITruco | void>
 }
 
 export interface EnvidoState {
@@ -93,7 +116,7 @@ export interface IPlayInstance {
   handIdx: number
   roundIdx: number
   state: EHandState
-  truco: TrucoState
+  truco: ITruco
   envido: EnvidoState
   player: IPlayer | null
   commands: Array<ECommand> | null
@@ -118,15 +141,18 @@ export interface IHand {
   state: EHandState
   turn: number
   points: HandPoints
-  truco: TrucoState
+  truco: ITruco
   envido: EnvidoState
   rounds: Array<IRound>
-  currentPlayer: IPlayer | null
+  _currentPlayer: IPlayer | null
+  get currentPlayer(): IPlayer | null
+  set currentPlayer(player: IPlayer | null)
   currentRound: IRound | null
-  disabledPlayerIds: Array<string>
   commands: IHandCommands
   finished: () => boolean
   play(): IPlayInstance | null
+  nextTurn(): void
+  use(idx: number): ICard | null
   pushRound(round: IRound): IRound
   setTurn(turn: number): IPlayer
   addPoints(team: 0 | 1, points: number): void
@@ -137,6 +163,24 @@ export interface IHand {
   getNextPlayer(): IteratorResult<IHand, IHand | void>
 }
 
+export interface IPrivateTrucoshi {
+  lastTeamIdx: 0 | 1
+  _players: Map<string, IPlayer>
+  get players(): Array<IPlayer>
+  teams: Array<ITeam>
+  maxPlayers: number
+  table: ITable | null
+  ready: boolean
+  full: boolean
+  addPlayer(id: string, teamIdx?: 0 | 1): IPlayer
+  removePlayer(id: string): ITrucoshi
+  calculateReady(): boolean
+  calculateFull(): boolean
+  startMatch(matchPoint?: 9 | 12 | 15): IGameLoop
+}
+
+export interface ITrucoshi extends Pick<IPrivateTrucoshi, 'addPlayer' | 'removePlayer' | 'startMatch'> {}
+
 export interface ITable {
   forehandIdx: number
   cards: Array<Array<IPlayedCard>>
@@ -151,6 +195,8 @@ export interface IRound {
   winner: IPlayer | null
   highest: number
   cards: Array<IPlayedCard>
+  turn: number,
+  nextTurn(): void
   use(playedCard: IPlayedCard): ICard
 }
 

package/src/lib/utils.ts

@@ -26,29 +26,8 @@ export function shuffleArray<T = unknown>(array: Array<T>) {
 
 export function checkHandWinner(
   rounds: Array<IRound>,
-  forehandTeamIdx: 0 | 1,
-  disabledPlayerIds: Array<string>,
-  teams: [ITeam, ITeam]
+  forehandTeamIdx: 0 | 1
 ): null | 0 | 1 {
-  let winningTeamIdx = null
-
-  // End hand if all players in one team go MAZO
-  if (disabledPlayerIds.length) {
-    const disabledTeams = teams.map((team) => {
-      const forfeited = team.players.filter((player) => disabledPlayerIds.includes(player.id))
-      return forfeited.length === team.players.length
-    })
-    if (disabledTeams[0] && disabledTeams[1]) {
-      return forehandTeamIdx
-    }
-    if (disabledTeams[0]) {
-      return 1
-    }
-    if (disabledTeams[1]) {
-      return 0
-    }
-  }
-
   const roundsWon: RoundPoints = {
     0: 0,
     1: 0,

package/src/test/autoplay.ts

@@ -1,7 +1,17 @@
 import { Trucoshi } from "../lib"
 import { IRound } from "../lib/types"
 ;(async () => {
-  Trucoshi(["lukini", "guada", "day"], ["denoph", "juli", "fran"], 9)
+  const trucoshi = Trucoshi()
+
+  trucoshi.addPlayer("lukini").setReady(true)
+  trucoshi.addPlayer("denoph").setReady(true)
+  trucoshi.addPlayer("guada").setReady(true)
+  trucoshi.addPlayer("juli").setReady(true)
+  trucoshi.addPlayer("day").setReady(true)
+  trucoshi.addPlayer("fran").setReady(true) 
+
+  trucoshi
+    .startMatch()
     .onTurn(async (play) => {
       if (!play.player) {
         return
@@ -43,5 +53,5 @@ import { IRound } from "../lib/types"
       )
       console.log(`\nEquipo Ganador:${winner.players.map((p) => ` ${p.id}`)}`)
     })
-    .start()
+    .begin()
 })()

package/src/test/play.ts

@@ -1,6 +1,6 @@
 import * as readline from "readline"
 import { Trucoshi } from "../lib"
-import { EHandState, IPlayInstance, IRound, ITeam } from "../lib/types"
+import { IPlayInstance, IRound, ITeam } from "../lib/types"
 
 const command = (
   title: string,
@@ -29,9 +29,68 @@ const command = (
   return promise
 }
 
+const playCommand = (play: IPlayInstance) =>
+  command(
+    `${play.player?.id} elije una carta [${play.player?.hand.map(
+      (_c, i) => i + 1
+    )}]: ${JSON.stringify(play.player?.hand)}\n`,
+    async (idx) => {
+      const playedCard = play.use(Number(idx) - 1)
+      if (!playedCard) {
+        return Promise.reject()
+      }
+      const handString = JSON.stringify(play.player?.hand)
+      console.log(`\n${handString}\nUsing ${playedCard}`)
+      console.log(
+        play.rounds && play.rounds.length
+          ? play.rounds.map((round: IRound) =>
+              round.cards.length ? round.cards.map((c) => [c.player.id, c.card]) : ""
+            )
+          : ""
+      )
+      return Promise.resolve()
+    }
+  )
+
+const sayCommand = (play: IPlayInstance, canPlay: boolean) =>
+  command(
+    `${play.player?.id} elije una accion [${canPlay ? "0," : ""}${play.commands?.map(
+      (_c, i) => i + 1
+    )}]: ${
+      canPlay ? JSON.stringify(["CARTA", ...(play.commands || [])]) : JSON.stringify(play.commands)
+    }\n`,
+    async (idx, close) => {
+      const selectedCommand = play.commands?.[Number(idx) - 1]
+
+      if (selectedCommand) {
+        play.say(selectedCommand)
+        return Promise.resolve()
+      }
+
+      if (idx === "0" && canPlay) {
+        close()
+        await playCommand(play)()
+        return Promise.resolve()
+      }
+
+      return Promise.reject()
+    }
+  )
+
 ;(async () => {
-  Trucoshi(["lukini", "guada"], ["denoph", "juli"], 9)
-    .onTurn(async (play: IPlayInstance) => {
+  const trucoshi = Trucoshi()
+
+  trucoshi.addPlayer("lukini", 0).setReady(true)
+  trucoshi.addPlayer("guada", 0).setReady(true)
+  trucoshi.addPlayer("denoph", 1).setReady(true)
+  trucoshi.addPlayer("juli", 1).setReady(true)
+
+  trucoshi
+    .startMatch()
+    .onTruco(async (play) => {
+      await sayCommand(play, false)()
+    })
+    .onTurn(async (play) => {
       const name = play.player?.id.toUpperCase()
       console.log(`=== Mano ${play.handIdx} === Ronda ${play.roundIdx} === Turno de ${name} ===`)
 
@@ -39,8 +98,6 @@ const command = (
         console.log(`=== Team ${id} = ${team.points.malas} malas ${team.points.buenas} buenas`)
       )
 
-      const canPlay = play.state === EHandState.WAITING_PLAY
-
       console.log(
         play.rounds && play.rounds.length
           ? play.rounds.map((round: IRound) =>
@@ -49,55 +106,7 @@ const command = (
           : ""
       )
 
-      const sayCommand = command(
-        `${play.player?.id} elije una accion [${canPlay ? "0," : ""}${play.commands?.map(
-          (_c, i) => i + 1
-        )}]: ${
-          canPlay
-            ? JSON.stringify(["CARTA", ...(play.commands || [])])
-            : JSON.stringify(play.commands)
-        }\n`,
-        async (idx: string, close: () => void) => {
-          const selectedCommand = play.commands?.[Number(idx) - 1]
-
-          if (selectedCommand) {
-            play.say(selectedCommand)
-            return Promise.resolve()
-          }
-
-          if (idx === "0" && canPlay) {
-            close()
-            await playCommand()
-            return Promise.resolve()
-          }
-
-          return Promise.reject()
-        }
-      )
-
-      const playCommand = command(
-        `${play.player?.id} elije una carta [${play.player?.hand.map(
-          (_c, i) => i + 1
-        )}]: ${JSON.stringify(play.player?.hand)}\n`,
-        async (idx: string) => {
-          const playedCard = play.use(Number(idx) - 1)
-          if (!playedCard) {
-            return Promise.reject()
-          }
-          const handString = JSON.stringify(play.player?.hand)
-          console.log(`\n${handString}\nUsing ${playedCard}`)
-          console.log(
-            play.rounds && play.rounds.length
-              ? play.rounds.map((round: IRound) =>
-                  round.cards.length ? round.cards.map((c) => [c.player.id, c.card]) : ""
-                )
-              : ""
-          )
-          return Promise.resolve()
-        }
-      )
-
-      await sayCommand()
+      await sayCommand(play, true)()
     })
     .onWinner(async (winner: ITeam, teams: [ITeam, ITeam]) => {
       teams.map((t, i) =>
@@ -109,5 +118,5 @@ const command = (
       )
       console.log(`\nEquipo Ganador:${winner?.players.map((p) => ` ${p.id}`)}`)
     })
-    .start()
+    .begin()
 })()