Add Edamame

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?edamame" target="_parent">Edamame</a></li>
   <li><a href="/p?marutaring" target="_parent">Marutaring マルタリング</a></li>
   <li><a href="/p?heavydots" target="_parent">Heavy Dots</a></li>
   <li><a href="/p?bhaibahan" target="_parent">Bhai Bahan</a></li>
   <li><a href="/p?oasis" target="_parent">Oasis</a></li>
   <li><a href="/p?circuitwalk" target="_parent">Circuit Walk</a></li>
   <li><a href="/p?cornerch" target="_parent">Corner Chain 隅角チェーン</a></li>
-  <li><a href="/p?sendai" target="_parent">Sendai-Miyagi 宮城県仙台市</a></li>
 </ul>
 </main>
 </body>

src-ui/js/ui/KeyPopup.js

@@ -246,6 +246,7 @@ ui.keypopup = {
 		keywest: [4, 4],
 		oasis: [10, 0],
 		bhaibahan: [10, 0],
+		edamame: [4, 0],
 		heavydots: [10, 0],
 		marutaring: [10, 0]
 	},

src-ui/js/ui/Misc.js

@@ -143,6 +143,7 @@ function toBGimage(pid) {
 		"dotchi2",
 		"doubleback",
 		"easyasabc",
+		"edamame",
 		"energywalk",
 		"evolmino",
 		"fakearrow",

src-ui/list.html

@@ -413,6 +413,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
     <li data-pid="yajirushi2"></li>
     <li data-pid="arrowflow"></li>
     <li data-pid="distopia"></li>
+    <li data-pid="edamame"></li>
    </ul>
   </div>
   <div class="lists others">

src/puzzle/MouseInput.js

@@ -442,7 +442,7 @@ pzpr.classmgr.makeCommon({
 				this.savedInputMode[this.puzzle.editmode ? "edit" : "play"] = mode;
 				this.puzzle.redraw();
 			} else {
-				throw Error("Invalid input mode :" + mode);
+				throw Error("Invalid input mode: " + mode);
 			}
 		},
 		getInputModeList: function(type) {

src/pzpr/variety.js

@@ -158,6 +158,7 @@
 			dotchi2: [0, 0, "ドッチドッチループ", "Dotchi Dotchi Loop", "country"],
 			doubleback: [0, 0, "Double Back", "Double Back", "country"],
 			easyasabc: [0, 0, "ABCプレース", "Easy as ABC"],
+			edamame: [0, 0, "Edamame", "Edamame", "kaidan"],
 			energywalk: [0, 0, "Energy Walk", "Energy Walk", "icewalk"],
 			evolmino: [0, 0, "シンカミノ", "Evolmino"],
 			factors: [0, 0, "因子の部屋", "Rooms of Factors"],

src/res/failcode.en.json

@@ -447,6 +447,7 @@
     "csDivide.shugaku": "The aisle is divided.",
     "csDivide": "The shaded cells are divided.",
     "csDivide8.mochikoro": "The unshaded cells are divided.",
+    "csGt1.edamame": "A rectangle has more than one circle in the middle.",
     "csGt1.nothree": "A dot overlaps more than one shaded cell.",
     "csGt1.sumiwake": "A circle overlaps more than one shaded cell.",
     "csGt1.takoyaki": "A line has more than one circle in the middle.",
@@ -455,6 +456,7 @@
     "csGtLimit.kissing": "Two blocks are adjacent in an invalid location.",
     "csGtN.isowatari": "The size of a mass of shaded cells is greater than the indicated number.",
     "csLoop.parquet": "There is a loop of shaded cells.",
+    "csLt1.edamame": "A rectangle has no circle in the middle.",
     "csLt1.nothree": "A dot doesn't overlap a shaded cell.",
     "csLt1.sumiwake": "A circle doesn't overlap a shaded cell.",
     "csLt1.takoyaki": "A line has no circle in the middle.",
@@ -468,6 +470,7 @@
     "csNoSupport.aquarium": "A water cell is next to or above an empty cell.",
     "csNotBottom.dosufuwa": "An iron ball is not on the bottom of the row or on another iron ball.",
     "csNotOnShade.tawa": "There are no shaded cells under a shaded cell.",
+    "csNotOnLine.edamame": "A circle is not inside a rectangle.",
     "csNotRect": "A mass of shaded cells is not rectangle.",
     "csNotSquare": "A group of shaded cells is not a square.",
     "csOnArrow": "A cell with a clue is shaded.",
@@ -485,6 +488,7 @@
     "cuDivide.wittgen": "The cells not used by rectangles are divided.",
     "cuDivide": "The unshaded cells are divided.",
     "cuDivideRB": "The unshaded cells are divided.",
+    "cuEndpoint.edamame": "The corner of a rectangle does not have a circle.",
     "cuEndpoint.takoyaki": "An endpoint does not have a circle.",
     "cuLt2.sansaroad": "An empty cell is adjacent to less than 2 unshaded cells.",
     "cuLt3.sansaroad": "A triangle is adjacent to less than 3 unshaded cells.",

src/variety-common/MouseInput.js

@@ -357,9 +357,9 @@ pzpr.classmgr.makeCommon({
 			}
 			if (this.inputData !== null) {
 			} else if (this.inputMode === "bgcolor1") {
-				this.inputMode = cell.qsub !== 1 ? 11 : 10;
+				this.inputData = cell.qsub !== 1 ? 11 : 10;
 			} else if (this.inputMode === "bgcolor2") {
-				this.inputMode = cell.qsub !== 2 ? 12 : 10;
+				this.inputData = cell.qsub !== 2 ? 12 : 10;
 			} else if (this.btn === "left") {
 				if (cell.qsub === 0) {
 					this.inputData = 11;