jp.ms.common.engine 1.0.3 → 1.0.4

package/src/board-game/base/board-game-master.ts

@@ -1,56 +1,56 @@
-import { GameMaster } from '../../base';
-import { IGameRound } from '../../base/game-round';
-import { BoardPlayer } from './board-player';
-import { IGameTable } from '../../base/game-table';
-
-import { KillingMove, KillingMoveResult } from '../d2-board-game/d2-board-pattern-move-figure';
-import { BoardCell } from './board-cell';
-import { BoardFigure } from './board-figure';
-
-export abstract class BoardGameMaster<
-    GT extends IGameTable<GP>,
-    GR extends IGameRound<GP>,
-    GP extends BoardPlayer,
-    GSR,
-> extends GameMaster<GT, GR, GP, GSR> {
-    private figuresCount: number = 0;
-
-    abstract initStartFigures ();
-
-    abstract figuresStartPositions: Array<Array<number>>;
-
-    setFiguresStartPositions (figures: Array<Array<number>>) {
-        this.figuresStartPositions = figures;
-    }
-
-    findPath (
-        possibleMoves: Array<KillingMoveResult>,
-        movingFigureId: number | undefined,
-        movingFigureNewPosition: number | undefined,
-    ): KillingMove | undefined {
-        const foundMove = possibleMoves.find((item) => item.figureId === movingFigureId);
-
-        if (foundMove) {
-            return foundMove.paths.find((path) => path.targetCells.find((targetCell) => targetCell === movingFigureNewPosition));
-        }
-    }
-
-    killFigure (cell: BoardCell<BoardFigure> | null) {
-        const killedFigure = cell?.popFigure();
-        const rival = this.table.getPlayerByColor(killedFigure?.getColor() ?? 0);
-        rival?.popFigure(killedFigure?.getId() ?? 0);
-    }
-
-    isFinish () {
-        return this.table.getPlayers().filter((item) => item.hasNoFigures()).length > 0;
-    }
-
-    getFiguresCount () {
-        return this.figuresCount;
-    }
-
-    increaseFiguresCount () {
-        this.figuresCount += 1;
-    }
-}
-
+// import { GameMaster } from '../../base';
+// import { IGameRound } from '../../base/game-round';
+// import { BoardPlayer } from './board-player';
+// import { IGameTable } from '../../base/game-table';
+//
+// import { KillingMove, KillingMoveResult } from '../d2-board-game/d2-board-pattern-move-figure';
+// import { BoardCell } from './board-cell';
+// import { BoardFigure } from './board-figure';
+//
+// export abstract class BoardGameMaster<
+//     GT extends IGameTable<GP>,
+//     GR extends IGameRound<GP>,
+//     GP extends BoardPlayer,
+//     GSR,
+// > extends GameMaster<GT, GR, GP, GSR> {
+//     private figuresCount: number = 0;
+//
+//     abstract initStartFigures ();
+//
+//     abstract figuresStartPositions: Array<Array<number>>;
+//
+//     setFiguresStartPositions (figures: Array<Array<number>>) {
+//         this.figuresStartPositions = figures;
+//     }
+//
+//     findPath (
+//         possibleMoves: Array<KillingMoveResult>,
+//         movingFigureId: number | undefined,
+//         movingFigureNewPosition: number | undefined,
+//     ): KillingMove | undefined {
+//         const foundMove = possibleMoves.find((item) => item.figureId === movingFigureId);
+//
+//         if (foundMove) {
+//             return foundMove.paths.find((path) => path.targetCells.find((targetCell) => targetCell === movingFigureNewPosition));
+//         }
+//     }
+//
+//     killFigure (cell: BoardCell<BoardFigure> | null) {
+//         const killedFigure = cell?.popFigure();
+//         const rival = this.table.getPlayerByColor(killedFigure?.getColor() ?? 0);
+//         rival?.popFigure(killedFigure?.getId() ?? 0);
+//     }
+//
+//     isFinish () {
+//         return this.table.getPlayers().filter((item) => item.hasNoFigures()).length > 0;
+//     }
+//
+//     getFiguresCount () {
+//         return this.figuresCount;
+//     }
+//
+//     increaseFiguresCount () {
+//         this.figuresCount += 1;
+//     }
+// }
+//

