sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

オセロで黒白を真理値で表現するように

Browse Source
This commit is contained in:
syuilo
2018-03-13 01:49:54 +09:00
parent 1d62003e08
commit e6f68e0b9e
4 changed files with 98 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/models/othello-game.ts
View File

@ -25,7 +25,11 @@ export interface IGame {
is_started: boolean;
is_ended: boolean;
winner_id: mongo.ObjectID;
logs: any[];
logs: Array<{
at: Date;
color: boolean;
pos: number;
}>;
settings: {
map: string[];
bw: string | number;

12
src/api/stream/othello-game.ts
View File

@ -214,9 +214,9 @@ export default function(request: websocket.request, connection: websocket.connec
if (o.isEnded) {
let winner;
if (o.winner == 'black') {
if (o.winner === true) {
winner = freshGame.black == 1 ? freshGame.user1_id : freshGame.user2_id;
} else if (o.winner == 'white') {
} else if (o.winner === false) {
winner = freshGame.black == 1 ? freshGame.user2_id : freshGame.user1_id;
} else {
winner = null;
@ -263,17 +263,17 @@ export default function(request: websocket.request, connection: websocket.connec
const myColor =
(game.user1_id.equals(user._id) && game.black == 1) || (game.user2_id.equals(user._id) && game.black == 2)
? 'black'
: 'white';
? true
: false;
if (!o.canPut(myColor, pos)) return;
o.put(myColor, pos);
let winner;
if (o.isEnded) {
if (o.winner == 'black') {
if (o.winner === true) {
winner = game.black == 1 ? game.user1_id : game.user2_id;
} else if (o.winner == 'white') {
} else if (o.winner === false) {
winner = game.black == 1 ? game.user2_id : game.user1_id;
} else {
winner = null;