fillomino: Improve key combo inputs

Author: x-sheep

src/puzzle/KeyInput.js

@@ -24,7 +24,7 @@ pzpr.classmgr.makeCommon({
 		// kc.keyreset()     キーボード入力に関する情報を初期化する
 		// kc.isenablemode() 現在のモードでキー入力が有効か判定する
 		//---------------------------------------------------------------------------
-		keyreset: function() {
+		keyreset: function(isTest) {
 			this.isCTRL = false;
 			this.isMETA = false; // MacのCommandキーなど
 			this.isALT = false; // ALTはメニュー用なので基本的に使わない
@@ -36,9 +36,11 @@ pzpr.classmgr.makeCommon({
 			this.keydown = false;
 			this.keyup = false;
 
-			this.ca = "";
+			if (!isTest) {
+				this.ca = "";
 
-			this.prev = null;
+				this.prev = null;
+			}
 		},
 		isenablemode: function() {
 			return (
@@ -190,8 +192,19 @@ pzpr.classmgr.makeCommon({
 		//---------------------------------------------------------------------------
 		inputKeys: function(array) {
 			for (var i = 0; i < arguments.length; i++) {
-				this.keyevent(arguments[i], 0);
-				this.keyevent(arguments[i], 1);
+				var ca = arguments[i];
+
+				this.isSHIFT = ca.match(/shift\+/);
+				this.isCTRL = ca.match(/ctrl\+/);
+				this.isALT = ca.match(/alt\+/);
+				this.isMETA = ca.match(/meta\+/);
+				this.isX = ca.match(/x\+/);
+				this.isY = ca.match(/y\+/);
+				this.isZ = ca.match(/z\+/);
+
+				this.keyevent(ca, 0);
+				this.keyevent(ca, 1);
+				this.keyreset(true);
 			}
 		},
 

src/variety/fillomino.js

@@ -228,7 +228,7 @@
 				return this.moveTBorder(ca);
 			} else if (
 				this.puzzle.playmode &&
-				(this.isCTRL || this.isX || this.isZ)
+				(this.isCTRL || this.isALT || this.isX || this.isZ)
 			) {
 				return this.move_fillomino(ca);
 			}
@@ -244,6 +244,9 @@
 			var adc = cell.adjacent,
 				adb = cell.adjborder;
 			var nc, nb;
+
+			var tokens = ca.split("+");
+			ca = tokens[tokens.length - 1];
 			switch (ca) {
 				case "up":
 					nc = adc.top;
@@ -265,23 +268,24 @@
 					return false;
 			}
 			if (!nc.isnull) {
-				var isMoved = this.isCTRL || this.isX || this.isZ;
+				var isMoved = this.isCTRL || this.isALT || this.isX || this.isZ;
 				if (!isMoved) {
 					return false;
 				}
 
-				if (this.isCTRL) {
+				if (this.isCTRL || this.isALT) {
 					if (!nb.isnull) {
 						nb.setQsub(nb.qsub === 0 ? 1 : 0);
 						this.cursor.setaddr(nc);
 					}
-				} else if (this.isZ) {
+				} else if (this.isZ && this.pid !== "numcity") {
 					if (!nb.isnull) {
 						nb.setQans(!nb.isBorder() ? 1 : 0);
 					}
 				} else if (this.isX) {
 					if (!nc.isnull) {
 						nc.setAnum(cell.getNum());
+						nc.draw();
 						this.cursor.setaddr(nc);
 					}
 				}

test/script/fillomino.js

@@ -77,6 +77,20 @@ ui.debug.addDebugData("fillomino", {
 			input: ["mouse,left, 2,0, 2,2, 0,2"],
 			result:
 				"pzprv3/fillomino/2/4/3 . . . /. . . . /. . . . /. . . . /2 -1 0 /0 0 0 /1 0 0 0 /"
+		},
+		{
+			input: ["playmode,copynum", "mouse,left,1.9,1.9,1.9,3.9"],
+			result:
+				"pzprv3/fillomino/2/4/3 . . . /. . . . /. . . . /3 . . . /2 -1 0 /0 0 0 /1 0 0 0 /"
+		},
+		{
+			input: [
+				"playmode",
+				"cursor,5,1",
+				"key,alt+down,left,left,x+right,z+right"
+			],
+			result:
+				"pzprv3/fillomino/2/4/3 . . . /. . . . /. . . . /3 3 . . /2 -1 0 /0 1 0 /1 0 -1 0 /"
 		}
 	]
 });