Add Elastic Link

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?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>
   <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>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -261,7 +261,8 @@ ui.keypopup = {
 		golemgrad: [10, 0],
 		topo: [10, 10],
 		soulmates: [10, 10],
-		landmeasure: [10, 0]
+		landmeasure: [10, 0],
+		elasticlink: [10, 0]
 	},
 
 	//---------------------------------------------------------------------------
@@ -526,6 +527,9 @@ ui.keypopup = {
 		if (pid === "familyphoto") {
 			itemlist.push(["q", "●"]);
 		}
+		if (pid === "elasticlink") {
+			itemlist.push(["q", "○"]);
+		}
 		if (
 			pid === "icelom" ||
 			pid === "icelom2" ||

src-ui/list.html

@@ -239,6 +239,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="wataridori"></li>
     <li data-pid="uturns"></li>
     <li data-pid="golemgrad"></li>
+    <li data-pid="elasticlink"></li>
    </ul>
   </div>
   <div class="lists lines">

src/pzpr/variety.js

@@ -161,6 +161,7 @@
 			doubleback: [0, 0, "Double Back", "Double Back", "country"],
 			easyasabc: [0, 0, "ABCプレース", "Easy as ABC"],
 			edamame: [0, 0, "Edamame", "Edamame", "kaidan"],
+			elasticlink: [0, 0, "Elastic Link", "Elastic Link"],
 			energywalk: [0, 0, "Energy Walk", "Energy Walk", "icewalk"],
 			evolmino: [0, 0, "シンカミノ", "Evolmino"],
 			factors: [0, 0, "因子の部屋", "Rooms of Factors"],

src/res/failcode.en.json

@@ -565,6 +565,7 @@
     "laLenNe": "The length of a line is wrong.",
     "laLoop": "A line forms a loop.",
     "laMoveOver.herugolf": "You make a bogey or more.",
+    "laNoCurve": "A line doesn't turn.",
     "laOnBorder": "There is a line across a border.",
     "laOnHole.herugolf": "A line goes through a hole.",
     "laOnIce.oyakodori": "A line goes through a nest cell.",
@@ -668,6 +669,7 @@
     "lnLengthGt3": "A line is longer than 3 cells.",
     "lnLengthLt.pencils": "A line is shorter than the connected pencil.",
     "lnLengthLt3": "A line is shorter than 3 cells.",
+    "lnLengthNe.elasticlink": "A number doesn't overlap a segment of the correct length.",
     "lnLengthNe3.wittgen": "A block does not cover exactly 3 cells.",
     "lnLenLt.anglers": "A line is shorter than the number.",
     "lnLenLt.reflect": "The lines passing a triangle are too short.",
@@ -833,6 +835,7 @@
     "nmMoveNe.tren": "A block cannot move in the correct number of spaces.",
     "nmNoLine.amibo": "No bar connects to a white circle.",
     "nmNoLine.coffeemilk": "A white or black circle doesn't have a line.",
+    "nmNoLine.elasticlink": "A number or circle doesn't have a line.",
     "nmNoLine.firefly": "There is a lonely firefly.",
     "nmNoLine.ichimaga": "A circle doesn't start any line.",
     "nmNoLine.kusabi": "A circle is not connected to another object.",
@@ -946,6 +949,7 @@
     "routeLenLoop": "The route does not contain a loop.",
     "routeIgnoreCP.nurimaze": "There is a circle out of the shortest route from S to G.",
     "routePassDeadEnd.nurimaze": "There is a triangle on the shortest route from S to G.",
+    "segAlternate": "Two connected segments don't have a length difference of exactly 1.",
     "segBlackEq.balance": "Segments through a black circle are equal.",
     "segDiff.geradeweg": "Segments have different length.",
     "segLong.balance": "A segment is too long.",

src/variety-common/Answer.js

@@ -448,6 +448,23 @@ pzpr.classmgr.makeCommon({
 			}
 		},
 
+		checkLoop: function() {
+			var paths = this.board.linegraph.components;
+			for (var r = 0; r < paths.length; r++) {
+				var path = paths[r];
+				if (path.circuits === 0) {
+					continue;
+				}
+
+				this.failcode.add("laLoop");
+				if (this.checkOnly) {
+					break;
+				}
+				this.board.border.setnoerr();
+				path.setedgeerr(1);
+			}
+		},
+
 		//---------------------------------------------------------------------------
 		// ans.checkConnectLineCount() ○などがないセルから出ている線の本数について判定する
 		//---------------------------------------------------------------------------

src/variety/country.js

@@ -1858,25 +1858,6 @@
 				return cell1.lcnt === 1 && cell2.lcnt === 1;
 			}, "lnDeadEndAround");
 		},
-		checkLoop: function() {
-			var bd = this.board;
-			var paths = bd.linegraph.components;
-			for (var r = 0; r < paths.length; r++) {
-				if (
-					paths[r].clist.some(function(cell) {
-						return cell.lcnt !== 2;
-					})
-				) {
-					continue;
-				}
-				this.failcode.add("laLoop");
-				if (this.checkOnly) {
-					break;
-				}
-				this.board.border.setnoerr();
-				paths[r].setedgeerr(1);
-			}
-		},
 		checkLinesInRoom: function() {
 			var bd = this.board;
 			var paths = bd.linegraph.components;