Merge branch 'main' into blindrush

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?cityspace" target="_parent">City Space</a></li>
+  <li><a href="/p?numcity" target="_parent">Number City ナンバーシティ一</a></li>
+  <li><a href="/p?distopia" target="_parent">Distopia</a></li>
   <li><a href="/p?uturns" target="_parent">U-Turns</a></li>
   <li><a href="/p?isowatari" target="_parent">Isowatari イソワタリ</a></li>
   <li><a href="/p?narrow" target="_parent">Narrowfence</a></li>
   <li><a href="/p?kurarin" target="_parent">Kurarin クラリン</a></li>
-  <li><a href="/p?sumiwake" target="_parent">Sumiwake すみわけ</a></li>
-  <li><a href="/p?wataridori" target="_parent">Wataridori わたりどり</a></li>
-  <li><a href="/p?forestwalk" target="_parent">Forest Walk</a></li>
 </ul>
 </main>
 </body>

src-ui/img/cityspace.png

@@ -233,7 +233,10 @@ ui.keypopup = {
 		narrow: [134, 0],
 		blindrush: [10, 0],
 		isowatari: [10, 0],
-		uturns: [133, 0]
+		uturns: [133, 0],
+		distopia: [10, 0],
+		numcity: [10, 10],
+		cityspace: [10, 0]
 	},
 
 	//---------------------------------------------------------------------------

src-ui/img/numcity.png

@@ -117,6 +117,7 @@
 					idname = "nuriuzu_connect";
 					break;
 				case "pentopia":
+				case "distopia":
 					idname = "pentopia_transparent";
 					break;
 				case "koburin":

src-ui/js/ui/KeyPopup.js

