From ecff313192b1946e6835bbfbea7d1194fe6b32e0 Mon Sep 17 00:00:00 2001
From: Lennard Sprong <x-sheep@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:43:12 +0200
Subject: [PATCH] scrabble: Add variant for given letters

---
 src-ui/js/ui/MenuConfig.js |  3 +++
 src-ui/p.html              |  6 ++++++
 src-ui/res/p.en.json       |  1 +
 src/puzzle/Config.js       |  4 ++++
 src/res/failcode.en.json   |  1 +
 src/variety/scrabble.js    | 24 +++++++++++++++++++++++-
 test/script/scrabble.js    | 10 ++++++++++
 7 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src-ui/js/ui/MenuConfig.js b/src-ui/js/ui/MenuConfig.js
index 4ba74eab7..c8077824f 100644
--- a/src-ui/js/ui/MenuConfig.js
+++ b/src-ui/js/ui/MenuConfig.js
@@ -158,6 +158,9 @@
 				case "trizone":
 					idname = "trizone_ghost";
 					break;
+				case "scrabble":
+					idname = "scrabble_given";
+					break;
 				case "slither":
 				case "tslither":
 				case "swslither":
diff --git a/src-ui/p.html b/src-ui/p.html
index 4aa8defe4..92a69aafa 100644
--- a/src-ui/p.html
+++ b/src-ui/p.html
@@ -478,6 +478,12 @@ <h2 id="title2">読み込み中です...</h2>
         <span>__lapaz_liar__</span>
       </label>
     </div>
+    <div class="config" data-config="scrabble_given">
+      <label>
+        <input type="checkbox">
+        <span>__scrabble_given__</span>
+      </label>
+    </div>
     <div class="config" data-config="slither_full">
       <label>
         <input type="checkbox">
diff --git a/src-ui/res/p.en.json b/src-ui/res/p.en.json
index 648a87343..6d0c3b5a5 100644
--- a/src-ui/res/p.en.json
+++ b/src-ui/res/p.en.json
@@ -212,6 +212,7 @@
     "fillomino_tri": "Maximum block size is 3",
     "trizone_ghost": "Regions can have no clues",
     "lapaz_liar": "Liar (clues can be erased by shading)",
+    "scrabble_given": "All letters of a certain type are given",
     "slither_full": "All points must be visited",
     "loop_full": "All cells must be visited",
     "variant": "This puzzle uses variant rules",
diff --git a/src/puzzle/Config.js b/src/puzzle/Config.js
index cee722206..a10846bfd 100644
--- a/src/puzzle/Config.js
+++ b/src/puzzle/Config.js
@@ -161,6 +161,10 @@
 				variant: true,
 				volatile: true
 			}); /* Clues may be erased by shading over them */
+			this.add("scrabble_given", false, {
+				variant: true,
+				volatile: true
+			}); /* All letters of a certain type are given */
 			this.add("slither_full", false, {
 				variant: true,
 				volatile: true
diff --git a/src/res/failcode.en.json b/src/res/failcode.en.json
index f78f90fe9..91a08bb7a 100644
--- a/src/res/failcode.en.json
+++ b/src/res/failcode.en.json
@@ -874,6 +874,7 @@
     "nmNotConseq.kouchoku": "Equal letters are not connected directly.",
     "nmNotConseq.trainstations": "A number doesn't connect to the next consecutive number.",
     "nmNotConseqFull.trainstations": "A number doesn't connect to the next consecutive number.",
+    "nmNotGiven.scrabble": "There are too many instances of the given letter.",
     "nmNotLink.kazunori": "A number doesn't link to other cells in the room.",
     "nmNotSeq.numrope": "The numbers on a line are not consecutive.",
     "nmNumberEq.oyakodori": "Two identical birds are in the same nest.",
diff --git a/src/variety/scrabble.js b/src/variety/scrabble.js
index 1d404b588..d29c31f87 100644
--- a/src/variety/scrabble.js
+++ b/src/variety/scrabble.js
@@ -362,8 +362,10 @@
 		decodePzpr: function(type) {
 			this.decodeNumber16();
 			this.decodePieceBank();
+			this.puzzle.setConfig("scrabble_given", this.checkpflag("g"));
 		},
 		encodePzpr: function(type) {
+			this.outpflag = this.puzzle.getConfig("scrabble_given") ? "g" : null;
 			this.encodeNumber16();
 			this.encodePieceBank();
 		}
@@ -371,12 +373,14 @@
 
 	FileIO: {
 		decodeData: function() {
+			this.decodeConfigFlag("g", "scrabble_given");
 			this.decodeCellQnum();
 			this.decodeCellAnumsub();
 			this.decodePieceBank();
 			this.decodePieceBankQcmp();
 		},
 		encodeData: function() {
+			this.encodeConfigFlag("g", "scrabble_given");
 			this.encodeCellQnum();
 			this.encodeCellAnumsub();
 			this.encodePieceBank();
@@ -388,8 +392,26 @@
 		checklist: [
 			"checkBankPiecesAvailable",
 			"checkBankPiecesInvalid",
+			"checkGivenLetters",
 			"checkConnectNumber",
 			"checkBankPiecesUsed"
-		]
+		],
+
+		checkGivenLetters: function() {
+			if (!this.puzzle.getConfig("scrabble_given")) {
+				return;
+			}
+
+			var letters = new Set();
+			this.board.cell.each(function(cell) {
+				if (cell.qnum >= 0) {
+					letters.add(cell.qnum);
+				}
+			});
+
+			this.checkAllCell(function(cell) {
+				return cell.qnum === -1 && cell.anum >= 0 && letters.has(cell.anum);
+			}, "nmNotGiven");
+		}
 	}
 });
diff --git a/test/script/scrabble.js b/test/script/scrabble.js
index a6d29779b..d6e213288 100644
--- a/test/script/scrabble.js
+++ b/test/script/scrabble.js
@@ -19,6 +19,16 @@ ui.debug.addDebugData("scrabble", {
 			"bankLt",
 			"pzprv3/scrabble/8/6/. . . . . . /. . . . . . /19 . . . . . /. . . 6 . . /. . . . . . /. . . . . . /. . . . . . /. . . . . . /. . . 19 . . /. . . 21 . . /. . . 18 . . /8 . . . . . /1 . 23 1 12 12 /16 . . 3 . . /5 4 7 5 . . /. . . . . . /5/EDGE/LINE/WALL/SHAPE/SURFACE/1 0 1 1 1 /"
 		],
+		[
+			"nmNotGiven",
+			"pzprv3/scrabble/3/4/g/. 1 . . /. 1 . . /. . . . /. . . . /. . . . /. 2 1 2 /2/AAB/BAB/0 0 /",
+			{ skiprules: true }
+		],
+		[
+			null,
+			"pzprv3/scrabble/3/4/g/. 1 . . /. 1 . . /. . . . /2 . 2 . /. . . . /. 2 . . /2/AAB/BAB/0 0 /",
+			{ skiprules: true }
+		],
 		[
 			null,
 			"pzprv3/scrabble/8/6/. . . . . . /. . . . . . /19 . . . . . /. . . 6 . . /. . . . . . /. . . . . . /. . . . . . /. . . . . . /. . . 19 . . /. . . 21 . . /. . . 18 . . /8 . . . . . /1 . 23 1 12 12 /16 . . 3 . 9 /5 4 7 5 . 14 /. . . . . 5 /5/EDGE/LINE/WALL/SHAPE/SURFACE/0 0 0 0 0 /"