Skip to content
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.

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

Add Battenberg Painting #547

Merged
merged 5 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Binary file added src-ui/img/batten.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src-ui/js/ui/KeyPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ ui.keypopup = {
portal: [10, 0],
kuromenbun: [10, 0],
bosnianroad: [8, 0],
sananko: [10, 113]
sananko: [10, 113],
batten: [10, 0]
},

//---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions src-ui/js/ui/Misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ function toBGimage(pid) {
"araf",
"skyscrapers",
"balance",
"batten",
"battleship",
"bdwalk",
"bosnianroad",
Expand Down
1 change: 1 addition & 0 deletions src-ui/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
<li data-pid="circlesquare"></li>
<li data-pid="tetrochain"></li>
<li data-pid="mrtile"></li>
<li data-pid="batten"></li>
</ul>
</div>
<div class="lists blocks">
Expand Down
1 change: 1 addition & 0 deletions src-ui/p.html
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ <h2 id="title2">読み込み中です...</h2>
<div class="child" data-value="mark-tree">__inputmode.mark-tree__</div>
<div class="child" data-value="mark-tent">__inputmode.mark-tent__</div>
<div class="child" data-value="mark-cross">__inputmode.mark-cross__</div>
<div class="child" data-value="mark-checkerboard">__inputmode.mark-checkerboard__</div>
<div class="child" data-value="undef">__inputmode.undef__</div>
<div class="child" data-value="line">__inputmode.line__</div>
<div class="child" data-value="peke">__inputmode.peke__</div>
Expand Down
1 change: 1 addition & 0 deletions src-ui/res/p.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
"inputmode.mark-tree": "Trees",
"inputmode.mark-tent": "Tents",
"inputmode.mark-cross": "Crosses",
"inputmode.mark-checkerboard": "Checkerboards",
"inputmode.undef": "Question marks",
"inputmode.line": "Lines",
"inputmode.peke": "Cross marks",
Expand Down
1 change: 1 addition & 0 deletions src-ui/res/rules.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -306,3 +306,4 @@ teri: "Shade some cells on the board.\n1. Shaded cells cannot be horizontally or
lixloop: "Shade some cells on the board, and draw a single loop that goes through all remaining cells.\n1. The loop cannot branch off or cross itself.\n2. Shaded cells cannot be orthogonally adjacent.\n3. Cells with letters or question marks cannot be shaded, and are not part of the loop.\n4. The letters represent cells that contain a turning line (L), straight line (I), or shaded cell (X). The clued cells indicate whichever type is most frequent in that direction. If multiple types are tied for most frequent, all letters will be listed in the clue."
sananko: "Place a number between 1 and 3 in some of the empty cells.\n1. Numbers must appear in groups of 3 orthogonally connected cells with the same number.\n2. Different groups cannot be orthogonally adjacent.\n3. Clues on shaded cells indicate the sum of numbers in the (up to four) orthogonally adjacent cells."
bosnianroad: "Shade some cells to form a loop.\n1. The loop cannot visit a cell that's orthogonally or diagonally adjacent to a cell it has visited before.\n2. Gray cells cannot be shaded.\n3. A number indicates the amount of shaded cells in the orthogonally and diagonally adjacent cells."
batten: "Shade some cells on the board.\n1. The numbers outside the grid indicate the number of shaded cells in that row/column.\n2. Checkerboard symbols mark every vertex of the grid surrounded by a 2x2 checkerboard pattern."
1 change: 1 addition & 0 deletions src/pzpr/variety.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
crossstitch: [0, 0, "Crossstitch", "Crossstitch"],
cts: [0, 0, "Cross the Streams", "Cross the Streams", "nonogram"],
barns: [1, 0, "バーンズ", "Barns"],
batten: [0, 0, "Battenberg Painting", "Battenberg Painting", "batten"],
Seren-35 marked this conversation as resolved.
Show resolved Hide resolved
battleship: [0, 0, "Battleship", "Battleship", "statuepark"],
bdblock: [1, 0, "ボーダーブロック", "Border Block"],
bdwalk: [0, 0, "ビルウォーク", "Building Walk", "haisu"],
Expand Down
3 changes: 3 additions & 0 deletions src/res/failcode.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@
"exNoMatch.nonogram": "The shaded cells don't match the clues in the row or column.",
"exPlusNe.magnets": "The number of Plus signs in the row or column is not correct.",
"exShadeNe.aquarium": "The number of shaded cells in the row or column is not correct.",
"exShadeNe.batten": "The number of shaded cells in the row or column is not correct.",
"exShadeNe.battleship": "The number of shaded cells in the row or column is not correct.",
"exShadeNe.snake": "The number of shaded cells in the row or column is not correct.",
"exTentNe.tents": "The number of tents in the row or column is not correct.",
Expand Down Expand Up @@ -793,6 +794,7 @@
"shBranch.bosnianroad": "The loop branches off.",
"shBranch.snake": "The snake branches off.",
"shDeadEnd.bosnianroad": "There is a dead-end cell.",
"shDiag.batten": "A checkerboard pattern isn't marked with a clue.",
"shDiag.battleship": "Two ships are diagonally adjacent.",
"shDiag.bosnianroad": "The loop touches itself diagonally.",
"shDiag.pentatouch": "A place where two pieces touch isn't marked with a point.",
Expand All @@ -804,6 +806,7 @@
"shLoop.snake": "The snake has no head or tail.",
"shMidpoint.snake": "A white circle is not a middle.",
"shMultiple.curvedata": "A shape is connected to multiple clues.",
"shNoDiag.batten": "A clue does not overlap a checkerboard pattern.",
"shNoDiag.pentatouch": "A point is not adjacent to two different pieces.",
"shNoDivide.interbd": "A shaded cell does not divide two or more countries.",
"shNone.curvedata": "A shape is not connected to a clue.",
Expand Down
Loading
Loading