Skip to content

Update Court #369

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
jpneto merged 2 commits into from
May 10, 2026
+24 −26
Merged

Update Court #369

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30d90a0
Update court.ts
jpneto May 10, 2026
6bfe92e
Merge branch 'AbstractPlay:develop' into develop
jpneto May 10, 2026
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
50 changes: 24 additions & 26 deletions src/games/court.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface IMoveState extends IIndividualState {
currplayer: playerid;
board: Map<string, CellContents>;
lastmove?: string;
hands?: [Piece[], Piece[]];
hands: [Piece[], Piece[]];
};

export interface ICourtState extends IAPGameState {
Expand Down Expand Up @@ -60,7 +60,7 @@ export class CourtGame extends GameBase {
public currplayer: playerid = 1;
public board!: Map<string, CellContents>;
public gameover = false;
public hands?: [Piece[], Piece[]];
public hands!: [Piece[], Piece[]];
public winner: playerid[] = [];
public variants: string[] = [];
public stack!: Array<IMoveState>;
Expand Down Expand Up @@ -139,7 +139,7 @@ export class CourtGame extends GameBase {
if ( !this.board.has(cell) || this.board.get(cell)![1] !== player ) { continue; }
const piece = this.board.get(cell)![0];
const [x, y] = g.algebraic2coords(cell);

if ( piece === "P" ) {
if ( player === 1 && y > 0 ) { // pawns move forward by decreasing row index
const nCell = g.coords2algebraic(x, y-1);
Expand Down Expand Up @@ -177,7 +177,7 @@ export class CourtGame extends GameBase {
}
}
// check promotions
const available: Piece[] = [...new Set(this.hands![this.currplayer - 1])]; // remove duplicates
const available: Piece[] = [...new Set(this.hands[this.currplayer - 1])]; // remove duplicates
for (const piece of available) {
moves.push(`${cell}+${piece}`); // promotion to piece
}
Expand Down Expand Up @@ -227,8 +227,8 @@ export class CourtGame extends GameBase {
if ( move === "" ) {
newmove = cell;
} else if ( moves[0] === cell ) { // reclick cycles thru all possible promotions and then resets
const available: Piece[] = [...new Set(this.hands![this.currplayer - 1])]; // remove duplicates
if ( available.length === 0 ||
const available: Piece[] = [...new Set(this.hands[this.currplayer - 1])]; // remove duplicates
if ( available.length === 0 ||
move.includes(available.at(-1)!) ||
this.board.get(cell)![0] !== "P" ) { // non-pawns do not promote
newmove = "";
Expand Down Expand Up @@ -270,7 +270,7 @@ export class CourtGame extends GameBase {
}

const moves: string[] = m.split(/[+-]/);

if ( moves.length === 1 ) {
if ( !this.board.has(moves[0]) || this.board.get(moves[0])![1] !== this.currplayer ) {
result.valid = false;
Expand Down Expand Up @@ -320,19 +320,17 @@ export class CourtGame extends GameBase {
this.results = [];
const moves = m.split(/[+-]/);

if ( partial && m !== "" && !m.includes('+') ) { // if partial move, set the points to be shown
if ( partial && m.length > 0 && !m.includes('+') ) { // if partial move, set the points to be shown
const g = this.graph;
this._points = this.findPoints(m).map(c => g.algebraic2coords(c));
return this;
} else {
this._points = []; // otherwise delete the points and process the full move
}

if ( moves.length === 1 ) { // a friendly piece was selected
this.results.push({ type: "place", where: m });
} else if ( m.includes('+') ) { // a promotion (eg, "cell+piece")
const idxPiece = this.hands![this.currplayer - 1].indexOf(moves[1] as Piece);
this.hands![this.currplayer - 1].splice(idxPiece, 1); // remove piece from player's hand
if ( m.includes('+') ) { // a promotion (eg, "cell+piece")
const idxPiece = this.hands[this.currplayer - 1].indexOf(moves[1] as Piece);
this.hands[this.currplayer - 1].splice(idxPiece, 1); // remove piece from player's hand
this.board.set(moves[0], [moves[1] as Piece, this.currplayer]); // add piece to board
this.results.push({ type: "place", where: moves[0] });
} else { // it is a move
Expand All @@ -341,7 +339,7 @@ export class CourtGame extends GameBase {
this.results.push({ type: "move", from: moves[0], to: moves[1] });
}

if (partial) { return this; }
if (partial) { return this; } // a promotion might still be partial

this.lastmove = m;
this.currplayer = this.currplayer % 2 + 1 as playerid;
Expand All @@ -357,13 +355,13 @@ export class CourtGame extends GameBase {

protected checkEOG(): CourtGame {
const nPawns = this.getPawns(this.currplayer).length;

if ( nPawns === 0 || this.moves().length === 0 ) {
const prevPlayer: playerid = this.currplayer % 2 + 1 as playerid;
this.gameover = true;
this.winner = [prevPlayer];
}

if ( this.gameover ) {
this.results.push(
{type: "eog"},
Expand Down Expand Up @@ -423,14 +421,14 @@ export class CourtGame extends GameBase {

// Build rep
const rep: APRenderRep = {
board: {
style: "squares-checkered",
width: this.boardsize,
board: {
style: "squares-checkered",
width: this.boardsize,
height: this.boardsize
},
legend: {
P1: { name: "piece", colour: this.getPlayerColour(1) },
P2: { name: "piece", colour: this.getPlayerColour(2) },
P2: { name: "piece", colour: this.getPlayerColour(2) },
B1: [{ name: "piece", colour: this.getPlayerColour(1) },
{ name: "chess-bishop-outline-traditional", colour: "#ffffff", scale: 0.6, opacity: 0.6 }],
B2: [{ name: "piece", colour: this.getPlayerColour(2) },
Expand Down Expand Up @@ -480,14 +478,14 @@ export class CourtGame extends GameBase {
public getPlayerStash(player: number): IStashEntry[] | undefined {
const col = this.getPlayerColour(player as playerid);
return [
{ count: this.hands![player - 1].filter(x => x === 'N').length,
glyph: { name: "chess-knight-outline-traditional", colour: col },
{ count: this.hands[player - 1].filter(x => x === 'N').length,
glyph: { name: "chess-knight-outline-traditional", colour: col },
movePart: "" },
{ count: this.hands![player - 1].filter(x => x === 'B').length,
glyph: { name: "chess-bishop-outline-traditional", colour: col },
{ count: this.hands[player - 1].filter(x => x === 'B').length,
glyph: { name: "chess-bishop-outline-traditional", colour: col },
movePart: "" },
{ count: this.hands![player - 1].filter(x => x === 'R').length,
glyph: { name: "chess-rook-outline-traditional", colour: col },
{ count: this.hands[player - 1].filter(x => x === 'R').length,
glyph: { name: "chess-rook-outline-traditional", colour: col },
movePart: "" },
];
}
Expand Down
Loading