161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 20:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1200

Browse Source
This commit is contained in:
syuilo 2018-03-08 17:57:57 +09:00
parent ac98858ae6
commit 8fad927a69
12 changed files with 956 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/endpoints/othello/games.ts
View File

@ -7,12 +7,15 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (myErr) return rej('invalid my param');
const q = my ? {
is_started: true,
$or: [{
black_user_id: user._id
user1_id: user._id
}, {
white_user_id: user._id
user2_id: user._id
}]
} : {};
} : {
is_started: true
};
// Fetch games
const games = await Game.find(q, {

20
src/api/endpoints/othello/match.ts
View File

@ -3,6 +3,7 @@ import Matching, { pack as packMatching } from '../../models/othello-matching';
import Game, { pack as packGame } from '../../models/othello-game';
import User from '../../models/user';
import { publishOthelloStream } from '../../event';
import { eighteight } from '../../../common/othello/maps';
module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'user_id' parameter
@ -26,16 +27,21 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
_id: exist._id
});
const parentIsBlack = Math.random() > 0.5;
// Start game
// Create game
const game = await Game.insert({
created_at: new Date(),
black_user_id: parentIsBlack ? exist.parent_id : user._id,
white_user_id: parentIsBlack ? user._id : exist.parent_id,
turn_user_id: parentIsBlack ? exist.parent_id : user._id,
user1_id: exist.parent_id,
user2_id: user._id,
user1_accepted: false,
user2_accepted: false,
is_started: false,
is_ended: false,
logs: []
logs: [],
settings: {
map: eighteight,
bw: 'random',
is_llotheo: false
}
});
// Reponse

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

