Add Battenberg Painting

src-ui/changes.html

@@ -33,13 +33,13 @@
 <main>
 <div style="margin-bottom: 5px;"><b>Latest types</b> (<em><a href="/list.html" target="_parent">all types</a></em>)</div>
 <ul>
+  <li><a href="/p?batten" target="_parent">Battenberg Painting</a></li>
   <li><a href="/p?zabajaba" target="_parent">Zabajaba</a></li>
   <li><a href="/p?curving" target="_parent">Curving Road カービングロード</a></li>
   <li><a href="/p?sananko" target="_parent">San-Anko サンアンコー</a></li>
   <li><a href="/p?bosnianroad" target="_parent">Bosnian Road</a></li>
   <li><a href="/p?kuromenbun" target="_parent">Kuromenbun クロメンブン</a></li>
   <li><a href="/p?portal" target="_parent">Portal Loop</a></li>
-  <li><a href="/p?teri" target="_parent">Territory テリトリー</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -202,7 +202,8 @@ ui.keypopup = {
 		kuromenbun: [10, 0],
 		bosnianroad: [80, 0],
 		sananko: [10, 113],
-		zabajaba: [80, 0]
+		zabajaba: [80, 0],
+		batten: [10, 0]
 	},
 
 	//---------------------------------------------------------------------------

src-ui/js/ui/Misc.js

@@ -113,6 +113,7 @@ function toBGimage(pid) {
 		"araf",
 		"skyscrapers",
 		"balance",
+		"batten",
 		"battleship",
 		"bdwalk",
 		"bosnianroad",

src-ui/list.html

@@ -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">

src-ui/p.html

@@ -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>

src-ui/res/p.en.json

@@ -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",

src-ui/res/rules.en.yaml

@@ -310,3 +310,4 @@ snakeegg: "Shade some cells into the grid to form a snake.\n1. The snake cannot
 curving: "Shade some cells on the board.\n1. Shaded cells cannot be horizontally or vertically adjacent.\n2. All unshaded cells on the board form an orthogonally connected area.\n3. Cells with circles cannot be shaded.\n4. Every possible orthogonal path through unshaded cells between two circles must turn at least twice."
 firewalk: "Draw a loop that goes through every numbered cell.\n1. The loop cannot branch off or cross itself.\n2. Orange cells represent fire, while regular cells represent ground. The loop must turn on every orange cell it visits.\n3. The loop is allowed to visit an orange cell twice if the center of the cell is inside the loop.\n4. A number indicates how many cells make up the continuous grounded section of the loop that the number is on."
 zabajaba: "Place several rectangles of size 1x3 or 2x2 into the grid.\n1. A number indicates the amount of rectangles in the orthogonally and diagonally adjacent cells.\n2. Rectangles cannot overlap numbers.\n3. Two orthogonally adjacent rectangles must have different size or different orientation.\n4. All rectangles form an orthogonally contiguous area."
+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."

src-ui/res/rules.ja.yaml

@@ -265,3 +265,4 @@ lineofsight: "1. パズル面のいくつかの頂点を線でつないで枝分
 snakeegg: "1. 盤面上のマスを黒く塗り、タテヨコにひとつながりになった蛇の形になるようにします。蛇の頭と尾になるマスは、○で示されています。\n2. 蛇はナナメの角でのみ、自分自身に接触することができます。辺で接触してはいけません。\n3. タテヨコにいくつかの白マスがつながったカタマリができるようにします。指定されたマス数のカタマリがそれぞれひとつずつできるようにします。\n4. 数字のマスは黒マスになりません。そしてその数字が、そのマスの含まれるカタマリのマス数を表すようにします。"
 curving: "1. 盤面にいくつかの障害物（黒マス）を配置してください。\n2. 黒マスはタテヨコに連続しません。また黒マスによって盤面が分断されてはいけません。\n3. 丸同士を結ぶ経路は必ず２回以上曲がるようにします。"
 firewalk: ''
+batten: "1. 盤面のいくつかのマスを黒く塗ります。\n2. 盤面の外にある数字は、その列にある黒マスの数を表します。\n3. 盤面が2×2の市松模様に塗られる場所はすべて市松模様の記号で表されています。記号がない場所が2×2の市松模様に塗られることはありません。"

src/pzpr/variety.js

@@ -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"],
 			battleship: [0, 0, "Battleship", "Battleship", "statuepark"],
 			bdblock: [1, 0, "ボーダーブロック", "Border Block"],
 			bdwalk: [0, 0, "ビルウォーク", "Building Walk", "haisu"],

src/res/failcode.en.json

@@ -443,6 +443,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.",
@@ -797,6 +798,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.",
@@ -808,6 +810,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.",