package/src/board-game/base/board-player-move.ts

@@ -1,29 +1,29 @@
-import { GamePlayerMove } from '../../base/game-player-move';
-
-export class BoardPlayerMove {
-    private readonly move?: GamePlayerMove;
-
-    constructor (move: GamePlayerMove | undefined) {
-        this.move = move;
-    }
-
-    getRoomId () {
-        return this.move?.getRoomId();
-    }
-
-    getTableId () {
-        return this.move?.getTableId();
-    }
-
-    getAction () {
-        return this.move?.getAction();
-    }
-
-    getFigureId (): number | undefined {
-        return parseInt(this.move?.getAttr('figureId') ?? '', 10);
-    }
-
-    getFigureNewPosition (): number | undefined {
-        return parseInt(this.move?.getAttr('figureNewPosition') ?? '', 10);
-    }
-}
+// import { GamePlayerMove } from '../../base/game-player-move';
+//
+// export class BoardPlayerMove {
+//     private readonly move?: GamePlayerMove;
+//
+//     constructor (move: GamePlayerMove | undefined) {
+//         this.move = move;
+//     }
+//
+//     getRoomId () {
+//         return this.move?.getRoomId();
+//     }
+//
+//     getTableId () {
+//         return this.move?.getTableId();
+//     }
+//
+//     getAction () {
+//         return this.move?.getAction();
+//     }
+//
+//     getFigureId (): number | undefined {
+//         return parseInt(this.move?.getAttr('figureId') ?? '', 10);
+//     }
+//
+//     getFigureNewPosition (): number | undefined {
+//         return parseInt(this.move?.getAttr('figureNewPosition') ?? '', 10);
+//     }
+// }

package/src/board-game/base/board-player.ts

@@ -1,43 +1,43 @@
-import { remove } from 'lodash';
-
-import { GamePlayer } from '../../base';
-import { BoardFigure } from './board-figure';
-
-export abstract class BoardPlayer extends GamePlayer {
-    private readonly figures: Array<BoardFigure>;
-
-    constructor (
-        id: string,
-        fullName: string,
-        avatarUrl: string,
-        balance: number,
-        color: number,
-    ) {
-        super(id, fullName, avatarUrl, balance, color);
-        this.figures = [];
-    }
-
-    getFigures (): Array<BoardFigure> {
-        return this.figures;
-    }
-
-    hasNoFigures (): boolean {
-        return this.figures.length === 0;
-    }
-
-    addFigure (figure: BoardFigure): void {
-        this.figures.push(figure);
-    }
-
-    popFigure (figureId: number) {
-        remove(this.figures, (item) => item.getId() === figureId);
-    }
-
-    findFigure (figureId: number) {
-        return this.figures.find((item) => item.getId() === figureId);
-    }
-
-    hasFigure (figureId: number) {
-        return !!this.findFigure(figureId);
-    }
-}
+// import { remove } from 'lodash';
+//
+// import { GamePlayer } from '../../base';
+// import { BoardFigure } from './board-figure';
+//
+// export abstract class BoardPlayer extends GamePlayer {
+//     private readonly figures: Array<BoardFigure>;
+//
+//     constructor (
+//         id: string,
+//         fullName: string,
+//         avatarUrl: string,
+//         balance: number,
+//         color: number,
+//     ) {
+//         super(id, fullName, avatarUrl, balance, color);
+//         this.figures = [];
+//     }
+//
+//     getFigures (): Array<BoardFigure> {
+//         return this.figures;
+//     }
+//
+//     hasNoFigures (): boolean {
+//         return this.figures.length === 0;
+//     }
+//
+//     addFigure (figure: BoardFigure): void {
+//         this.figures.push(figure);
+//     }
+//
+//     popFigure (figureId: number) {
+//         remove(this.figures, (item) => item.getId() === figureId);
+//     }
+//
+//     findFigure (figureId: number) {
+//         return this.figures.find((item) => item.getId() === figureId);
+//     }
+//
+//     hasFigure (figureId: number) {
+//         return !!this.findFigure(figureId);
+//     }
+// }

package/src/board-game/base/board-table.ts

