Merge branch 'main' into patchwork

src-ui/changes.html

@@ -34,13 +34,13 @@
 <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?patchwork" target="_parent">Patchwork パッチワーク</a></li>
+  <li><a href="/p?myopia" target="_parent">Myopia</a></li>
+  <li><a href="/p?sashikazune" target="_parent">Sashikazune さしカズね</a></li>
   <li><a href="/p?brownies" target="_parent">Brownies ブラウニー</a></li>
   <li><a href="/p?tetrochain" target="_parent">Tetrochain テトロチェーン</a></li>
   <li><a href="/p?bdwalk" target="_parent">Building Walk ビルウォーク <small>(rules update)</small></a></li>
   <li><a href="/p?heyapin" target="_parent">Heyapin へやピン</a></li>
   <li><a href="/p?invlitso" target="_parent">Inverse LITSO</a></li>
-  <li><a href="/p?battleship" target="_parent">Battleship</a></li>
-  <li><a href="/p?fracdiv" target="_parent">Fractional Division 分数分割</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -180,6 +180,7 @@ ui.keypopup = {
 		maxi: [10, 0],
 		tetrochain: [10, 0],
 		brownies: [127, 0],
+		sashikazune: [10, 0],
 		patchwork: [10, 0]
 	},
 

src-ui/js/ui/Misc.js

@@ -164,6 +164,7 @@ function toBGimage(pid) {
 		"rassi",
 		"remlen",
 		"roundtrip",
+		"sashikazune",
 		"satogaeri",
 		"scrin",
 		"simplegako",

src-ui/list.html

@@ -133,6 +133,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="koburin"></li>
     <li data-pid="remlen"></li>
     <li data-pid="nanameguri"></li>
+    <li data-pid="myopia"></li>
    </ul>
   </div>
   <div class="lists loops">
@@ -232,6 +233,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="familyphoto"></li>
     <li data-pid="slashpack"></li>
     <li data-pid="fracdiv"></li>
+    <li data-pid="sashikazune"></li>
   </ul>
   </div>
   <div class="lists divides">

src-ui/p.html

@@ -453,6 +453,7 @@ <h2 id="title2">読み込み中です...</h2>
   <button type="button" class="btn" id="btnpresets" data-button-exec="applypreset">__applypreset__</button>
   <button type="button" class="btn" data-disp-pid="stostone" data-press-exec="dropblocks,resetblocks">__dropblocks__</button>
   <button type="button" class="btn" data-disp-pid="slither" data-button-exec="outlineshaded">__outlineshaded__</button>
+  <button type="button" class="btn" data-disp-pid="myopia" data-button-exec="outlineshaded">__outlineshaded__</button>
   <button type="button" class="btn" id="btntrial"   data-button-exec="enterTrial">__enterTrial__</button>
   <div id="btntrialarea" style="display:none;">
     <button type="button" class="btn btn-ok" id="btntriala"  data-button-exec="acceptTrial">__acceptTrial__</button

src-ui/res/p.ja.json

@@ -143,7 +143,7 @@
     "inputmode.info-line": "線の繋がりチェック",
     "inputmode.info-blk": "黒マス繋がりチェック",
     "inputmode.info-ublk": "白マス繋がりチェック",
-    "inputmode.info-room": "Check room connection",
+    "inputmode.info-room": "へやの繋がりチェック",
     "inputmode.info-road": "経路チェック",
     "disptype": "表示形式",
     "context_marks": "矢印を表示する",
@@ -185,15 +185,15 @@
     "voxas_tatami": "タタミルール(境界の十字交差禁止)",
     "tren_new": "白マスひとつながりルールを追加",
     "nuriuzu_connect": "黒マスひとつながりルールを追加",
-    "bdwalk_height": "Maximum height is unknown",
+    "bdwalk_height": "盤面にある数字より大きい階数があってもよい",
     "pentopia_transparent": "Transparent (矢印のマスが黒マスになる場合もあります。)",
     "koburin_minesweeper": "マインスイーパモード (数字は斜めのマスを含みます)",
     "akichi_maximum": "最大値が数字より小さくても可",
-    "magnets_anti": "Anti-Magnets (adjacent poles of different magnets must be equal)",
-    "heyapin_overlap": "Pins must overlap 2 or more regions",
+    "magnets_anti": "Anti-Magnets (磁石が必ず同じ極で隣り合う)",
+    "heyapin_overlap": "ピンは必ず複数の部屋にまたがる",
     "variant": "変種ルール",
     "time": "経過時間：",
-    "timer.menu": "Show timer",
+    "timer.menu": "タイマーを表示",
     "check": "チェック",
     "check.variant": "本家ルールでチェック",
     "undo": "戻",
@@ -278,5 +278,9 @@
     "about.author": "は はっぱ/連続発破",
     "network.title": "ネットワークプレイ",
     "network.start": "始める",
-    "network.share": "共有用URL:"
+    "network.share": "共有用URL:",
+    "inputmode.copysymbol": "コピー",
+    "preset.fleet3": "サイズ3",
+    "preset.fleet4": "サイズ4",
+    "preset.fleet5": "サイズ5"
 }

