From 90b5474d44782faec430c4c34cecfd2415c2368b Mon Sep 17 00:00:00 2001
From: Lennard Sprong <x-sheep@users.noreply.github.com>
Date: Thu, 16 Jan 2025 21:03:56 +0100
Subject: [PATCH] Add Full Loop variant to other genres

---
 src-ui/js/ui/MenuConfig.js   |  9 +++++++++
 src-ui/p.html                |  6 ++++++
 src-ui/res/p.en.json         |  1 +
 src/puzzle/Config.js         | 16 ++++++++++++++++
 src/variety-common/Answer.js |  5 ++++-
 src/variety/balance.js       |  5 +++++
 src/variety/country.js       | 13 +++++++++++++
 src/variety/geradeweg.js     |  5 +++++
 src/variety/mashu.js         |  5 +++++
 src/variety/midloop.js       |  5 +++++
 src/variety/tapaloop.js      |  5 +++++
 src/variety/turnaround.js    |  5 +++++
 12 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/src-ui/js/ui/MenuConfig.js b/src-ui/js/ui/MenuConfig.js
index 42fdbe3a1..a2417a7d5 100644
--- a/src-ui/js/ui/MenuConfig.js
+++ b/src-ui/js/ui/MenuConfig.js
@@ -139,6 +139,15 @@
 				case "lineofsight":
 					idname = "slither_full";
 					break;
+				case "mashu":
+				case "geradeweg":
+				case "disloop":
+				case "midloop":
+				case "ovotovata":
+				case "balance":
+				case "turnaround":
+					idname = "loop_full";
+					break;
 			}
 
 			if (typeof idname === "string") {
diff --git a/src-ui/p.html b/src-ui/p.html
index e91696181..0d1c51c4b 100644
--- a/src-ui/p.html
+++ b/src-ui/p.html
@@ -442,6 +442,12 @@ <h2 id="title2">読み込み中です...</h2>
         <span>__slither_full__</span>
       </label>
     </div>
+    <div class="config" data-config="loop_full">
+      <label>
+        <input type="checkbox">
+        <span>__loop_full__</span>
+      </label>
+    </div>
     <div class="config" data-config="variant">
       <label>
         <input type="checkbox">
diff --git a/src-ui/res/p.en.json b/src-ui/res/p.en.json
index 3ed213d88..2be307eaa 100644
--- a/src-ui/res/p.en.json
+++ b/src-ui/res/p.en.json
@@ -203,6 +203,7 @@
     "magnets_anti": "Anti-Magnets (adjacent poles of different magnets must be equal)",
     "heyapin_overlap": "Pins must overlap 2 or more regions",
     "slither_full": "All points must be visited",
+    "loop_full": "All cells must be visited",
     "variant": "This puzzle uses variant rules",
     "time": "Time:",
     "timer.menu": "Show timer",
diff --git a/src/puzzle/Config.js b/src/puzzle/Config.js
index 5299d5b68..851e1fd92 100644
--- a/src/puzzle/Config.js
+++ b/src/puzzle/Config.js
@@ -141,6 +141,10 @@
 				variant: true,
 				volatile: true
 			}); /* All vertices must be visited */
+			this.add("loop_full", false, {
+				variant: true,
+				volatile: true
+			}); /* All cells must be visited */
 			/* generic variant */
 			this.add("variant", false, { variant: true, volatile: true });
 			this.add("variantid", "", { volatile: true });
@@ -481,6 +485,18 @@
 							"lineofsight"
 						].indexOf(pid) >= 0;
 					break;
+				case "loop_full":
+					exec =
+						[
+							"mashu",
+							"geradeweg",
+							"disloop",
+							"midloop",
+							"ovotovata",
+							"balance",
+							"turnaround"
+						].indexOf(pid) >= 0;
+					break;
 				default:
 					exec = !!this.list[name];
 			}
diff --git a/src/variety-common/Answer.js b/src/variety-common/Answer.js
index 371c4e99c..d12d4e1fd 100644
--- a/src/variety-common/Answer.js
+++ b/src/variety-common/Answer.js
@@ -400,7 +400,10 @@ pzpr.classmgr.makeCommon({
 			this.checkLineCount(0, this.board.borderAsLine ? "cxNoLine" : "ceNoLine");
 		},
 		checkNoLineIfVariant: function() {
-			if (this.puzzle.getConfig("slither_full")) {
+			if (
+				this.puzzle.getConfig("slither_full") ||
+				this.puzzle.getConfig("loop_full")
+			) {
 				this.checkNoLine();
 			}
 		},
diff --git a/src/variety/balance.js b/src/variety/balance.js
index 404680ef1..f754fafd6 100644
--- a/src/variety/balance.js
+++ b/src/variety/balance.js
@@ -277,8 +277,10 @@
 				}
 			}
 			this.outbstr = bstr.substr(i);
