Add Rule of Three

Author: x-sheep

src-ui/list.html

@@ -393,6 +393,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="lither"></li>
     <li data-pid="recoil"></li>
     <li data-pid="tjunction"></li>
+    <li data-pid="ruleofthree"></li>
    </ul>
   </div>
   <div class="lists others">

src-ui/p.html

@@ -182,6 +182,7 @@ <h2 id="title2">読み込み中です...</h2>
       <div class="child" data-value="peke">__inputmode.peke__</div>
       <div class="child" data-value="diraux">__inputmode.diraux__</div>
       <div class="child" data-value="bar">__inputmode.bar__</div>
+      <div class="child" data-value="crossbar">__inputmode.bar__</div>
       <div class="child" data-value="akari">__inputmode.akari__</div>
       <div class="child" data-value="star">__inputmode.star__</div>
       <div class="child" data-value="dot">__inputmode.dot__</div>

src/puzzle/MouseInput.js

@@ -370,6 +370,9 @@ pzpr.classmgr.makeCommon({
 				case "bar":
 					this.inputTateyoko();
 					break;
+				case "crossbar":
+					this.inputTateyoko(true);
+					break;
 				case "empty":
 					this.inputempty();
 					break;

src/pzpr/variety.js

@@ -391,6 +391,7 @@
 			],
 			roma: [0, 0, "ろーま", "Roma", "", { alias: "rome" }],
 			roundtrip: [0, 0, "Round Trip", "Round Trip"],
+			ruleofthree: [0, 0, "Rule of Three", "Rule of Three", "amibo"],
 			sananko: [0, 0, "サンアンコー", "San-Anko", "kakuru"],
 			sansaroad: [0, 0, "サンサロード", "Sansa Road", "kurarin"],
 			sashikabe: [0, 0, "Sashikabe", "Sashikabe", "loute"],

src/res/failcode.en.json

@@ -512,7 +512,7 @@
     "cuRect": "A mass of unshaded cells is a rectangle.",
     "cuRoomGt.akichi": "A cluster of unshaded cells is larger than the number.",
     "cuRoomLt.akichi": "All clusters of unshaded cells are smaller than the number.",
-    "cxAdjacent.crossstitch": "Crossings are adjacent.",
+    "cxAdjacent": "Crossings are adjacent.",
     "cxNoLine": "A point is not visited.",
     "cxOverlap.diamond": "Two diamonds overlap.",
     "cxOverlap.heyapin": "A pin overlaps a single region.",
@@ -647,7 +647,9 @@
     "lnLenGt.anglers": "A line is longer than the number.",
     "lnLenGt.reflect": "The lines passing a triangle are too long.",
     "lnLengthGt.pencils": "A line is longer than the connected pencil.",
+    "lnLengthGt3": "A line is longer than 3 cells.",
     "lnLengthLt.pencils": "A line is shorter than the connected pencil.",
+    "lnLengthLt3": "A line is shorter than 3 cells.",
     "lnLengthNe3.wittgen": "A block does not cover exactly 3 cells.",
     "lnLenLt.anglers": "A line is shorter than the number.",
     "lnLenLt.reflect": "The lines passing a triangle are too short.",

src/res/failcode.ja.json

@@ -344,7 +344,7 @@
     "cuNotTop.dosufuwa": "風船の上に風船や黒マスがありません。",
     "cuOutside.castle": "白マスがループの外にあります。",
     "cuRect": "白マスのカタマリが正方形または長方形になっています。",
-    "cxAdjacent.crossstitch": "線が交差するマスが隣り合っています。",
+    "cxAdjacent": "線が交差するマスが隣り合っています。",
     "exNoMatch.nonogram": "黒マスの数が正しくありません。",
     "exShadeNe.aquarium": "行または列内にある水のマスの数と外の数字が異なります。",
     "exShadeNe.snake": "行または列内にあるスネークのマスの数と外の数字が異なります。",

src/variety-common/MouseInput.js

@@ -339,7 +339,12 @@ pzpr.classmgr.makeCommon({
 		},
 		inputFixedQsub: function(val) {
 			var cell = this.getcell();
-			if (cell.isnull || cell.is51cell() || cell === this.mouseCell) {
+			if (
+				cell.isnull ||
+				cell.is51cell() ||
+				!cell.isValid() ||
+				cell === this.mouseCell
+			) {
 				return;
 			}
 
@@ -915,7 +920,7 @@ pzpr.classmgr.makeCommon({
 		//---------------------------------------------------------------------------
 		// mv.inputTateyoko() 縦棒・横棒をドラッグで入力する
 		//---------------------------------------------------------------------------
-		inputTateyoko: function() {
+		inputTateyoko: function(plus) {
 			if (this.mouseend && this.notInputted() && !!this.clickTateyoko) {
 				this.clickTateyoko();
 				return;
@@ -927,7 +932,7 @@ pzpr.classmgr.makeCommon({
 			}
 
 			// 黒マス上なら何もしない
-			if (this.pid !== "amibo" && cell.ques === 1) {
+			if (this.pid !== "amibo" && (!cell.isValid() || cell.ques === 1)) {
 			} else if (this.pid === "amibo" && cell.isNum()) {
 			}
 			// 初回 or 入力し続けていて別のマスに移動した場合
@@ -946,8 +951,6 @@ pzpr.classmgr.makeCommon({
 				}
 
 				if (val !== null) {
-					var plus = this.pid === "amibo" || this.pid === "tatamibari";
-
 					var shape = 0;
 					if (this.puzzle.playmode) {
 						shape = { 0: 0, 11: 3, 12: 1, 13: 2 }[cell.qans];