src-ui/res/rules.en.yaml

@@ -1171,3 +1171,22 @@ nothing: "Draw lines through orthogonally adjacent cells to form a loop.\n1. The
   cannot branch off or cross itself.\n2. If a country is visted by the loop, it must
   visit all cells.\n3. Countries cannot be visited more than once.\n4. Two unused
   countries cannot be orthogonally adjacent."
+myopia: "Draw lines along the edges of some cells to form a loop.\n1. The loop cannot 
+  branch off or cross itself.\n2. Arrows point towards the lines closest to the clue. If a 
+  clue has multiple arrows, the distance to the closest line must be the same. Directions 
+  without an arrow must have a line further away, or not have a line in that direction."
+waterwalk: "Draw a loop that goes through every numbered cell.\n1. The loop cannot
+  branch off or cross itself.\n2. Blue cells represent water, while regular cells
+  represent ground. The loop may not go through more than 2 water cells in a row.\n
+  3. A number indicates how many cells make up the continuous grounded section of
+  the loop that the number is on."
+pentatouch: "Place every shape from the bank into the grid. Shapes can be rotated
+  or mirrored.\n1. All shapes must be used exactly once. There cannot be shapes in
+  the grid that aren't present in the bank.\n2. Two shapes cannot be orthogonally
+  adjacent.\n3. A dot indicates a place where two shapes are diagonally adjacent.
+  All possible dots are given, meaning that two shapes cannot be diagonally adjacent
+  in places without a dot."
+wittgen: "Place several rectangles of size 1x3 into the grid.\n1. A number indicates
+  the amount of rectangles in the 4 orthogonally adjacent cells.\n2. Rectangles cannot
+  overlap numbers.\n3. All cells not used by rectangles form an orthogonally contiguous
+  area."

src-ui/res/rules.ja.yaml

@@ -508,3 +508,7 @@ brownies: "1. 盤面にある○をタテヨコいずれかに移動して、盤
   2. ○の移動は矢印で表しますが、矢印は途中で折れ曲がったりせず、また他の矢印や○や黒マスとぶつかることはありません。"
 mrtile: "1. 盤面のいくつかのマスを黒くぬりましょう。\n2. タテヨコでひとつながりになった黒マスのカタマリを「タイル」と呼びます。盤面にあるタイルはどれも、そのタイルと同じ大きさで同じ形のものと点で接するようにします。回転や裏返しをして同じになるものは「同じ形」とします。\n
   3. 数字は、その数字を含むタイルのマス数を表します。最初からある黒マスを白マスにしたり動かしたりしてはいけません。"
+magnets: "1.1×2マスのブロックのいくつかに、磁石を配置します。磁石の入らないブロックは、黒マスになります。\n2.磁石の両側にはそれぞれ、+(N極)と-(S極)がひとつずつあります。同じ極どうしは、タテヨコに接しません。\n\
+  3.盤面の外の数は、その列に入る+と-の数を表します。"
+tetrominous: "点線に沿って線を引き、盤面をテトロミノ(４マスのブロック)に分割します。同じ形のペントミノをいくつ配置してもかまいません(使わなくてもよい)。\n\
+  1.同じ形のブロックが隣り合ってはいけません。回転や反転で一致するものは同じ形とみなします。\n2.文字は、そのマスが入るブロックの形を表します。２つ以上の文字が入ったブロックや、文字が１つも入らないブロックができてもかまいません。"

src/puzzle/Config.js

@@ -375,7 +375,7 @@
 					exec = pid === "interbd";
 					break;
 				case "bgcolor":
-					exec = pid === "slither";
+					exec = pid === "slither" || pid === "myopia";
 					break;
 				case "irowake":
 					exec = puzzle.painter.irowake;

