jp.ms.common.engine 1.0.2 → 1.0.4

package/src/base-rooms/tournament-room.ts

@@ -1,169 +1,169 @@
-import { first, remove, reverse } from 'lodash';
-
-import { GamePlayer, GameRoom } from '../base';
-import { IGameTable } from '../base/game-table';
-import { GameRoomConfig } from '../base/game-room';
-
-import { TournamentState } from './tournament-state';
-import { ITournamentWinner } from './tournament-winner';
-import { ITournamentParticipant } from './tournament-participant';
-import { TournamentPrizes } from './tournament-prize';
-
-export type TournamentRoomConfig = {
-    ticketPrice: number;
-    prizeTable: TournamentPrizes;
-} & GameRoomConfig
-
-export abstract class TournamentRoom<
-    GT extends IGameTable<GP>,
-    GP extends GamePlayer,
-> extends GameRoom<GT, GP> {
-    private readonly state: TournamentState;
-    private readonly prizeTable: TournamentPrizes;
-    private queue: Array<GP>;
-    private readonly userRating: Array<ITournamentWinner>;
-    private winners: Array<ITournamentWinner>;
-    private readonly participants: Array<ITournamentParticipant>;
-    private readonly ticketPrice: number;
-
-    constructor (config: TournamentRoomConfig) {
-        super(config);
-        this.state = new TournamentState();
-        this.ticketPrice = config.ticketPrice;
-        this.prizeTable = config.prizeTable;
-        this.queue = [];
-        this.userRating = [];
-        this.winners = [];
-        this.participants = [];
-    }
-
-    abstract handleJoinTournament (player: GP);
-
-    abstract handleLeaveTournament (player: GP);
-
-    abstract startTournament ();
-
-    abstract finishTournament ();
-
-    abstract isTournamentFinish (): boolean;
-
-    getParticipants () {
-        return this.participants;
-    }
-
-    addParticipant (participant: GP) {
-        return this.participants.push({
-            userId: participant.getId(),
-            userName: participant.getFullName(),
-            userAvatarUrl: participant.getAvatarUrl(),
-        });
-    }
-
-    getParticipant (userId: string) {
-        return this.participants.find((item) => item.userId === userId);
-    }
-
-    isParticipant (userId: string): boolean {
-        return !!this.participants.find((item) => item.userId === userId);
-    }
-
-    getQueue () {
-        return this.queue;
-    }
-
-    getOnlineQueuers () {
-        return this.queue.filter((item) => item.hasOpenConnection());
-    }
-
-    addUserRoomToQueue (player: GP) {
-        const hasThisUser = this.queue.find((queuer) => queuer.getId() === player.getId());
-        if (!hasThisUser) {
-            player.getInTournamentQueue(this.getId());
-            this.queue.push(player);
-        }
-    }
-
-    removeUserFromQueue (player: GP) {
-        player.quit();
-        remove(this.queue, (queuer) => queuer.getId() === player.getId());
-    }
-
-    clearQueue () {
-        this.queue.forEach((player) => player.quit());
-        this.queue = [];
-    }
-
-    getRatingList () {
-        return this.userRating;
-    }
-
-    addPlayerToRating (player: GP) {
-        remove(this.userRating, (user) => player.getId() === user.userId);
-
-        this.userRating.push({
-            userId: player.getId(),
-            userName: player.getFullName(),
-            userAvatarUrl: player.getAvatarUrl() ?? '',
-            prize: 0,
-            rank: 0,
-        });
-    }
-
-    getWinner (): ITournamentWinner | undefined {
-        return first(this.winners);
-    }
-
-    getWinners () {
-        return this.winners;
-    }
-
-    setWinners (winners: Array<ITournamentWinner>) {
-        this.winners = winners;
-    }
-
-    getState (): TournamentState {
-        return this.state;
-    }
-
-    isTournament (): boolean {
-        return true;
-    }
-
-    calculateWinners () {
-        const firstTen = this.getSortedRatingList();
-        const winners: Array<ITournamentWinner> = [];
-
-        for (let i = 0; i < firstTen.length; i += 1) {
-            const ratingUser = firstTen[i];
-            const rank = i + 1;
-            const prize = this.getPrize(rank);
-
-            winners.push({
-                ...ratingUser,
-                prize,
-                rank,
-            });
-        }
-
-        this.setWinners(winners);
-    }
-
-    getSortedRatingList (): Array<ITournamentWinner> {
-        return reverse(this.getRatingList());
-    }
-
-    getTournamentFund (): number {
-        return this.participants.length * this.ticketPrice;
-    }
-
-    getPrize (rank: number): number {
-        const allPlayersCount = this.getRatingList().length;
-
-        const prize = this.prizeTable.find((item) =>
-            allPlayersCount >= item.minPlayers && allPlayersCount <= item.maxPlayers);
-
-        const rankPrize = prize?.prizes[rank] ?? 0;
-
-        return rankPrize * this.getTournamentFund() / 100;
-    }
-}
+// import { first, remove, reverse } from 'lodash';
+//
+// import { GamePlayer, GameRoom } from '../base';
+// import { IGameTable } from '../base/game-table';
+// import { GameRoomConfig } from '../base/game-room';
+//
+// import { TournamentState } from './tournament-state';
+// import { ITournamentWinner } from './tournament-winner';
+// import { ITournamentParticipant } from './tournament-participant';
+// import { TournamentPrizes } from './tournament-prize';
+//
+// export type TournamentRoomConfig = {
+//     ticketPrice: number;
+//     prizeTable: TournamentPrizes;
+// } & GameRoomConfig
+//
+// export abstract class TournamentRoom<
+//     GT extends IGameTable<GP>,
+//     GP extends GamePlayer,
+// > extends GameRoom<GT, GP> {
+//     private readonly state: TournamentState;
+//     private readonly prizeTable: TournamentPrizes;
+//     private queue: Array<GP>;
+//     private readonly userRating: Array<ITournamentWinner>;
+//     private winners: Array<ITournamentWinner>;
+//     private readonly participants: Array<ITournamentParticipant>;
+//     private readonly ticketPrice: number;
+//
+//     constructor (config: TournamentRoomConfig) {
+//         super(config);
+//         this.state = new TournamentState();
+//         this.ticketPrice = config.ticketPrice;
+//         this.prizeTable = config.prizeTable;
+//         this.queue = [];
+//         this.userRating = [];
+//         this.winners = [];
+//         this.participants = [];
+//     }
+//
+//     abstract handleJoinTournament (player: GP);
+//
+//     abstract handleLeaveTournament (player: GP);
+//
+//     abstract startTournament ();
+//
+//     abstract finishTournament ();
+//
+//     abstract isTournamentFinish (): boolean;
+//
+//     getParticipants () {
+//         return this.participants;
+//     }
+//
+//     addParticipant (participant: GP) {
+//         return this.participants.push({
+//             userId: participant.getId(),
+//             userName: participant.getFullName(),
+//             userAvatarUrl: participant.getAvatarUrl(),
+//         });
+//     }
+//
+//     getParticipant (userId: string) {
+//         return this.participants.find((item) => item.userId === userId);
+//     }
+//
+//     isParticipant (userId: string): boolean {
+//         return !!this.participants.find((item) => item.userId === userId);
+//     }
+//
+//     getQueue () {
+//         return this.queue;
+//     }
+//
+//     getOnlineQueuers () {
+//         return this.queue.filter((item) => item.hasOpenConnection());
+//     }
+//
+//     addUserRoomToQueue (player: GP) {
+//         const hasThisUser = this.queue.find((queuer) => queuer.getId() === player.getId());
+//         if (!hasThisUser) {
+//             player.getInTournamentQueue(this.getId());
+//             this.queue.push(player);
+//         }
+//     }
+//
+//     removeUserFromQueue (player: GP) {
+//         player.quit();
+//         remove(this.queue, (queuer) => queuer.getId() === player.getId());
+//     }
+//
+//     clearQueue () {
+//         this.queue.forEach((player) => player.quit());
+//         this.queue = [];
+//     }
+//
+//     getRatingList () {
+//         return this.userRating;
+//     }
+//
+//     addPlayerToRating (player: GP) {
+//         remove(this.userRating, (user) => player.getId() === user.userId);
+//
+//         this.userRating.push({
+//             userId: player.getId(),
+//             userName: player.getFullName(),
+//             userAvatarUrl: player.getAvatarUrl() ?? '',
+//             prize: 0,
+//             rank: 0,
+//         });
+//     }
+//
+//     getWinner (): ITournamentWinner | undefined {
+//         return first(this.winners);
+//     }
+//
+//     getWinners () {
+//         return this.winners;
+//     }
+//
+//     setWinners (winners: Array<ITournamentWinner>) {
+//         this.winners = winners;
+//     }
+//
+//     getState (): TournamentState {
+//         return this.state;
+//     }
+//
+//     isTournament (): boolean {
+//         return true;
+//     }
+//
+//     calculateWinners () {
+//         const firstTen = this.getSortedRatingList();
+//         const winners: Array<ITournamentWinner> = [];
+//
+//         for (let i = 0; i < firstTen.length; i += 1) {
+//             const ratingUser = firstTen[i];
+//             const rank = i + 1;
+//             const prize = this.getPrize(rank);
+//
+//             winners.push({
+//                 ...ratingUser,
+//                 prize,
+//                 rank,
+//             });
+//         }
+//
+//         this.setWinners(winners);
+//     }
+//
+//     getSortedRatingList (): Array<ITournamentWinner> {
+//         return reverse(this.getRatingList());
+//     }
+//
+//     getTournamentFund (): number {
+//         return this.participants.length * this.ticketPrice;
+//     }
+//
+//     getPrize (rank: number): number {
+//         const allPlayersCount = this.getRatingList().length;
+//
+//         const prize = this.prizeTable.find((item) =>
+//             allPlayersCount >= item.minPlayers && allPlayersCount <= item.maxPlayers);
+//
+//         const rankPrize = prize?.prizes[rank] ?? 0;
+//
+//         return rankPrize * this.getTournamentFund() / 100;
+//     }
+// }

