Add U-Bahn

Author: x-sheep

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?ubahn" target="_parent">U-Bahn</a></li>
   <li><a href="/p?soulmates" target="_parent">Soul Mates ソウルメイツ</a></li>
   <li><a href="/p?longest" target="_parent">The Longest 短辺消失</a></li>
   <li><a href="/p?yokeimoji" target="_parent">Yokeimoji Cross 余計文字クロス</a></li>
   <li><a href="/p?golemgrad" target="_parent">Golem Grad</a></li>
   <li><a href="/p?bwloop" target="_parent">Kuroshiro Loop クロシロループ</a></li>
   <li><a href="/p?hamlepaths" target="_parent">Hamle Paths</a></li>
-  <li><a href="/p?ruleofthree" target="_parent">Rule of Three</a></li>
 </ul>
 </main>
 </body>

src-ui/img/ubahn.png

@@ -252,6 +252,7 @@ ui.keypopup = {
 		heavydots: [10, 0],
 		suguru: [10, 10],
 		marutaring: [10, 0],
+		ubahn: [10, 135],
 		nuriloop: [10, 0],
 		tetroctb: [10, 0],
 		hasunomura: [10, 0],
@@ -419,6 +420,8 @@ ui.keypopup = {
 			this.generate_kurarin(mode);
 		} else if (type === 134) {
 			this.generate_narrowfence(mode);
+		} else if (type === 135) {
+			this.generate_ubahn(mode);
 		} else if (type === 5339) {
 			this.generate_swslither();
 		}
@@ -1062,6 +1065,13 @@ ui.keypopup = {
 		);
 	},
 
+	generate_ubahn: function(mode) {
+		this.generate_main(
+			[["o", "O"], ["l", "L"], ["i", "I"], ["t", "T"], ["x", "X"], " "],
+			3
+		);
+	},
+
 	generate_swslither: function() {
 		this.generate_main(
 			[["5", "🐑"], ["6", "🐺"], null, "1", "2", "3", "0", " ", ["-", "?"]],

src-ui/js/ui/KeyPopup.js

@@ -251,6 +251,7 @@ function toBGimage(pid) {
 		"trainstations",
 		"tslither",
 		"turnaround",
+		"ubahn",
 		"voxas",
 		"vslither",
 		"wafusuma",

src-ui/js/ui/Misc.js

@@ -257,6 +257,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="diamond"></li>
     <li data-pid="energywalk"></li>
     <li data-pid="keywest"></li>
+    <li data-pid="ubahn"></li>
    </ul>
   </div>
   <div class="lists lines">

src-ui/list.html

@@ -84,8 +84,6 @@ <h2 id="title2">読み込み中です...</h2>
        <li data-value="3"><span>__use_tri.3__</span></li>
      </menu></li>
      <li class="check" data-config="bgcolor"><span>__bgcolor.menu__</span></li>
-     <li class="check" data-config="autoerr"><span data-disp-pid="hitori">__autoerr.menu.hitori__</span
-                                            ><span data-disp-pid="gokigen,wagiri">__autoerr.menu.gokigen__</span></li>
      <li class="check" data-config="multierr"><span>__multierr__</span></li>
      <li class="check" data-config="forceallcell"><span>__forceallcell.menu__</span></li>
      <li class="check" data-config="dirauxmark"><span>__dirauxmark.menu__</span></li>
@@ -266,6 +264,7 @@ <h2 id="title2">読み込み中です...</h2>
         <input type="checkbox">
         <span data-disp-pid="hitori">__autoerr.tool.hitori__</span>
         <span data-disp-pid="gokigen">__autoerr.tool.gokigen__</span>
+        <span data-disp-pid="ubahn">__autoerr.tool.ubahn__</span>
         <span data-disp-pid="wagiri">__autoerr.tool.wagiri__</span>
       </label>
     </div>

src-ui/p.html

@@ -42,8 +42,6 @@
     "use_tri.2": "Pull-to-input",
     "use_tri.3": "One button",
     "bgcolor.menu": "Input background color",
-    "autoerr.menu.hitori": "Show overlapped number",
-    "autoerr.menu.gokigen": "Loop slash with color",
     "multierr": "Check multiple errors",
     "forceallcell.menu": "Number in all cells",
     "dirauxmark.menu": "Direction aux. mark",
@@ -179,6 +177,7 @@
     "autocmp.recoil": "Paint background of path obstacles",
     "autoerr.tool.hitori": "Show overlapped number as red",
     "autoerr.tool.gokigen": "Draw loop line as red",
+    "autoerr.tool.ubahn": "Paint background of cell types",
     "autoerr.tool.wagiri": "Draw loop line as bold",
     "dirauxmark.tool": "Enable to input aux mark of direction",
     "enline.tool": "Enable to draw line only between the points",

src-ui/res/p.en.json

@@ -42,8 +42,6 @@
     "use_tri.2": "引っ張り入力",
     "use_tri.3": "1ボタン",
     "bgcolor.menu": "背景色入力",
-    "autoerr.menu.hitori": "重複した数字を表示",
-    "autoerr.menu.gokigen": "ループした斜線の色分け",
     "multierr": "複数エラー検出",
     "forceallcell.menu": "全マス数字必須",
     "dirauxmark.menu": "方向の補助記号",

src-ui/res/p.ja.json

@@ -438,7 +438,11 @@
 					exec = !!puzzle.painter.autocmp;
 					break;
 				case "autoerr":
-					exec = pid === "hitori" || pid === "gokigen" || pid === "wagiri";
+					exec =
+						pid === "hitori" ||
+						pid === "gokigen" ||
+						pid === "wagiri" ||
+						pid === "ubahn";
 					break;
 				case "singlenum":
 					exec = pid === "hanare" || pid === "putteria" || pid === "twinarea";

src/puzzle/Config.js

@@ -486,6 +486,7 @@
 			turnaround: [0, 0, "ターンアラウンド", "Turnaround"],
 			turnrun: [0, 0, "トツゲキループ", "Turn and Run", "trainstations"],
 			twinarea: [0, 0, "ツインエリア", "Twin Area", "hanare"],
+			ubahn: [0, 0, "U-Bahn", "U-Bahn"],
 			usotatami: [0, 0, "ウソタタミ", "Uso-tatami", "fillmat"],
 			usoone: [0, 0, "ウソワン", "Uso-one"],
 			uturns: [0, 0, "U-Turns", "U-Turns", "kusabi"],