Add Heavy Dots

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?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>
-  <li><a href="/p?morningwalk" target="_parent">Morning Walk</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

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

src-ui/list.html

@@ -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/pzpr/variety.js

@@ -193,6 +193,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/res/failcode.en.json

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

src/variety-common/Encode.js

@@ -750,41 +750,44 @@ pzpr.classmgr.makeCommon({
 		// enc.decodeCircle() 白丸・黒丸をデコードする
 		// enc.encodeCircle() 白丸・黒丸をエンコードする
 		//---------------------------------------------------------------------------
-		genericDecodeThree: function(set_func) {
-			var bd = this.board;
+		genericDecodeTriple: function(length, set_func) {
 			var bstr = this.outbstr,
 				c = 0,
 				tri = [9, 3, 1];
-			var pos = bstr
-				? Math.min(((bd.cols * bd.rows + 2) / 3) | 0, bstr.length)
-				: 0;
+			var pos = bstr ? Math.min(((length + 2) / 3) | 0, bstr.length) : 0;
 			for (var i = 0; i < pos; i++) {
 				var ca = parseInt(bstr.charAt(i), 27);
 				for (var w = 0; w < 3; w++) {
-					if (!!bd.cell[c]) {
-						var val = ((ca / tri[w]) | 0) % 3;
-						if (val > 0) {
-							set_func(bd.cell[c], val);
-						}
-						c++;
+					var val = ((ca / tri[w]) | 0) % 3;
+					if (val > 0) {
+						set_func(c, val);
 					}
+					c++;
 				}
 			}
 			this.outbstr = bstr.substr(pos);
 		},
+		genericDecodeThree: function(set_func) {
+			var bd = this.board;
+			this.genericDecodeTriple(bd.cell.length, function(c, val) {
+				var cell = bd.cell[c];
+				if (cell) {
+					set_func(cell, val);
+				}
+			});
+		},
 		decodeCircle: function() {
 			this.genericDecodeThree(function(cell, val) {
 				cell.qnum = val;
 			});
 		},
-		genericEncodeThree: function(get_func) {
-			var bd = this.board;
+		genericEncodeTriple: function(length, get_func) {
 			var cm = "",
 				num = 0,
 				pass = 0,
 				tri = [9, 3, 1];
-			for (var c = 0; c < bd.cell.length; c++) {
-				pass += get_func(bd.cell[c]) * tri[num];
+			for (var c = 0; c < length; c++) {
+				pass += get_func(c) * tri[num];
 				num++;
 				if (num === 3) {
 					cm += pass.toString(27);
@@ -798,6 +801,12 @@ pzpr.classmgr.makeCommon({
 
 			this.outbstr += cm;
 		},
+		genericEncodeThree: function(get_func) {
+			var bd = this.board;
+			this.genericEncodeTriple(bd.cell.length, function(c) {
+				return get_func(bd.cell[c]);
+			});
+		},
 		encodeCircle: function() {
 			this.genericEncodeThree(function(cell) {
 				return Math.max(0, cell.qnum);

src/variety-common/MouseInput.js

@@ -599,7 +599,7 @@ pzpr.classmgr.makeCommon({
 			}
 			cross.draw();
 		},
-		inputcrossMark: function() {
+		inputcrossMark: function(value) {
 			var pos = this.getpos(0.24);
 			if (!pos.oncross()) {
 				return;
@@ -619,9 +619,12 @@ pzpr.classmgr.makeCommon({
 			if (cross.isnull) {
 				return;
 			}
+			if (value === undefined) {
+				value = 1;
+			}
 
 			this.puzzle.opemgr.disCombine = true;
-			cross.setQnum(cross.qnum === 1 ? -1 : 1);
+			cross.setQnum(cross.qnum === value ? -1 : value);
 			this.puzzle.opemgr.disCombine = false;
 
 			cross.draw();