@ -2,6 +2,7 @@ import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import db from '../../db/mongodb';
import { IUser, pack as packUser } from './user';
import { Map } from '../../common/othello/maps';
const Game = db.get<IGame>('othello_games');
export default Game;
@ -9,12 +10,28 @@ export default Game;
export interface IGame {
_id: mongo.ObjectID;
created_at: Date;
black_user_id: mongo.ObjectID;
white_user_id: mongo.ObjectID;
turn_user_id: mongo.ObjectID;
started_at: Date;
user1_id: mongo.ObjectID;
user2_id: mongo.ObjectID;
user1_accepted: boolean;
user2_accepted: boolean;
/**
* どちらのプレイヤーが先行(黒)か
* 1 ... user1
* 2 ... user2
*/
black: number;
is_started: boolean;
is_ended: boolean;
winner_id: mongo.ObjectID;
logs: any[];
settings: {
map: Map;
bw: string | number;
is_llotheo: boolean;
};
}
/**
@ -24,6 +41,20 @@ export const pack = (
game: any,
me?: string | mongo.ObjectID | IUser
) => new Promise<any>(async (resolve, reject) => {
let _game: any;
// Populate the game if 'game' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(game)) {
_game = await Game.findOne({
_id: game
});
} else if (typeof game === 'string') {
_game = await Game.findOne({
_id: new mongo.ObjectID(game)
});
} else {
_game = deepcopy(game);
}
// Me
const meId: mongo.ObjectID = me
@ -34,15 +65,13 @@ export const pack = (
: (me as IUser)._id
: null;
const _game = deepcopy(game);
// Rename _id to id
_game.id = _game._id;
delete _game._id;
// Populate user
_game.black_user = await packUser(_game.black_user_id, meId);
_game.white_user = await packUser(_game.white_user_id, meId);
_game.user1 = await packUser(_game.user1_id, meId);
_game.user2 = await packUser(_game.user2_id, meId);
if (_game.winner_id) {
_game.winner = await packUser(_game.winner_id, meId);
} else {

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

@ -1,8 +1,8 @@
import * as websocket from 'websocket';
import * as redis from 'redis';
import Game from '../models/othello-game';
import Game, { pack } from '../models/othello-game';
import { publishOthelloGameStream } from '../event';
import Othello from '../../common/othello';
import Othello from '../../common/othello/core';
export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
const gameId = request.resourceURL.query.game;
@ -17,6 +17,19 @@ export default function(request: websocket.request, connection: websocket.connec
const msg = JSON.parse(data.utf8Data);
switch (msg.type) {
case 'accept':
accept(true);
break;
case 'cancel-accept':
accept(false);
break;
case 'update-settings':
if (msg.settings == null) return;
updateSettings(msg.settings);
break;
case 'set':
if (msg.pos == null) return;
set(msg.pos);
@ -24,38 +37,118 @@ export default function(request: websocket.request, connection: websocket.connec
}
});
async function updateSettings(settings) {
const game = await Game.findOne({ _id: gameId });
if (game.is_started) return;
if (!game.user1_id.equals(user._id) && !game.user2_id.equals(user._id)) return;
if (game.user1_id.equals(user._id) && game.user1_accepted) return;
if (game.user2_id.equals(user._id) && game.user2_accepted) return;
await Game.update({ _id: gameId }, {
$set: {
settings
}
});
publishOthelloGameStream(gameId, 'update-settings', settings);
}
async function accept(accept: boolean) {
const game = await Game.findOne({ _id: gameId });
if (game.is_started) return;
let bothAccepted = false;
if (game.user1_id.equals(user._id)) {
await Game.update({ _id: gameId }, {
$set: {
user1_accepted: accept
}
});
publishOthelloGameStream(gameId, 'change-accepts', {
user1: accept,
user2: game.user2_accepted
});
if (accept && game.user2_accepted) bothAccepted = true;
} else if (game.user2_id.equals(user._id)) {
await Game.update({ _id: gameId }, {
$set: {
user2_accepted: accept
}
});
publishOthelloGameStream(gameId, 'change-accepts', {
user1: game.user1_accepted,
user2: accept
});
if (accept && game.user1_accepted) bothAccepted = true;
} else {
return;
}
if (bothAccepted) {
// 3秒後、まだacceptされていたらゲーム開始
setTimeout(async () => {
const freshGame = await Game.findOne({ _id: gameId });
if (freshGame == null || freshGame.is_started || freshGame.is_ended) return;
let bw: number;
if (freshGame.settings.bw == 'random') {
bw = Math.random() > 0.5 ? 1 : 2;
} else {
bw = freshGame.settings.bw as number;
}
await Game.update({ _id: gameId }, {
$set: {
started_at: new Date(),
is_started: true,
black: bw
}
});
publishOthelloGameStream(gameId, 'started', await pack(gameId));
}, 3000);
}
}
async function set(pos) {
const game = await Game.findOne({ _id: gameId });
if (!game.is_started) return;
if (game.is_ended) return;
if (!game.black_user_id.equals(user._id) && !game.white_user_id.equals(user._id)) return;
if (!game.user1_id.equals(user._id) && !game.user2_id.equals(user._id)) return;
const o = new Othello();
game.logs.forEach(log => {
o.set(log.color, log.pos);
const o = new Othello(game.settings.map, {
isLlotheo: game.settings.is_llotheo
});
const myColor = game.black_user_id.equals(user._id) ? 'black' : 'white';
const opColor = myColor == 'black' ? 'white' : 'black';
game.logs.forEach(log => {
o.put(log.color, log.pos);
});
if (!o.canReverse(myColor, pos)) return;
o.set(myColor, pos);
const myColor =
(game.user1_id.equals(user._id) && game.black == 1) || (game.user2_id.equals(user._id) && game.black == 2)
? 'black'
: 'white';
let turn;
if (o.getPattern(opColor).length > 0) {
turn = myColor == 'black' ? game.white_user_id : game.black_user_id;
} else if (o.getPattern(myColor).length > 0) {
turn = myColor == 'black' ? game.black_user_id : game.white_user_id;
} else {
turn = null;
}
const isEnded = turn === null;
if (!o.canPut(myColor, pos)) return;
o.put(myColor, pos);
let winner;
if (isEnded) {
winner = o.blackCount == o.whiteCount ? null : o.blackCount > o.whiteCount ? game.black_user_id : game.white_user_id;
if (o.isEnded) {
if (o.winner == 'black') {
winner = game.black == 1 ? game.user1_id : game.user2_id;
} else if (o.winner == 'white') {
winner = game.black == 1 ? game.user2_id : game.user1_id;
} else {
winner = null;
}
}
const log = {
@ -68,8 +161,7 @@ export default function(request: websocket.request, connection: websocket.connec
_id: gameId
}, {
$set: {
turn_user_id: turn,
is_ended: isEnded,
is_ended: o.isEnded,
winner_id: winner
},
$push: {

325
src/common/othello.ts
View File

@ -1,325 +0,0 @@
const BOARD_SIZE = 8;
export default class Othello {
public board: Array<'black' | 'white'>;
public stats: Array<{
b: number;
w: number;
}> = [];
/**
* ゲームを初期化します
*/
constructor() {
this.board = [
null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null,
null, null, null, 'white', 'black', null, null, null,
null, null, null, 'black', 'white', null, null, null,
null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null
];
this.stats.push({
b: 0.5,
w: 0.5
});
}
public prevPos = -1;
public get blackCount() {
return this.board.filter(s => s == 'black').length;
}
public get whiteCount() {
return this.board.filter(s => s == 'white').length;
}
public get blackP() {
return this.blackCount / (this.blackCount + this.whiteCount);
}
public get whiteP() {
return this.whiteCount / (this.blackCount + this.whiteCount);
}
public setByNumber(color, n) {
const ps = this.getPattern(color);
this.set2(color, ps[n][0], ps[n][1]);
}
private write(color, x, y) {
const pos = x + (y * 8);
this.board[pos] = color;
}
/**
* 石を配置します
*/
public set2(color, x, y) {
this.prevPos = x + (y * 8);
this.write(color, x, y);
const reverses = this.getReverse(color, x, y);
reverses.forEach(r => {
switch (r[0]) {
case 0: // 上
for (let c = 0, _y = y - 1; c < r[1]; c++, _y--) {
this.write(color, x, _y);
}
break;
case 1: // 右上
for (let c = 0, i = 1; c < r[1]; c++, i++) {
this.write(color, x + i, y - i);
}
break;
case 2: // 右
for (let c = 0, _x = x + 1; c < r[1]; c++, _x++) {
this.write(color, _x, y);
}
break;
case 3: // 右下
for (let c = 0, i = 1; c < r[1]; c++, i++) {
this.write(color, x + i, y + i);
}
break;
case 4: // 下
for (let c = 0, _y = y + 1; c < r[1]; c++, _y++) {
this.write(color, x, _y);
}
break;
case 5: // 左下
for (let c = 0, i = 1; c < r[1]; c++, i++) {
this.write(color, x - i, y + i);
}
break;
case 6: // 左
for (let c = 0, _x = x - 1; c < r[1]; c++, _x--) {
this.write(color, _x, y);
}
break;
case 7: // 左上
for (let c = 0, i = 1; c < r[1]; c++, i++) {
this.write(color, x - i, y - i);
}
break;
}
});
this.stats.push({
b: this.blackP,
w: this.whiteP
});
}
public set(color, pos) {
const x = pos % BOARD_SIZE;
const y = Math.floor(pos / BOARD_SIZE);
this.set2(color, x, y);
}
public get(x, y) {
const pos = x + (y * 8);
return this.board[pos];
}
/**
* 打つことができる場所を取得します
*/
public getPattern(myColor): number[][] {
const result = [];
this.board.forEach((stone, i) => {
if (stone != null) return;
const x = i % BOARD_SIZE;
const y = Math.floor(i / BOARD_SIZE);
if (this.canReverse2(myColor, x, y)) result.push([x, y]);
});
return result;
}
/**
* 指定の位置に石を打つことができるかどうか(相手の石を1つでも反転させられるか)を取得します
*/
public canReverse2(myColor, x, y): boolean {
return this.canReverse(myColor, x + (y * 8));
}
public canReverse(myColor, pos): boolean {
if (this.board[pos] != null) return false;
const x = pos % BOARD_SIZE;
const y = Math.floor(pos / BOARD_SIZE);
return this.getReverse(myColor, x, y) !== null;
}
private getReverse(myColor, targetx, targety): number[] {
const opponentColor = myColor == 'black' ? 'white' : 'black';
const createIterater = () => {
let opponentStoneFound = false;
let breaked = false;
return (x, y): any => {
if (breaked) {
return;
} else if (this.get(x, y) == myColor && opponentStoneFound) {
return true;
} else if (this.get(x, y) == myColor && !opponentStoneFound) {
breaked = true;
} else if (this.get(x, y) == opponentColor) {
opponentStoneFound = true;
} else {
breaked = true;
}
};
};
const res = [];
let iterate;
// 上
iterate = createIterater();
for (let c = 0, y = targety - 1; y >= 0; c++, y--) {
if (iterate(targetx, y)) {
res.push([0, c]);
break;
}
}
// 右上
iterate = createIterater();
for (let c = 0, i = 1; i <= Math.min(BOARD_SIZE - targetx, targety); c++, i++) {
if (iterate(targetx + i, targety - i)) {
res.push([1, c]);
break;
}
}
// 右
iterate = createIterater();
for (let c = 0, x = targetx + 1; x < BOARD_SIZE; c++, x++) {
if (iterate(x, targety)) {
res.push([2, c]);
break;
}
}
// 右下
iterate = createIterater();
for (let c = 0, i = 1; i < Math.min(BOARD_SIZE - targetx, BOARD_SIZE - targety); c++, i++) {
if (iterate(targetx + i, targety + i)) {
res.push([3, c]);
break;
}
}
// 下
iterate = createIterater();
for (let c = 0, y = targety + 1; y < BOARD_SIZE; c++, y++) {
if (iterate(targetx, y)) {
res.push([4, c]);
break;
}
}
// 左下
iterate = createIterater();
for (let c = 0, i = 1; i <= Math.min(targetx, BOARD_SIZE - targety); c++, i++) {
if (iterate(targetx - i, targety + i)) {
res.push([5, c]);
break;
}
}
// 左
iterate = createIterater();
for (let c = 0, x = targetx - 1; x >= 0; c++, x--) {
if (iterate(x, targety)) {
res.push([6, c]);
break;
}
}
// 左上
iterate = createIterater();
for (let c = 0, i = 1; i <= Math.min(targetx, targety); c++, i++) {
if (iterate(targetx - i, targety - i)) {
res.push([7, c]);
break;
}
}
return res.length === 0 ? null : res;
}
public toString(): string {
//return this.board.map(row => row.map(state => state === 'black' ? '●' : state === 'white' ? '○' : '┼').join('')).join('\n');
//return this.board.map(row => row.map(state => state === 'black' ? '⚫️' : state === 'white' ? '⚪️' : '🔹').join('')).join('\n');
return 'wip';
}
public toPatternString(color): string {
//const num = ['０', '１', '２', '３', '４', '５', '６', '７', '８', '９'];
/*const num = ['0️⃣', '1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣', '6️⃣', '7️⃣', '8️⃣', '9️⃣', '🔟', '🍏', '🍎', '🍐', '🍊', '🍋', '🍌', '🍉', '🍇', '🍓', '🍈', '🍒', '🍑', '🍍'];
const pattern = this.getPattern(color);
return this.board.map((row, y) => row.map((state, x) => {
const i = pattern.findIndex(p => p[0] == x && p[1] == y);
//return state === 'black' ? '●' : state === 'white' ? '○' : i != -1 ? num[i] : '┼';
return state === 'black' ? '⚫️' : state === 'white' ? '⚪️' : i != -1 ? num[i] : '🔹';
}).join('')).join('\n');*/
return 'wip';
}
}
export function ai(color: string, othello: Othello) {
const opponentColor = color == 'black' ? 'white' : 'black';
function think() {
// 打てる場所を取得
const ps = othello.getPattern(color);
if (ps.length > 0) { // 打てる場所がある場合
// 角を取得
const corners = ps.filter(p =>
// 左上
(p[0] == 0 && p[1] == 0) ||
// 右上
(p[0] == (BOARD_SIZE - 1) && p[1] == 0) ||
// 右下
(p[0] == (BOARD_SIZE - 1) && p[1] == (BOARD_SIZE - 1)) ||
// 左下
(p[0] == 0 && p[1] == (BOARD_SIZE - 1))
);
if (corners.length > 0) { // どこかしらの角に打てる場合
// 打てる角からランダムに選択して打つ
const p = corners[Math.floor(Math.random() * corners.length)];
othello.set(color, p[0], p[1]);
} else { // 打てる角がない場合
// 打てる場所からランダムに選択して打つ
const p = ps[Math.floor(Math.random() * ps.length)];
othello.set(color, p[0], p[1]);
}
// 相手の打つ場所がない場合続けてAIのターン
if (othello.getPattern(opponentColor).length === 0) {
think();
}
}
}
think();
}

