fix(mulligan): refine mulligan timing for slightly earlier exit (#43)

* fix(mulligan): refine mulligan timing for slightly earlier exit

* refactor: define deck card count as const

src/GameState.ts

@@ -16,6 +16,7 @@ export interface Player {
 	cardCount: number;
 	position: 'top' | 'bottom';
 	secrets: Secret[];
+	cardsReplacedInMulligan: number;
 }
 
 export class GameState {

src/data/meta.ts

@@ -0,0 +1 @@
+export const DECK_CARD_COUNT = 30;

src/line-parsers/game-tag-change.ts

@@ -24,21 +24,22 @@ export class GameTagChangeLineParser extends AbstractLineParser {
 	lineMatched(parts: string[], gameState: GameState): void {
 		const data = formatParts(parts);
 
-		if (data.entity === 'GameEntity' && data.tag === 'STEP' && data.value === 'MAIN_READY') {
-			gameState.mulliganActive = false;
-			gameState.turnStartTime = new Date();
-
-			// Neither of players have turn true which means bottom player is playing first
-			if (gameState.players.every(player => !player.turn)) {
-				const bottomPlayer = gameState.getPlayerByPosition('bottom');
-				if (bottomPlayer) {
-					bottomPlayer.turn = true;
-				}
+		if (data.entity === 'GameEntity' && data.value === 'MAIN_READY') {
+			if (data.tag === 'NEXT_STEP') {
+				gameState.mulliganActive = false;
 			}
-		}
 
-		if (data.tag === 'MULLIGAN_STATE' && data.value === 'DEALING') {
-			gameState.mulliganActive = true;
+			if (data.tag === 'STEP') {
+				gameState.turnStartTime = new Date();
+
+				// Neither of players have turn true which means bottom player is playing first
+				if (gameState.players.every(player => !player.turn)) {
+					const bottomPlayer = gameState.getPlayerByPosition('bottom');
+					if (bottomPlayer) {
+						bottomPlayer.turn = true;
+					}
+				}
+			}
 		}
 
 		if (data.tag === 'TIMEOUT') {

src/line-parsers/index.ts

@@ -7,6 +7,7 @@ import {ZoneChangeLineParser} from './zone-change';
 import {TagChangeLineParser} from './tag-change';
 import {GameState} from '../GameState';
 import {MulliganStartParser} from './mulligan-start';
+import {MullinganResultParser} from './mulligan-result';
 
 export const lineParsers = [
 	new GameOverLineParser(),
@@ -16,7 +17,8 @@ export const lineParsers = [
 	new ZoneChangeLineParser(),
 	new TagChangeLineParser(),
 	new GameTagChangeLineParser(),
-	new MulliganStartParser()
+	new MulliganStartParser(),
+	new MullinganResultParser()
 ];
 
 export interface Events {
@@ -29,4 +31,5 @@ export interface Events {
 	'tag-change': void;
 	'zone-change': void;
 	'mulligan-start': void;
+	'mulligan-result': void;
 }

src/line-parsers/mulligan-result.ts

@@ -0,0 +1,44 @@
+import {AbstractLineParser} from './AbstractLineParser';
+import {GameState} from '../GameState';
+import {DECK_CARD_COUNT} from '../data/meta';
+
+const calcCardsReplaced = (cardsLeft: number, cardCount: number): number => {
+	return 	DECK_CARD_COUNT - cardCount - cardsLeft;
+};
+
+// Detect how many cards are replaced in mulligan
+export class MullinganResultParser extends AbstractLineParser {
+	regex = /\[Power\]\s+GameState\.DebugPrintEntitiesChosen\(\)\s+-\s+id=\w+\s+Player=(.*)\s+EntitiesCount=(\d+)/;
+
+	eventName = 'mulligan-result' as const;
+
+	lineMatched([, name, cardsLeft]: string[], gameState: GameState): void {
+		if (!gameState.mulliganActive) {
+			return;
+		}
+
+		const player = gameState.getPlayerByName(name);
+		if (!player) {
+			return;
+		}
+
+		player.cardsReplacedInMulligan = calcCardsReplaced(parseInt(cardsLeft, 10), player.cardCount);
+	}
+
+	formatLogMessage([, name, cardsLeft]: string[], gameState: GameState): string | false {
+		if (!gameState.mulliganActive) {
+			return false;
+		}
+
+		const player = gameState.getPlayerByName(name);
+		if (!player) {
+			return false;
+		}
+
+		return `${player.name} replaced ${calcCardsReplaced(parseInt(cardsLeft, 10), player.cardCount)} cards in mulligan`;
+	}
+
+	shouldEmit(gameState: GameState): boolean {
+		return gameState.mulliganActive;
+	}
+}

src/line-parsers/new-player.ts

@@ -21,7 +21,8 @@ export class NewPlayerLineParser extends AbstractLineParser {
 			timeout: 45,
 			cardCount: 0,
 			position: gameState.numPlayers === 0 ? 'bottom' : 'top',
-			secrets: []
+			secrets: [],
+			cardsReplacedInMulligan: 0
 		});
 	}