Skip to content

Commit 2e14f5d

Browse files
committed
Merge branch 'develop'
2 parents 5a423a7 + 333c837 commit 2e14f5d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

locales/en/apgames.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5682,8 +5682,8 @@
56825682
"INITIAL_INSTRUCTIONS_choose": "Use the buttons to choose whether to play first or second.",
56835683
"INITIAL_INSTRUCTIONS_play_one": "You may place up to {{count}} piece this turn. Click the piece at the side of the board and then an empty cell to place it. Or just click an empty cell to place one of your own pieces.",
56845684
"INITIAL_INSTRUCTIONS_play_other": "You may place up to {{count}} pieces this turn. Click the piece at the side of the board and then an empty cell to place it. Or just click an empty cell to place one of your own pieces.",
5685-
"INITIAL_INSTRUCTIONS_setup_one": "Create a chunk for each colour anywhere on the board ({{count}} piece remaining).",
5686-
"INITIAL_INSTRUCTIONS_setup_other": "Create a chunk for each colour anywhere on the board ({{count}} pieces remaining).",
5685+
"INITIAL_INSTRUCTIONS_setup_one": "Create a chunk (two adjacent pieces) for each colour anywhere on the board ({{count}} piece remaining).",
5686+
"INITIAL_INSTRUCTIONS_setup_other": "Create a chunk (two adjacent pieces) for each colour anywhere on the board ({{count}} pieces remaining).",
56875687
"INVALID_COLOUR": "The requested colour ({{colour}}) is invalid.",
56885688
"PARTIAL": "Select where you want to place that piece.",
56895689
"SETUP_CHUNKS": "The pieces you place must be adjacent to each other (one chunk per player).",

src/games/asli.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,11 @@ export class AsliGame extends GameBase {
718718
});
719719
prisonPiece.push({
720720
text: this.prison[0] > 0 ? this.prison[0].toString() : this.prison[1].toString(),
721-
colour: "_context_strokes",
721+
colour: {
722+
func: "bestContrast",
723+
fg: ["_context_background", "_context_fill", "_context_label"],
724+
bg: this.prison[0] > 0 ? this.getPlayerColour(1) : this.getPlayerColour(2),
725+
},
722726
scale: 0.75,
723727
rotate: null,
724728
});

0 commit comments

Comments
 (0)