Merge branch 'main'

x-sheep · x-sheep · commit 01e92754cead · 2025-11-17T08:06:39.000+01:00
diff --git a/src-ui/changes.html b/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?sansaroad" target="_parent">Sansa Road サンサロード</a></li>
   <li><a href="/p?diamond" target="_parent">Diamond Chain</a></li>
   <li><a href="/p?tetrochaink" target="_parent">Tetro Chain-K テトロチェーンＫ</a></li>
   <li><a href="/p?bunnyhop" target="_parent">Bunnyhop</a></li>
   <li><a href="/p?sashikabe" target="_parent">Sashikabe</a></li>
   <li><a href="/p?blindrush" target="_parent">Blind Rush 猪突猛進</a></li>
   <li><a href="/p?cityspace" target="_parent">City Space</a></li>
-  <li><a href="/p?numcity" target="_parent">Number City ナンバーシティ一</a></li>
 </ul>
 </main>
 </body>
diff --git a/src-ui/img/sansaroad.png b/src-ui/img/sansaroad.png
diff --git a/src-ui/js/ui/Misc.js b/src-ui/js/ui/Misc.js
@@ -202,6 +202,7 @@ function toBGimage(pid) {
 		"retsurin",
 		"roundtrip",
 		"sananko",
+		"sansaroad",
 		"sashikabe",
 		"sashikazune",
 		"satogaeri",
diff --git a/src-ui/list.html b/src-ui/list.html
@@ -70,6 +70,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="cityspace"></li>
     <li data-pid="sashikabe"></li>
     <li data-pid="tetrochaink"></li>
+    <li data-pid="sansaroad"></li>
    </ul>
   </div>
   <div class="lists blocks">
diff --git a/src-ui/res/history.en.yaml b/src-ui/res/history.en.yaml
@@ -221,3 +221,6 @@ sashikabe: This genre was invented by Grant Fikes.
 diamond: This genre was invented by Martin Ender a.k.a. Menderbug.
 bunnyhop: This genre was invented by Arvi Teikari a.k.a. Hempuli.
 tetrochaink: This genre first appeared in Puzzle Communication Nikoli vol. 192.
+sansaroad: This genre first appeared in Puzzle Communication Nikoli vol. 185.
+sendai: This genre first appeared in Puzzle Communication Nikoli vol. 104.
+keywest: This genre first appeared in Puzzle Communication Nikoli vol. 53.
diff --git a/src-ui/res/history.ja.yaml b/src-ui/res/history.ja.yaml
@@ -221,3 +221,6 @@ sashikabe: Grant Fikes氏考案
 diamond: Martin Ender (Menderbug)氏発案
 bunnyhop: Arvi Teikari氏発案
 tetrochaink: パズル通信ニコリ vol.192より
+sansaroad: パズル通信ニコリ vol.185より
+sendai: パズル通信ニコリ vol.104より
+keywest: パズル通信ニコリ vol.53より
diff --git a/src-ui/res/rules.en.yaml b/src-ui/res/rules.en.yaml
@@ -353,3 +353,6 @@ sashikabe: "Shade some empty cells on the board to form regions of unshaded cell
 diamond: "Place several 2x2 diamonds in the grid.\n1. Diamonds cannot overlap shaded cells, or cells containing other diamonds.\n2. A number indicates how many diamonds share a point with the shaded cell.\n3. The combination of diamonds and shaded cells must form one connected area. Two shapes count as connected if they touch at the corners."
 bunnyhop: "Draw lines along the edges of cells to form a loop.\n1. Every line segment goes through a cell, connecting two corners located along the same edge. Every cell must be visited exactly once.\n2. The loop cannot branch off or cross itself.\n3. Black cells cannot be visited."
 tetrochaink: "Shade some cells in the grid to form tetrominoes (blocks of 4 cells).\n1. Tetrominoes cannot be orthogonally adjacent.\n2. Two tetrominoes which touch each other at the corners must have different shapes, counting rotations and reflections as the same.\n3. All tetrominoes form a diagonally contiguous area.\n4. A black circle overlaps more shaded cells than unshaded cells.\n5. A white circle overlaps more unshaded cells than shaded cells.\n6. A gray circle overlaps an equal number of shaded and unshaded cells."
+sansaroad: "Shade some empty cells on the board to form a single unshaded region.\n1. Black circles indicate there are more shaded than unshaded cells among the cells the circle overlaps. White circles indicate more unshaded cells. Grey circles indicate the amount of shaded and unshaded cells is equal.\n2. Triangles indicate an unshaded cell which is orthogonally adjacent to exactly 3 other unshaded cells. All triangles are given.\n3. All unshaded empty cells must be orthogonally adjacent to exactly 2 other unshaded cells.\n4. The unshaded cells cannot form a 2x2 square."
+sendai: "Draw lines over the dotted lines to divide each larger region (prefecture) into smaller regions (cities). Cities are allowed to be the same size as its prefecture.\n1. Every city must be orthogonally adjacent to at least one other city with the same shape and orientation.\n2. A number indicates the amount of cities in a prefecture. A prefecture without a number may have any amount of cities.\n3. There can be no dead-end lines."
+keywest: "Place a number between 0 and 4 in every island, and draw orthogonal bridges connecting them.\n1. Orthogonally adjacent islands cannot have the same number.\n2. Numbers indicate how many bridges are connected to this island.\n3. All islands with a number above 0 must be connected into a single network."
diff --git a/src-ui/res/rules.ja.yaml b/src-ui/res/rules.ja.yaml
@@ -311,3 +311,6 @@ blindrush: "1. すべての丸を１マス以上、タテかヨコにまっす
 sashikabe: "盤面のマスを黒く塗り、いくつかの白マスのブロックを作りましょう。\n1. 白マスのブロックは必ず幅1マスのL字型でなければなりません。\n2. 丸の場所は必ずL字のブロックの角になります。\n3. 矢印の場所は必ずL字のブロックの端になり、その矢印は必ずブロックの角を指します。\n4. 数字はL字のブロックの面積を示します。\n5. 黒マスが2×2の大きさになってはいけません。\n6. すべての黒マスはタテヨコにひとつながりになります。"
 turnaround: "マスの中央を通る線をタテヨコに引いて全体で1つの輪っかを作りましょう。\n1. 線を分岐させたり、交差させたりすることはできません。\n2. 線は全ての数字を通らなければなりません。\n3. 数字は、それを含むマスとその前後1マス、計3マスを通る線が曲がる回数を示します。"
 tetrochaink: "1. 盤面のいくつかのマスを黒くぬりましょう。\n2. 小さな丸は、その丸が接している周囲のマスのうち、黒マスと白マスのどちらの数が多いかを表しています。黒丸なら黒マスのほうが多く、白丸なら白マスのほうが多いということです。灰色の丸は、白マスと黒マスが同数であることを表しています。\n3. 黒マスがタテヨコにつながってできるカタマリは、必ず４マスになります。\n4. すべての黒マスのカタマリは角でひとつながりになります。\n5. 角を共有している２つの黒マスのカタマリが同じ形になってはいけません。回転や裏返しをして同じになるものは「同じ形」とします。"
+sansaroad: "盤面のいくつかのマスを黒くぬりましょう。\n1. 小さな丸は、その丸が接している周囲のマスのうち、黒マスと白マスのどちらの数が多いかを表しています。黒丸なら黒マスの方が多く、白丸なら白マスの方が多いということです。灰色の丸は白マスと黒マスが同数であることを表しています。\n2. ▽のマスはすべて白マスになります。また、▽のマスにタテヨコに隣り合うマスのうち、ちょうど３マスだけが白マスになります。▽のマス以外の白マスでは、タテヨコに隣り合うマスのうち、ちょうど２マスだけが白マスになります。\n3. すべての白マスはタテヨコにひとつながりになっていなければなりません。\n4. 白マスが２×２以上のカタマリになってはいけません。"
+sendai: "点線上に線を引き、すでに太線で区切られた大部屋（県）を、いくつかの小さな部屋（市）に分けます。線が引かれない（市を１つしか持たない）県があってもかまいません。\n1. すべての市は、形も向きも同じになる他の市と辺（市境）を共有しなければなりません。\n2. 数字は、その県が含む市の数を表します。"
+keywest: "丸(シマといいます)の中に、０～４の数字のどれかを入れます。\n1. 同じ数字はタテヨコに連続しません。\n2. 数字は、その数字のあるシマからタテヨコに隣接したシマへかける橋の数です。\n3. 橋は１ヵ所に１本しかかけられません。\n4. ０が入るシマ以外のすべてのシマは、橋によって１つにつながっていなければいけません。"
diff --git a/src/pzpr/variety.js b/src/pzpr/variety.js
@@ -380,6 +380,7 @@
 			roma: [0, 0, "ろーま", "Roma", "", { alias: "rome" }],
 			roundtrip: [0, 0, "Round Trip", "Round Trip"],
 			sananko: [0, 0, "サンアンコー", "San-Anko", "kakuru"],
+			sansaroad: [0, 0, "サンサロード", "Sansa Road", "kurarin"],
 			sashikabe: [0, 0, "Sashikabe", "Sashikabe", "loute"],
 			sashigane: [0, 0, "さしがね", "Sashigane", "loute"],
 			sashikazune: [0, 0, "さしカズね", "Sashikazune", "loute"],
diff --git a/src/res/failcode.en.json b/src/res/failcode.en.json
@@ -476,6 +476,10 @@
     "cuDivide": "The unshaded cells are divided.",
     "cuDivideRB": "The unshaded cells are divided.",
     "cuEndpoint.takoyaki": "An endpoint does not have a circle.",
+    "cuLt2.sansaroad": "An empty cell is adjacent to less than 2 unshaded cells.",
+    "cuLt3.sansaroad": "A triangle is adjacent to less than 3 unshaded cells.",
+    "cuGt2.sansaroad": "An empty cell is adjacent to more than 2 unshaded cells.",
+    "cuGt3.sansaroad": "A triangle is adjacent to more than 3 unshaded cells.",
     "cuLoop": "There is a loop of unshaded cells.",
     "cuLower.stostone": "Unshaded cells exist in the lower half of the board after the blocks have fallen.",
     "cuNoLine.icebarn": "The line doesn't pass all of the non-icy cell.",
diff --git a/src/variety/kurarin.js b/src/variety/kurarin.js
@@ -4,7 +4,7 @@
 	} else {
 		pzpr.classmgr.makeCustom(pidlist, classbase);
 	}
