Failchecks

Author: x-sheep

src/res/failcode.en.json

@@ -434,8 +434,7 @@
     "crConnSlNe.gokigen": "A number is not equal to count of lines that is connected to it.",
     "crNoSegment.tajmahal": "A clue is not inside a square.",
     "crShade0": "A number 0 is overlapping a shaded cell.",
-    "crShade1": "A number 1 isn't overlapping exactly one shaded cell.",
-    "crShadeDistNe.landmeasure": "A number isn't equal to the distance from this and that",
+    "crShadeDistNe.landmeasure": "A number isn't equal to the length of the path covering all adjacent cells.",
     "crShadeInfinite.landmeasure": "An infinity clue doesn't overlap 2 disconnected shaded cells.",
     "crShadeGt.creek": "The number of shaded cells overlapping a number is too high.",
     "crShadeLt.creek": "The number of shaded cells overlapping a number is too low.",

src/variety/landmeasure.js

@@ -214,7 +214,6 @@
 			"checkZeroes",
 			"checkAllNumbers",
 			"checkInfinites",
-			"checkOnes",
 			"doneShadingDecided"
 		],
 
@@ -250,12 +249,6 @@
 			}, "crShade0");
 		},
 
-		checkOnes: function() {
-			this.checkQnumCross(function(num, shaded) {
-				return num === 1 && shaded.length !== 1;
-			}, "crShade1");
-		},
-
 		checkInfinites: function() {
 			this.checkQnumCross(function(num, shaded) {
 				if (num !== -2) {
@@ -271,8 +264,8 @@
 				if (num < 2) {
 					return false;
 				}
-				if (num === 3) {
-					return shaded.length !== 3;
+				if (num === 1 || num === 3) {
+					return shaded.length !== num;
 				}
 				if (shaded.length !== 2 || shaded[0].sblk !== shaded[1].sblk) {
 					return true;

test/script/landmeasure.js

@@ -3,6 +3,30 @@
 ui.debug.addDebugData("landmeasure", {
 	url: "6/6/n7h.g2u9i3o0h2h",
 	failcheck: [
+		[
+			"brNoShade",
+			"pzprv3/landmeasure/6/6/. . . . . . . /. 7 . . - . 2 /. . . . . . . /. . . . . . . /. 9 . . . 3 . /. . . . . . . /. 0 . . 2 . . /. . . . . . /. . . . . . /. . . . . . /. . . . . . /. . . . . . /. . . . . . /"
+		],
+		[
+			"cs2x2",
+			"pzprv3/landmeasure/6/6/. . . . . . . /. 7 . . - . 2 /. . . . . . . /. . . . . . . /. 9 . . . 3 . /. . . . . . . /. 0 . . 2 . . /. # # # . # /# . # . # # /# # # # . . /# . . # . # /. # # # # # /. . . # # . /"
+		],
+		[
+			"csLoop",
+			"pzprv3/landmeasure/6/6/. . . . . . . /. 7 . . - . 2 /. . . . . . . /. . . . . . . /. 9 . . . 3 . /. . . . . . . /. 0 . . 2 . . /. . . . . . /. . . . . . /# # # # . . /# . . # # # /. # # # . # /. . . # # # /"
+		],
+		[
+			"crShade0",
+			"pzprv3/landmeasure/6/6/. . . . . . . /. 7 . . - . 2 /. . . . . . . /. . . . . . . /. 9 . . . 3 . /. . . . . . . /. 0 . . 2 . . /. . . . . . /. . . . . . /. . . . . . /. # # # # # /# . . # . # /# # # # # . /"
+		],
+		[
+			"crShadeDistNe",
+			"pzprv3/landmeasure/6/6/. . . . . . . /. 7 . . - . 2 /. . . . . . . /. . . . . . . /. 9 . . . 3 . /. . . . . . . /. 0 . . 2 . . /. # # # . # /# . # . # # /# # # . . . /# . # . . # /. # # . # # /. . . # # . /"
+		],
+		[
+			"crShadeInfinite",
+			"pzprv3/landmeasure/6/6/. . . . . . . /. 7 . . - . 2 /. . . . . . . /. . . . . . . /. 9 . . . 3 . /. . . . . . . /. 0 . . 2 . . /. # # # . # /# . # . # # /# # # # . # /# . . # # # /. # # # . # /. . . # # . /"
+		],
 		[
 			null,
 			"pzprv3/landmeasure/6/6/. . . . . . . /. 7 . . - . 2 /. . . . . . . /. . . . . . . /. 9 . . . 3 . /. . . . . . . /. 0 . . 2 . . /. # # # . # /# . # . # # /# # # # . . /# . . # # # /. # # # . # /. . . # # . /"