Add Fire Walk

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?firewalk" target="_parent">Fire Walk</a></li>
   <li><a href="/p?batten" target="_parent">Battenberg Painting</a></li>
   <li><a href="/p?zabajaba" target="_parent">Zabajaba</a></li>
   <li><a href="/p?curving" target="_parent">Curving Road カービングロード</a></li>
   <li><a href="/p?sananko" target="_parent">San-Anko サンアンコー</a></li>
   <li><a href="/p?bosnianroad" target="_parent">Bosnian Road</a></li>
   <li><a href="/p?kuromenbun" target="_parent">Kuromenbun クロメンブン</a></li>
-  <li><a href="/p?portal" target="_parent">Portal Loop</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -203,7 +203,8 @@ ui.keypopup = {
 		bosnianroad: [80, 0],
 		sananko: [10, 113],
 		zabajaba: [80, 0],
-		batten: [10, 0]
+		batten: [10, 0],
+		firewalk: [10, 0]
 	},
 
 	//---------------------------------------------------------------------------
@@ -465,13 +466,19 @@ ui.keypopup = {
 			pid === "icelom2" ||
 			pid === "icewalk" ||
 			pid === "waterwalk" ||
+			pid === "firewalk" ||
 			pid === "dbchoco"
 		) {
 			itemlist.push([
 				"q",
 				{
 					text: "■",
-					color: pid === "dbchoco" ? "rgb(204,204,204)" : "rgb(192,224,255)"
+					color:
+						pid === "dbchoco"
+							? "rgb(204,204,204)"
+							: pid === "firewalk"
+							? "rgb(255,192,192)"
+							: "rgb(192,224,255)"
 				}
 			]);
 		}

src-ui/js/ui/Misc.js

@@ -137,6 +137,7 @@ function toBGimage(pid) {
 		"doubleback",
 		"easyasabc",
 		"evolmino",
+		"firewalk",
 		"geradeweg",
 		"heteromino",
 		"heyapin",

src-ui/list.html

@@ -157,6 +157,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="lixloop"></li>
     <li data-pid="portal"></li>
     <li data-pid="bosnianroad"></li>
+    <li data-pid="firewalk"></li>
    </ul>
   </div>
   <div class="lists loops">

src-ui/p.html

@@ -156,6 +156,7 @@ <h2 id="title2">読み込み中です...</h2>
       <div class="child" data-value="empty">__inputmode.empty__</div>
       <div class="child" data-value="ice">__inputmode.ice__</div>
       <div class="child" data-value="water">__inputmode.water__</div>
+      <div class="child" data-value="fire">__inputmode.fire__</div>
       <div class="child" data-value="nabe">__inputmode.nabe__</div>
       <div class="child" data-value="box">__inputmode.box__</div>
       <div class="child" data-value="pin">__inputmode.pin__</div>

src-ui/res/p.en.json

@@ -104,6 +104,7 @@
     "inputmode.empty": "Invalid cells",
     "inputmode.ice": "Icebarns",
     "inputmode.water": "Water hazard",
+    "inputmode.fire": "Fire",
     "inputmode.nabe": "Crocks",
     "inputmode.box": "Boxes",
     "inputmode.pin": "Pins",

src/puzzle/LineManager.js

@@ -248,6 +248,10 @@ pzpr.classmgr.makeCommon({
 		// linegraph.createNodeIfEmpty()  指定されたオブジェクトの場所にNodeを生成する
 		// linegraph.deleteNodeIfEmpty()  指定されたオブジェクトの場所からNodeを除去する
 		//---------------------------------------------------------------------------
+		usesSecondNode: function(cell, other) {
+			return cell.getvert(other, 2);
+		},
+
 		createNodeIfEmpty: function(cell) {
 			var nodes = this.getObjNodeList(cell);
 
@@ -265,8 +269,8 @@ pzpr.classmgr.makeCommon({
 				// 上下/左右の線が1本ずつだった場合は左右の線をnodes[1]に付加し直します
 				var nbnodes = nodes[0].nodes;
 				var isvert = [
-					cell.getvert(nbnodes[0].obj, 2),
-					cell.getvert(nbnodes[1].obj, 2)
+					this.usesSecondNode(cell, nbnodes[0].obj),
+					this.usesSecondNode(cell, nbnodes[1].obj)
 				];
 				if (isvert[0] !== isvert[1]) {
 					// breaking up a corner; we create two new nodes to ensure

src/pzpr/variety.js

@@ -159,6 +159,7 @@
 				{ kanpen2: "fillomino01" }
 			],
 			firefly: [1, 0, "ホタルビーム", "Hotaru Beam"],
+			firewalk: [1, 0, "Fire Walk", "Fire Walk", "icewalk"],
 			fivecells: [0, 0, "ファイブセルズ", "FiveCells", "nawabari"],
 			fourcells: [0, 0, "フォーセルズ", "FourCells", "nawabari"],
 			fracdiv: [0, 0, "分数分割", "Fractional Division"],

src/res/failcode.en.json

@@ -499,6 +499,7 @@
     "lcCurveNe.firefly": "The number of curves is different from a firefly's number.",
     "lcDeadEnd": "There is a dead-end line.",
     "lcDivided": "All lines and numbers are not connected to each other.",
+    "lnDoubleTurn.firewalk": "A cell with double turns has its center outside of the loop.",
     "lcGrayGt.coffeemilk": "A group has more than one gray circle.",
     "lcInvalid.coffeemilk": "A white and black circle are connected directly.",
     "lcInvalid.kusabi": "The types of connected circles don't match.",
@@ -588,6 +589,7 @@
     "lnRightAngle.kouchoku": "Segments don't intersect at a right angle.",
     "lnSnLine.lither": "There is only one tree.",
     "lnStarNe.starbattle": "The number of stars in a line is wrong.",
+    "lnStraightOnIce.firewalk": "A line goes straight through fire.",
     "lnWrongAngle.kouchoku": "Some segments meet at the wrong angle.",
     "lookairBC.lookair": "Two squares of the same size can see each other.",
     "lpNoNum.onsen": "A loop has no numbers.",