Merge branch 'main'

Author: x-sheep

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?circuitwalk" target="_parent">Circuit Walk</a></li>
   <li><a href="/p?cornerch" target="_parent">Corner Chain 隅角チェーン</a></li>
   <li><a href="/p?sendai" target="_parent">Sendai-Miyagi 宮城県仙台市</a></li>
   <li><a href="/p?keywest" target="_parent">Key West キーウエスト</a></li>
   <li><a href="/p?morningwalk" target="_parent">Morning Walk</a></li>
   <li><a href="/p?energywalk" target="_parent">Energy Walk</a></li>
   <li><a href="/p?sansaroad" target="_parent">Sansa Road サンサロード</a></li>
-  <li><a href="/p?diamond" target="_parent">Diamond Chain</a></li>
 </ul>
 </main>
 </body>

src-ui/img/circuitwalk.png

@@ -239,6 +239,7 @@ ui.keypopup = {
 		cityspace: [10, 0],
 		diamond: [4, 0],
 		sendai: [10, 0],
+		circuitwalk: [10, 0],
 		morningwalk: [10, 0],
 		energywalk: [10, 0],
 		cornerch: [10, 0],
@@ -510,6 +511,7 @@ ui.keypopup = {
 			pid === "forestwalk" ||
 			pid === "morningwalk" ||
 			pid === "energywalk" ||
+			pid === "circuitwalk" ||
 			pid === "dbchoco" ||
 			pid === "balloon"
 		) {
@@ -528,6 +530,8 @@ ui.keypopup = {
 							? "rgb(212,180,212)"
 							: pid === "energywalk"
 							? "rgb(255,255,163)"
+							: pid === "circuitwalk"
+							? "rgb(118,165,175)"
 							: "rgb(192,224,255)"
 				}
 			]);

src-ui/js/ui/KeyPopup.js

