Fix baseball scoring summary

TODO

@@ -4,11 +4,9 @@ indicator of if trade will be accepted
 allow undoing a trade
 
 shootouts
-- baseball
-  - scoring summary filtering in eventsToShow can't handle misses, they get shown early
-    - need football scoringSummary style - build up from events?
 - hockey
-  - need football scoringSummary style - build up from events?
+  - need football/baseball scoringSummary style - build up from events?
+- isScoringPlay -> formatScoringSummaryEvent
 - confirm for all sports
   - check what fast-forward options are shown during shootout
   - no injuries during shootout

src/common/formatScoringSummaryEvent.baseball.ts

@@ -0,0 +1,41 @@
+import type {
+	PlayByPlayEvent,
+	PlayByPlayEventInput,
+	PlayByPlayEventScore,
+} from "../worker/core/GameSim.baseball/PlayByPlayLogger";
+
+export const formatScoringSummaryEvent = (
+	event: PlayByPlayEventInput,
+	period: number,
+) => {
+	let scored = false;
+	if (event.type === "hitResult" && event.numBases === 4) {
+		// Home run
+		scored = true;
+	} else if (event.type === "shootoutShot") {
+		scored = true;
+	} else {
+		const runners = (event as Extract<PlayByPlayEvent, { type: "hitResult" }>)
+			.runners;
+		if (runners?.some(runner => runner.scored)) {
+			scored = true;
+		}
+	}
+
+	if (scored) {
+		const scoringSummaryEvent = {
+			...event,
+			inning: period,
+		} as PlayByPlayEventScore;
+		if (
+			scoringSummaryEvent.type === "balk" ||
+			scoringSummaryEvent.type === "wildPitch" ||
+			scoringSummaryEvent.type === "passedBall"
+		) {
+			// Swap team, so it shows up correctly in scoring summary. Basically, t must be team that scored
+			scoringSummaryEvent.t = scoringSummaryEvent.t === 0 ? 1 : 0;
+		}
+
+		return scoringSummaryEvent;
+	}
+};

src/ui/components/BoxScore.baseball.tsx

@@ -263,14 +263,7 @@ const ScoringSummary = ({
 		Record<number, BoxScorePlayer>
 	>({});
 
-	const eventsToShow = processedEvents.filter(event => {
-		const ptsKey = event.type === "shootoutShot" ? "sPts" : "pts";
-		return (
-			event.score[0] <= teams[0][ptsKey]! && event.score[1] <= teams[1][ptsKey]!
-		);
-	});
-
-	const someEvents = eventsToShow.length > 0;
+	const someEvents = processedEvents.length > 0;
 
 	useEffect(() => {
 		if (!someEvents) {
@@ -295,7 +288,7 @@ const ScoringSummary = ({
 	return (
 		<table className="table table-sm border-bottom">
 			<tbody>
-				{eventsToShow.map((event, i) => {
+				{processedEvents.map((event, i) => {
 					let quarterHeader: ReactNode = null;
 					const currentInning =
 						event.type === "shootoutShot" ? "Shootout" : event.inning;
@@ -334,7 +327,9 @@ const ScoringSummary = ({
 													className={
 														!event.noPoints && event.t === i
 															? "fw-bold"
-															: "text-body-secondary"
+															: event.noPoints && event.t === i
+																? "text-danger"
+																: "text-body-secondary"
 													}
 												>
 													{pts}

src/ui/components/BoxScore.football.tsx

@@ -384,9 +384,7 @@ const ScoringSummary = memo(
 								{quarterHeader}
 								<tr>
 									<td>{teams[event.t].abbrev}</td>
-									<td className={event.noPoints ? "text-danger" : undefined}>
-										{event.scoreType === "SH" ? "FG" : event.scoreType}
-									</td>
+									<td>{event.scoreType === "SH" ? "FG" : event.scoreType}</td>
 									<td>
 										{event.score.map((pts, i) => {
 											return (
@@ -395,7 +393,9 @@ const ScoringSummary = memo(
 														className={
 															!event.noPoints && event.t === i
 																? "fw-bold"
-																: "text-body-secondary"
+																: event.noPoints && event.t === i
+																	? "text-danger"
+																	: "text-body-secondary"
 														}
 													>
 														{pts}

src/ui/util/processLiveGameEvents.baseball.tsx

@@ -9,6 +9,7 @@ import {
 	POS_NUMBERS_INVERSE,
 } from "../../common/constants.baseball";
 import type { PlayerInjury } from "../../common/types";
+import { formatScoringSummaryEvent } from "../../common/formatScoringSummaryEvent.baseball";
 
 export type BoxScorePlayer = {
 	name: string;
@@ -648,6 +649,14 @@ const processLiveGameEvents = ({
 				e.type === "gameOver";
 
 			stop = true;
+
+			const scoringSummaryEvent = formatScoringSummaryEvent(e, quarters.length);
+			if (scoringSummaryEvent) {
+				boxScore.scoringSummary = [
+					...boxScore.scoringSummary,
+					scoringSummaryEvent,
+				];
+			}
 		}
 	}
 

src/worker/core/GameSim.baseball/PlayByPlayLogger.ts

@@ -1,7 +1,8 @@
 import type { POS_NUMBERS_INVERSE } from "../../../common/constants.baseball";
+import { formatScoringSummaryEvent } from "../../../common/formatScoringSummaryEvent.baseball";
 import type { Runner, TeamNum } from "./types";
 
-type PlayByPlayEventInput =
+export type PlayByPlayEventInput =
 	| {
 			type: "sideStart";
 			inning: number;
@@ -216,35 +217,9 @@ class PlayByPlayLogger {
 			this.period = event.inning;
 		}
 
-		let scored = false;
-		if (event.type === "hitResult" && event.numBases === 4) {
-			// Home run
-			scored = true;
-		} else if (event.type === "shootoutShot") {
-			scored = true;
-		} else {
-			const runners = (event as Extract<PlayByPlayEvent, { type: "hitResult" }>)
-				.runners;
-			if (runners?.some(runner => runner.scored)) {
-				scored = true;
-			}
-		}
-
-		if (scored) {
-			const scoringSummaryEvent = {
-				...event,
-				inning: this.period,
-			};
-			if (
-				scoringSummaryEvent.type === "balk" ||
-				scoringSummaryEvent.type === "wildPitch" ||
-				scoringSummaryEvent.type === "passedBall"
-			) {
-				// Swap team, so it shows up correctly in scoring summary. Basically, t must be team that scored
-				scoringSummaryEvent.t = scoringSummaryEvent.t === 0 ? 1 : 0;
-			}
-
-			this.scoringSummary.push(scoringSummaryEvent as any);
+		const scoringSummaryEvent = formatScoringSummaryEvent(event, this.period);
+		if (scoringSummaryEvent) {
+			this.scoringSummary.push(scoringSummaryEvent);
 		}
 	}
 

src/worker/views/liveGame.ts

@@ -126,7 +126,7 @@ export const boxScoreToLiveSim = async ({
 	}
 
 	// For FBGM, build up scoringSummary from events, to handle deleting a score due to penalty
-	if (isSport("football")) {
+	if (isSport("football") || isSport("baseball")) {
 		boxScore.scoringSummary = [];
 	}