Merge branch 'main' into edamame

Author: x-sheep

package-lock.json

@@ -38,8 +38,8 @@
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-uglify": "^5.2.1",
-    "mocha": "^10.0.0",
-    "nyc": "^15.1.0",
+    "mocha": "^11.7.5",
+    "nyc": "^18.0.0",
     "prettier": "^1.19.1"
   },
   "dependencies": {

package.json

@@ -34,12 +34,12 @@
 <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?edamame" target="_parent">Edamame</a></li>
+  <li><a href="/p?heavydots" target="_parent">Heavy Dots</a></li>
   <li><a href="/p?bhaibahan" target="_parent">Bhai Bahan</a></li>
   <li><a href="/p?oasis" target="_parent">Oasis</a></li>
   <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>
 </ul>
 </main>
 </body>

src-ui/changes.html

@@ -246,7 +246,8 @@ ui.keypopup = {
 		keywest: [4, 4],
 		oasis: [10, 0],
 		bhaibahan: [10, 0],
-		edamame: [4, 0]
+		edamame: [4, 0],
+		heavydots: [10, 0]
 	},
 
 	//---------------------------------------------------------------------------

src-ui/js/ui/KeyPopup.js

@@ -302,6 +302,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="balloon"></li>
     <li data-pid="narrow"></li>
     <li data-pid="sendai"></li>
+    <li data-pid="heavydots"></li>
   </ul>
   </div>
   <div class="lists divides">

src-ui/list.html

@@ -230,3 +230,4 @@ circuitwalk: This genre was invented by Parachor.
 cornerch: This genre first appeared in Puzzle Communication Nikoli vol. 191.
 marutaring: This genre first appeared in Puzzle Communication Nikoli vol. 181.
 bhaibahan: This genre was invented by Prasanna Seshadri.
+heavydots: This genre was invented by Prasanna Seshadri.

src-ui/res/history.en.yaml

@@ -230,3 +230,4 @@ circuitwalk: Parachor氏発案
 cornerch: パズル通信ニコリ vol.191より
 marutaring: パズル通信ニコリ vol.181より
 bhaibahan: Prasanna Seshadri氏発案
+heavydots: Prasanna Seshadri氏発案

src-ui/res/history.ja.yaml

@@ -395,3 +395,10 @@ bhaibahan: |-
   1. The loop cannot branch off or cross itself.
   2. When two circles are orthogonally adjacent, the loop goes straight in one and turns in the other.
   3. The loop is split into segments, alternating between a segment where the loop turns in every cell and a segment where the loop goes straight in every cell. A number indicates the size of the segment that the number is on.
+heavydots: |-
+  Draw lines over the dotted lines to divide the board into several blocks.
+  1. A number indicates the size of the block in cells.
+  2. A block can contain no more than one number.
+  3. A black dot touches exactly 3 lines, and a white dot touches exactly 4 lines.
+  4. A regular grid point that's located next to a white/black dot cannot have more than 2 lines touching it.
+  5. A block cannot contain a 2x2 square of cells.

src-ui/res/rules.en.yaml

@@ -194,6 +194,7 @@
 				"",
 				{ pzprurl: "hashi", kanpen: "hashi", alias: "bridges" }
 			],
+			heavydots: [0, 0, "Heavy Dots", "Heavy Dots"],
 			hebi: [1, 0, "へびいちご", "Hebi-Ichigo", "", { old: "snakes" }],
 			herugolf: [0, 0, "ヘルゴルフ", "Herugolf"],
 			heteromino: [0, 0, "ヘテロミノ", "Heteromino", "nawabari"],

src/pzpr/variety.js

@@ -62,6 +62,10 @@
     "bdCross": "There is a crossing border line.",
     "bdCrossBP.kramma": "There is a crossing line on the point.",
     "bdCrossExBP.bdblock": "Lines are crossed out of the point.",
+    "bdCrossExBP.heavydots": "A black dot has more than 3 lines.",
+    "bdCrossNearBP.heavydots": "A vertex adjacent to a dot has more than 2 lines.",
+    "bdCrossUnder.heavydots": "A black dot has less than 3 lines.",
+    "bdCrossUnderWhite.heavydots": "A white dot has less than 4 lines.",
     "bdCurveExBP.kramma": "A line curves out of the points.",
     "bdDeadEnd": "There is a dead-end line.",
     "bdDoorsGt.oneroom": "Two rooms have more than one door between them.",
@@ -89,6 +93,7 @@
     "bdwMismatch.bdwalk": "The line goes through different numbers without switching floors.",
     "bdwSkipElevator.bdwalk": "The line doesn't change floors at an elevator.",
     "bdwTopFloor.bdwalk": "The line goes above the top floor.",
+    "bk2x2": "There is a 2x2 block of cells belonging to the same region.",
     "bkArafEqual.araf": "An area is equal to a number.",
     "bkArafTooBig.araf": "An area is larger than both numbers.",
     "bkArafTooSmall.araf": "An area is smaller than both numbers.",