Add Mr. OK and Mr. NO

src-ui/changes.html

@@ -33,13 +33,13 @@
 <main>
 <div style="margin-bottom: 5px;"><b>Latest types</b> (<em><a href="/list.html" target="_parent">all types</a></em>)</div>
 <ul>
+  <li><a href="/p?mrokmrno" target="_parent">Mr. OK and Mr. NO</a></li>
   <li><a href="/p?slovak" target="_parent">Slovak Sums</a></li>
   <li><a href="/p?anymino" target="_parent">Anymino</a></li>
   <li><a href="/p?elasticlink" target="_parent">Elastic Link</a></li>
   <li><a href="/p?landmeasure" target="_parent">Land Measurement</a></li>
   <li><a href="/p?trizone" target="_parent">Trizone サントイッチ</a></li>
   <li><a href="/p?ubahn" target="_parent">U-Bahn</a></li>
-  <li><a href="/p?soulmates" target="_parent">Soul Mates ソウルメイツ</a></li>
 </ul>
 </main>
 </body>

src-ui/css/ui.css

@@ -360,6 +360,7 @@ div#keypopup {
 }
 div.panelbase {
   margin: 1pt;
+  font-variant-emoji: text;
 }
 
 div.kpcell {

src-ui/js/ui/KeyPopup.js

@@ -259,6 +259,7 @@ ui.keypopup = {
 		hasunomura: [10, 0],
 		bramble: [10, 0],
 		golemgrad: [10, 0],
+		mrokmrno: [137, 137],
 		topo: [10, 10],
 		soulmates: [10, 10],
 		landmeasure: [10, 0],
@@ -428,6 +429,8 @@ ui.keypopup = {
 			this.generate_ubahn(mode);
 		} else if (type === 136) {
 			this.generate_slovak(mode);
+		} else if (type === 137) {
+			this.generate_mrokmrno(mode);
 		} else if (type === 5339) {
 			this.generate_swslither();
 		}
@@ -1135,6 +1138,24 @@ ui.keypopup = {
 		);
 	},
 
+	generate_mrokmrno: function(mode) {
+		var mbcolor = ui.puzzle.painter.mbcolor;
+		var items = [
+			["1", "N"],
+			["2", "K"],
+			["3", "O"],
+			["4", "😶"],
+			["5", "🙂"],
+			["6", "🙁"],
+			" "
+		];
+		if (mode === 3) {
+			items.push(["q", { text: "⋅", color: mbcolor }]);
+		}
+
+		this.generate_main(items, 3);
+	},
+
 	generate_main: function(list, split) {
 		for (var i = 0; i < list.length; i++) {
 			this.inputcol(list[i]);

src-ui/list.html

@@ -460,6 +460,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="retroships"></li>
     <li data-pid="regional-poly"></li>
     <li data-pid="yajirushi"></li>
+    <li data-pid="mrokmrno"></li>
    </ul>
   </div>
  </div>

src/puzzle/KeyInput.js

@@ -157,7 +157,7 @@ pzpr.classmgr.makeCommon({
 				key = "-";
 			} else if (keycode === 106) {
 				key = "*";
-			} else if (keycode === 107) {
+			} else if (keycode === 107 || keycode === 59 || keycode === 61) {
 				key = "+";
 			}
 
@@ -171,7 +171,7 @@ pzpr.classmgr.makeCommon({
 			if (this.isCTRL) {
 				keylist.unshift("ctrl");
 			}
-			if (this.isSHIFT) {
+			if (this.isSHIFT && key !== "+") {
 				keylist.unshift("shift");
 			}
 			key = keylist.join("+");

src/pzpr/variety.js

@@ -305,6 +305,7 @@
 			mochinyoro: [1, 0, "モチにょろ", "Mochinyoro", "nurikabe"],
 			moonsun: [0, 0, "月か太陽", "Moon or Sun", "country"],
 			morningwalk: [0, 0, "Morning Walk", "Morning Walk", "icewalk"],
+			mrokmrno: [0, 0, "OKさんとNOくん", "Mr. OK and Mr. NO"],
 			mrtile: [0, 0, "ミラーリングタイル", "Mirroring Tile", "chainedb"],
 			mukkonn: [0, 0, "Mukkonn Enn", "Mukkonn Enn", "compass"],
 			myopia: [0, 0, "Myopia", "Myopia"],

src/res/failcode.en.json

@@ -176,6 +176,7 @@
     "bkNoNum.hanare": "A room has no numbers.",
     "bkNoNum.kaero": "An area has no letters.",
     "bkNoNum.kramma": "An area has no marks.",
+    "bkNoNum.mrokmrno": "A group doesn't have exactly 2 letters spelling out \"OK\" or \"NO\".",
     "bkNoNum.nanro": "There is an empty room.",
     "bkNoNum.narrow": "A region has no symbols.",
     "bkNoNum.nawabari": "A room has no numbers.",
@@ -406,6 +407,7 @@
     "ceNoEnd.kaidan": "A rectangle is not closed.",
     "ceNoLine.arukone": "A crossing is left blank.",
     "ceNoLine": "There is an empty cell.",
+    "ceNoMouth.mrokmrno": "A face has no mouth.",
     "ceNoNum.compass": "There is an area without a clue.",
     "ceNoNum.kakuro": "There is an empty cell.",
     "ceNoNum.lohkous": "There is an area without a clue.",
@@ -422,6 +424,8 @@
     "ceTapaNe.tapa": "The number is not equal to the length of surrounding shaded cells.",
     "ceTooManyBlocks.doppelblock": "There are more than two blocks in a row or column.",
     "ceUnused.kinkonkan": "A mirror is unused.",
+    "ceWrongSmile.mrokmrno": "A smiling face is next to the word NO.",
+    "ceWrongFrown.mrokmrno": "A frowning face is next to the word OK.",
     "ciNotOnCnr.loute": "A circle is not at the corner of an area.",
     "circleNotPromontory.kurodoko": "A circle is not a dead end.",
     "circleShade.kissing": "A crossed cell is shaded.",