projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Pandemonium isAttackedBy()
[vchess.git]
/
client
/
src
/
variants
/
Ball.js
diff --git
a/client/src/variants/Ball.js
b/client/src/variants/Ball.js
index
c9bdb33
..
8f6493a
100644
(file)
--- a/
client/src/variants/Ball.js
+++ b/
client/src/variants/Ball.js
@@
-3,6
+3,7
@@
import { ArrayFun } from "@/utils/array";
import { shuffle } from "@/utils/alea";
export class BallRules extends ChessRules {
import { shuffle } from "@/utils/alea";
export class BallRules extends ChessRules {
+
static get Lines() {
return [
// White goal:
static get Lines() {
return [
// White goal:
@@
-35,7
+36,7
@@
export class BallRules extends ChessRules {
}
static get BALL() {
}
static get BALL() {
- //
Ball
is already taken:
+ //
'b'
is already taken:
return "aa";
}
return "aa";
}
@@
-94,18
+95,19
@@
export class BallRules extends ChessRules {
const rows = position.split("/");
if (rows.length != V.size.x) return false;
let pieces = { "w": 0, "b": 0 };
const rows = position.split("/");
if (rows.length != V.size.x) return false;
let pieces = { "w": 0, "b": 0 };
- const withBall = Object.keys(V.HAS_BALL_DECODE).concat([
V.BALL
]);
+ const withBall = Object.keys(V.HAS_BALL_DECODE).concat([
'a'
]);
let ballCount = 0;
for (let row of rows) {
let sumElts = 0;
for (let i = 0; i < row.length; i++) {
const lowerRi = row[i].toLowerCase();
if (V.PIECES.includes(lowerRi)) {
let ballCount = 0;
for (let row of rows) {
let sumElts = 0;
for (let i = 0; i < row.length; i++) {
const lowerRi = row[i].toLowerCase();
if (V.PIECES.includes(lowerRi)) {
- if (lowerRi !=
V.BALL
) pieces[row[i] == lowerRi ? "b" : "w"]++;
+ if (lowerRi !=
'a'
) pieces[row[i] == lowerRi ? "b" : "w"]++;
if (withBall.includes(lowerRi)) ballCount++;
sumElts++;
if (withBall.includes(lowerRi)) ballCount++;
sumElts++;
- } else {
- const num = parseInt(row[i]);
+ }
+ else {
+ const num = parseInt(row[i], 10);
if (isNaN(num)) return false;
sumElts += num;
}
if (isNaN(num)) return false;
sumElts += num;
}
@@
-135,7
+137,7
@@
export class BallRules extends ChessRules {
const withPrefix =
Object.keys(V.HAS_BALL_DECODE)
.concat([V.PHOENIX])
const withPrefix =
Object.keys(V.HAS_BALL_DECODE)
.concat([V.PHOENIX])
- .concat(['a'
]);
+ .concat(['a'
, 'w']); //TODO: 'w' for backward compatibility - to remove
if (withPrefix.includes(b[1])) prefix = "Ball/";
return prefix + b;
}
if (withPrefix.includes(b[1])) prefix = "Ball/";
return prefix + b;
}
@@
-203,8
+205,10
@@
export class BallRules extends ChessRules {
if (rem2 == positions[1] % 2) {
// Fix bishops (on different colors)
for (let i=4; i<9; i++) {
if (rem2 == positions[1] % 2) {
// Fix bishops (on different colors)
for (let i=4; i<9; i++) {
- if (positions[i] % 2 != rem2)
+ if (positions[i] % 2 != rem2)
{
[positions[1], positions[i]] = [positions[i], positions[1]];
[positions[1], positions[i]] = [positions[i], positions[1]];
+ break;
+ }
}
}
rem2 = positions[2] % 2;
}
}
rem2 = positions[2] % 2;
@@
-336,7
+340,8
@@
export class BallRules extends ChessRules {
})
);
}
})
);
}
- } else if (mv.vanish[1].c == mv.vanish[0].c) {
+ }
+ else if (mv.vanish[1].c == mv.vanish[0].c) {
// Pass the ball: the passing unit does not disappear
mv.appear.push(JSON.parse(JSON.stringify(mv.vanish[0])));
mv.appear[0].p = V.HAS_BALL_CODE[mv.vanish[1].p];
// Pass the ball: the passing unit does not disappear
mv.appear.push(JSON.parse(JSON.stringify(mv.vanish[0])));
mv.appear[0].p = V.HAS_BALL_CODE[mv.vanish[1].p];
@@
-565,4
+570,5
@@
export class BallRules extends ChessRules {
finalSquare
);
}
finalSquare
);
}
+
};
};