Skip to content

Fix multiplayer issue #269

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
mcdemarco merged 1 commit into from
Nov 17, 2025
Merged

Fix multiplayer issue #269

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
27 changes: 14 additions & 13 deletions src/games/stawvs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ interface IMoveState extends IIndividualState {
currplayer: playerid;
mode: Mode;
board: Map<string, CellContents>;
captured: [Pyramid[], Pyramid[]];
captured: Pyramid[][];
lastmove?: string;
eliminated: playerid[];
}
Expand All @@ -58,7 +58,7 @@ export class StawvsGame extends GameBase {
uid: "stawvs",
playercounts: [2,3,4],
version: "20251113",
dateAdded: "2025-11-13",
dateAdded: "2025-11-16",
// i18next.t("apgames:descriptions.stawvs")
description: "apgames:descriptions.stawvs",
urls: [
Expand Down Expand Up @@ -104,7 +104,7 @@ export class StawvsGame extends GameBase {
public gameover = false;
public winner: playerid[] = [];
public variants: string[] = [];
public captured: [Pyramid[], Pyramid[]] = [[], []];
public captured: Pyramid[][] = [];
public eliminated: playerid[] = [];
public stack!: Array<IMoveState>;
public results: Array<APMoveResult> = []
Expand Down Expand Up @@ -145,6 +145,8 @@ export class StawvsGame extends GameBase {
}
}
}

const captured = Array(this.numplayers).fill([]);

const fresh: IMoveState = {
_version: StawvsGame.gameinfo.version,
Expand All @@ -153,7 +155,7 @@ export class StawvsGame extends GameBase {
currplayer: 1,
mode: "place",
board: board,
captured: [[], []],
captured: captured,
eliminated: [],
};
this.stack = [fresh];
Expand Down Expand Up @@ -188,7 +190,7 @@ export class StawvsGame extends GameBase {
this.mode = state.mode;
this.board = new Map(state.board);
this.lastmove = state.lastmove;
this.captured = clone(state.captured) as [Pyramid[], Pyramid[]];
this.captured = clone(state.captured) as Pyramid[][];
this.eliminated = [...state.eliminated];

return this;
Expand Down Expand Up @@ -853,7 +855,7 @@ export class StawvsGame extends GameBase {
lastmove: this.lastmove,
eliminated: [...this.eliminated],
board: new Map(this.board),
captured: clone(this.captured) as [Pyramid[], Pyramid[]]
captured: clone(this.captured) as Pyramid[][],
};
}

Expand Down Expand Up @@ -894,7 +896,7 @@ export class StawvsGame extends GameBase {
// Use lighter colors from the end of the palette.
const color = c + 8;
//The board pyramids.
myLegend[allColours[c] as string + "1"] = {
myLegend[allColours[c].toString() + "1"] = {
name: "pyramid-up-small-upscaled",
colour: color
};
Expand All @@ -907,7 +909,7 @@ export class StawvsGame extends GameBase {
colour: color
};
//The stash area pyramids.
myLegend[allColours[c] as string + "1c"] = {
myLegend[allColours[c].toString() + "1c"] = {
name: "pyramid-flattened-small",
colour: color
};
Expand All @@ -922,27 +924,26 @@ export class StawvsGame extends GameBase {
}

//An extra set of "ghost" board pyramids for the end state
const color = "#aaa";
myLegend["GH1"] = {
name: "pyramid-up-small-upscaled",
colour: color,
colour: "#aaa",
opacity: 0.25
};
myLegend["GH2"] = {
name: "pyramid-up-medium-upscaled",
colour: color,
colour: "#aaa",
opacity: 0.25
};
myLegend["GH3"] = {
name: "pyramid-up-large-upscaled",
colour: color,
colour: "#aaa",
opacity: 0.25
};

//Player pieces.
for (let p = 0; p < this.numplayers; p++) {
const color = p + 1;
myLegend["P" + color] = {
myLegend["P" + color.toString()] = {
name: "piece",
scale: 0.3,
colour: color,
Expand Down