@@ -124,6 +124,7 @@ function toBGimage(pid) {
 		"cbanana",
 		"chainedb",
 		"circlesquare",
+		"circuitwalk",
 		"cityspace",
 		"cocktail",
 		"coffeemilk",

src-ui/js/ui/Misc.js

@@ -210,6 +210,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="icelom"></li>
     <li data-pid="icelom2"></li>
     <li data-pid="icewalk"></li>
+    <li data-pid="circuitwalk"></li>
    </ul>
   </div>
   <div class="lists lines">

src-ui/list.html

@@ -183,7 +183,7 @@
     "enline.tool": "Enable to draw line only between the points",
     "lattice.tool": "Disable drawing segment passing over a lattice point",
     "uramashu": "Change to Ura-Mashu",
-    "singlenum.tool": "Ensure that a region has a number",
+    "singlenum.tool": "Ensure that each region has one number",
     "singleregion": "Ensure that only one tile is shaded in each region",
     "forceallcell.tool": "Force each cell to have a number",
     "snakebd": "Draw border around a snake",

src-ui/res/p.en.json

@@ -360,7 +360,7 @@ energywalk: "Draw lines to form a single network that goes through every numbere
 morningwalk: "Draw a loop that goes through every numbered cell.\n1. The loop cannot branch off or cross itself.\n2. A number indicates how many cells make up the continuous white section of the loop that the number is on.\n3. The lengths of two successive differently coloured sections of the loop must not be equal."
 cornerch: |-
   Shade some cells on the board to form regions of unshaded cells.
-  1. A number indicates the size of the region that contains it..
+  1. A number indicates the size of the region that contains it.
   2. Clues represent the number of cells in the region they belong to. A region can contain one or more identical numbers, or none at all.
   3. If the number of cells in an unshaded group is even, the area must be rectangular. If the number of cells is odd, the area must not be rectangular.
   4. All unshaded areas must be connected diagonally.

src-ui/res/rules.en.yaml

@@ -116,6 +116,7 @@
 			cave: [1, 0, "バッグ", "Cave", "kurodoko", { alias: "bag" }],
 			cbanana: [0, 0, "チョコバナナ", "Choco Banana"],
 			circlesquare: [0, 0, "Circles and Squares", "Circles and Squares"],
+			circuitwalk: [0, 0, "Circuit Walk", "Circuit Walk", "icewalk"],
 			context: [0, 0, "Context", "Context"],
 			crossstitch: [0, 0, "Crossstitch", "Crossstitch"],
 			cts: [0, 0, "Cross the Streams", "Cross the Streams", "nonogram"],

src/pzpr/variety.js

@@ -602,14 +602,15 @@
     "lnBranch.forestwalk": "There is a branch line outside of a forest cell.",
     "lnBranch": "There is a branch line.",
     "lnConsecutive.kaidan": "Two adjacent rectangles don't have a size difference of 1.",
-    "lnCross.crossstitch": "A loop crosses itself.",
     "lnCross": "There is a crossing line.",
     "lnCrossExCir.pipelink": "There is a crossing line out of circles.",
     "lnCrossExIce": "A line is crossed outside of ice.",
+    "lnCrossExIce.circuitwalk": "A line is crossed outside of a shaded cell.",
     "lnCrossExIce.energywalk": "A line is crossed outside of an energy cell.",
     "lnCrossExMk": "There is a crossing outside given crosses.",
     "lnCrossOnNum.pipelink": "Lines are crossed on a number.",
     "lnCrossPencil.pencils": "A line crosses a pencil.",
+    "lnCrossSelf": "A loop crosses itself.",
     "lnCurveOnCir.pipelink": "A line turns on a circle.",
     "lnCurveOnCir.portal": "A line turns on an unmarked portal.",
     "lnCurveOnIce": "A line turns on ice.",
@@ -637,6 +638,7 @@
     "lnLenLt.reflect": "The lines passing a triangle are too short.",
     "lnMultipleTips.pencils": "A line connects to more than one pencil tip.",
     "lnNoBorder.ladders": "A ladder doesn't touch two region borders.",
+    "lnNoBranch.circuitwalk": "A visited shaded cell doesn't contain a cross.",
     "lnNoBranch.energywalk": "A visited energy cell doesn't branch off in all directions.",
     "lnNoBranch.forestwalk": "A visited forest cell doesn't contain a T-junction.",
     "lnNoBranch.tjunction": "A cell doesn't contain a T-junction.",
@@ -664,6 +666,7 @@
     "lnOverlap.tontti": "A line overlaps a number.",
     "lnPassOver.kouchoku": "A segment passes over a clue.",
     "lnPlLine": "There are multiple lines.",
+    "lnPlLoop.circuitwalk": "The various loops don't form a single network.",
     "lnPlLoop.crossstitch": "There aren't exactly two loops.",
     "lnPlLoop.diamond": "Not all shaded cells and diamonds are connected.",
     "lnPlLoop.forestwalk": "There are multiple networks.",

src/res/failcode.en.json

@@ -411,13 +411,13 @@
     "lcTripleNum": "3つ以上の数字がつながっています。",
     "lnAdjacent.tontti": "繋がっている線の形が同じです。",
     "lnBranch": "分岐している線があります。",
-    "lnCross.crossstitch": "線が自己交差しています。",
     "lnCross": "線が交差しています。",
     "lnCrossExCir.pipelink": "○の部分以外で線が交差しています。",
     "lnCrossExIce": "氷の部分以外で線が交差しています。",
     "lnCrossExMk": "十字以外の場所で線が交差しています。",
     "lnCrossOnNum.pipelink": "○の部分で線が交差しています。",
     "lnCrossPencil.pencils": "線が鉛筆の軸と交差しています。",
+    "lnCrossSelf": "線が自己交差しています。",
     "lnCurveOnCir.pipelink": "○の部分で線が曲がっています。",
     "lnCurveOnIce": "氷の部分で線が曲がっています。",
     "lnDeadEnd": "途中で途切れている線があります。",