From 4da68c34546d3d3165751bc414080c8e20ba813e Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Fri, 22 Aug 2025 13:31:03 -0400
Subject: [PATCH 1/3] Fixed question marks for nanro, as well as a unit test to
 go with it

---
 src/variety/nanro.js | 12 +++++++++---
 test/script/nanro.js |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/variety/nanro.js b/src/variety/nanro.js
index 5f62d931b..8860fff8d 100644
--- a/src/variety/nanro.js
+++ b/src/variety/nanro.js
@@ -153,11 +153,14 @@
 			var nums = [];
 			var numkind = 0,
 				filled = -1,
-				circlecnt = 0;
+				circlecnt = 0,
+				questionmarkcnt = 0;
 			for (var i = 0; i < clist.length; i++) {
 				var num = clist[i].getNum();
 				if (num !== -1) {
-					if (isNaN(nums[num])) {
+					if (num === -2) {
+						questionmarkcnt++;
+					} else if (isNaN(nums[num])) {
 						numkind++;
 						filled = num;
 						nums[num] = 1;
@@ -169,7 +172,10 @@
 				}
 			}
 			component.number = filled;
-			component.numcnt = filled === -1 ? circlecnt : nums[filled] + circlecnt;
+			component.numcnt =
+				filled === -1
+					? circlecnt + questionmarkcnt
+					: nums[filled] + circlecnt + questionmarkcnt;
 			component.numkind = numkind;
 		}
 	},
diff --git a/test/script/nanro.js b/test/script/nanro.js
index b0de007af..e07c56b00 100644
--- a/test/script/nanro.js
+++ b/test/script/nanro.js
@@ -28,6 +28,11 @@ ui.debug.addDebugData("nanro", {
 			"pzprv3/nanro/1/4/2/0 0 1 1 /2 . . 2 /. + + . /",
 			{ skiprules: true }
 		],
+		[
+			null,
+			"pzprv3/nanro/1/4/2/0 0 1 1 /2 . . 2 /. + + . /",
+			{ skiprules: true }
+		],
 		[
 			"nmCountLt",
 			"pzprv3/nanro/4/4/5/0 0 0 1 /2 3 3 1 /2 3 3 1 /2 4 4 4 /. . . 1 /3 . . . /. . . . /. 1 . . /. 3 3 . /. 1 . - /3 - . - /3 . - - /"

From 6641381466186a5437e5b88c32a797ba2fd2be4a Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Fri, 22 Aug 2025 13:37:16 -0400
Subject: [PATCH 2/3] I am silly

---
 test/script/nanro.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/script/nanro.js b/test/script/nanro.js
index e07c56b00..91c143066 100644
--- a/test/script/nanro.js
+++ b/test/script/nanro.js
@@ -30,7 +30,7 @@ ui.debug.addDebugData("nanro", {
 		],
 		[
 			null,
-			"pzprv3/nanro/1/4/2/0 0 1 1 /2 . . 2 /. + + . /",
+			"pzprv3/nanro/1/4/2/0 0 1 1 /2 - - . /. . . . /",
 			{ skiprules: true }
 		],
 		[

From e9cf90ce19262d70b85796c5bd85109e63c14b91 Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Fri, 22 Aug 2025 16:21:07 -0400
Subject: [PATCH 3/3] Combined circles and question marks into the same counter

---
 src/variety/nanro.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/variety/nanro.js b/src/variety/nanro.js
index 8860fff8d..8b6c365c1 100644
--- a/src/variety/nanro.js
+++ b/src/variety/nanro.js
@@ -153,13 +153,12 @@
 			var nums = [];
 			var numkind = 0,
 				filled = -1,
-				circlecnt = 0,
-				questionmarkcnt = 0;
+				othercnt = 0;
 			for (var i = 0; i < clist.length; i++) {
 				var num = clist[i].getNum();
 				if (num !== -1) {
 					if (num === -2) {
-						questionmarkcnt++;
+						othercnt++;
 					} else if (isNaN(nums[num])) {
 						numkind++;
 						filled = num;
@@ -168,14 +167,11 @@
 						nums[num]++;
 					}
 				} else if (clist[i].qsub === 1) {
-					circlecnt++;
+					othercnt++;
 				}
 			}
 			component.number = filled;
-			component.numcnt =
-				filled === -1
-					? circlecnt + questionmarkcnt
-					: nums[filled] + circlecnt + questionmarkcnt;
+			component.numcnt = filled === -1 ? othercnt : nums[filled] + othercnt;
 			component.numkind = numkind;
 		}
 	},