src/pzpr/variety.js

@@ -252,6 +252,7 @@
 			mochikoro: [1, 0, "モチコロ", "Mochikoro", "nurikabe"],
 			mochinyoro: [1, 0, "モチにょろ", "Mochinyoro", "nurikabe"],
 			moonsun: [0, 0, "月か太陽", "Moon or Sun", "country"],
+			myopia: [0, 0, "Myopia", "Myopia"],
 			nagare: [0, 0, "流れるループ", "Nagareru-Loop"],
 			nagenawa: [0, 0, "なげなわ", "Nagenawa", "nagenawa"],
 			nanameguri: [0, 0, "ななめぐり", "Nanameguri"],
@@ -316,6 +317,7 @@
 			roma: [0, 0, "ろーま", "Roma", "", { alias: "rome" }],
 			roundtrip: [0, 0, "Round Trip", "Round Trip"],
 			sashigane: [0, 0, "さしがね", "Sashigane", "loute"],
+			sashikazune: [0, 0, "さしカズね", "Sashikazune", "loute"],
 			satogaeri: [
 				0,
 				1,

src/res/failcode.en.json

@@ -22,10 +22,13 @@
     "arBlocked.toichika2": "Other numbers are between a pair of numbers.",
     "arBlockLt2.evolmino": "The arrow passes through less than two blocks.",
     "arDistance.toichika2": "A pair of numbers does not have the correct distance.",
+    "arDistanceGt.myopia": "There is a line closer to a clue in an unmarked direction.",
     "arDistanceGt.pentopia": "There is a shaded cell closer to a clue in an unmarked direction.",
+    "arDistanceNe.myopia": "The lines pointed to by a clue are at different distances.",
     "arDistanceNe.pentopia": "The shaded cells pointed to by a clue are at different distances.",
     "arInvalid.evolmino": "The arrow is invalid.",
     "arNoLine": "A line doesn't go through some arrows.",
+    "arNoLineSeen": "There is no line in the direction of an arrow.",
     "arNoShade.pentopia": "There is no shaded cell in the direction of an arrow.",
     "arNotMax.makaro": "An arrow doesn't point out biggest number.",
     "arNotPtCnr.loute": "An arrow doesn't point at the corner of an area.",
@@ -188,6 +191,7 @@
     "bkNumGe2": "A block has multiple numbers.",
     "bkNumGe3.news": "An area has more than two letters.",
     "bkNumGt2.magnets": "A room has more than two poles.",
+    "bkNumGt2.sashikazune": "A block has more than two numbers.",
     "bkNumGt3.hakoiri": "A box has more than three shapes.",
     "bkNumLt2.magnets": "A room has half a magnet.",
     "bkNumLt2.news": "An area has less than two letters.",
@@ -303,7 +307,7 @@
     "bsNotEvol.evolmino": "The block doesn't have the same shape as the previous block with one additional square.",
     "bsSameNum.fillomino": "Adjacent areas have the same number.",
     "bsSameShape.chainedb": "A chain contains two identical blocks.",
-    "bsSameShape.lits": "Some Tetrominos that are the same shape are Adjacent.",
+    "bsSameShape.lits": "Some tetrominoes that have the same shape are adjacent.",
     "bsSameShape": "Two blocks that have the same shape are adjacent.",
     "bsSizeEq.fillmat": "Tatamis of the same size are adjacent.",
     "bsSnake.hebi": "Different snakes are adjacent.",
@@ -550,7 +554,7 @@
     "lnSnLine.lither": "There is only one tree.",
     "lnStarNe.starbattle": "The number of stars in a line is wrong.",
     "lnWrongAngle.kouchoku": "Some segments meet at the wrong angle.",
-    "lookairBC.lookair": "A mass of shaded cells can looks other same size mass of shaded cells.",
+    "lookairBC.lookair": "Two squares of the same size can see each other.",
     "lpNoNum.onsen": "A loop has no numbers.",
     "lpNoNum.pipelink": "A loop has no numbers.",
     "lpNumGt2.onsen": "A loop has more than one number.",
@@ -612,6 +616,7 @@
     "nmDiag.snakepit": "A snake touches itself diagonally.",
     "nmDiffDistNe.hanare": "The distance of the paired numbers is not equal to their difference.",
     "nmDiffDistNe.putteria": "The distance of the paired numbers is not equal to their difference.",
+    "nmDistNe.sashikazune": "A number is not equal to the distance to the region's corner.",
     "nmDivEq2.kropki": "The number is double the other between two adjacent cells without shaded circle.",
     "nmDivide.hakoiri": "The shapes are divided.",
     "nmDivide.tontonbeya": "Identical symbols are divided in a room.",
@@ -675,7 +680,7 @@
     "nmRange.trainstations": "A number is out of range.",
     "nmSame2x2.kazunori": "There is a 2x2 block of the same number.",
     "nmSame2x2.snakepit": "A snake loops back on itself.",
-    "nmShade5Ne.lookair": "the number is not equal to the number of shaded cells in the cell and four adjacent cells.",
+    "nmShade5Ne.lookair": "The number is not equal to the number of shaded cells in the cell and the four adjacent cells.",
     "nmShadeDiagNe.context": "The number of shaded cells diagonally adjacent to a shaded number is not correct.",
     "nmShadeGt.interbd": "The number of shaded cells around a number is not correct.",
     "nmShadeGt.kaidan": "The number of circles around a number is not correct.",

src/res/failcode.ja.json

@@ -54,7 +54,7 @@
     "bdwInvalidUp.bdwalk": "▼のエレベーターで昇っています。",
     "bdwMismatch.bdwalk": "エレベーターのマスを通らずに階を移動しています。",
     "bdwSkipElevator.bdwalk": "エレベーターで階を移動していません。",
-    "bdwTopFloor.bdwalk": "The line goes above the top floor.",
+    "bdwTopFloor.bdwalk": "線が最上階よりも上を通っています。",
     "bkArafEqual.araf": "面積が数字と一致しています。",
     "bkArafTooBig.araf": "面積が大きすぎるブロックがあります。",
     "bkArafTooSmall.araf": "面積が小さすぎるブロックがあります。",
@@ -748,5 +748,29 @@
     "nmConnected.oyakodori": "鳥どうしがつながっています。",
     "nmAdjacentGt2.tontonbeya": "同じ記号のカタマリであって、2つ以上のカタマリとつながっているものがあります。",
     "nmDivide.tontonbeya": "同じ記号が部屋の中でタテヨコにひとつながりになっていません。",
-    "nmNumberEq.oyakodori": "同じ種類の鳥が同じ巣に入っています。"
+    "nmNumberEq.oyakodori": "同じ種類の鳥が同じ巣に入っています。",
+    "bkShadeDivide.invlitso": "白マスが領域内でタテヨコに連なっていません。",
+    "bkShadeGt4.invlitso": "領域に白マスが４つ以下しかありません。",
+    "bkShadeLt4.invlitso": "領域に白マスが５つ以上あります。",
+    "nmVertexNe.vslither": "ループが通る頂点の数が正しくありません。",
+    "csLt4": "黒マスの数が４より少ないです。",
+    "csGt4": "黒マスの数が４より多いです。",
+    "exPlusNe.magnets": "列に入る「＋」の数が正しくありません。",
+    "exMinusNe.magnets": "列に入る「－」の数が正しくありません。",
+    "nmAdjacent.magnets": "同じ極が隣り合っています。",
+    "nmCircleNe.brownies": "数字が、タテヨコナナメに接する○の数と一致していません。",
+    "bankGt.battleship": "艦の数が多すぎます。",
+    "bankLt.battleship": "配置されていない艦があります。",
+    "bkCircleNe.fracdiv": "数字が、ブロック内の(黒丸の数)÷(マスの数)と一致していません。",
+    "bkNumLt2.magnets": "磁石が一方の極しかありません。",
+    "nmAdjDiff.magnets": "磁石が同じ極で隣り合っていません。",
+    "nmTouchNe.tslither": "マスの周りの頂点や辺にループが訪れる回数が正しくありません。",
+    "shDiag.battleship": "異なる艦がナナメに接しています。",
+    "bkMissingNum": "ブロックにすべての数字が入っていません。",
+    "bkNumGt2.sashikazune": "１つのブロックに数字が３個以上入っています。",
+    "exShadeNe.battleship": "列に入る艦の数が正しくありません。",
+    "bkPinNe.heyapin": "部屋にあるピンの数が正しくありません。",
+    "bkNumGt2.magnets": "領域の中に同じ極が2つ以上入っています。",
+    "nmDistNe.sashikazune": "数字が、角からのマス数と一致していません。",
+    "cxOverlap.heyapin": "ピンが複数の部屋にまたがっていません。"
 }