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
4 changes: 2 additions & 2 deletions 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?slovak" target="_parent">Slovak Sums</a></li>
<li><a href="/p?anymino" target="_parent">Anymino</a></li>
<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>
</ul>
</main>
</body>
15 changes: 14 additions & 1 deletion src-ui/js/ui/KeyPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@ ui.keypopup = {
topo: [10, 10],
soulmates: [10, 10],
landmeasure: [10, 0],
elasticlink: [10, 0]
elasticlink: [10, 0],
slovak: [136, 10]
},

//---------------------------------------------------------------------------
Expand Down Expand Up @@ -425,6 +426,8 @@ ui.keypopup = {
this.generate_narrowfence(mode);
} else if (type === 135) {
this.generate_ubahn(mode);
} else if (type === 136) {
this.generate_slovak(mode);
} else if (type === 5339) {
this.generate_swslither();
}
Expand Down Expand Up @@ -789,6 +792,16 @@ ui.keypopup = {
5
);
},
generate_slovak: function() {
var itemlist = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", " "];
itemlist.push(["-", "?"]);
itemlist.push(["q", "⠐"]);
itemlist.push(["w", "⠒"]);
itemlist.push(["e", "…"]);
itemlist.push(["r", "⸬"]);

this.generate_main(itemlist, 4);
},
generate_interbd: function() {
this.generate_main(
[
Expand Down
1 change: 1 addition & 0 deletions src-ui/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ <h2 id="title"><span lang="ja">パズルの種類のリスト</span><span lang="
<li data-pid="simplegako"></li>
<li data-pid="japanesesums"></li>
<li data-pid="soulmates"></li>
<li data-pid="slovak"></li>
</ul>
</div>
<div class="lists numbers">
Expand Down
3 changes: 1 addition & 2 deletions src/puzzle/Graphic.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,7 @@
// pc.resetRange() rangeオブジェクトを初期化する
//---------------------------------------------------------------------------
prepaint: function() {
var hasIndicator =
this.pid === "starbattle" || this.pid === "isowatari";
var hasIndicator = this.puzzle.cursor.hasIndicator;
if (this.suspended || !this.context) {
return;
}
Expand Down
10 changes: 4 additions & 6 deletions src/puzzle/KeyInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,17 +324,16 @@ pzpr.classmgr.makeCommon({
},
moveTC: function(ca, mv) {
var cursor = this.cursor,
editmode = this.puzzle.editmode,
pos0 = cursor.getaddr(),
flag = true,
dir = cursor.NDIR;

var hasIndicator = this.pid === "easyasabc" || this.pid === "isowatari";

switch (ca) {
case "up":
if (
(hasIndicator && cursor.by === cursor.miny) ||
cursor.by - mv >= cursor.miny
cursor.by - mv >= cursor.miny ||
(editmode && cursor.hasIndicator && cursor.by === cursor.miny)
) {
dir = cursor.UP;
}
Expand Down Expand Up @@ -622,12 +621,11 @@ pzpr.classmgr.makeCommon({
// tc.setaddr() ターゲットの位置をAddressクラス等のオブジェクトで設定する
//---------------------------------------------------------------------------
setaddr: function(pos) {
var hasIndicator = this.pid === "easyasabc" || this.pid === "isowatari";
/* Address, Cellなどのオブジェクトいずれを入力しても良い */
if (
pos.bx < this.minx ||
this.maxx < pos.bx ||
pos.by < this.miny - (hasIndicator ? 2 : 0) ||
pos.by < this.miny - (this.hasIndicator ? 2 : 0) ||
this.maxy < pos.by
) {
return;
Expand Down
1 change: 1 addition & 0 deletions src/pzpr/variety.js
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@
"",
{ kanpen: "slitherlink" }
],
slovak: [0, 0, "Slovak Sums", "Slovak Sums"],
smullyan: [0, 0, "Smullyanic Dynasty", "Smullyanic Dynasty", "context"],
snake: [0, 0, "Snake", "Snake"],
snakeegg: [0, 0, "Snake Egg", "Snake Egg"],
Expand Down
4 changes: 3 additions & 1 deletion src/res/failcode.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@
"nmBranch.snakepit": "A snake branches off.",
"nmCircleNe.brownies": "A number is not equal to the amount of circles in the surrounding cells.",
"nmCircleNe.crossstitch": "A circled number is not equal to the amount of corners used by a loop.",
"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.kouchoku": "Different letters are connected directly.",
Expand Down Expand Up @@ -832,6 +833,7 @@
"nmMissing.lohkous": "There is no segment of the given length in the room.",
"nmMissRow.alter": "A row or column has less than two symbols.",
"nmMissRow.easyasabc": "There are missing letters in a row or column.",
"nmMissRow.slovak": "There are missing numbers in a row or column.",
"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.",
Expand Down Expand Up @@ -933,7 +935,7 @@
"nmVertexNe.vslither": "The number is not equal to the number of visited vertices around it.",
"nonCirclePromontory.kurodoko": "A dead end has no circle.",
"nqAroundDup.kakuru": "There are same numbers around the pre-numbered cell.",
"nqAroundSumNe.kakuru": "A sum of numbers around the pre-numbered cell is incorrect.",
"nqAroundSumNe": "A sum of numbers around the pre-numbered cell is incorrect.",
"numNoLine": "A number has no line.",
"objShaded.nurimaze": "An object is shaded.",
"objShaded.tilecity": "A number is shaded.",
Expand Down
2 changes: 1 addition & 1 deletion src/res/failcode.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@
"nmUnpass.icebarn": "通過していない数字があります。",
"nonCirclePromontory.kurodoko": "丸のないマスが岬になっています。",
"nqAroundDup.kakuru": "初めから出ている数字の周りに同じ数字が入っています。",
"nqAroundSumNe.kakuru": "初めから出ている数字の周りに入る数の合計が正しくありません。",
"nqAroundSumNe": "初めから出ている数字の周りに入る数の合計が正しくありません。",
"numNoLine": "線の通っていない数字があります。",
"objShaded.nurimaze": "オブジェクトが黒マスになっています。",
"pairedLetterNe.kinkonkan": "光が同じ文字の場所へ到達しません。",
Expand Down
2 changes: 2 additions & 0 deletions src/variety/easyasabc.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
},

TargetCursor: {
hasIndicator: true,

draw: function() {
if (this.by >= this.board.minby) {
this.common.draw.call(this);
Expand Down
2 changes: 2 additions & 0 deletions src/variety/isowatari.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
},

TargetCursor: {
hasIndicator: true,

draw: function() {
if (this.by >= this.board.minby) {
this.common.draw.call(this);
Expand Down
Loading
Loading