Add Mirroring Tile

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?mrtile" target="_parent">Mirroring Tile ミラーリングタイル</a></li>
   <li><a href="/p?kissing" target="_parent">Kissing Polyominoes</a></li>
   <li><a href="/p?lineofsight" target="_parent">Line of Sight サイトライン</a></li>
   <li><a href="/p?tetrominous" target="_parent">Tetrominous</a></li>
   <li><a href="/p?mannequin" target="_parent">Mannequin Gate マネキンゲート</a></li>
   <li><a href="/p?nothing" target="_parent">All or Nothing オールｏｒナッシング</a></li>
   <li><a href="/p?alter" target="_parent">Alternation オルタネーション</a></li>
-  <li><a href="/p?tachibk" target="_parent">Tachiawase Block たちあわせブロック</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -192,7 +192,8 @@ ui.keypopup = {
 		alter: [113, 113],
 		mannequin: [10, 0],
 		tetrominous: [128, 128],
-		lineofsight: [10, 0]
+		lineofsight: [10, 0],
+		mrtile: [10, 0]
 	},
 
 	//---------------------------------------------------------------------------
@@ -409,7 +410,11 @@ ui.keypopup = {
 		) {
 		} else if (pid === "tasquare") {
 			cap = "□";
-		} else if (pid === "rectslider" || pid === "aquapelago") {
+		} else if (
+			pid === "rectslider" ||
+			pid === "aquapelago" ||
+			pid === "mrtile"
+		) {
 			cap = "■";
 		} else if (pid === "patchwork") {
 			cap = {

src-ui/js/ui/Misc.js

@@ -153,6 +153,7 @@ function toBGimage(pid) {
 		"midloop",
 		"mirrorbk",
 		"moonsun",
+		"mrtile",
 		"mukkonn",
 		"nanameguri",
 		"nondango",

src-ui/list.html

@@ -60,6 +60,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="norinuri"></li>
     <li data-pid="circlesquare"></li>
     <li data-pid="tetrochain"></li>
+    <li data-pid="mrtile"></li>
    </ul>
   </div>
   <div class="lists blocks">

src/pzpr/variety.js

@@ -264,6 +264,7 @@
 			mochikoro: [1, 0, "モチコロ", "Mochikoro", "nurikabe"],
 			mochinyoro: [1, 0, "モチにょろ", "Mochinyoro", "nurikabe"],
 			moonsun: [0, 0, "月か太陽", "Moon or Sun", "country"],
+			mrtile: [0, 0, "ミラーリングタイル", "Mirroring Tile", "chainedb"],
 			mukkonn: [0, 0, "Mukkonn Enn", "Mukkonn Enn", "compass"],
 			myopia: [0, 0, "Myopia", "Myopia"],
 			nagare: [0, 0, "流れるループ", "Nagareru-Loop"],

src/res/failcode.en.json

@@ -126,6 +126,7 @@
     "bkMSPassedGt2.moonsun": "A line passes the marks of the moon for two rooms in a row.",
     "bkMUPassedGt2.moonsun": "A line passes the marks of the sun for two rooms in a row.",
     "bkNoChain.chainedb": "A block is not diagonally adjacent to another block.",
+    "bkNoChain.mrtile": "A block is not diagonally adjacent to another identical block.",
     "bkNoColor.interbd": "A country has no color.",
     "bkNoLevel.aquarium": "A region has different water surface levels.",
     "bkNoLine.country": "A line doesn't pass a country.",

src/variety/chainedb.js

@@ -10,7 +10,7 @@
 	} else {
 		pzpr.classmgr.makeCustom(pidlist, classbase);
 	}
-})(["chainedb"], {
+})(["chainedb", "mrtile"], {
 	//---------------------------------------------------------
 	// マウス入力系
 	MouseEvent: {
@@ -35,6 +35,12 @@
 			this.inputFixedNumber(-1);
 		}
 	},
+	"MouseEvent@mrtile": {
+		inputModes: {
+			edit: ["number", "undef", "clear"],
+			play: ["shade", "unshade"]
+		}
+	},
 
 	//---------------------------------------------------------
 	// キーボード入力系
@@ -43,9 +49,10 @@
 	},
 
 	AreaShadeGraph: {
+		relation: { "cell.qans": "node", "cell.qnum": "node" },
 		enabled: true
 	},
-	"AreaShade8Graph:AreaShadeGraph": {
+	"AreaShade8Graph:AreaShadeGraph@chainedb": {
 		enabled: true,
 		setComponentRefs: function(obj, component) {
 			obj.blk8 = component;
@@ -70,22 +77,9 @@
 		}
 	},
 
-	Board: {
+	"Board@chainedb": {
 		addExtraInfo: function() {
 			this.sblk8mgr = this.addInfoList(this.klass.AreaShade8Graph);
-		},
-
-		reapplyShades: function() {
-			this.cell.each(function(cell) {
-				if (cell.qnum !== -1) {
-					cell.setQans(1);
-				}
-			});
-		},
-
-		ansclear: function() {
-			this.common.ansclear.call(this);
-			this.reapplyShades();
 		}
 	},
 
@@ -114,11 +108,17 @@
 			}
 		}
 	},
