Skip to content

games: Make Splendor end after last player has completed their turn #118

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

Open
TannPat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

games: Make Splendor end after last player has completed their turn #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions src/ps/games/splendor/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ export class Splendor extends BaseGame<State> {
};
}

gameCanEnd(): boolean {
gameCanEnd(turn: Turn | null = this.turn): boolean {

@PartMan7 PartMan7 Aug 24, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nit; any reason to send this from props? I think it's equivalent in this case.

Also, try to avoid shadowing

const lastPlayerInRound = this.turns.findLast(turn => !this.players[turn].out);

return (
this.turn === lastPlayerInRound &&
turn === lastPlayerInRound &&
Object.values(this.players)
.filter(player => !player.out)
.some(player => this.state.playerData[player.turn].points >= this.state.pointsToWin)
Expand Down Expand Up @@ -381,8 +381,11 @@ export class Splendor extends BaseGame<State> {

this.state.actionState = { action: VIEW_ACTION_TYPE.NONE };

if (this.gameCanEnd()) return this.end();
else this.handlePostTurn(action, playerData, user, player, logEntry);
const currentPlayer = this.turn;

const turnEnded: boolean = this.handlePostTurn(action, playerData, user, player, logEntry);

if (turnEnded && this.gameCanEnd(currentPlayer)) return this.end();
Comment on lines +384 to +388

@PartMan7 PartMan7 Aug 24, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const currentPlayer = this.turn;
const turnEnded: boolean = this.handlePostTurn(action, playerData, user, player, logEntry);
if (turnEnded && this.gameCanEnd(currentPlayer)) return this.end();
const turnEnded = this.handlePostTurn(action, playerData, user, player, logEntry);
if (turnEnded && this.gameCanEnd()) return this.end();

}

canAfford(
Expand Down Expand Up @@ -495,32 +498,32 @@ export class Splendor extends BaseGame<State> {
return { success: true, data: null };
}

handlePostTurn(action: POST_TURN_ACTIONS | ACTIONS, playerData: PlayerData, user: User, player: Player, logEntry: Log): void {
handlePostTurn(action: POST_TURN_ACTIONS | ACTIONS, playerData: PlayerData, user: User, player: Player, logEntry: Log): boolean {
if (Object.values(playerData.tokens).sum() > MAX_TOKEN_COUNT) {
const count = Object.values(playerData.tokens).sum();
this.state.actionState = { action: POST_TURN_ACTIONS.TOO_MANY_TOKENS, discard: count - MAX_TOKEN_COUNT };
this.update(user.id);
this.backup();
return;
return false;
}

if (action === POST_TURN_ACTIONS.CLAIM_TRAINER) {
this.endTurn();
return;
return true;
}

const affordableTrainers = this.state.board.trainers.filter(trainer => this.canAfford(trainer.types, {}, playerData.cards));

if (affordableTrainers.length === 0) {
this.endTurn();
return;
return true;
}

if (affordableTrainers.length > 1) {
this.state.actionState = { action: POST_TURN_ACTIONS.CLAIM_TRAINER, canAfford: affordableTrainers };
this.update(user.id);
this.backup();
return;
return false;
}

this.state.board.trainers.remove(affordableTrainers[0]);
Expand All @@ -537,6 +540,7 @@ export class Splendor extends BaseGame<State> {
this.update(user.id);
this.chatLog(logEntry);
this.endTurn();
return true;
}

onEnd(type?: EndType): TranslatedText {
Expand Down
Loading