From d150bfb030680f69ec5ca85a144001fdb34c5bfb Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 17:51:09 +0100 Subject: [PATCH 01/24] shakashaka: Don't overdraw triangles (fixes alignment with shaded cells) --- Changelog.md | 1 + src/variety-common/Graphic.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a9d8cec6a..febac7c3b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -40,6 +40,7 @@ * doubleback: Save empty cells to file. * kurochute: Fix error highlighting. * renban: Fix consecutive number error check. +* shakashaka: Fix alignment of triangles to shaded cells. * triplace: Don't allow drawing on clues. * walllogic: Fix redraw with autocompletion. * yajilin: Fix interaction between edit mode and answer. diff --git a/src/variety-common/Graphic.js b/src/variety-common/Graphic.js index a37c67dc2..6152be760 100644 --- a/src/variety-common/Graphic.js +++ b/src/variety-common/Graphic.js @@ -1327,7 +1327,7 @@ pzpr.classmgr.makeCommon({ }, drawTriangle1: function(px, py, num) { var g = this.context; - var mgn = this.pid === "reflect" ? 1 : 0, + var mgn = this.pid === "reflect" ? 1 : 0.5, bw = this.bw + 1 - mgn, bh = this.bh + 1 - mgn; g.beginPath(); From e887c6e398c959fc4333e0dfc26076d2302a2eba Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 17:59:48 +0100 Subject: [PATCH 02/24] kinkonkan: reword error messages --- src/variety/kinkonkan.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/variety/kinkonkan.js b/src/variety/kinkonkan.js index 77eea2151..b82dce61c 100644 --- a/src/variety/kinkonkan.js +++ b/src/variety/kinkonkan.js @@ -757,15 +757,15 @@ bkNoObj: ["斜線の引かれていない部屋があります。", "A room has no mirrors."], bkObjGe2: [ "斜線が複数引かれた部屋があります。", - "A room has plural mirrors." + "A room has more than one mirror." ], pairedLetterNe: [ "光が同じ文字の場所へ到達しません。", - "Beam from a light doesn't reach one's pair." + "Beam from a light doesn't reach its pair." ], pairedNumberNe: [ "光の反射回数が正しくありません。", - "The count of refrection is wrong." + "The number of reflections is wrong." ] } }); From bc5eb781cad8418688f607a1aace01d5c5e02679 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:02:14 +0100 Subject: [PATCH 03/24] onsen: reword error messages --- src/variety/country.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/variety/country.js b/src/variety/country.js index d83a86efc..77a033936 100644 --- a/src/variety/country.js +++ b/src/variety/country.js @@ -1034,24 +1034,24 @@ "FailCode@onsen": { blPassTwice: [ "ある線が１つの部屋を２回以上通っています。", - "A line passes a room twice or more." + "A line passes a room more than once." ], blLineNe: [ "線が通過するマスの数が数字と違います。", - "The Length of the path in a room is different from the number of the loop." + "The length of the path in a room is different from the number of the loop." ], blLineDiff: [ "各部屋で線が通過するマスの数が違います。", - "The Length of the path in a room is different in each room." + "The length of the path in a room is different in some rooms." ], bkNoLine: ["線の通っていない部屋があります。", "A room remains blank."], lnIsolate: [ "線の通っていない○があります。", - "Lines doesn't pass a circle." + "A circle doesn't have a line." ], lpNumGt2: [ "数字が2つ以上含まれたループがあります。", - "A loop has plural numbers." + "A loop has more than one number." ], lpNoNum: ["○を含んでいないループがあります。", "A loop has no numbers."] }, From 4f17cfaa1d5804dcae6c295211787d9695e3a40a Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:03:18 +0100 Subject: [PATCH 04/24] hanare: reword error messages --- src/variety/hanare.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/variety/hanare.js b/src/variety/hanare.js index d480454f6..c1c0f676a 100644 --- a/src/variety/hanare.js +++ b/src/variety/hanare.js @@ -273,7 +273,7 @@ bkNoNum: ["数字の入っていない部屋があります。", "A room has no numbers."], bkNumGe2: [ "1つの部屋に2つ以上の数字が入っています。", - "A room has plural numbers." + "A room has more than one number." ], bkSizeNe: [ "数字と部屋の大きさが違います。", @@ -281,7 +281,7 @@ ], nmDiffDistNe: [ "２つの数字の差とその間隔が正しくありません。", - "The distance of the paired numbers is not equal to the diff of them." + "The distance of the paired numbers is not equal to their difference." ] } }); From 8ee71e3850a83047492b2e6afadd8fc6c40a6edc Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:11:05 +0100 Subject: [PATCH 05/24] hakoiri: reword error messages --- src/variety/hakoiri.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/variety/hakoiri.js b/src/variety/hakoiri.js index 679bffe4c..d2b1a9ccb 100644 --- a/src/variety/hakoiri.js +++ b/src/variety/hakoiri.js @@ -316,23 +316,23 @@ FailCode: { bkDupNum: [ "1つのハコに同じ記号が複数入っています。", - "A box has same plural marks." + "A box has duplicate shapes." ], bkNumGt3: [ "1つのハコに4つ以上の記号が入っています。", - "A box has four or more marks." + "A box has more than three shapes." ], bkNumLt3: [ "1つのハコに2つ以下の記号しか入っていません。", - "A box has tow or less marks." + "A box has less than three shapes." ], nmDivide: [ "タテヨコにつながっていない記号があります。", - "Marks are divided." + "The shapes are divided." ], nmAround: [ "同じ記号がタテヨコナナメに隣接しています。", - "Same marks are adjacent." + "Equal shapes touch." ] } }); From 11ea7a28020e1864ad7826056a5a5fd6a728332d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:17:34 +0100 Subject: [PATCH 06/24] fillmat, usotatami: reword error messages --- src/variety/fillmat.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/variety/fillmat.js b/src/variety/fillmat.js index 8d1d946b4..1210bb76f 100644 --- a/src/variety/fillmat.js +++ b/src/variety/fillmat.js @@ -178,23 +178,23 @@ ], bkNumGe2: [ "1つのタタミに2つ以上の数字が入っています。", - "A tatami has plural numbers." + "A tatami has more than one number." ], bkSizeNe: [ "数字とタタミの大きさが違います。", - "The size of tatami and the number written in Tatami is different." + "The number is different from the size of the tatami." ], bkSizeEq: [ "数字とタタミの大きさが同じです。", - "The size of tatami and the number is the same." + "The number is equal to the size of the tatami." ], bkLenGt4: [ "「幅１マス、長さ１～４マス」ではないタタミがあります。", - "The width of Tatami is over 1 or the length is over 4." + "The width of the tatami is more than one, or the length is more than four." ], bsSizeEq: [ "隣り合うタタミの大きさが同じです。", - "The same size Tatami are adjacent." + "Tatamis of the same size are adjacent." ] } }); From 9091b8b0cc13ea08f9f47d18fda7e7627b483dff Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:21:59 +0100 Subject: [PATCH 07/24] kaero, armyants: reword error messages --- src/variety/kaero.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/variety/kaero.js b/src/variety/kaero.js index 367f1ee50..d7bc957d9 100644 --- a/src/variety/kaero.js +++ b/src/variety/kaero.js @@ -549,15 +549,15 @@ "FailCode@kaero": { bkNoNum: [ "アルファベットのないブロックがあります。", - "A block has no letters." + "An area has no letters." ], bkPlNum: [ "１つのブロックに異なるアルファベットが入っています。", - "A block has plural kinds of letters." + "An area has more than one kind of letter." ], bkSepNum: [ "同じアルファベットが異なるブロックに入っています。", - "Same kinds of letters are placed different blocks." + "Letters of one kind are placed in different areas." ] }, "FailCode@armyants": { @@ -569,12 +569,14 @@ "線が境界線をまたいでいます。", "There is a line across a border." ], - bsAnt: ["別々のアリが接しています。", "Other ants are adjacent."], - bkWrongNum: ["アリの数字がおかしいです。", "Numbers on the ant is wrong."], + bsAnt: ["別々のアリが接しています。", "Two ants are adjacent."], + bkWrongNum: [ + "アリの数字がおかしいです。", + "The numbers on the ant are wrong." + ], ceNumGtSize: [ "数字がアリの大きさよりも大きいです。", "A number is greater than the size of the ant." - ], - nmBranch: ["アリが分岐しています。", "An ant could have branch."] + ] } }); From 01e671f412124eb927db00f94d4579742d90c2d4 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:22:12 +0100 Subject: [PATCH 08/24] roma: reword error message --- src/variety/roma.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/variety/roma.js b/src/variety/roma.js index 898331d0a..e46b6373a 100644 --- a/src/variety/roma.js +++ b/src/variety/roma.js @@ -338,7 +338,7 @@ FailCode: { bkDupNum: [ "1つの領域に2つ以上の同じ矢印が入っています。", - "An area has plural same arrows." + "An area has duplicate arrows." ], stopHalfway: [ "ゴールにたどり着かないセルがあります。", From 6e1d51f3e970d7ca985b81f4790e7182a7948b2a Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:26:14 +0100 Subject: [PATCH 09/24] chocona, stostone: reword error messages --- src/variety/shimaguni.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/variety/shimaguni.js b/src/variety/shimaguni.js index 85c036dfd..b96070a1b 100644 --- a/src/variety/shimaguni.js +++ b/src/variety/shimaguni.js @@ -488,11 +488,11 @@ "FailCode@shimaguni": { bkShadeNe: [ "海域内の数字と国のマス数が一致していません。", - "The number of shaded cells is not equals to the number." + "The number of shaded cells is not equal to the number." ], bkShadeDivide: [ "1つの海域に入る国が2つ以上に分裂しています。", - "Countries in one marine area are divided to plural ones." + "The shaded cells in a marine area are divided." ], bkNoShade: [ "黒マスのカタマリがない海域があります。", @@ -500,11 +500,11 @@ ], cbShade: [ "異なる海域にある国どうしが辺を共有しています。", - "Countries in other marine area share the side over border line." + "Countries in different marine areas are adjacent." ], bsEqShade: [ "隣り合う海域にある国の大きさが同じです。", - "The size of countries that there are in adjacent marine areas are the same." + "The sizes of countries that are in adjacent marine areas are the same." ] }, @@ -522,15 +522,15 @@ "FailCode@stostone": { cbShade: [ "異なる部屋にある黒マスどうしが辺を共有しています。", - "Shade cell blocks in other region are adjacent over border line." + "Shaded cells are adjacent over a border." ], csUpper: [ "ブロックを落とした後に黒マスが盤面の上半分に残っています。", - "Shaded cells are remained in upper half of the board after they are fallen." + "Shaded cells remain in the upper half of the board after the blocks have fallen." ], cuLower: [ "ブロックを落とした後の空間が盤面の下半分にあります。", - "Unshaded cells exist in lower half of the board after blocks are fallen." + "Unshaded cells exist in the lower half of the board after the blocks have fallen." ] } }); From faa2f42fa473b95c1cf05c4efc6c1582b11aaf64 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:28:23 +0100 Subject: [PATCH 10/24] hebi: reword error messages --- src/variety/hebi.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/variety/hebi.js b/src/variety/hebi.js index b22fe44c3..d922434a2 100644 --- a/src/variety/hebi.js +++ b/src/variety/hebi.js @@ -502,15 +502,15 @@ }, FailCode: { - bkDupNum: ["同じ数字が入っています。", "A Snake has same plural marks."], + bkDupNum: ["同じ数字が入っています。", "A snake has duplicate numbers."], bkSizeNe5: [ "大きさが５ではない蛇がいます。", "The size of a snake is not five." ], - bsSnake: ["別々の蛇が接しています。", "Other snakes are adjacent."], + bsSnake: ["別々の蛇が接しています。", "Different snakes are adjacent."], anNumberNe: [ "矢印の先にある数字が正しくありません。", - "There is a wrong number which is in front of the arrowed number." + "A clue points at the wrong number." ], snakeAttack: [ "蛇の視線の先に別の蛇がいます。", From 5711b7148d80a0c53271b3cdf7c27b51947901a3 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:28:56 +0100 Subject: [PATCH 11/24] toichika: reword error messages --- src/variety/toichika.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/variety/toichika.js b/src/variety/toichika.js index ec94094ce..8770fb25b 100644 --- a/src/variety/toichika.js +++ b/src/variety/toichika.js @@ -363,7 +363,7 @@ bkNoNum: ["国に矢印が入っていません。", "A country has no arrow."], bkNumGe2: [ "1つの国に2つ以上の矢印が入っています。", - "A country has plural arrows." + "A country has more than one arrow." ], arAdjPair: [ "辺を共有する国にペアとなる矢印が入っています。", @@ -371,7 +371,7 @@ ], arAlone: [ "矢印の先にペアとなる矢印がいません。", - "There is not paired arrow in the direction of an arrow." + "There is no paired arrow in the direction of an arrow." ] } }); From fee71e6930c7e5a55b95fc51a0eb6a2bbd7aa6d7 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:30:25 +0100 Subject: [PATCH 12/24] tateyoko: reword error messages --- src/variety/tateyoko.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/variety/tateyoko.js b/src/variety/tateyoko.js index be4499629..e9a7cccc0 100644 --- a/src/variety/tateyoko.js +++ b/src/variety/tateyoko.js @@ -374,10 +374,10 @@ }, checkBarOverNum: function() { - this.checkShade(1, "nmConnBarGt"); + this.checkShade(1, "nmConnBarWrong"); }, checkBarLessNum: function() { - this.checkShade(2, "nmConnBarLt"); + this.checkShade(2, "nmConnBarWrong"); }, checkShade: function(type, code) { var bd = this.board; @@ -450,17 +450,13 @@ ceNoBar: ["何も入っていないマスがあります。", "There is an empty cell."], bkSizeNe: [ "数字と棒の長さが違います。", - "The number is different from the length of line." + "The number is different from the length of the line." ], baPlNum: [ "1つの棒に2つ以上の数字が入っています。", - "A line passes plural numbers." + "A line passes more than one number." ], - nmConnBarGt: [ - "黒マスに繋がる線の数が正しくありません。", - "The number of lines connected to a shaded cell is wrong." - ], - nmConnBarLt: [ + nmConnBarWrong: [ "黒マスに繋がる線の数が正しくありません。", "The number of lines connected to a shaded cell is wrong." ] From 44f94c246ef24fb02f1fe8a80db021483b6b9379 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:31:33 +0100 Subject: [PATCH 13/24] nawabari: reword error message --- src/variety/nawabari.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/variety/nawabari.js b/src/variety/nawabari.js index 8dabac802..44c115b94 100644 --- a/src/variety/nawabari.js +++ b/src/variety/nawabari.js @@ -491,7 +491,7 @@ bkNoNum: ["数字の入っていない部屋があります。", "A room has no numbers."], bkNumGe2: [ "1つの部屋に2つ以上の数字が入っています。", - "A room has plural numbers." + "A room has more than one number." ], bkSizeLt3: [ "サイズが3マスより小さいブロックがあります。", From 7d4ac0ab2d896c4ea34d5174465655a1931e147e Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:33:11 +0100 Subject: [PATCH 14/24] nurikabe and friends: reword error messages --- src/variety/nurikabe.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/variety/nurikabe.js b/src/variety/nurikabe.js index bf70679dc..646f59764 100644 --- a/src/variety/nurikabe.js +++ b/src/variety/nurikabe.js @@ -363,36 +363,36 @@ ], bkNumGe2: [ "1つのシマに2つ以上の数字が入っています。", - "An area of unshaded cells has plural numbers." + "An area of unshaded cells has more than one number." ], bkSizeNe: [ "数字とシマの面積が違います。", - "The number is not equal to the number of the size of the area." + "The number is not equal to the size of the area." ] }, "FailCode@nuribou": { csWidthGt1: [ "「幅１マス、長さ１マス以上」ではない黒マスのカタマリがあります。", - "There is a mass of shaded cells, whose width is more than two." + "There is a mass of shaded cells whose width is more than two." ], csCornerSize: [ "同じ面積の黒マスのカタマリが、角を共有しています。", - "Masses of shaded cells whose length is the same share a corner." + "Masses of shaded cells with the same length share a corner." ] }, "FailCode@mochikoro,mochinyoro": { cuNotRect: [ "四角形でない白マスのブロックがあります。", - "There is a block of unshaded cells that is not rectangle." + "There is a block of unshaded cells that is not a rectangle." ], csRect: [ "四角形になっている黒マスのブロックがあります。", - "There is a block of shaded cells that is rectangle." + "There is a block of shaded cells that is a rectangle." ], csDivide8: [ "孤立した白マスのブロックがあります。", - "Unshaded cells are divided." + "The unshaded cells are divided." ] } }); From d996bba1ef7271eabde7786679d3734f2f583788 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:34:38 +0100 Subject: [PATCH 15/24] shikaku, aho: reword error messages --- src/variety/shikaku.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/variety/shikaku.js b/src/variety/shikaku.js index 8b6a76b20..9686a40b9 100644 --- a/src/variety/shikaku.js +++ b/src/variety/shikaku.js @@ -287,20 +287,23 @@ bkNoNum: ["数字の入っていない領域があります。", "An area has no numbers."], bkNumGe2: [ "1つの領域に2つ以上の数字が入っています。", - "An area has plural numbers." + "An area has more than one number." ], bkSizeNe: [ "数字と領域の大きさが違います。", "The size of the area is not equal to the number." ], - bkNotRect: ["四角形ではない領域があります。", "An area is not rectangle."], + bkNotRect: [ + "四角形ではない領域があります。", + "An area is not a rectangle." + ], bkNotRect3: [ "大きさが3の倍数ではないのに四角形ではない領域があります。", - "An area whose size is not multiples of three is not rectangle." + "An area whose size is not a multiple of three is not a rectangle." ], bkNotLshape3: [ "大きさが3の倍数である領域がL字型になっていません。", - "An area whose size is multiples of three is not L-shape." + "An area whose size is a multiple of three is not L-shaped." ] } }); From e3a3d1361047e81b703de42572645117f2ccec9b Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 18:36:05 +0100 Subject: [PATCH 16/24] remove various uses of "plural" --- docs/Config.md | 4 ++-- docs/Puzzle.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Config.md b/docs/Config.md index 3be13c11b..637a4c536 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -24,7 +24,7 @@ |`use_tri`|`number`|`1`|Input method for triangles from mouse for `'Shakashaka'`
Possible value: `1, 2 or 3`| |`support_tri`|`boolean`|`true`|Enable to support inputting triangles next to two or more walls for `'Shakashaka'`| |`bgcolor`|`boolean`|`false`|Enable to input background color for `'Slitherlink'`| -|`singlenum`|`boolean`|`true`|Disable to input plural answer numbers in a room for `'Hanare-gumi'`| +|`singlenum`|`boolean`|`true`|Disable to input multiple answer numbers in a room for `'Hanare-gumi'`| |`enline`|`boolean`|`true`|Limit to input segments only between points for `'Kouchoku'`| |`lattice`|`boolean`|`true`|Restrict not to input segments if other points are on the lattice for `'Kouchoku'`| @@ -34,7 +34,7 @@ |---|---|---|---| |`autocmp`|`boolean`|`true`|Show complete numbers apart from incompleted one automatically.| |`autoerr`|`boolean`|`false`|Show incomplete/wrong numbers automatically.| -|`multierr`|`boolean`|`false`|Check plural errors in `puzzle.check()` API.| +|`multierr`|`boolean`|`false`|Check multiple errors in `puzzle.check()` API.| |`forceallcell`|`boolean`|`false`|Force all cells to have number to get completed for `'fillomino'`| |`passallcell`|`boolean`|`true`|Force all cells to be passed for `'arukone'`| diff --git a/docs/Puzzle.md b/docs/Puzzle.md index 6ddbda6db..0be386a65 100644 --- a/docs/Puzzle.md +++ b/docs/Puzzle.md @@ -187,4 +187,4 @@ For details, see [list of puzzle config document](Config.md). |`autocmp_area`|`boolean`|`false`|Paint background of completed blocks/areas automatically.| |`autocmp_border`|`boolean`|`false`|Paint borders between different blocks/areas automatically.| |`autoerr`|`boolean`|`false`|Show incomplete/wrong numbers automatically.| -|`multierr`|`boolean`|`false`|Check plural errors in `puzzle.check()` API.| +|`multierr`|`boolean`|`false`|Check multiple errors in `puzzle.check()` API.| From ebc3a7a1364082f6288727705728f7e261de0ece Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 19:08:48 +0100 Subject: [PATCH 17/24] experimental devicePixelRatio-based grid width --- src/puzzle/Graphic.js | 14 +++++++++++++- src/variety-common/Graphic.js | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/puzzle/Graphic.js b/src/puzzle/Graphic.js index b6f7bcd10..bb41a8962 100644 --- a/src/puzzle/Graphic.js +++ b/src/puzzle/Graphic.js @@ -149,6 +149,8 @@ bw: 18, // セルの横幅/2 bh: 18, // セルの縦幅/2 + devicePixelRatio: 1, + gw: 1, // grid width lw: 1, // LineWidth 境界線・Lineの太さ lwmin: 3, lm: 1, // LineMargin @@ -294,6 +296,8 @@ var cw = (cwid / cols) | 0, ch = (chgt / rows) | 0; + this.devicePixelRatio = window.devicePixelRatio || 1; + if (this.puzzle.getConfig("squarecell")) { this.cw = this.ch = Math.min(cw, ch); } else { @@ -304,7 +308,15 @@ this.bw = this.cw / 2; this.bh = this.ch / 2; - this.lw = Math.max(this.cw / this.lwratio, this.lwmin); + var gwmax = 1, + gwratio = 40; + var gw = Math.min(this.cw / gwratio, gwmax); + var pxSize = 1 / this.devicePixelRatio; + var gwdev = Math.max(1, Math.round(gw / pxSize)); + this.gw = gwdev * pxSize; + + var lwmin = this.lwmin / this.devicePixelRatio; + this.lw = Math.max(this.cw / this.lwratio, lwmin); this.lm = this.lw / 2; }, setOffset: function() { diff --git a/src/variety-common/Graphic.js b/src/variety-common/Graphic.js index 6152be760..6e942331c 100644 --- a/src/variety-common/Graphic.js +++ b/src/variety-common/Graphic.js @@ -2118,7 +2118,7 @@ pzpr.classmgr.makeCommon({ yb = Math.min(y2, maxy - bs); // isdraw!==false: 指定無しかtrueのときは描画する - g.lineWidth = 1; + g.lineWidth = this.gw; g.strokeStyle = this.gridcolor; for (var i = xa; i <= xb; i += 2) { g.vid = "bdy_" + i; @@ -2185,7 +2185,7 @@ pzpr.classmgr.makeCommon({ var ya = Math.max(y1, miny + bs), yb = Math.min(y2, maxy - bs); - g.lineWidth = 1; + g.lineWidth = this.gw; g.strokeStyle = this.gridcolor; for (var i = xa; i <= xb; i += 2) { var px = i * bw, From fb0f244cf2222f0b7b4656e6e3592baeb6247880 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 19:41:58 +0100 Subject: [PATCH 18/24] redraw on devicePixelRatio change --- src-ui/js/ui/Event.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src-ui/js/ui/Event.js b/src-ui/js/ui/Event.js index 9e3e2a7cb..27dd845c2 100644 --- a/src-ui/js/ui/Event.js +++ b/src-ui/js/ui/Event.js @@ -73,6 +73,11 @@ ui.event = { // onunloadイベントを割り当てる this.addEvent(window, "unload", this, this.onunload_func); + + if (!!matchMedia) { + var mqString = "(resolution: 1dppx)"; + matchMedia(mqString).addListener(this.onpixelratiochange_func); + } }, setDocumentEvents: function() { @@ -145,5 +150,9 @@ ui.event = { this.visibilityCallbacks = []; } } + }, + + onpixelratiochange_func: function(e) { + ui.puzzle.redraw(true); } }; From 836e49ecee225a70def551fece3420975dac1acf Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 19:42:19 +0100 Subject: [PATCH 19/24] remove unused redraw method --- src-ui/js/ui/MenuArea.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src-ui/js/ui/MenuArea.js b/src-ui/js/ui/MenuArea.js index 48beda157..66c52f138 100644 --- a/src-ui/js/ui/MenuArea.js +++ b/src-ui/js/ui/MenuArea.js @@ -353,9 +353,6 @@ ui.menuarea = { ui.menuconfig.set("toolarea", !ui.menuconfig.get("toolarea")); ui.displayAll(); }, - repaint: function() { - ui.puzzle.redraw(true); - }, disppopup: function(e) { var el = e.target; if (el.nodeName === "SPAN") { From bf5cda8b2553d0249c48393fd2fad01b0f849228 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 20:03:44 +0100 Subject: [PATCH 20/24] raise dash min count to 4 --- src/variety-common/Graphic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/variety-common/Graphic.js b/src/variety-common/Graphic.js index 6e942331c..15bf39728 100644 --- a/src/variety-common/Graphic.js +++ b/src/variety-common/Graphic.js @@ -2057,7 +2057,7 @@ pzpr.classmgr.makeCommon({ }, getDashArray: function() { - var dashCount = Math.max(Math.round(this.cw / 10), 3); + var dashCount = Math.max(Math.round(this.cw / 10), 4); var stepSize = this.cw / dashCount; var lengthOn = (5 / 8) * stepSize; var lengthOff = stepSize - lengthOn; From 12b969d99a99252ff1199bb73c98e7179f20ecf0 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 20:10:17 +0100 Subject: [PATCH 21/24] tateyoko error test fix --- test/script/tateyoko.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/script/tateyoko.js b/test/script/tateyoko.js index bad29b9b4..4b2c28754 100644 --- a/test/script/tateyoko.js +++ b/test/script/tateyoko.js @@ -4,7 +4,7 @@ ui.debug.addDebugData("tateyoko", { url: "5/5/i23i3ono2i25i22pnqi33i2", failcheck: [ [ - "nmConnBarGt", + "nmConnBarWrong", "pzprv3/tateyoko/5/5/. . 3 . . /. e . e 2 /. . 5 . . /2 a . b . /. . 3 . . /0 0 0 0 0 /2 . 2 . 2 /0 0 0 0 0 /0 . 0 . 0 /0 0 0 0 0 /" ], [ @@ -16,7 +16,7 @@ ui.debug.addDebugData("tateyoko", { "pzprv3/tateyoko/5/5/. . 3 . . /. e . e 2 /. . 5 . . /2 a . b . /. . 3 . . /0 0 0 0 0 /0 . 0 . 0 /0 2 2 2 2 /0 . 0 . 0 /0 0 0 0 0 /" ], [ - "nmConnBarLt", + "nmConnBarWrong", "pzprv3/tateyoko/5/5/. . 3 . . /. e . e 2 /. . 5 . . /2 a . b . /. . 3 . . /0 0 0 0 0 /0 . 0 . 0 /2 2 2 2 2 /0 . 0 . 0 /0 0 0 0 0 /" ], [ From 560fc7cf7b4acf2a1893c50b39ad14037a17123d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 20:19:16 +0100 Subject: [PATCH 22/24] fix device pixel ratio detection for node / unit tests --- src/puzzle/Graphic.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/puzzle/Graphic.js b/src/puzzle/Graphic.js index bb41a8962..99ec21ef6 100644 --- a/src/puzzle/Graphic.js +++ b/src/puzzle/Graphic.js @@ -296,7 +296,9 @@ var cw = (cwid / cols) | 0, ch = (chgt / rows) | 0; - this.devicePixelRatio = window.devicePixelRatio || 1; + this.devicePixelRatio = this.puzzle.pzpr.env.browser + ? window.devicePixelRatio || 1 + : 1; if (this.puzzle.getConfig("squarecell")) { this.cw = this.ch = Math.min(cw, ch); From 4e2086f5f2e85d9ea0eab8fc33d099b6f563d705 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 21:00:35 +0100 Subject: [PATCH 23/24] crispEdges for shakashaka triangles --- src/variety-common/Graphic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/variety-common/Graphic.js b/src/variety-common/Graphic.js index 15bf39728..557ca7173 100644 --- a/src/variety-common/Graphic.js +++ b/src/variety-common/Graphic.js @@ -1306,7 +1306,7 @@ pzpr.classmgr.makeCommon({ // pc.drawTriangle1() 三角形をCanvasに書き込む(1マスのみ) //--------------------------------------------------------------------------- drawTriangle: function() { - var g = this.vinc("cell_triangle", "auto"); + var g = this.vinc("cell_triangle", "crispEdges"); var clist = this.range.cells; for (var i = 0; i < clist.length; i++) { From 67eeb333308b891f59d28bf4aff3c83bef8fbb41 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 18 Mar 2020 21:27:30 +0100 Subject: [PATCH 24/24] snap linewidth to pixel multiple --- src/puzzle/Graphic.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/puzzle/Graphic.js b/src/puzzle/Graphic.js index 99ec21ef6..f1f74781e 100644 --- a/src/puzzle/Graphic.js +++ b/src/puzzle/Graphic.js @@ -317,8 +317,9 @@ var gwdev = Math.max(1, Math.round(gw / pxSize)); this.gw = gwdev * pxSize; - var lwmin = this.lwmin / this.devicePixelRatio; - this.lw = Math.max(this.cw / this.lwratio, lwmin); + var lw = Math.max(this.cw / this.lwratio, this.lwmin); + var lwdev = Math.max(1, Math.round(lw / pxSize)); + this.lw = lwdev * pxSize; this.lm = this.lw / 2; }, setOffset: function() {