Skip to content

Commit 2b4263a

Browse files
committed
Merge branch 'develop'
2 parents 61b4a61 + 58695cd commit 2b4263a

File tree

8 files changed

+205
-68
lines changed

8 files changed

+205
-68
lines changed

locales/en/apgames.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4217,6 +4217,8 @@
42174217
"MUST_HOP_FORWARD": "When using a hand card, your frog must hop forward.",
42184218
"MUST_MOVE": "Your frog must move to a different card/column.",
42194219
"MUST_PASS": "You must pass to allow another player to complete their turn.",
4220+
"NO_CARDS_FOR_REFILL": "There are no cards left with which to refill the draw pool.",
4221+
"NO_CARDS_BLOCKED": "If, at the start of your turn, you have no hand cards, none of your frogs can move back, and the draw pool is empty, you must pass.",
42204222
"NO_CHOICE_BLOCKED": "If, at the start of your turn, you have no hand cards and none of your frogs can move back, you must draw a single card from the draw pool and end your turn.",
42214223
"NO_MOVE_BLOCKED": "You cannot move after claiming a card for being blocked.",
42224224
"NO_PASSING": "There is no passing as such in Frogger. If you are blocked, you must draw a single card from the draw pool.",

locales/en/apresults.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"biscuit": "The next player was unable to play any cards in their hand, so they drew a card.",
171171
"emu_deck": "{{player}} drew a face-down card from the deck.",
172172
"emu_discard": "{{player}} drew the {{what}} from the top of the discard pile.",
173-
"frogger": "The draw pool was refilled.",
173+
"frogger": "The draw pool was {{what}} refilled.",
174174
"quincunx_one": "{{player}} drew {{count}} card.",
175175
"quincunx_other": "{{player}} drew {{count}} cards."
176176
},
@@ -347,7 +347,7 @@
347347
"deckfish": "{{player}} was unable to move.",
348348
"entropy": "{{player}} chose not to move any pieces this turn.",
349349
"forced": "{{player}} was forced to pass.",
350-
"frogger": "{{player}} passed to permit refilling the draw pool.",
350+
"frogger": "{{player}} passed {{why}}.",
351351
"pie": "{{player}} accepted the komi offer and will continue playing second.",
352352
"pigs": "{{player}} idles.",
353353
"simple": "{{player}} passed.",

src/games/arimaa.ts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,21 +1138,27 @@ export class ArimaaGame extends GameBase {
11381138
// flipy: colour === 2 ? true : false,
11391139
orientation: "vertical",
11401140
};
1141-
legend[`${pc}${colour}x`] = {
1142-
name,
1143-
colour,
1144-
colour2: {
1145-
func: "bestContrast",
1146-
bg: colour,
1147-
fg: [
1148-
"_context_strokes",
1149-
"_context_fill"
1150-
]
1141+
legend[`${pc}${colour}x`] = [
1142+
{
1143+
name,
1144+
colour: {
1145+
func: "flatten",
1146+
fg: colour,
1147+
bg: "_context_background",
1148+
opacity: 0.5,
1149+
},
1150+
colour2: {
1151+
func: "bestContrast",
1152+
bg: colour,
1153+
fg: [
1154+
"_context_strokes",
1155+
"_context_fill"
1156+
]
1157+
},
1158+
// flipy: colour === 2 ? true : false,
1159+
orientation: "vertical",
11511160
},
1152-
// flipy: colour === 2 ? true : false,
1153-
opacity: 0.5,
1154-
orientation: "vertical",
1155-
};
1161+
];
11561162
}
11571163
}
11581164

src/games/enso.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class EnsoGame extends GameBase {
2828
uid: "enso",
2929
playercounts: [2],
3030
version: "20260108",
31-
dateAdded: "2026-01-08",
31+
dateAdded: "2026-01-12",
3232
// i18next.t("apgames:descriptions.enso")
3333
description: "apgames:descriptions.enso",
3434
urls: [
@@ -54,7 +54,7 @@ export class EnsoGame extends GameBase {
5454
},
5555
],
5656
categories: ["goal>isolate", "mechanic>move", "mechanic>capture", "board>shape>rect", "board>connect>rect", "components>simple>1per"],
57-
flags: ["automove", "experimental"]
57+
flags: ["automove"]
5858
};
5959

6060
public static coords2algebraic(x: number, y: number): string {
@@ -385,6 +385,9 @@ export class EnsoGame extends GameBase {
385385
} else if (ensoTwo) {
386386
this.gameover = true;
387387
this.winner = [2];
388+
} else if (this.moves().length === 0) {
389+
this.gameover = true;
390+
this.winner = [this.currplayer === 1 ? 2 : 1];
388391
}
389392

390393
if (this.gameover) {

0 commit comments

Comments
 (0)