@@ -123,6 +123,7 @@ function toBGimage(pid) {
 		"cbanana",
 		"chainedb",
 		"circlesquare",
+		"cityspace",
 		"cocktail",
 		"coffeemilk",
 		"compass",
@@ -176,6 +177,7 @@ function toBGimage(pid) {
 		"nonogram",
 		"norinuri",
 		"nothing",
+		"numcity",
 		"nurimisaki",
 		"nuritwin",
 		"nuriuzu",

src-ui/js/ui/MenuConfig.js

@@ -67,6 +67,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="nibunnogo"></li>
     <li data-pid="island"></li>
     <li data-pid="isowatari"></li>
+    <li data-pid="cityspace"></li>
    </ul>
   </div>
   <div class="lists blocks">
@@ -356,6 +357,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="wafusuma"></li>
     <li data-pid="sananko"></li>
     <li data-pid="twinarea"></li>
+    <li data-pid="numcity"></li>
    </ul>
   </div>
   <div class="lists others">
@@ -395,6 +397,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="zabajaba"></li>
     <li data-pid="yajirushi2"></li>
     <li data-pid="arrowflow"></li>
+    <li data-pid="distopia"></li>
    </ul>
   </div>
   <div class="lists others">

src-ui/js/ui/Misc.js

@@ -215,3 +215,5 @@ sumiwake: This genre first appeared in Puzzle Communication Nikoli vol. 66.
 narrow: This genre was invented by Arvi Teikari a.k.a. Hempuli.
 kurarin: This genre first appeared in Puzzle Communication Nikoli vol. 191.
 uturns: This genre was invented by Eric Fox.
+numcity: This genre first appeared in Puzzle Communication Nikoli vol. 175.
+blindrush: This genre first appeared in Puzzle Communication Nikoli vol. 162.

src-ui/list.html

@@ -215,3 +215,5 @@ recoil: Sebastian Simon氏考案、初出Logic Masters Germany
 turnrun: 齋藤スバル氏考案、初出2018年(当時の名称は「トツゲキループ」。「Turn and Run」は後に発表された似たルールのもの、初出2021年開催Logic Masters Deutschland competition)
 uturns: Eric Fox氏発案
 isowatari: IHNN氏発案
+numcity: パズル通信ニコリ vol.175より
+blindrush: パズル通信ニコリ vol.162より

src-ui/res/history.en.yaml

@@ -122,6 +122,7 @@ skyscrapers: "Place a number in each cell.\n1. Numbers must be between 1 and N,
 castle: "Draw lines through orthogonally adjacent cells to form a loop.\n1. Lines cannot go through bold borders.\n2. White cells must be inside the loop, and black cells must be outside the loop.\n3. A number with an arrow indicates the number of line segments in that direction. Vertical arrows only count vertical lines, and horizontal arrows count horizontal lines."
 cbblock: "Draw lines over the dotted lines to divide the board into blocks.\n1. Each block must contain exactly two outlined regions.\n2. Two adjacent blocks cannot have the same shape, counting rotations and reflections as the same.\n3. Blocks cannot be rectangle- or square-shaped."
 chocona: "Shade some cells on the board.\n1. A group of orthogonally connected shaded cells is called a block. Each block must be a filled rectangle or square.\n2. Numbered regions must contain the indicated amount of shaded cells."
+cityspace: "Shade some cells on the board.\n1. Groups of orthogonally connected shaded cells must be 1xN rectangles, where N is at least 2.\n2. All unshaded cells on the board form an orthogonally connected area.\n3. Unshaded cells cannot form a loop. This includes 2x2 squares.\n4. Numbers cannot be shaded.\n5. Clues represent the total number of unshaded cells that can be seen in a straight line vertically or horizontally, including itself."
 cojun: "Place a number in each cell. Some numbers are given.\n1. Numbers must be between 1 and N, where N is the size of the region.\n2. Each region contains exactly one of each number.\n3. Two equal numbers cannot be orthogonally adjacent.\n4. Where two numbers within a region are stacked vertically, the number on top must always be larger."
 compass: "Draw lines over the dotted lines to divide the board into several blocks.\n 1. Each block contains exactly one cell with a compass.\n2. A number in a compass indicates how many cells belong to its region that are further in the indicated direction than the compass itself."
 country: "Draw lines through orthogonally adjacent cells to form a loop.\n1. The loop cannot branch off or cross itself.\n2. Every country must be visited exactly once.\n3. A number indicates how many cells inside the country are visited by the loop.\n4. Two adjacent cells separated by a border cannot both be unused by the loop."
@@ -346,3 +347,5 @@ narrow: "Draw lines along the dotted lines to divide the grid into regions.\n1.
 distopia: "Place some shapes from the bank into the grid. Shapes can be rotated or mirrored.\n1. A shape can be used no more than once. There cannot be shapes in the grid that aren't present in the bank.\n2. Two shapes cannot be orthogonally or diagonally adjacent.\n3. A number indicates the shortest distance to a shaded cell in the 4 cardinal directions, multiplied by the amount of directions where the distance is minimal.\n4. A cell with a clue cannot overlap a shape."
 kurarin: "Shade some cells on the board, and draw a single loop that goes through all remaining cells.\n1. The loop cannot branch off or cross itself.\n2. A black circle overlaps more shaded cells than unshaded cells.\n3. A white circle overlaps more unshaded cells than shaded cells.\n4. A gray circle overlaps an equal number of shaded and unshaded cells."
 uturns: "Draw lines to form pairs between gray circles.\n1. Lines cannot cross or overlap each other.\n2. Lines cannot go through black circles.\n3. The lines must visit all white circles.\n4. A line must turn exactly twice between two circles, and both turns must be in the same direction."
+numcity: "Place a positive number in every cell.\n1. Groups of identical numbers are called districts, and each outlined region is called a city. All identical numbers in each city must be connected.\n2. The largest district in each city is marked with a 1, the second-largest is marked with a 2, and so on. Districts in a city cannot have the same size.\n3. Identical numbers cannot be orthogonally adjacent across city borders."
+blindrush: "Draw lines to move every circle.\n1. A circle can be moved horizontally or vertically, but cannot make a turn.\n2. Movement lines cannot cross or overlap each other. Lines can also not go through the start- or endpoint of other circles.\n3. Connected groups of thick lines (excluding the grid edges) are called a wall. Every wall is crossed by a line exactly once.\n4. Every movement line stops directly in front of a wall or the edge of the grid.\n5. A number indicates how many walls the circle must move through before stopping."