42
src/common/othello/ai.ts Normal file
View File

@ -0,0 +1,42 @@
import Othello, { Color } from './core';
export function ai(color: Color, othello: Othello) {
//const opponentColor = color == 'black' ? 'white' : 'black';
/* wip
function think() {
// 打てる場所を取得
const ps = othello.canPutSomewhere(color);
if (ps.length > 0) { // 打てる場所がある場合
// 角を取得
const corners = ps.filter(p =>
// 左上
(p[0] == 0 && p[1] == 0) ||
// 右上
(p[0] == (BOARD_SIZE - 1) && p[1] == 0) ||
// 右下
(p[0] == (BOARD_SIZE - 1) && p[1] == (BOARD_SIZE - 1)) ||
// 左下
(p[0] == 0 && p[1] == (BOARD_SIZE - 1))
);
if (corners.length > 0) { // どこかしらの角に打てる場合
// 打てる角からランダムに選択して打つ
const p = corners[Math.floor(Math.random() * corners.length)];
othello.set(color, p[0], p[1]);
} else { // 打てる角がない場合
// 打てる場所からランダムに選択して打つ
const p = ps[Math.floor(Math.random() * ps.length)];
othello.set(color, p[0], p[1]);
}
// 相手の打つ場所がない場合続けてAIのターン
if (othello.getPattern(opponentColor).length === 0) {
think();
}
}
}
think();*/
}