package/src/base-rooms/tournament-state.ts

@@ -1,4 +1,4 @@
-import { GameStateMachine, StateMachineConfig } from '../base/game-state-machine';
+import { GameStateMachine, StateMachineConfig } from '../base';
 
 export enum TournamentStateMachineStates {
     STATE_WAITING_FOR_START = 'STATE_WAITING_FOR_START',
@@ -43,7 +43,7 @@ const config: StateMachineConfig = {
     [STATE_CANCELLED]: { on: {} },
 };
 
-export class TournamentState extends GameStateMachine<TournamentStateMachineStates, TournamentStateMachineActions> {
+export class TournamentState extends GameStateMachine {
     constructor () {
         super(TournamentStateMachineStates.STATE_WAITING_FOR_START, config);
     }

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

@@ -1,50 +1,50 @@
-import { last } from 'lodash';
-
-import { BoardFigure } from './board-figure';
-
-export class BoardCell<BF extends BoardFigure> {
-    private readonly id: number;
-    private readonly figures: Array<BF>;
-
-    constructor (id: number) {
-        this.id = id;
-        this.figures = [];
-    }
-
-    getId (): number {
-        return this.id;
-    }
-
-    getFigures (): Array<BF> {
-        return this.figures;
-    }
-
-    getFigure (): BF | null {
-        return last(this.figures) ?? null;
-    }
-
-    addFigure (figure: BF): void {
-        this.figures.push(figure);
-        figure.addCell(this.getId());
-    }
-
-    hasFigure (): boolean {
-        return this.figures.length > 0;
-    }
-
-    popFigure (): BF | undefined {
-        return this.figures.pop();
-    }
-
-    isFree () {
-        return this.figures.length === 0;
-    }
-
-    hasYoursFigure (color: number) {
-        return this.getFigure()?.getColor() === color;
-    }
-
-    hasEnemiesFigure (color: number) {
-        return this.hasFigure() && !this.hasYoursFigure(color);
-    }
-}
+// import { last } from 'lodash';
+//
+// import { BoardFigure } from './board-figure';
+//
+// export class BoardCell<BF extends BoardFigure> {
+//     private readonly id: number;
+//     private readonly figures: Array<BF>;
+//
+//     constructor (id: number) {
+//         this.id = id;
+//         this.figures = [];
+//     }
+//
+//     getId (): number {
+//         return this.id;
+//     }
+//
+//     getFigures (): Array<BF> {
+//         return this.figures;
+//     }
+//
+//     getFigure (): BF | null {
+//         return last(this.figures) ?? null;
+//     }
+//
+//     addFigure (figure: BF): void {
+//         this.figures.push(figure);
+//         figure.addCell(this.getId());
+//     }
+//
+//     hasFigure (): boolean {
+//         return this.figures.length > 0;
+//     }
+//
+//     popFigure (): BF | undefined {
+//         return this.figures.pop();
+//     }
+//
+//     isFree () {
+//         return this.figures.length === 0;
+//     }
+//
+//     hasYoursFigure (color: number) {
+//         return this.getFigure()?.getColor() === color;
+//     }
+//
+//     hasEnemiesFigure (color: number) {
+//         return this.hasFigure() && !this.hasYoursFigure(color);
+//     }
+// }

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

@@ -1,49 +1,49 @@
-import { last } from 'lodash';
-
-import { GamePlayerColor } from '../../base/game-player';
-
-export abstract class BoardFigure {
-    private readonly id: number;
-    private readonly color: number;
-    private readonly cells: Array<number>;
-
-    constructor (id: number, color: number) {
-        this.id = id;
-        this.color = color;
-        this.cells = [];
-    }
-
-    abstract getType (): number;
-
-    getId () {
-        return this.id;
-    }
-
-    getColor () {
-        return this.color;
-    }
-
-    getCells () {
-        return this.cells;
-    }
-
-    getCell () {
-        return last(this.cells);
-    }
-
-    getState () {
-        return 0;
-    }
-
-    addCell (cellId: number) {
-        this.cells.push(cellId);
-    }
-
-    isWhite () {
-        return this.color === GamePlayerColor.WHITE;
-    }
-
-    isBlack () {
-        return this.color === GamePlayerColor.BLACK;
-    }
-}
+// import { last } from 'lodash';
+//
+// import { GamePlayerColor } from '../../base/game-player';
+//
+// export abstract class BoardFigure {
+//     private readonly id: number;
+//     private readonly color: number;
+//     private readonly cells: Array<number>;
+//
+//     constructor (id: number, color: number) {
+//         this.id = id;
+//         this.color = color;
+//         this.cells = [];
+//     }
+//
+//     abstract getType (): number;
+//
+//     getId () {
+//         return this.id;
+//     }
+//
+//     getColor () {
+//         return this.color;
+//     }
+//
+//     getCells () {
+//         return this.cells;
+//     }
+//
+//     getCell () {
+//         return last(this.cells);
+//     }
+//
+//     getState () {
+//         return 0;
+//     }
+//
+//     addCell (cellId: number) {
+//         this.cells.push(cellId);
+//     }
+//
+//     isWhite () {
+//         return this.color === GamePlayerColor.WHITE;
+//     }
+//
+//     isBlack () {
+//         return this.color === GamePlayerColor.BLACK;
+//     }
+// }