@@ -1,52 +1,52 @@
-import { GamePlayer, GameTable } from '../../base';
-import { GameTableConfig } from '../../base/game-table';
-
-import { BoardFigure } from './board-figure';
-import { BoardCell } from './board-cell';
-
-export abstract class BoardTable<
-    GP extends GamePlayer,
-    GM,
-    GSR,
-    BF extends BoardFigure,
-    BC extends BoardCell<BF>,
-> extends GameTable<GP, GM, GSR> {
-    private readonly bar: Array<BoardFigure>;
-
-    constructor (config: GameTableConfig<GP>) {
-        super(config);
-        this.bar = [];
-    }
-
-    abstract initCells ();
-
-    abstract getCell (id: number): BC | null;
-
-    abstract getCellsArray (): Array<BC>;
-
-    getCellsWithFigures (color: number) {
-        return this.getCellsArray().filter((item) => item.hasYoursFigure(color));
-    }
-
-    moveFigure (fromCellId: number, toCellId: number) {
-        const movingFigure = this.getCell(fromCellId)?.popFigure();
-        if (movingFigure) {
-            this.getCell(toCellId)?.addFigure(movingFigure);
-        }
-    }
-
-    getBar () {
-        return this.bar;
-    }
-
-    getFiguresAtBar (color: number) {
-        return this.bar.filter((item) => item.getColor() === color);
-    }
-
-    moveFigureToBar (fromCellId: number) {
-        const movingFigure = this.getCell(fromCellId)?.popFigure();
-        if (movingFigure) {
-            this.bar.push(movingFigure);
-        }
-    }
-}
+// import { GamePlayer, GameTable } from '../../base';
+// import { GameTableConfig } from '../../base/game-table';
+//
+// import { BoardFigure } from './board-figure';
+// import { BoardCell } from './board-cell';
+//
+// export abstract class BoardTable<
+//     GP extends GamePlayer,
+//     GM,
+//     GSR,
+//     BF extends BoardFigure,
+//     BC extends BoardCell<BF>,
+// > extends GameTable<GP, GM, GSR> {
+//     private readonly bar: Array<BoardFigure>;
+//
+//     constructor (config: GameTableConfig<GP>) {
+//         super(config);
+//         this.bar = [];
+//     }
+//
+//     abstract initCells ();
+//
+//     abstract getCell (id: number): BC | null;
+//
+//     abstract getCellsArray (): Array<BC>;
+//
+//     getCellsWithFigures (color: number) {
+//         return this.getCellsArray().filter((item) => item.hasYoursFigure(color));
+//     }
+//
+//     moveFigure (fromCellId: number, toCellId: number) {
+//         const movingFigure = this.getCell(fromCellId)?.popFigure();
+//         if (movingFigure) {
+//             this.getCell(toCellId)?.addFigure(movingFigure);
+//         }
+//     }
+//
+//     getBar () {
+//         return this.bar;
+//     }
+//
+//     getFiguresAtBar (color: number) {
+//         return this.bar.filter((item) => item.getColor() === color);
+//     }
+//
+//     moveFigureToBar (fromCellId: number) {
+//         const movingFigure = this.getCell(fromCellId)?.popFigure();
+//         if (movingFigure) {
+//             this.bar.push(movingFigure);
+//         }
+//     }
+// }

package/src/board-game/d1-board-game/d1-board-table.ts