239
src/common/othello/core.ts Normal file
View File

@ -0,0 +1,239 @@
import { Map } from './maps';
export type Color = 'black' | 'white';
export type MapPixel = 'null' | 'empty';
export type Options = {
isLlotheo: boolean;
};
/**
* オセロエンジン
*/
export default class Othello {
public map: Map;
public mapData: MapPixel[];
public board: Color[];
public turn: Color = 'black';
public opts: Options;
public stats: Array<{
b: number;
w: number;
}>;
/**
* ゲームを初期化します
*/
constructor(map: Map, opts: Options) {
this.map = map;
this.opts = opts;
// Parse map data
this.board = this.map.data.split('').map(d => {
if (d == '-') return null;
if (d == 'b') return 'black';
if (d == 'w') return 'white';
return undefined;
});
this.mapData = this.map.data.split('').map(d => {
if (d == '-' || d == 'b' || d == 'w') return 'empty';
return 'null';
});
// Init stats
this.stats = [{
b: this.blackP,
w: this.whiteP
}];
}
public prevPos = -1;
/**
* 黒石の数
*/
public get blackCount() {
return this.board.filter(x => x == 'black').length;
}
/**
* 白石の数
*/
public get whiteCount() {
return this.board.filter(x => x == 'white').length;
}
/**
* 黒石の比率
*/
public get blackP() {
return this.blackCount / (this.blackCount + this.whiteCount);
}
/**
* 白石の比率
*/
public get whiteP() {
return this.whiteCount / (this.blackCount + this.whiteCount);
}
public transformPosToXy(pos: number): number[] {
const x = pos % this.map.size;
const y = Math.floor(pos / this.map.size);
return [x, y];
}
public transformXyToPos(x: number, y: number): number {
return x + (y * this.map.size);
}
/**
* 指定のマスに石を書き込みます
* @param color 石の色
* @param pos 位置
*/
private write(color: Color, pos: number) {
this.board[pos] = color;
}
/**
* 指定のマスに石を打ちます
* @param color 石の色
* @param pos 位置
*/
public put(color: Color, pos: number) {
if (!this.canPut(color, pos)) return;
this.prevPos = pos;
this.write(color, pos);
// 反転させられる石を取得
const reverses = this.effects(color, pos);
// 反転させる
reverses.forEach(pos => {
this.write(color, pos);
});
this.stats.push({
b: this.blackP,
w: this.whiteP
});
// ターン計算
const opColor = color == 'black' ? 'white' : 'black';
if (this.canPutSomewhere(opColor).length > 0) {
this.turn = color == 'black' ? 'white' : 'black';
} else if (this.canPutSomewhere(color).length > 0) {
this.turn = color == 'black' ? 'black' : 'white';
} else {
this.turn = null;
}
}
/**
* 指定したマスの状態を取得します
* @param pos 位置
*/
public get(pos: number) {
return this.board[pos];
}
/**
* 指定した位置のマップデータのマスを取得します
* @param pos 位置
*/
public mapDataGet(pos: number): MapPixel {
if (pos < 0 || pos >= this.mapData.length) return 'null';
return this.mapData[pos];
}
/**
* 打つことができる場所を取得します
*/
public canPutSomewhere(color: Color): number[] {
const result = [];
this.board.forEach((x, i) => {
if (this.canPut(color, i)) result.push(i);
});
return result;
}
/**
* 指定のマスに石を打つことができるかどうか(相手の石を1つでも反転させられるか)を取得します
* @param color 自分の色
* @param pos 位置
*/
public canPut(color: Color, pos: number): boolean {
// 既に石が置いてある場所には打てない
if (this.get(pos) !== null) return false;
return this.effects(color, pos).length !== 0;
}
/**
* 指定のマスに石を置いた時の、反転させられる石を取得します
* @param color 自分の色
* @param pos 位置
*/
private effects(color: Color, pos: number): number[] {
const enemyColor = color == 'black' ? 'white' : 'black';
const [x, y] = this.transformPosToXy(pos);
let stones = [];
const iterate = (fn: (i: number) => number[]) => {
let i = 1;
const found = [];
while (true) {
const [x, y] = fn(i);
if (x < 0 || y < 0 || x >= this.map.size || y >= this.map.size) break;
const pos = this.transformXyToPos(x, y);
const pixel = this.mapDataGet(pos);
if (pixel == 'null') break;
const stone = this.get(pos);
if (stone == null) break;
if (stone == enemyColor) found.push(pos);
if (stone == color) {
stones = stones.concat(found);
break;
}
i++;
}
};
iterate(i => [x , y - i]); // 上
iterate(i => [x + i, y - i]); // 右上
iterate(i => [x + i, y ]); // 右
iterate(i => [x + i, y + i]); // 右下
iterate(i => [x , y + i]); // 下
iterate(i => [x - i, y + i]); // 左下
iterate(i => [x - i, y ]); // 左
iterate(i => [x - i, y - i]); // 左上
return stones;
}
/**
* ゲームが終了したか否か
*/
public get isEnded(): boolean {
return this.turn === null;
}
/**
* ゲームの勝者 (null = 引き分け)
*/
public get winner(): Color {
if (!this.isEnded) return undefined;
if (this.blackCount == this.whiteCount) return null;
if (this.opts.isLlotheo) {
return this.blackCount > this.whiteCount ? 'white' : 'black';
} else {
return this.blackCount > this.whiteCount ? 'black' : 'white';
}
}
}

