Skip to content

Commit b6266f5

Browse files
committed
Remove bcolor
1 parent 2c0787f commit b6266f5

File tree

3 files changed

+10
-40
lines changed

3 files changed

+10
-40
lines changed

src-ui/changes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
<main>
3434
<div style="margin-bottom: 5px;"><b>Latest types</b> (<em><a href="/list.html" target="_parent">all types</a></em>)</div>
3535
<ul>
36+
<li><a href="/p?oasis" target="_parent">Oasis</a></li>
3637
<li><a href="/p?sendai" target="_parent">Sendai-Miyagi 宮城県仙台市</a></li>
3738
<li><a href="/p?keywest" target="_parent">Key West キーウエスト</a></li>
3839
<li><a href="/p?morningwalk" target="_parent">Morning Walk</a></li>
3940
<li><a href="/p?energywalk" target="_parent">Energy Walk</a></li>
4041
<li><a href="/p?sansaroad" target="_parent">Sansa Road サンサロード</a></li>
4142
<li><a href="/p?diamond" target="_parent">Diamond Chain</a></li>
42-
<li><a href="/p?tetrochaink" target="_parent">Tetro Chain-K テトロチェーンK</a></li>
4343
</ul>
4444
</main>
4545
</body>

src/variety/oasis.js

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
if (this.isDraggingPeke) {
2424
this.inputpeke();
2525
} else if (this.btn === "left" && this.mousestart) {
26-
if (!this.inputdark()) {
26+
if (!this.inputqcmp()) {
2727
this.inputcell();
2828
}
2929
} else if (this.inputData === null || this.inputData < 20) {
@@ -35,33 +35,18 @@
3535
}
3636
}
3737
},
38-
inputdark: function() {
39-
var cell = this.getcell();
40-
if (cell.isnull) {
41-
return false;
42-
}
43-
44-
var distance = 0.6,
45-
dx = this.inputPoint.bx - cell.bx /* ここはtargetcellではなくcell */,
46-
dy = this.inputPoint.by - cell.by;
47-
if (cell.isNum() && dx * dx + dy * dy < distance * distance) {
48-
this.inputData = cell.qcmp !== 1 ? 21 : 20;
49-
cell.setQcmp(this.inputData === 21 ? 1 : 0);
50-
cell.draw();
51-
return true;
52-
}
53-
return false;
54-
},
5538
inputqcmp: function() {
5639
var cell = this.getcell();
57-
if (cell.isnull) {
58-
return;
40+
if (cell.isnull || !cell.isNum()) {
41+
return false;
5942
}
6043

44+
this.inputData = 20;
6145
cell.setQcmp(+!cell.qcmp);
6246
cell.draw();
6347

6448
this.mousereset();
49+
return true;
6550
}
6651
},
6752

@@ -231,15 +216,14 @@
231216
// 画像表示系
232217
Graphic: {
233218
qanscolor: "black",
234-
bgcellcolor_func: "qsub1",
235219
gridcolor_type: "LIGHT",
236220

237221
autocmp: "number",
238222
hideHatena: true,
239-
enablebcolor: true,
240223

241224
paint: function() {
242225
this.drawBGCells();
226+
this.drawDotCells();
243227
this.drawGrid();
244228
this.drawShadedCells();
245229

@@ -287,9 +271,6 @@
287271
this.decodeCell(function(cell, ca) {
288272
if (ca === "+") {
289273
cell.qsub = 1;
290-
} else if (ca === "c") {
291-
cell.qsub = 1;
292-
cell.qcmp = 1;
293274
} else if (ca === "-") {
294275
cell.qcmp = 1;
295276
} else if (ca === "1") {
@@ -302,7 +283,7 @@
302283
if (cell.qans === 1) {
303284
return "1 ";
304285
} else if (cell.qsub === 1) {
305-
return cell.qcmp ? "c " : "+ ";
286+
return "+ ";
306287
} else if (cell.qcmp === 1) {
307288
return "- ";
308289
} else {

test/script/oasis.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,12 @@ ui.debug.addDebugData("oasis", {
4646
result: "pzprv3/oasis/3/3/. 1 . /. . . /. . . /. . . /. 1 + /. . . /"
4747
},
4848
{
49-
input: [
50-
"editmode",
51-
"cursor,5,5",
52-
"key,2",
53-
"playmode",
54-
"mouse,left,3,1",
55-
"mouse,left,4.1,4.1"
56-
],
49+
input: ["editmode", "cursor,5,5", "key,2", "playmode", "mouse,left,3,1"],
5750
result: "pzprv3/oasis/3/3/. 1 . /. . . /. . 2 /. - . /. 1 + /. . . /"
5851
},
59-
{
60-
input: ["setconfig,use,2", "mouse,left,4.1,4.1"],
61-
result: "pzprv3/oasis/3/3/. 1 . /. . . /. . 2 /. - . /. 1 + /. . + /"
62-
},
6352
{
6453
input: ["mouse,left,5,5", "playmode,completion", "mouse,left,3,1"],
65-
result: "pzprv3/oasis/3/3/. 1 . /. . . /. . 2 /. . . /. 1 + /. . c /"
54+
result: "pzprv3/oasis/3/3/. 1 . /. . . /. . 2 /. . . /. 1 + /. . - /"
6655
}
6756
]
6857
});

0 commit comments

Comments
 (0)