Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src-ui/changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -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?balancelink" target="_parent">Balance Link バランスリンク</a></li>
<li><a href="/p?heyajirimisaki" target="_parent">Heyajirimisaki へやジリみさき</a></li>
<li><a href="/p?jatahoku" target="_parent">JaTaHoKu</a></li>
<li><a href="/p?seiza" target="_parent">Seiza 星座になれたら</a></li>
<li><a href="/p?lring" target="_parent">L-Ring えるりんぐ</a></li>
<li><a href="/p?gravel" target="_parent">Gravel</a></li>
<li><a href="/p?scrabble" target="_parent">Scrabble</a></li>
<li><a href="/p?vertigo" target="_parent">Vertigo</a></li>
</ul>
</main>
</body>
Binary file added src-ui/img/balancelink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 19 additions & 1 deletion src-ui/js/ui/KeyPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,8 @@ ui.keypopup = {
slovak: [136, 10],
gravel: [120, 0],
seiza: [4, 0],
heyajirimisaki: [10, 0]
heyajirimisaki: [10, 0],
balancelink: [139, 0]
},

//---------------------------------------------------------------------------
Expand Down Expand Up @@ -445,6 +446,8 @@ ui.keypopup = {
this.generate_mrokmrno(mode);
} else if (type === 138) {
this.generate_jatahoku();
} else if (type === 139) {
this.generate_balancelink();
} else if (type === 5339) {
this.generate_swslither();
}
Expand Down Expand Up @@ -855,6 +858,21 @@ ui.keypopup = {
4
);
},
generate_balancelink: function() {
this.generate_main(
[
["1", { text: "●" }],
["2", { text: "◆" }],
["3", { text: "▲" }],
["4", { text: "■" }],
["5", { text: "★" }],
["6", { text: "▼" }],
["-", { text: "?" }],
" "
],
3
);
},
generate_bdwalk: function() {
this.generate_main(
[
Expand Down
1 change: 1 addition & 0 deletions src-ui/js/ui/Misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ function toBGimage(pid) {
"araf",
"archipelago",
"balance",
"balancelink",
"balloon",
"batten",
"battleship",
Expand Down
1 change: 1 addition & 0 deletions src-ui/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
<li data-pid="uturns"></li>
<li data-pid="golemgrad"></li>
<li data-pid="elasticlink"></li>
<li data-pid="balancelink"></li>
</ul>
</div>
<div class="lists lines">
Expand Down
1 change: 1 addition & 0 deletions src/pzpr/variety.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
arukone: [0, 0, "アルコネ", "Arukone", "numlin"],
ayeheya: [0, 1, "∀人∃HEYA", "Ayeheya", "heyawake"],
balance: [0, 0, "Balance Loop", "Balance Loop"],
balancelink: [0, 0, "バランスリンク", "Balance Link"],
balloon: [0, 0, "風船箱", "Balloon Box"],
barns: [1, 0, "バーンズ", "Barns"],
batten: [0, 0, "Battenberg Painting", "Battenberg Painting"],
Expand Down
6 changes: 6 additions & 0 deletions src/res/failcode.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@
"lcInvDirW.firefly": "Fireflies are connected without a line starting from point.",
"lcInvWhite.wblink": "Two white circles are connected.",
"lcIsolate.arukone": "A line doesn't connect any alphabet.",
"lcIsolate.balancelink": "A line doesn't connect to any symbol.",
"lcIsolate.balloon": "A string doesn't connect to any number.",
"lcIsolate.kusabi": "A line isn't connected to any circle.",
"lcIsolate.uturns": "A line doesn't connect two gray circles.",
Expand All @@ -632,12 +633,14 @@
"lcLenInvNe.kusabi": "The legs of a U have different lengths.",
"lcNotKusabi.kusabi": "A line is not U-shaped.",
"lcOnNum.anglers": "A line goes through a symbol.",
"lcOnNum.balancelink": "A line goes through a symbol.",
"lcOnNum.arukone": "A line goes through an alphabet.",
"lcOnNum.kusabi": "A line goes through a circle.",
"lcOnNum.uturns": "A line goes through a gray circle.",
"lcOnNum": "A line goes through a number.",
"lcSameNum.ichimaga": "Same numbers are connected each other.",
"lcTripleNum.arukone": "Three or more alphabets are connected.",
"lcTripleNum.balancelink": "Three or more symbols are connected.",
"lcTripleNum.kusabi": "Three or more objects are connected.",
"lcTripleNum.wblink": "Three or more objects are connected.",
"lcTripleNum": "Three or more numbers are connected.",
Expand Down Expand Up @@ -707,6 +710,7 @@
"lnNoTip.pencils": "A line is not connected to a pencil tip.",
"lnNotRect.nagenawa": "There is a non-rectangle loop.",
"lnNotSq.tajmahal": "A segment doesn't form a square.",
"lnNotSymm.balancelink": "A line is not symmetrical.",
"lcNotUTurns.uturns": "A line does not turn twice in the same direction between circles.",
"lcNotUTurns.vertigo": "A line turns in the wrong direction.",
"lnOnCenter.midloop": "A circle is not the center point of a line.",
Expand Down Expand Up @@ -791,6 +795,7 @@
"nmCircleNe.slovak": "The amount of circles is not equal to the amount of numbers in the surrounding cells.",
"nmConnBarWrong": "The number of lines connected to a shaded cell is wrong.",
"nmConnDiff.arukone": "Different alphabets are connected.",
"nmConnDiff.balancelink": "Different symbols are connected.",
"nmConnDiff.kouchoku": "Different letters are connected directly.",
"nmConnDiff.numlin": "Different numbers are connected.",
"nmConnected.bonsan": "There are connected circles.",
Expand Down Expand Up @@ -858,6 +863,7 @@
"nmMixed.aquapelago": "A group contains different numbers.",
"nmMoveNe.tren": "A block cannot move in the correct number of spaces.",
"nmNoLine.amibo": "No bar connects to a white circle.",
"nmNoLine.balancelink": "A symbol doesn't have a line.",
"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.",
Expand Down
37 changes: 10 additions & 27 deletions src/variety-common/Graphic.js
Original file line number Diff line number Diff line change
Expand Up @@ -2300,39 +2300,22 @@ pzpr.classmgr.makeCommon({
}
},

fillStar: function(g, px, py, sizeX, sizeY) {
// 星を描画するときの頂点の位置
var starXOffset = [
0,
0.235,
0.95,
0.38,
0.588,
0,
-0.588,
-0.38,
-0.95,
-0.235
];
var starYOffset = [
-1,
-0.309,
-0.309,
0.124,
0.809,
0.4,
0.809,
0.124,
-0.309,
-0.309
];
pathStar: function(g, px, py, sizeX, sizeY, factor) {
if (!factor) {
factor = 0.38;
}

g.beginPath();
g.moveTo(px, py - sizeY);
for (var p = 1; p < 10; p++) {
g.lineTo(px + sizeX * starXOffset[p], py + sizeY * starYOffset[p]);
var starY = Math.cos(p * Math.PI * 0.2) * (p & 1 ? factor : 1),
starX = Math.sin(p * Math.PI * 0.2) * (p & 1 ? factor : 1);
g.lineTo(px + sizeX * starX, py + sizeY * -starY);
}
g.closePath();
},
fillStar: function(g, px, py, sizeX, sizeY, factor) {
this.pathStar(g, px, py, sizeX, sizeY, factor);
g.fill();
},

Expand Down
Loading
Loading