217
src/common/othello/maps.ts Normal file
View File

@ -0,0 +1,217 @@
/**
* 組み込みマップ定義
*
* データ値:
* (スペース) ... マス無し
* - ... マス
* b ... 初期配置される黒石
* w ... 初期配置される白石
*/
export type Map = {
name?: string;
size: number;
data: string;
};
export const fourfour: Map = {
name: '4x4',
size: 4,
data:
'----' +
'-wb-' +
'-bw-' +
'----'
};
export const sixsix: Map = {
name: '6x6',
size: 6,
data:
'------' +
'------' +
'--wb--' +
'--bw--' +
'------' +
'------'
};
export const eighteight: Map = {
name: '8x8',
size: 8,
data:
'--------' +
'--------' +
'--------' +
'---wb---' +
'---bw---' +
'--------' +
'--------' +
'--------'
};
export const roundedEighteight: Map = {
name: '8x8 rounded',
size: 8,
data:
' ------ ' +
'--------' +
'--------' +
'---wb---' +
'---bw---' +
'--------' +
'--------' +
' ------ '
};
export const roundedEighteight2: Map = {
name: '8x8 rounded 2',
size: 8,
data:
' ---- ' +
' ------ ' +
'--------' +
'---wb---' +
'---bw---' +
'--------' +
' ------ ' +
' ---- '
};
export const eighteightWithNotch: Map = {
name: '8x8 with notch',
size: 8,
data:
'--- ---' +
'--------' +
'--------' +
' --wb-- ' +
' --bw-- ' +
'--------' +
'--------' +
'--- ---'
};
export const eighteightWithSomeHoles: Map = {
name: '8x8 with some holes',
size: 8,
data:
'--- ----' +
'----- --' +
'-- -----' +
'---wb---' +
'---bw- -' +
' -------' +
'--- ----' +
'--------'
};
export const sixeight: Map = {
name: '6x8',
size: 8,
data:
' ------ ' +
' ------ ' +
' ------ ' +
' --wb-- ' +
' --bw-- ' +
' ------ ' +
' ------ ' +
' ------ '
};
export const tenthtenth: Map = {
name: '10x10',
size: 10,
data:
'----------' +
'----------' +
'----------' +
'----------' +
'----wb----' +
'----bw----' +
'----------' +
'----------' +
'----------' +
'----------'
};
export const hole: Map = {
name: 'hole',
size: 10,
data:
'----------' +
'----------' +
'--wb--wb--' +
'--bw--bw--' +
'---- ----' +
'---- ----' +
'--wb--wb--' +
'--bw--bw--' +
'----------' +
'----------'
};
export const spark: Map = {
name: 'spark',
size: 10,
data:
' - - ' +
'----------' +
' -------- ' +
' -------- ' +
' ---wb--- ' +
' ---bw--- ' +
' -------- ' +
' -------- ' +
'----------' +
' - - '
};
export const islands: Map = {
name: 'islands',
size: 10,
data:
'-------- ' +
'---wb--- ' +
'---bw--- ' +
'-------- ' +
' - - ' +
' - - ' +
' --------' +
' ---bw---' +
' ---wb---' +
' --------'
};
export const grid: Map = {
name: 'grid',
size: 10,
data:
'----------' +
'- - -- - -' +
'----------' +
'- - -- - -' +
'----wb----' +
'----bw----' +
'- - -- - -' +
'----------' +
'- - -- - -' +
'----------'
};
export const iphonex: Map = {
name: 'iPhone X',
size: 10,
data:
' -- -- ' +
' -------- ' +
' -------- ' +
' -------- ' +
' ---wb--- ' +
' ---bw--- ' +
' -------- ' +
' -------- ' +
' -------- ' +
' ------ '
};

164
src/web/app/common/views/components/othello.game.vue
View File

