Skip to content

Refactor clean up logger #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 30, 2025
Merged

Refactor clean up logger #482

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
62f557e
Refactor PlayByPlayEvent types
jdabapo Mar 24, 2025
55e39b4
add type casting
jdabapo Mar 24, 2025
eb87e80
missed 1
jdabapo Mar 24, 2025
b8c63db
Big refactor, grouped types together in logger + weird bug with shots…
jdabapo Mar 27, 2025
616e172
move logger out of else, which is why 3pts not showing up
jdabapo Mar 27, 2025
a0aca75
remove typecast
jdabapo Mar 27, 2025
b8a4451
remove comment, change naming of tp to fgTp
jdabapo Mar 27, 2025
8455f21
address comments
jdabapo Mar 28, 2025
a02f981
another cmnt
jdabapo Mar 28, 2025
e39f558
address mroe comments
jdabapo Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ui/util/processLiveGameEvents.basketball.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ export const getText = (
} else if (
event.type === "fgLowPost" ||
event.type === "fgMidRange" ||
event.type === "tp"
event.type === "fgTp"
) {
texts = ["It's good!"];
} else if (
event.type === "fgLowPostAndOne" ||
event.type === "fgMidRangeAndOne" ||
event.type === "tpAndOne"
event.type === "fgTpAndOne"
) {
texts = ["It's good, and a foul!"];
} else if (
Expand Down
281 changes: 45 additions & 236 deletions src/worker/core/GameSim.basketball/PlayByPlayLogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,292 +1,100 @@
type TeamNum = 0 | 1;
export type BlockType =
| "blkAtRim"
| "blkLowPost"
| "blkMidRange"
| "blkTp"
| "blkTipIn"
| "blkPutBack";
export type FgaType = "fgaAtRim" | "fgaLowPost" | "fgaMidRange" | "fgaPutBack";
export type FgMissType =
| "missPutBack"
| "missAtRim"
| "missLowPost"
| "missMidRange"
| "missTp"
| "missTpFake"
| "missTipIn";
export type FgMakeType = // fgAtRim/AndOne, ft,fgPutBack/AndOne excluded because they are handled separately

| "fgLowPost"
| "fgLowPostAndOne"
| "fgMidRange"
| "fgMidRangeAndOne"
| "fgTp"
| "fgTpAndOne"
| "fgTipIn"
| "fgTipInAndOne"; // Wondering, why is there a missTpFake but no fgTpFake?
type PlayByPlayEventInputScore =
| {
type: "fgAtRim";
type: "fgAtRim" | "fgAtRimAndOne";
t: TeamNum;
pid: number;
pidDefense: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgAtRimAndOne";
t: TeamNum;
pid: number;
pidDefense: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgLowPost";
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgLowPostAndOne";
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgMidRange";
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgMidRangeAndOne";
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "ft";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "tp";
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "tpAndOne";
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgTipIn";
type: FgMakeType;
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgTipInAndOne";
t: TeamNum;
pid: number;
pidAst: number | undefined;
clock: number;
}
| {
type: "fgPutBack";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "fgPutBackAndOne";
type: "ft" | "fgPutBack" | "fgPutBackAndOne";
t: TeamNum;
pid: number;
clock: number;
};

type PlayByPlayEventInputNoScore =
| {
type: "blkTipIn";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "blkPutBack";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "blkAtRim";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "blkLowPost";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "blkMidRange";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "blkTp";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "drb";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "fgaAtRim";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "fgaLowPost";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "fgaMidRange";
type:
| BlockType
| FgaType
| FgMissType
| "pfNonShooting"
| "pfAndOne"
| "drb"
| "orb"
| "foulOut"
| "injury"
| "jumpBall"
| "missFt";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "fgaTp";
type: "fgaTp" | "fgaTpFake";
t: TeamNum;
pid: number;
clock: number;
desperation: boolean;
}
| {
type: "fgaTpFake";
type: "fgaTipIn" | "fgTipInAndOne";
t: TeamNum;
pid: number;
clock: number;
desperation: boolean;
}
| {
type: "fgaTipIn";
t: TeamNum;
pid: number;
pidPass: number;
clock: number;
}
| {
type: "fgaPutBack";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "foulOut";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "gameOver";
}
| {
type: "injury";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "jumpBall";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "missTipIn";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "missPutBack";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "missAtRim";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "missFt";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "missLowPost";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "missMidRange";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "missTp";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "orb";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "overtime";
clock: number;
period: number;
}
| {
type: "pfNonShooting";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "pfBonus";
t: TeamNum;
pid: number;
pidShooting: number;
clock: number;
}
| {
type: "pfFG";
t: TeamNum;
pid: number;
pidShooting: number;
clock: number;
}
| {
type: "pfTP";
type: "pfBonus" | "pfFG" | "pfTP";
t: TeamNum;
pid: number;
pidShooting: number;
clock: number;
}
| {
type: "pfAndOne";
t: TeamNum;
pid: number;
clock: number;
}
| {
type: "period";
clock: number;
Expand Down Expand Up @@ -393,7 +201,8 @@ const scoringTypes = [
"fgMidRange",
"fgMidRangeAndOne",
"ft",
"tp",
"fgTp",
"fgTpAndOne",
];

const isScoringPlay = (
Expand Down
Loading