Add Orbital

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?orbital" target="_parent">Orbital オービタル</a></li>
   <li><a href="/p?tilecity" target="_parent">Tile City タイルシティー</a></li>
   <li><a href="/p?turnrun" target="_parent">Turn and Run トツゲキループ</a></li>
   <li><a href="/p?island" target="_parent">Inaba's Island アイランド</a></li>
   <li><a href="/p?balloon" target="_parent">Balloon Box 風船箱</a></li>
   <li><a href="/p?mintonette" target="_parent">Mintonette</a></li>
   <li><a href="/p?nibunnogo" target="_parent">Nibun-nogo ニブンノゴ</a></li>
-  <li><a href="/p?timebomb" target="_parent">Time Bomb 時限爆弾</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -218,7 +218,8 @@ ui.keypopup = {
 		nibunnogo: [4, 0],
 		mintonette: [10, 0],
 		balloon: [10, 0],
-		tilecity: [10, 0]
+		tilecity: [10, 0],
+		orbital: [124, 0]
 	},
 
 	//---------------------------------------------------------------------------
@@ -880,6 +881,7 @@ ui.keypopup = {
 	},
 
 	generate_trainstations: function(mode) {
+		var orbital = ui.puzzle.pid === "orbital";
 		this.generate_main(
 			[
 				"0",
@@ -893,8 +895,8 @@ ui.keypopup = {
 				"8",
 				"9",
 				" ",
-				["-", "?"],
-				["q", "╋"]
+				["-", orbital ? "●" : "?"],
+				["q", orbital ? "○" : "╋"]
 			],
 			4
 		);

src-ui/js/ui/Misc.js

@@ -174,6 +174,7 @@ function toBGimage(pid) {
 		"nurimisaki",
 		"nuriuzu",
 		"oneroom",
+		"orbital",
 		"ovotovata",
 		"oyakodori",
 		"patchwork",

src-ui/list.html

@@ -183,6 +183,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="roundtrip"></li>
     <li data-pid="trainstations"></li>
     <li data-pid="turnrun"></li>
+    <li data-pid="orbital"></li>
    </ul>
   </div>
   <div class="lists loops">

src/pzpr/variety.js

@@ -310,6 +310,7 @@
 			ovotovata: [0, 0, "Ovotovata", "Ovotovata", "country"],
 			oneroom: [0, 0, "ワンルームワンドア", "One Room One Door", "heyawake"],
 			onsen: [0, 0, "温泉めぐり", "Onsen-meguri", "country"],
+			orbital: [0, 0, "オービタル", "Orbital", "nagenawa"],
 			oyakodori: [0, 0, "おやこどり", "Oyakodori", "kaero"],
 			paintarea: [1, 0, "ペイントエリア", "Paintarea"],
 			parquet: [0, 0, "Parquet", "Parquet"],

src/res/failcode.en.json

@@ -625,6 +625,7 @@
     "lpNoNum.onsen": "A loop has no numbers.",
     "lpNoNum.pipelink": "A loop has no numbers.",
     "lpNumGt2.onsen": "A loop has more than one number.",
+    "lpNumGt2.orbital": "A loop encloses more than one black circle.",
     "lpPlNum.pipelink": "A loop has multiple kinds of number.",
     "lpSepNum.pipelink": "A kind of number is in different loops.",
     "lrAcrossArrow.nagare": "The line doesn't go straight in the arrow's direction.",
@@ -734,6 +735,7 @@
     "nmNoLine": "A number is not connected to another number.",
     "nmNoMove.bonsan": "A circle doesn't start any line.",
     "nmNoMove.rectslider": "A shaded cell doesn't start any line.",
+    "nmNoOrbit.orbital": "A black circle is not inside a loop.",
     "nmNoSideShade.tasquare": "No shaded cells are adjacent to square marks.",
     "nmNotConsecNeighbors.ripple": "A number is not the neighbor of its consecutive numbers.",
     "nmNotConseq.kouchoku": "Equal letters are not connected directly.",
@@ -745,6 +747,7 @@
     "nmNumberNe.sukoro": "The number of numbers placed in four adjacent cells is not equal to the number.",
     "nmNumberNe.sukororoom": "The number of numbers placed in four adjacent cells is not equal to the number.",
     "nmNumberNe.view": "The number of numbers placed in four adjacent cells is not equal to the number.",
+    "nmOrbitNe.orbital": "A number does not indicate the amount of white circles used by the loop.",
     "nmOutOfBk.oyakodori": "A bird is outside a nest.",
     "nmOutOfBk.yosenabe": "A filling isn't in a crock.",
     "nmOutOfHole.herugolf": "A ball doesn't cup in.",
@@ -753,15 +756,16 @@
     "nmOutsideTren.tren": "A number is not contained inside a 1x2 or 1x3 block.",
     "nmPillowGt.shugaku": "The number of pillows around the number is wrong.",
     "nmPillowLt.shugaku": "The number of pillows around the number is wrong.",
+    "nmPlOrbit.orbital": "A black circle is inside multiple loops.",
     "nmProduct.factors": "A number of room is not equal to the product of these numbers.",
     "nmRange.kakuru": "A number is larger than 9.",
     "nmRange.sananko": "A number is larger than 3.",
     "nmRange.trainstations": "A number is out of range.",
     "nmSame2x2.kazunori": "There is a 2x2 block of the same number.",
     "nmSame2x2.snakepit": "A snake loops back on itself.",
-    "nmShadeEq.smullyan": "The number of shaded cells in a shaded number's domain is equal to the number.",
     "nmShade5Ne.lookair": "The number is not equal to the number of shaded cells in the cell and the four adjacent cells.",
     "nmShadeDiagNe.context": "The number of shaded cells diagonally adjacent to a shaded number is not correct.",
+    "nmShadeEq.smullyan": "The number of shaded cells in a shaded number's domain is equal to the number.",
     "nmShadeGt.interbd": "The number of shaded cells around a number is not correct.",
     "nmShadeGt.kaidan": "The number of circles around a number is not correct.",
     "nmShadeGt.kuromenbun": "The number of shaded cells around an area is not correct.",