@ -1,23 +1,27 @@
<template>
<div class="root">
<header><b>{{ game.black_user.name }}</b>(黒) vs <b>{{ game.white_user.name }}</b>(白)</header>
<p class="turn" v-if="!iAmPlayer && !isEnded">{{ turn.name }}のターンです<mk-ellipsis/></p>
<p class="turn" v-if="logPos != logs.length">{{ turn.name }}のターン</p>
<p class="turn" v-if="iAmPlayer && !isEnded">{{ isMyTurn ? 'あなたのターンです' : '相手のターンです' }}<mk-ellipsis v-if="!isMyTurn"/></p>
<p class="result" v-if="isEnded && logPos == logs.length">
<template v-if="winner"><b>{{ winner.name }}</b>の勝ち</template>
<header><b>{{ blackUser.name }}</b>(黒) vs <b>{{ whiteUser.name }}</b>(白)</header>
<p class="turn" v-if="!iAmPlayer && !game.is_ended">{{ turnUser.name }}のターンです<mk-ellipsis/></p>
<p class="turn" v-if="logPos != logs.length">{{ turnUser.name }}のターン</p>
<p class="turn" v-if="iAmPlayer && !game.is_ended">{{ isMyTurn ? 'あなたのターンです' : '相手のターンです' }}<mk-ellipsis v-if="!isMyTurn"/></p>
<p class="result" v-if="game.is_ended && logPos == logs.length">
<template v-if="game.winner"><b>{{ game.winner.name }}</b>の勝ち{{ game.settings.is_llotheo ? ' (ロセオ)' : '' }}</template>
<template v-else>引き分け</template>
</p>
<div class="board">
<div class="board" :style="{ 'grid-template-rows': `repeat(${ game.settings.map.size }, 1fr)`, 'grid-template-columns': `repeat(${ game.settings.map.size }, 1fr)` }">
<div v-for="(stone, i) in o.board"
:class="{ empty: stone == null, myTurn: isMyTurn, can: o.canReverse(turn.id == game.black_user.id ? 'black' : 'white', i), prev: o.prevPos == i }"
:class="{ empty: stone == null, none: o.map.data[i] == ' ', myTurn: isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id ? 'black' : 'white', i) : null, prev: o.prevPos == i }"
@click="set(i)"
>
<img v-if="stone == 'black'" :src="`${game.black_user.avatar_url}?thumbnail&size=64`" alt="">
<img v-if="stone == 'white'" :src="`${game.white_user.avatar_url}?thumbnail&size=64`" alt="">
<img v-if="stone == 'black'" :src="`${blackUser.avatar_url}?thumbnail&size=128`" alt="">
<img v-if="stone == 'white'" :src="`${whiteUser.avatar_url}?thumbnail&size=128`" alt="">
</div>
</div>
<p>黒:{{ o.blackCount }} 白:{{ o.whiteCount }} 合計:{{ o.blackCount + o.whiteCount }}</p>
<div class="graph">
<div v-for="n in 61 - o.stats.length">
</div>
@ -26,7 +30,8 @@
<div :style="{ height: `${ Math.floor(data.w * 100) }%` }"></div>
</div>
</div>
<div class="player" v-if="isEnded">
<div class="player" v-if="game.is_ended">
<el-button type="primary" @click="logPos = 0" :disabled="logPos == 0">%fa:fast-backward%</el-button>
<el-button type="primary" @click="logPos--" :disabled="logPos == 0">%fa:backward%</el-button>
<span>{{ logPos }} / {{ logs.length }}</span>
@ -38,58 +43,63 @@
<script lang="ts">
import Vue from 'vue';
import { OthelloGameStream } from '../../scripts/streaming/othello-game';
import Othello from '../../../../../common/othello';
import Othello, { Color } from '../../../../../common/othello/core';
export default Vue.extend({
props: ['game'],
props: ['game', 'connection'],
data() {
return {
o: new Othello(),
o: null as Othello,
logs: [],
logPos: 0,
turn: null,
isMyTurn: null,
isEnded: false,
winner: null,
connection: null
logPos: 0
};
},
computed: {
iAmPlayer(): boolean {
return this.game.black_user_id == (this as any).os.i.id || this.game.white_user_id == (this as any).os.i.id;
return this.game.user1_id == (this as any).os.i.id || this.game.user2_id == (this as any).os.i.id;
},
myColor(): string {
return this.game.black_user_id == (this as any).os.i.id ? 'black' : 'white';
myColor(): Color {
if (!this.iAmPlayer) return null;
if (this.game.user1_id == (this as any).os.i.id && this.game.black == 1) return 'black';
if (this.game.user2_id == (this as any).os.i.id && this.game.black == 2) return 'black';
return 'white';
},
opColor(): string {
opColor(): Color {
if (!this.iAmPlayer) return null;
return this.myColor == 'black' ? 'white' : 'black';
},
blackUser(): any {
return this.game.black == 1 ? this.game.user1 : this.game.user2;
},
whiteUser(): any {
return this.game.black == 1 ? this.game.user2 : this.game.user1;
},
turnUser(): any {
if (this.o.turn == 'black') {
return this.game.black == 1 ? this.game.user1 : this.game.user2;
} else if (this.o.turn == 'white') {
return this.game.black == 1 ? this.game.user2 : this.game.user1;
} else {
return null;
}
},
isMyTurn(): boolean {
if (this.turnUser == null) return null;
return this.turnUser.id == (this as any).os.i.id;
}
},
watch: {
logPos(v) {
if (!this.isEnded) return;
this.o = new Othello();
this.turn = this.game.black_user;
if (!this.game.is_ended) return;
this.o = new Othello(this.game.settings.map, {
isLlotheo: this.game.settings.is_llotheo
});
this.logs.forEach((log, i) => {
if (i < v) {
this.o.set(log.color, log.pos);
if (log.color == 'black' && this.o.getPattern('white').length > 0) {
this.turn = this.game.white_user;
}
if (log.color == 'black' && this.o.getPattern('white').length == 0) {
this.turn = this.game.black_user;
}
if (log.color == 'white' && this.o.getPattern('black').length > 0) {
this.turn = this.game.black_user;
}
if (log.color == 'white' && this.o.getPattern('black').length == 0) {
this.turn = this.game.white_user;
}
this.o.put(log.color, log.pos);
}
});
this.$forceUpdate();
@ -97,74 +107,65 @@ export default Vue.extend({
},
created() {
this.o = new Othello(this.game.settings.map, {
isLlotheo: this.game.settings.is_llotheo
});
this.game.logs.forEach(log => {
this.o.set(log.color, log.pos);
this.o.put(log.color, log.pos);
});
this.logs = this.game.logs;
this.logPos = this.logs.length;
this.turn = this.game.turn_user_id == this.game.black_user_id ? this.game.black_user : this.game.white_user;
this.isMyTurn = this.game.turn_user_id == (this as any).os.i.id;
this.isEnded = this.game.is_ended;
this.winner = this.game.winner;
},
mounted() {
this.connection = new OthelloGameStream((this as any).os.i, this.game);
this.connection.on('set', this.onSet);
},
beforeDestroy() {
this.connection.off('set', this.onSet);
this.connection.close();
},
methods: {
set(pos) {
if (!this.isMyTurn) return;
if (!this.o.canReverse(this.myColor, pos)) return;
this.o.set(this.myColor, pos);
if (this.o.getPattern(this.opColor).length > 0) {
this.isMyTurn = !this.isMyTurn;
this.turn = this.myColor == 'black' ? this.game.white_user : this.game.black_user;
} else if (this.o.getPattern(this.myColor).length == 0) {
this.isEnded = true;
this.winner = this.o.blackCount == this.o.whiteCount ? null : this.o.blackCount > this.o.whiteCount ? this.game.black_user : this.game.white_user;
}
if (!this.o.canPut(this.myColor, pos)) return;
this.o.put(this.myColor, pos);
this.connection.send({
type: 'set',
pos
});
this.checkEnd();
this.$forceUpdate();
},
onSet(x) {
this.logs.push(x);
this.logPos++;
this.o.set(x.color, x.pos);
this.o.put(x.color, x.pos);
this.checkEnd();
this.$forceUpdate();
},
if (this.o.getPattern('black').length == 0 && this.o.getPattern('white').length == 0) {
this.isEnded = true;
this.winner = this.o.blackCount == this.o.whiteCount ? null : this.o.blackCount > this.o.whiteCount ? this.game.black_user : this.game.white_user;
} else {
if (this.iAmPlayer && this.o.getPattern(this.myColor).length > 0) {
this.isMyTurn = true;
}
if (x.color == 'black' && this.o.getPattern('white').length > 0) {
this.turn = this.game.white_user;
}
if (x.color == 'black' && this.o.getPattern('white').length == 0) {
this.turn = this.game.black_user;
}
if (x.color == 'white' && this.o.getPattern('black').length > 0) {
this.turn = this.game.black_user;
}
if (x.color == 'white' && this.o.getPattern('black').length == 0) {
this.turn = this.game.white_user;
checkEnd() {
this.game.is_ended = this.o.isEnded;
if (this.game.is_ended) {
if (this.o.winner == 'black') {
this.game.winner_id = this.game.black == 1 ? this.game.user1_id : this.game.user2_id;
this.game.winner = this.game.black == 1 ? this.game.user1 : this.game.user2;
} else if (this.o.winner == 'white') {
this.game.winner_id = this.game.black == 1 ? this.game.user2_id : this.game.user1_id;
this.game.winner = this.game.black == 1 ? this.game.user2 : this.game.user1;
} else {
this.game.winner_id = null;
this.game.winner = null;
}
}
this.$forceUpdate();
}
}
});
@ -182,8 +183,6 @@ export default Vue.extend({
> .board
display grid
grid-template-rows repeat(8, 1fr)
grid-template-columns repeat(8, 1fr)
grid-gap 4px
width 300px
height 300px
@ -221,6 +220,9 @@ export default Vue.extend({
&.prev
box-shadow 0 0 0 4px rgba($theme-color, 0.7)
&.none
border-color transparent !important
> img
display block
width 100%

42
src/web/app/common/views/components/othello.gameroom.vue Normal file
View File

@ -0,0 +1,42 @@
<template>
<div>
<x-room v-if="!g.is_started" :game="g" :connection="connection"/>
<x-game v-else :game="g" :connection="connection"/>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import XGame from './othello.game.vue';
import XRoom from './othello.room.vue';
import { OthelloGameStream } from '../../scripts/streaming/othello-game';
export default Vue.extend({
components: {
XGame,
XRoom
},
props: ['game'],
data() {
return {
connection: null,
g: null
};
},
created() {
this.g = this.game;
this.connection = new OthelloGameStream((this as any).os.i, this.game);
this.connection.on('started', this.onStarted);
},
beforeDestroy() {
this.connection.off('started', this.onStarted);
this.connection.close();
},
methods: {
onStarted(game) {
Object.assign(this.g, game);
this.$forceUpdate();
}
}
});
</script>

152
src/web/app/common/views/components/othello.room.vue Normal file
View File

@ -0,0 +1,152 @@
<template>
<div class="root">
<header><b>{{ game.user1.name }}</b> vs <b>{{ game.user2.name }}</b></header>
<p>ゲームの設定</p>
<el-select v-model="mapName" placeholder="マップを選択" @change="onMapChange">
<el-option v-for="m in maps" :key="m.name" :label="m.name" :value="m.name"/>
</el-select>
<div class="board" :style="{ 'grid-template-rows': `repeat(${ game.settings.map.size }, 1fr)`, 'grid-template-columns': `repeat(${ game.settings.map.size }, 1fr)` }">
<div v-for="(x, i) in game.settings.map.data"
:class="{ none: x == ' ' }"
>
<template v-if="x == 'b'">%fa:circle%</template>
<template v-if="x == 'w'">%fa:circle R%</template>
</div>
</div>
<div class="rules">
<mk-switch v-model="game.settings.is_llotheo" @change="onIsLlotheoChange" text="石の少ない方が勝ち(ロセオ)"/>
</div>
<div class="actions">
<el-button @click="exit">キャンセル</el-button>
<el-button type="primary" @click="accept" v-if="!isAccepted">準備完了</el-button>
<el-button type="primary" @click="cancel" v-if="isAccepted">準備続行</el-button>
</div>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import * as maps from '../../../../../common/othello/maps';
export default Vue.extend({
props: ['game', 'connection'],
data() {
return {
o: null,
isLlotheo: false,
mapName: maps.eighteight.name,
maps: maps
};
},
computed: {
isAccepted(): boolean {
if (this.game.user1_id == (this as any).os.i.id && this.game.user1_accepted) return true;
if (this.game.user2_id == (this as any).os.i.id && this.game.user2_accepted) return true;
return false;
}
},
created() {
this.connection.on('change-accepts', this.onChangeAccepts);
this.connection.on('update-settings', this.onUpdateSettings);
},
beforeDestroy() {
this.connection.off('change-accepts', this.onChangeAccepts);
this.connection.off('update-settings', this.onUpdateSettings);
},
methods: {
exit() {
},
accept() {
this.connection.send({
type: 'accept'
});
},
cancel() {
this.connection.send({
type: 'cancel-accept'
});
},
onChangeAccepts(accepts) {
this.game.user1_accepted = accepts.user1;
this.game.user2_accepted = accepts.user2;
this.$forceUpdate();
},
onUpdateSettings(settings) {
this.game.settings = settings;
this.mapName = this.game.settings.map.name;
},
onMapChange(v) {
this.game.settings.map = Object.entries(maps).find(x => x[1].name == v)[1];
this.connection.send({
type: 'update-settings',
settings: this.game.settings
});
this.$forceUpdate();
},
onIsLlotheoChange(v) {
this.connection.send({
type: 'update-settings',
settings: this.game.settings
});
this.$forceUpdate();
}
}
});
</script>
<style lang="stylus" scoped>
@import '~const.styl'
.root
text-align center
> header
padding 8px
border-bottom dashed 1px #c4cdd4
> .board
display grid
grid-gap 4px
width 300px
height 300px
margin 16px auto
> div
background transparent
border solid 2px #eee
border-radius 6px
overflow hidden
*
pointer-events none
user-select none
width 100%
height 100%
&.none
border-color transparent
> .rules
max-width 300px
margin 0 auto
> .actions
margin-bottom 16px
</style>

18
src/web/app/common/views/components/othello.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="mk-othello">
<div v-if="game">
<x-game :game="game"/>
<x-gameroom :game="game"/>
</div>
<div class="matching" v-else-if="matching">
<h1><b>{{ matching.name }}</b>を待っています<mk-ellipsis/></h1>
@ -40,18 +40,18 @@
<section v-if="myGames.length > 0">
<h2>自分の対局</h2>
<div class="game" v-for="g in myGames" tabindex="-1" @click="game = g">
<img :src="`${g.black_user.avatar_url}?thumbnail&size=32`" alt="">
<img :src="`${g.white_user.avatar_url}?thumbnail&size=32`" alt="">
<span><b>{{ g.black_user.name }}</b> vs <b>{{ g.white_user.name }}</b></span>
<img :src="`${g.user1.avatar_url}?thumbnail&size=32`" alt="">
<img :src="`${g.user2.avatar_url}?thumbnail&size=32`" alt="">
<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
<span class="state">{{ g.is_ended ? '終了' : '進行中' }}</span>
</div>
</section>
<section v-if="games.length > 0">
<h2>みんなの対局</h2>
<div class="game" v-for="g in games" tabindex="-1" @click="game = g">
<img :src="`${g.black_user.avatar_url}?thumbnail&size=32`" alt="">
<img :src="`${g.white_user.avatar_url}?thumbnail&size=32`" alt="">
<span><b>{{ g.black_user.name }}</b> vs <b>{{ g.white_user.name }}</b></span>
<img :src="`${g.user1.avatar_url}?thumbnail&size=32`" alt="">
<img :src="`${g.user2.avatar_url}?thumbnail&size=32`" alt="">
<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
<span class="state">{{ g.is_ended ? '終了' : '進行中' }}</span>
</div>
</section>
@ -61,11 +61,11 @@
<script lang="ts">
import Vue from 'vue';
import XGame from './othello.game.vue';
import XGameroom from './othello.gameroom.vue';
export default Vue.extend({
components: {
XGame
XGameroom
},
data() {
return {