-})(["kurarin", "tetrochaink"], {
+})(["kurarin", "tetrochaink", "sansaroad"], {
 	//---------------------------------------------------------
 	// マウス入力系
 	MouseEvent: {
@@ -73,15 +73,16 @@
 			var dot = pos.getDot();
 			if (dot !== null) {
 				var qn = dot.getDot();
+				var max = dot.piece.getmaxnum();
 				if (this.btn === "left") {
-					if (qn === 3) {
+					if (qn === max) {
 						dot.setDot(0);
 					} else {
 						dot.setDot(qn + 1);
 					}
 				} else if (this.btn === "right") {
 					if (qn === 0) {
-						dot.setDot(3);
+						dot.setDot(max);
 					} else {
 						dot.setDot(qn - 1);
 					}
@@ -114,6 +115,20 @@
 			this.puzzle.redraw();
 		}
 	},
+	"MouseEvent@sansaroad": {
+		inputModes: {
+			edit: ["mark-triangle"],
+			play: ["shade", "unshade"]
+		},
+		mouseinput_other: function() {
+			if (this.inputMode === "mark-triangle") {
+				this.inputFixedNumber(1);
+			}
+		},
+		mouseinputAutoPlay: function() {
+			this.inputShade();
+		}
+	},
 
 	//---------------------------------------------------------
 	// キーボード入力系
@@ -130,9 +145,9 @@
 			var dot = this.cursor.getDot();
 			if (dot !== null) {
 				var num = +ca;
-				if (num >= 0 && num <= 3) {
+				if (num >= 0 && num <= dot.piece.getmaxnum()) {
 					dot.setDot(num);
-				} else if (ca === " " || ca === "-") {
+				} else if (ca === " " || ca === "-" || ca === "BS") {
 					dot.setDot(0);
 				}
 				dot.draw();
@@ -161,6 +176,19 @@
 			return this.lcnt === 0 && this.qsub === 1;
 		}
 	},
+	"Cell@sansaroad": {
+		maxnum: 1,
+		allowShade: function() {
+			return this.qnum <= 0;
+		},
+		posthook: {
+			qnum: function(val) {
+				if (val >= 0) {
+					this.setQans(0);
+				}
+			}
+		}
+	},
 	Cross: {
 		qnum: 0,
 		minnum: 0,
@@ -205,6 +233,9 @@
 	"AreaShade8Graph@tetrochaink": {
 		enabled: true
 	},
+	"AreaUnshadeGraph@sansaroad": {
+		enabled: true
+	},
 
 	//---------------------------------------------------------
 	// 画像表示系
@@ -218,6 +249,8 @@
 			this.drawShadedCells();
 			if (this.pid === "kurarin") {
 				this.drawDotCells();
+			} else if (this.pid === "sansaroad") {
+				this.drawQuesMarks();
 			}
 			this.drawGrid();
 
@@ -238,6 +271,10 @@
 		},
 
 		getDotFillColor: function(dot) {
+			if (this.pid === "sansaroad" && dot.piece.group === "cell") {
+				return null;
+			}
+
 			switch (dot.getDot()) {
 				case 1:
 					return this.quescolor;
@@ -250,6 +287,10 @@
 			}
 		},
 		getDotOutlineColor: function(dot) {
+			if (this.pid === "sansaroad" && dot.piece.group === "cell") {
+				return null;
+			}
+
 			if (dot.getDot() >= 1) {
 				return dot.iserror() ? this.errcolor1 : this.quescolor;
 			}
@@ -263,6 +304,43 @@
 	"Graphic@tetrochaink": {
 		bgcellcolor_func: "qsub1"
 	},
+	"Graphic@sansaroad": {
+		bgcellcolor_func: "qsub1",
+		drawQuesMarks: function() {
+			var g = this.vinc("cell_mark", "auto", true);
+
+			var rsize = this.cw * 0.3,
+				tsize = this.cw * 0.26;
+			g.lineWidth = 2;
+
+			var clist = this.range.cells;
+			for (var i = 0; i < clist.length; i++) {
+				var cell = clist[i];
+				var px = cell.bx * this.bw,
+					py = cell.by * this.bh;
+				g.strokeStyle = this.getQuesNumberColor(cell);
+
+				g.vid = "c_mk_" + cell.id;
+				if (cell.qnum === 1) {
+					g.beginPath();
+					g.setOffsetLinePath(
+						px,
+						py,
+						0,
+						tsize,
+						-rsize,
+						-tsize,
+						rsize,
+						-tsize,
+						true
+					);
+					g.stroke();
+				} else {
+					g.vhide();
+				}
+			}
+		}
+	},
 
 	//---------------------------------------------------------
 	// URLエンコード/デコード処理
@@ -349,6 +427,10 @@
 					continue;
 				}
 
+				if (dot.piece.group === "cell" && this.pid === "sansaroad") {
+					continue;
+				}
+
 				var cells = dot.piece.dotCells();
 				var shaded = cells.filter(function(cell) {
 					return cell.isShade();
@@ -456,6 +538,53 @@
 			}
 		}
 	},
+	"AnsCheck@sansaroad": {
+		checklist: [
+			"checkConnectUnshade",
+			"checkTriangleUnder",
+			"checkEmptyUnder",
+			"checkShadeWhite",
+			"checkShadeBlack",
+			"checkShadeGray",
+			"checkTriangleOver",
+			"checkEmptyOver",
+			"check2x2UnshadeCell++",
+			"doneShadingDecided"
+		],
+		checkTriangleUnder: function() {
+			this.checkAdjacency(1, -1, "cuLt3");
+		},
+		checkEmptyUnder: function() {
+			this.checkAdjacency(0, -1, "cuLt2");
+		},
+		checkTriangleOver: function() {
+			this.checkAdjacency(1, +1, "cuGt3");
+		},
+		checkEmptyOver: function() {
+			this.checkAdjacency(0, +1, "cuGt2");
+		},
+
+		checkAdjacency: function(num, flag, code) {
+			for (var c = 0; c < this.board.cell.length; c++) {
+				var cell = this.board.cell[c];
+				if (cell.isShade() || cell.qnum !== num) {
+					continue;
+				}
+				var count = cell.countDir4Cell(function(cell2) {
+					return cell2.isUnshade();
+				});
+				if ((flag < 0 && count >= 2 + num) || (flag > 0 && count <= 2 + num)) {
+					continue;
+				}
+
+				this.failcode.add(code);
+				if (this.checkOnly) {
+					break;
+				}
+				cell.seterr(1);
+			}
+		}
+	},
 	FailCode: {
 		ceEmpty: "ceEmpty.yajilin"
 	}
diff --git a/test/script/sansaroad.js b/test/script/sansaroad.js
@@ -0,0 +1,48 @@
+/* sansaroad.js */
+
+ui.debug.addDebugData("sansaroad", {
+	url: "5/5/h4qch8h4x1g",
+	failcheck: [
+		[
+			"cuDivide",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./....1..../........./........./........./.......1./. . . . . /. # . # . /. . . # . /# # . . . /. . # # # /"
+		],
+		[
+			"cuLt2",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./....1..../........./........./........./.......1./. . . . . /. # . # . /. . . # . /# # . # . /# # . # # /"
+		],
+		[
+			"cuGt2",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./....1..../........./........./........./.......1./. . . . . /. # . # . /. . . # . /. # . . . /. . . # # /"
+		],
+		[
+			"cuLt3",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./1...1..../........./........./........./.......1./. . . . # /. # # . # /. . . . # /. # . # # /. . . # # /"
+		],
+		[
+			"cuGt3",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3......./1...1..../........./........./........./.......1./. . . . . /. # . # . /. . . . . /. # . # # /. . . # # /"
+		],
+		[
+			"cu2x2",
+			"pzprv3/sansaroad/5/5/....1..../........./........./........./........./........./1......../........./.......1./. . . . . /. # . # . /. # . . . /. . # # # /. . # # # /"
+		],
+		[
+			"csDotWhite",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./........./........./....1..../........./.......1./. . . . . /. # . # . /. # . # . /. # . . . /. . . # # /"
+		],
+		[
+			"csDotGray",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./....1..../........./........./........./.......1./. . . . . /. # . # . /. . . . . /# # # # # /# # # # # /"
+		],
+		[
+			"csDotBlack",
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./....1..../........./........./........./.......1./. . . . . /. # . # . /. . . # . /# # . # . /# # . . . /"
+		],
+		[
+			null,
+			"pzprv3/sansaroad/5/5/....1..../........./........./.3.....2./....1..../........./........./........./.......1./+ + + + + /+ # + # + /+ + + # + /# # + + + /# # # # # /"
+		]
+	],
+	inputs: []
+});