@@ -1,56 +1,56 @@
-import { BoardFigure } from '../base/board-figure';
-import { CircleList } from '../../utils/circle-list';
-import { GameTableConfig } from '../../base/game-table';
-import { BoardCell } from '../base/board-cell';
-import { BoardTable } from '../base/board-table';
-import { BoardPlayer } from '../base/board-player';
-
-export abstract class D1BoardTable<
-    GP extends BoardPlayer,
-    GM,
-    GSR,
-    BF extends BoardFigure,
-> extends BoardTable<GP, GM, GSR, BF, BoardCell<BF>> {
-    private cells: CircleList<BoardCell<BF>>;
-    private readonly boardSize: number;
-
-    protected constructor (config: GameTableConfig<GP>, boardSize: number) {
-        super(config);
-        this.boardSize = boardSize;
-        this.initCells();
-    }
-
-    initCells () {
-        const circleList: CircleList<BoardCell<BF>> = new CircleList<BoardCell<BF>>();
-
-        for (let i = 0; i < this.getBoardSize(); i += 1) {
-            circleList.push(new BoardCell(i));
-        }
-
-        this.cells = circleList;
-    }
-
-    getBoardSize (): number {
-        return this.boardSize;
-    }
-
-    getCell (id: number): BoardCell<BF> | null {
-        return this.cells.getData(id) ?? null;
-    }
-
-    getCells (): CircleList<BoardCell<BF>> {
-        return this.cells;
-    }
-
-    getCellsArray (): Array<BoardCell<BF>> {
-        return this.cells.toArray();
-    }
-
-    getCellsChain (id: number): Array<BoardCell<BF>> {
-        return this.cells.getNextChain(id);
-    }
-
-    getCellSlice (start: number, end?: number): Array<BoardCell<BF>> {
-        return this.cells.getSlice(start, end);
-    }
-}
+// import { BoardFigure } from '../base/board-figure';
+// import { CircleList } from '../../utils/circle-list';
+// import { GameTableConfig } from '../../base/game-table';
+// import { BoardCell } from '../base/board-cell';
+// import { BoardTable } from '../base/board-table';
+// import { BoardPlayer } from '../base/board-player';
+//
+// export abstract class D1BoardTable<
+//     GP extends BoardPlayer,
+//     GM,
+//     GSR,
+//     BF extends BoardFigure,
+// > extends BoardTable<GP, GM, GSR, BF, BoardCell<BF>> {
+//     private cells: CircleList<BoardCell<BF>>;
+//     private readonly boardSize: number;
+//
+//     protected constructor (config: GameTableConfig<GP>, boardSize: number) {
+//         super(config);
+//         this.boardSize = boardSize;
+//         this.initCells();
+//     }
+//
+//     initCells () {
+//         const circleList: CircleList<BoardCell<BF>> = new CircleList<BoardCell<BF>>();
+//
+//         for (let i = 0; i < this.getBoardSize(); i += 1) {
+//             circleList.push(new BoardCell(i));
+//         }
+//
+//         this.cells = circleList;
+//     }
+//
+//     getBoardSize (): number {
+//         return this.boardSize;
+//     }
+//
+//     getCell (id: number): BoardCell<BF> | null {
+//         return this.cells.getData(id) ?? null;
+//     }
+//
+//     getCells (): CircleList<BoardCell<BF>> {
+//         return this.cells;
+//     }
+//
+//     getCellsArray (): Array<BoardCell<BF>> {
+//         return this.cells.toArray();
+//     }
+//
+//     getCellsChain (id: number): Array<BoardCell<BF>> {
+//         return this.cells.getNextChain(id);
+//     }
+//
+//     getCellSlice (start: number, end?: number): Array<BoardCell<BF>> {
+//         return this.cells.getSlice(start, end);
+//     }
+// }

package/src/board-game/d2-board-game/d2-board-cell.ts

@@ -1,30 +1,30 @@
-import { BoardCell } from '../base/board-cell';
-import { BoardFigure } from '../base/board-figure';
-
-import { Coordinate } from './types';
-
-export class D2BoardCell<BF extends BoardFigure> extends BoardCell<BF> {
-    private readonly col: number;
-    private readonly row: number;
-
-    constructor (id: number, col: number, row: number) {
-        super(id);
-        this.col = col;
-        this.row = row;
-    }
-
-    getRow (): number {
-        return this.row;
-    }
-
-    getCol (): number {
-        return this.col;
-    }
-
-    getCoordinate (): Coordinate {
-        return {
-            y: this.row ?? 0,
-            x: this.col ?? 0,
-        };
-    }
-}
+// import { BoardCell } from '../base/board-cell';
+// import { BoardFigure } from '../base/board-figure';
+//
+// import { Coordinate } from './types';
+//
+// export class D2BoardCell<BF extends BoardFigure> extends BoardCell<BF> {
+//     private readonly col: number;
+//     private readonly row: number;
+//
+//     constructor (id: number, col: number, row: number) {
+//         super(id);
+//         this.col = col;
+//         this.row = row;
+//     }
+//
+//     getRow (): number {
+//         return this.row;
+//     }
+//
+//     getCol (): number {
+//         return this.col;
+//     }
+//
+//     getCoordinate (): Coordinate {
+//         return {
+//             y: this.row ?? 0,
+//             x: this.col ?? 0,
+//         };
+//     }
+// }