+	"Cell@mrtile": {
+		maxnum: function() {
+			var bd = this.board;
+			return ((bd.cols * bd.rows) >> 1) - 1;
+		}
+	},
 
 	//---------------------------------------------------------
 	// 画像表示系
 	Graphic: {
-		qanscolor: "black",
+		qanscolor: "#222222",
 		shadecolor: "#222222",
 		numbercolor_func: "fixed_shaded",
 		fontShadecolor: "white",
@@ -139,19 +139,32 @@
 		},
 
 		getShadedCellColor: function(cell) {
-			if (cell.qans === 1 && !cell.trial && cell.error === -1) {
+			if (!cell.isShade()) {
+				return null;
+			}
+
+			var info = cell.error || cell.qinfo;
+
+			if (info === 1) {
+				return this.errcolor1;
+			} else if (cell.trial) {
+				return this.trialcolor;
+			} else if (info === -1) {
 				return this.noerrcolor;
 			}
-			return this.common.getShadedCellColor.call(this, cell);
+			return cell.qnum !== -1 ? this.shadecolor : this.qanscolor;
 		}
 	},
+	"Graphic@mrtile": {
+		hideHatena: true,
+		shadecolor: "#111111"
+	},
 
 	//---------------------------------------------------------
 	// URLエンコード/デコード処理
 	Encode: {
 		decodePzpr: function(type) {
 			this.decodeNumber16();
-			this.board.reapplyShades();
 		},
 		encodePzpr: function(type) {
 			this.encodeNumber16();
@@ -161,7 +174,6 @@
 	FileIO: {
 		decodeData: function() {
 			this.decodeCellQnumAns();
-			this.board.reapplyShades();
 		},
 		encodeData: function() {
 			this.encodeCellQnumAns();
@@ -204,13 +216,23 @@
 			);
 		},
 		checkNumberAndShadeSize: function() {
-			this.checkAllArea(
-				this.board.sblkmgr,
-				function(w, h, a, n) {
-					return n <= 0 || n === a;
-				},
-				"bkSizeNe"
-			);
+			for (var c = 0; c < this.board.cell.length; c++) {
+				var cell = this.board.cell[c];
+				if (!cell.isShade() || cell.qnum < 0) {
+					continue;
+				}
+
+				var clist = cell.sblk.clist;
+				if (clist.length === cell.qnum) {
+					continue;
+				}
+
+				this.failcode.add("bkSizeNe");
+				if (this.checkOnly) {
+					break;
+				}
+				cell.sblk.clist.seterr(1);
+			}
 		},
 		checkNoChain: function() {
 			var shapes = this.board.sblkmgr.components;
@@ -281,5 +303,62 @@
 				}
 			}
 		}
+	},
+	"AnsCheck@mrtile": {
+		checklist: [
+			"checkNumberAndShadeSize",
+			"checkAdjacentExist",
+			"doneShadingDecided"
+		],
+
+		checkAdjacentExist: function() {
+			var bd = this.board;
+
+			var blocks = bd.sblkmgr.components;
+			for (var r = 0; r < blocks.length; r++) {
+				blocks[r].valid = false;
+			}
+
+			for (var c = 0; c < bd.cell.length; c++) {
+				var cell = bd.cell[c];
+				if (cell.bx >= bd.maxbx - 1 || cell.by >= bd.maxby - 1) {
+					continue;
+				}
+
+				var bx = cell.bx,
+					by = cell.by;
+				var clist = bd.cellinside(bx, by, bx + 2, by + 2).filter(function(cc) {
+					return cc.isShade();
+				});
+				if (clist.length !== 2) {
+					continue;
+				}
+
+				var ca = clist[0],
+					cb = clist[1];
+
+				if (ca.bx === cb.bx || ca.by === cb.by) {
+					continue;
+				}
+
+				if (
+					ca.sblk !== cb.sblk &&
+					!this.isDifferentShapeBlock(ca.sblk, cb.sblk)
+				) {
+					ca.sblk.valid = true;
+					cb.sblk.valid = true;
+				}
+			}
+
+			for (var r = 0; r < blocks.length; r++) {
+				if (!blocks[r].valid) {
+					this.failcode.add("bkNoChain");
+					if (this.checkOnly) {
+						break;
+					}
+					blocks[r].clist.seterr(1);
+				}
+			}
+		}
 	}
 });

test/script/mrtile.js

@@ -0,0 +1,25 @@
+/* mrtile.js */
+
+ui.debug.addDebugData("mrtile", {
+	url: "5/5/1h3k32g..q",
+	failcheck: [
+		[
+			"bkSizeNe",
+			"pzprv3/mrtile/5/5/1 . . 3 . /. # . . 3 /2 . - - . /# . . . # /. # # . # /"
+		],
+		[
+			"bkNoChain",
+			"pzprv3/mrtile/5/5/1 . . 3 # /. # . . 3 /2 . - - . /# . . . # /. # # . # /"
+		],
+		[
+			null,
+			"pzprv3/mrtile/5/5/1 + + 3 # /+ # + + 3 /2 + - - + /# + + # + /+ # # + + /"
+		]
+	],
+	inputs: [
+		{
+			input: ["newboard,6,2", "cursor,5,3", "mouse,right,5,3"],
+			result: "pzprv3/mrtile/2/6/. . . . . . /. . 5 . . . /"
+		}
+	]
+});