diff --git a/src/variety/nanro.js b/src/variety/nanro.js index 5f62d931b..8b6c365c1 100644 --- a/src/variety/nanro.js +++ b/src/variety/nanro.js @@ -153,11 +153,13 @@ var nums = []; var numkind = 0, filled = -1, - circlecnt = 0; + othercnt = 0; for (var i = 0; i < clist.length; i++) { var num = clist[i].getNum(); if (num !== -1) { - if (isNaN(nums[num])) { + if (num === -2) { + othercnt++; + } else if (isNaN(nums[num])) { numkind++; filled = num; nums[num] = 1; @@ -165,11 +167,11 @@ nums[num]++; } } else if (clist[i].qsub === 1) { - circlecnt++; + othercnt++; } } component.number = filled; - component.numcnt = filled === -1 ? circlecnt : nums[filled] + circlecnt; + component.numcnt = filled === -1 ? othercnt : nums[filled] + othercnt; component.numkind = numkind; } }, diff --git a/test/script/nanro.js b/test/script/nanro.js index b0de007af..91c143066 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 - - . /. . . . /", + { 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 . - - /"