Merge branch 'main' into tilecity

src-ui/changes.html

@@ -34,12 +34,12 @@
 <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?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>
-  <li><a href="/p?archipelago" target="_parent">Archipelago アーキペラゴ</a></li>
-  <li><a href="/p?yajirushi2" target="_parent">Yajirushi 2 見つめあう矢印２</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -168,6 +168,7 @@ ui.keypopup = {
 		pencils: [10, 0],
 		minarism: [10, 10],
 		trainstations: [124, 0],
+		turnrun: [124, 0],
 		wafusuma: [10, 0],
 		kuroclone: [10, 0],
 		martini: [10, 0],
@@ -211,6 +212,7 @@ ui.keypopup = {
 		timebomb: [10, 0],
 		smullyan: [10, 0],
 		meidjuluk: [10, 0],
+		island: [10, 0],
 		archipelago: [10, 0],
 		yajirushi2: [4, 0],
 		nibunnogo: [4, 0],

src-ui/js/ui/MenuConfig.js

@@ -132,6 +132,23 @@
 				case "bdwalk":
 					idname = "bdwalk_height";
 					break;
+				case "slither":
+				case "tslither":
+				case "swslither":
+				case "myopia":
+				case "lineofsight":
+					idname = "slither_full";
+					break;
+				case "mashu":
+				case "geradeweg":
+				case "disloop":
+				case "midloop":
+				case "ovotovata":
+				case "balance":
+				case "turnaround":
+				case "turnrun":
+					idname = "loop_full";
+					break;
 			}
 
 			if (typeof idname === "string") {

src-ui/js/ui/Misc.js

@@ -108,11 +108,10 @@ function toBGimage(pid) {
 		"akichi",
 		"alter",
 		"angleloop",
-		"archipelago",
 		"aquapelago",
 		"aquarium",
 		"araf",
-		"skyscrapers",
+		"archipelago",
 		"balance",
 		"balloon",
 		"batten",
@@ -146,14 +145,15 @@ function toBGimage(pid) {
 		"heyapin",
 		"icewalk",
 		"invlitso",
-		"ladders",
-		"lixloop",
+		"island",
 		"kaidan",
 		"kaisu",
 		"kissing",
 		"kropki",
 		"kuroclone",
 		"kuromenbun",
+		"ladders",
+		"lixloop",
 		"lollipops",
 		"magnets",
 		"mannequin",
@@ -170,9 +170,9 @@ function toBGimage(pid) {
 		"nondango",
 		"nonogram",
 		"norinuri",
+		"nothing",
 		"nurimisaki",
 		"nuriuzu",
-		"nothing",
 		"oneroom",
 		"ovotovata",
 		"oyakodori",
@@ -184,8 +184,8 @@ function toBGimage(pid) {
 		"portal",
 		"ququ",
 		"rassi",
-		"remlen",
 		"regional-poly",
+		"remlen",
 		"retroships",
 		"roundtrip",
 		"sananko",
@@ -194,6 +194,7 @@ function toBGimage(pid) {
 		"scrin",
 		"simplegako",
 		"simpleloop",
+		"skyscrapers",
 		"slashpack",
 		"smullyan",
 		"snake",
@@ -202,7 +203,6 @@ function toBGimage(pid) {
 		"starbattle",
 		"statuepark",
 		"subomino",
-		"wafusuma",
 		"swslither",
 		"symmarea",
 		"tachibk",
@@ -221,6 +221,7 @@ function toBGimage(pid) {
 		"turnaround",
 		"voxas",
 		"vslither",
+		"wafusuma",
 		"walllogic",
 		"waterwalk",
 		"wittgen",

src-ui/list.html

@@ -65,6 +65,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="snakeegg"></li>
     <li data-pid="archipelago"></li>
     <li data-pid="nibunnogo"></li>
+    <li data-pid="island"></li>
    </ul>
   </div>
   <div class="lists blocks">
@@ -181,6 +182,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="crossstitch"></li>
     <li data-pid="roundtrip"></li>
     <li data-pid="trainstations"></li>
+    <li data-pid="turnrun"></li>
    </ul>
   </div>
   <div class="lists loops">

src-ui/p.html

@@ -436,6 +436,18 @@ <h2 id="title2">読み込み中です...</h2>
         <span>__heyapin_overlap__</span>
       </label>
     </div>
+    <div class="config" data-config="slither_full">
+      <label>
+        <input type="checkbox">
+        <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">

src-ui/res/history.en.yaml

@@ -25,59 +25,44 @@ heyablock: This genre was invented by Atsumi Hirose in 2013 for the Japan Zukei
 mirrorbk: This genre first appeared in Puzzle Communication Nikoli vol. 177.
 takoyaki: This genre was invented by Michael Vedder.
 akichi: This genre was invented by Prasanna Seshadri.
-aho: ""
 amibo: "This genre first appeared in Puzzle Communication Nikoli vol. 134."
-angleloop: ""
-anglers: ""
 aqre: "This genre was invented by Eric Fox."
 aquapelago: "This genre was invented by Walker Anderson."
 aquarium: "This genre was invented by Inaba Naoki."
-araf: ""
 armyants: "This genre first appeared in Puzzle Communication Nikoli vol. 158."
-ayeheya: ""
 balance: "This genre was invented by Prasanna Seshadri."
 cave: "This genre first appeared in Puzzle Communication Nikoli vol. 58 under the name 'Bag'."
 barns: "This genre first appeared in Puzzle Communication Nikoli vol. 114."
 bdblock: "This genre first appeared in Puzzle Communication Nikoli vol. 49."
 bonsan: "This genre first appeared in Puzzle Communication Nikoli vol. 96."
 bosanowa: "This genre first appeared in Puzzle Communication Nikoli vol. 119."
 box: "This genre first appeared in Puzzle Communication Nikoli vol. 24."
-skyscrapers: ""
 castle: "This genre was invented by Palmer Mebane."
 cbblock: "This genre first appeared in Puzzle Communication Nikoli vol. 131."
 chainedb: "This genre first appeared in Puzzle Communication Nikoli vol. 173."
-chocona: ""
 coffeemilk: "This genre first appeared in Puzzle Communication Nikoli vol. 156."
 cojun: "This genre first appeared in Puzzle Communication Nikoli vol. 125."
-compass: ""
-coral: ""
 country: "This genre first appeared in Puzzle Communication Nikoli vol. 65."
 creek: "This genre first appeared in Puzzle Communication Nikoli vol. 110."
-curvedata: ""
 dbchoco: "This genre first appeared in Puzzle Communication Nikoli vol. 163."
-detour: ""
 dominion: "This genre was invented by Inaba Naoki."
 doppelblock: "This genre was invented by Inaba Naoki."
 dosufuwa: "This genre first appeared in Puzzle Communication Nikoli vol. 151."
 dotchi: "This genre first appeared in Puzzle Communication Nikoli vol. 167."
 doubleback: "This genre was invented by Palmer Mebane."
-easyasabc: ""
 evolmino: "This genre first appeared in Puzzle Communication Nikoli vol. 182."
 factors: "This genre first appeared in Puzzle Communication Nikoli vol. 92."
 fillmat: "This genre first appeared in Puzzle Communication Nikoli vol. 42."
 fillomino: "This genre first appeared in Puzzle Communication Nikoli vol. 47."
 firefly: "This genre first appeared in Puzzle Communication Nikoli vol. 91."
 fivecells: "This genre first appeared in Puzzle Communication Nikoli vol. 133."
 fourcells: "This genre first appeared in Puzzle Communication Nikoli vol. 132."
-geradeweg: ""
-goishi: ""
 gokigen: "This genre first appeared in Puzzle Communication Nikoli vol. 104."
 haisu: "This genre was invented by William Hu."
 hakoiri: "This genre first appeared in Puzzle Communication Nikoli vol. 72."
 hanare: "This genre first appeared in Puzzle Communication Nikoli vol. 134."
 hashikake: "This genre first appeared in Puzzle Communication Nikoli vol. 31."
 hebi: "This genre first appeared in Puzzle Communication Nikoli vol. 126."
-herugolf: ""
 heteromino: "This genre was invented by Inaba Naoki."
 heyabon: "This genre first appeared in Puzzle Communication Nikoli vol. 107."
 heyawake: "This genre first appeared in Puzzle Communication Nikoli vol. 39."
@@ -90,16 +75,13 @@ ichimaga: "This genre first appeared in Puzzle Communication Nikoli vol. 35."
 ichimagam: "This genre first appeared in Puzzle Communication Nikoli vol. 37."
 ichimagax: "This genre first appeared in Puzzle Communication Nikoli vol. 36."
 interbd: "This genre was invented by Palmer Mebane."
-juosan: ""
-kaero: ""
 kakuru: "This genre first appeared in Puzzle Communication Nikoli vol. 32."
 kazunori: "This genre first appeared in Puzzle Communication Nikoli vol. 149."
 kinkonkan: "This genre first appeared in Puzzle Communication Nikoli vol. 89."
 koburin: "This genre first appeared in Puzzle Communication Nikoli vol. 116."
 kouchoku: "This genre first appeared in Puzzle Communication Nikoli vol. 133."
 kramma: "This genre first appeared in Puzzle Communication Nikoli vol. 123."
 kramman: "This genre first appeared in Puzzle Communication Nikoli vol. 124."
-kropki: ""
 kurochute: "This genre first appeared in Puzzle Communication Nikoli vol. 120."
 kuroclone: "This genre first appeared in Puzzle Communication Nikoli vol. 153."
 kurodoko: "This genre first appeared in Puzzle Communication Nikoli vol. 34."
@@ -113,12 +95,10 @@ loute: "This genre first appeared in Puzzle Communication Nikoli vol. 133."
 makaro: "This genre first appeared in Puzzle Communication Nikoli vol. 143."
 mashu: "This genre first appeared in Puzzle Communication Nikoli vol. 90."
 maxi: "This genre was invented by Inaba Naoki."
-meander: ""
 mejilink: "This genre first appeared in Puzzle Communication Nikoli vol. 126."
 minarism: "This genre first appeared in Puzzle Communication Nikoli vol. 93."
 midloop: "This genre first appeared in Puzzle Communication Nikoli vol. 163."
 mochikoro: "This genre first appeared in Puzzle Communication Nikoli vol. 100."
-mochinyoro: ""
 moonsun: "This genre first appeared in Puzzle Communication Nikoli vol. 154."
 nagare: "This genre first appeared in Puzzle Communication Nikoli vol. 147."
 nagenawa: "This genre first appeared in Puzzle Communication Nikoli vol. 123."
@@ -131,13 +111,9 @@ nothree: "This genre first appeared in Puzzle Communication Nikoli vol. 158."
 nuribou: "This genre first appeared in Puzzle Communication Nikoli vol. 68."
 nurikabe: "This genre first appeared in Puzzle Communication Nikoli vol. 33."
 nurimaze: "This genre first appeared in Puzzle Communication Nikoli vol. 145."
-nurimisaki: ""
-nuriuzu: ""
 onsen: "This genre first appeared in Puzzle Communication Nikoli vol. 155."
 paintarea: "This genre first appeared in Puzzle Communication Nikoli vol. 69."
-parquet: ""
 pencils: "This genre first appeared in Puzzle Communication Nikoli vol. 158."
-pentominous: ""
 pentopia: "This genre was invented by Bram de Laat."
 pipelink: "This genre first appeared in Puzzle Communication Nikoli vol. 45."
 pipelinkr: "This genre first appeared in Puzzle Communication Nikoli vol. 110."
@@ -155,44 +131,30 @@ shakashaka: "This genre first appeared in Puzzle Communication Nikoli vol. 123."
 shikaku: "This genre first appeared in Puzzle Communication Nikoli vol. 27."
 shimaguni: "This genre first appeared in Puzzle Communication Nikoli vol. 117."
 shugaku: "This genre first appeared in Puzzle Communication Nikoli vol. 119."
-shwolf: ""
 slalom: "This genre first appeared in Puzzle Communication Nikoli vol. 116."
 slither: "This genre first appeared in Puzzle Communication Nikoli vol. 26."
-snake: ""
-snakepit: ""
-starbattle: ""
 statuepark: "This genre was invented by Palmer Mebane."
 stostone: "This genre first appeared in Puzzle Communication Nikoli vol. 156."
 sukoro: "This genre first appeared in Puzzle Communication Nikoli vol. 40."
 sukororoom: "This genre first appeared in Puzzle Communication Nikoli vol. 130."
-symmarea: ""
-tajmahal: ""
 tapa: "This genre was invented by Serkan Yürekli."
-tapaloop: ""
 tasquare: "This genre first appeared in Puzzle Communication Nikoli vol. 123."
 tatamibari: "This genre first appeared in Puzzle Communication Nikoli vol. 107."
 tateyoko: "This genre first appeared in Puzzle Communication Nikoli vol. 103."
 tawa: "This genre first appeared in Puzzle Communication Nikoli vol. 127."
 tentaisho: "This genre first appeared in Puzzle Communication Nikoli vol. 96."
-tents: ""
 tilepaint: "This genre first appeared in Puzzle Communication Nikoli vol. 53."
 toichika: "This genre first appeared in Puzzle Communication Nikoli vol. 129."
 toichika2: "This genre first appeared in Puzzle Communication Nikoli vol. 167."
-tren: ""
 triplace: "This genre first appeared in Puzzle Communication Nikoli vol. 43."
-tslither: ""
 usotatami: "This genre first appeared in Puzzle Communication Nikoli vol. 125."
 usoone: "This genre first appeared in Puzzle Communication Nikoli vol. 151."
-view: ""
-vslither: ""
 wagiri: "This genre first appeared in Puzzle Communication Nikoli vol. 129."
-walllogic: ""
 wblink: "This genre first appeared in Puzzle Communication Nikoli vol. 45."
 yajikazu: "This genre first appeared in Puzzle Communication Nikoli vol. 74."
 yajilin: "This genre first appeared in Puzzle Communication Nikoli vol. 86."
 yajilin-regions: "This genre was invented by Inaba Naoki."
 yajitatami: "This genre first appeared in Puzzle Communication Nikoli vol. 135."
-yinyang: ""
 yosenabe: "This genre first appeared in Puzzle Communication Nikoli vol. 135."
 slashpack: This genre was invented by Yosuke Imai.
 remlen: This genre was invented by Palmer Mebane.
@@ -236,3 +198,5 @@ archipelago: This genre first appeared in Puzzle Communication Nikoli vol. 175.
 timebomb: This genre first appeared in Puzzle Communication Nikoli vol. 163.
 nibunnogo: This genre first appeared in Puzzle Communication Nikoli vol. 164.
 balloon: This genre first appeared in Puzzle Communication Nikoli vol. 189.
+tilecity: This genre was invented by _AtomicNeoN_.
+turnrun: This genre was invented as "Totsugeki Loop" by Subaru Saito in 2018. A similar ruleset named "Turn and Run" appeared in a Logic Masters Deutschland competition in 2021.

src-ui/res/history.ja.yaml

@@ -195,3 +195,4 @@ archipelago: パズル通信ニコリ vol.175より
 timebomb: パズル通信ニコリ vol.163より
 nibunnogo: パズル通信ニコリ vol.164より
 balloon: パズル通信ニコリ vol.189より
+tilecity: _AtomicNeoN_氏発案

src-ui/res/p.en.json

@@ -202,6 +202,8 @@
     "akichi_maximum": "Maximum numbers may be reduced",
     "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",