+			this.puzzle.setConfig("loop_full", this.checkpflag("f"));
 		},
 		encodePzpr: function(type) {
+			this.outpflag = this.puzzle.getConfig("loop_full") ? "f" : null;
 			var count = 0,
 				cm = "",
 				bd = this.board;
@@ -312,6 +314,7 @@
 	},
 	FileIO: {
 		decodeData: function() {
+			this.decodeConfigFlag("f", "loop_full");
 			this.decodeCell(function(cell, ca) {
 				if (ca === ".") {
 					return;
@@ -323,6 +326,7 @@
 			this.decodeBorderLine();
 		},
 		encodeData: function() {
+			this.encodeConfigFlag("f", "loop_full");
 			this.encodeCell(function(cell) {
 				if (cell.qnum !== -1) {
 					return cell.ques + "," + cell.qnum + " ";
@@ -344,6 +348,7 @@
 			"checkBlackEqual",
 			"checkDeadendLine+",
 			"checkNoLineCircle",
+			"checkNoLineIfVariant",
 			"checkOneLoop"
 		],
 
diff --git a/src/variety/country.js b/src/variety/country.js
index 0a1a1e138..b6a9de032 100644
--- a/src/variety/country.js
+++ b/src/variety/country.js
@@ -757,6 +757,9 @@
 			if (this.pid === "country") {
 				this.puzzle.setConfig("country_empty", this.checkpflag("e"));
 			}
+			if (this.pid === "ovotovata") {
+				this.puzzle.setConfig("loop_full", this.checkpflag("f"));
+			}
 			if (this.pid !== "simpleloop") {
 				this.decodeBorder();
 			}
@@ -791,6 +794,9 @@
 			if (this.pid === "country") {
 				this.outpflag = this.puzzle.getConfig("country_empty") ? "e" : null;
 			}
+			if (this.pid === "ovotovata") {
+				this.outpflag = this.puzzle.getConfig("loop_full") ? "f" : null;
+			}
 			if (this.pid !== "simpleloop") {
 				this.encodeBorder();
 			}
@@ -858,6 +864,9 @@
 			if (this.pid === "country" && this.filever >= 1) {
 				this.decodeFlags();
 			}
+			if (this.pid === "ovotovata") {
+				this.decodeConfigFlag("f", "loop_full");
+			}
 			if (this.pid !== "simpleloop") {
 				if (this.filever >= 2) {
 					this.decodeBorderQues();
@@ -887,6 +896,9 @@
 			if (this.pid === "country") {
 				this.encodeFlags(["country_empty"]);
 			}
+			if (this.pid === "ovotovata") {
+				this.encodeConfigFlag("f", "loop_full");
+			}
 			if (this.pid !== "simpleloop") {
 				this.filever = 2;
 				this.encodeBorderQues();
@@ -1111,6 +1123,7 @@
 			"checkHatenaExit",
 
 			"checkDeadendLine+",
+			"checkNoLineIfVariant",
 			"checkOneLoop"
 		]
 	},
diff --git a/src/variety/geradeweg.js b/src/variety/geradeweg.js
index a9069d182..a0c594b5c 100644
--- a/src/variety/geradeweg.js
+++ b/src/variety/geradeweg.js
@@ -101,17 +101,21 @@
 	Encode: {
 		decodePzpr: function(type) {
 			this.decodeNumber16();
+			this.puzzle.setConfig("loop_full", this.checkpflag("f"));
 		},
 		encodePzpr: function(type) {
+			this.outpflag = this.puzzle.getConfig("loop_full") ? "f" : null;
 			this.encodeNumber16();
 		}
 	},
 	FileIO: {
 		decodeData: function() {
+			this.decodeConfigFlag("f", "loop_full");
 			this.decodeCellQnum();
 			this.decodeBorderLine();
 		},
 		encodeData: function() {
+			this.encodeConfigFlag("f", "loop_full");
 			this.encodeCellQnum();
 			this.encodeBorderLine();
 		}
@@ -128,6 +132,7 @@
 			"checkNoLineNumber",
 
 			"checkDeadendLine+",
+			"checkNoLineIfVariant",
 			"checkOneLoop"
 		],
 
diff --git a/src/variety/mashu.js b/src/variety/mashu.js
index a6ce8a5dd..7630817ab 100644
--- a/src/variety/mashu.js
+++ b/src/variety/mashu.js
@@ -130,8 +130,10 @@
 		decodePzpr: function(type) {
 			this.decodeCircle();
 			this.board.revCircle();
+			this.puzzle.setConfig("loop_full", this.checkpflag("f"));
 		},
 		encodePzpr: function(type) {
+			this.outpflag = this.puzzle.getConfig("loop_full") ? "f" : null;
 			this.board.revCircle();
 			this.encodeCircle();
 			this.board.revCircle();
@@ -150,11 +152,13 @@
 	//---------------------------------------------------------
 	FileIO: {
 		decodeData: function() {
+			this.decodeConfigFlag("f", "loop_full");
 			this.decodeCellQnum();
 			this.decodeBorderLine();
 			this.board.revCircle();
 		},
 		encodeData: function() {
+			this.encodeConfigFlag("f", "loop_full");
 			this.board.revCircle();
 			this.encodeCellQnum();
 			this.encodeBorderLine();
@@ -201,6 +205,7 @@
 			"checkWhitePearl2",
 			"checkNoLinePearl",
 			"checkDeadendLine+",
+			"checkNoLineIfVariant",
 			"checkOneLoop"
 		],
 
diff --git a/src/variety/midloop.js b/src/variety/midloop.js
index a1ccdc790..87d3b750b 100644
--- a/src/variety/midloop.js
+++ b/src/variety/midloop.js
@@ -152,18 +152,22 @@
 	Encode: {
 		decodePzpr: function(type) {
 			this.decodeDot();
+			this.puzzle.setConfig("loop_full", this.checkpflag("f"));
 		},
 		encodePzpr: function(type) {
+			this.outpflag = this.puzzle.getConfig("loop_full") ? "f" : null;
 			this.encodeDot();
 		}
 	},
 	//---------------------------------------------------------
 	FileIO: {
 		decodeData: function() {
+			this.decodeConfigFlag("f", "loop_full");
 			this.decodeDotFile();
 			this.decodeBorderLine();
 		},
 		encodeData: function() {
+			this.encodeConfigFlag("f", "loop_full");
 			this.encodeDotFile();
 			this.encodeBorderLine();
 		}
@@ -181,6 +185,7 @@
 			"checkDotOnLine",
 
 			"checkDeadendLine+",
+			"checkNoLineIfVariant",
 			"checkOneLoop"
 		],
 
diff --git a/src/variety/tapaloop.js b/src/variety/tapaloop.js
index ad49932d9..22339dc3f 100644
--- a/src/variety/tapaloop.js
+++ b/src/variety/tapaloop.js
@@ -529,8 +529,10 @@
 	"Encode@disloop": {
 		decodePzpr: function(type) {
 			this.decodeArrowNumber_disloop();
+			this.puzzle.setConfig("loop_full", this.checkpflag("f"));
 		},
 		encodePzpr: function(type) {
+			this.outpflag = this.puzzle.getConfig("loop_full") ? "f" : null;
 			this.encodeArrowNumber_disloop();
 		},
 		decodeArrowNumber_disloop: function() {
@@ -588,11 +590,13 @@
 	},
 	"FileIO@disloop": {
 		decodeData: function() {
+			this.decodeConfigFlag("f", "loop_full");
 			this.decodeQnums();
 			this.decodeDirs();
 			this.decodeBorderLine();
 		},
 		encodeData: function() {
+			this.encodeConfigFlag("f", "loop_full");
 			this.encodeQnums();
 			this.encodeDirs();
 			this.encodeBorderLine();
@@ -620,6 +624,7 @@
 			"checkArrowLineExist@disloop",
 			"checkNumberHasArrow@disloop",
 			"checkDeadendLine+",
+			"checkNoLineIfVariant@disloop",
 			"checkOneLoop"
 		],
 
diff --git a/src/variety/turnaround.js b/src/variety/turnaround.js
index 014911ac7..a878bae47 100644
--- a/src/variety/turnaround.js
+++ b/src/variety/turnaround.js
@@ -111,17 +111,21 @@
 	Encode: {
 		decodePzpr: function(type) {
 			this.decodeNumber16();
+			this.puzzle.setConfig("loop_full", this.checkpflag("f"));
 		},
 		encodePzpr: function(type) {
+			this.outpflag = this.puzzle.getConfig("loop_full") ? "f" : null;
 			this.encodeNumber16();
 		}
 	},
 	FileIO: {
 		decodeData: function() {
+			this.decodeConfigFlag("f", "loop_full");
 			this.decodeCellQnum();
 			this.decodeBorderLine();
 		},
 		encodeData: function() {
+			this.encodeConfigFlag("f", "loop_full");
 			this.encodeCellQnum();
 			this.encodeBorderLine();
 		}
@@ -136,6 +140,7 @@
 			"checkNoLineNumber",
 
 			"checkDeadendLine+",
+			"checkNoLineIfVariant",
 			"checkOneLoop"
 		],