Creating gameEngine folder under gameplay (#736)

src/databaseAdapters/user.ts

@@ -1,5 +1,5 @@
 import User from '../models/user';
-import { IUser } from '../gameplay/types';
+import { IUser } from '../gameplay/gameEngine/types';
 import { S3AvatarSet } from '../clients/s3/S3Agent';
 
 interface DatabaseAdapter {

src/gameplay/anonymizer.ts → src/gameplay/gameEngine/anonymizer.ts

@@ -1,4 +1,4 @@
-import shuffleArray from '../util/shuffleArray';
+import shuffleArray from '../../util/shuffleArray';
 import { IRecoverable, RecoverableComponent } from './types';
 
 const ANON_NAMES = [

src/gameplay/cards/avalon/ladyOfTheLake.ts → src/gameplay/gameEngine/cards/avalon/ladyOfTheLake.ts

@@ -1,6 +1,6 @@
 import { Phase } from '../../phases/types';
 import { Card, ICard } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class LadyOfTheLake implements ICard {
   private thisRoom: any;

src/gameplay/cards/avalon/refOfTheRain.ts → src/gameplay/gameEngine/cards/avalon/refOfTheRain.ts

@@ -1,6 +1,6 @@
 import { Phase } from '../../phases/types';
 import { Card, ICard } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class RefOfTheRain implements ICard {
   private thisRoom: any;

src/gameplay/cards/avalon/sireOfTheSea.ts → src/gameplay/gameEngine/cards/avalon/sireOfTheSea.ts

@@ -1,6 +1,6 @@
 import { Phase } from '../../phases/types';
 import { Card, ICard } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class SireOfTheSea implements ICard {
   private thisRoom: any;

src/gameplay/cards/types.ts → src/gameplay/gameEngine/cards/types.ts

@@ -1,4 +1,4 @@
-import { SocketUser } from '../../sockets/types';
+import { SocketUser } from '../../../sockets/types';
 
 export enum Card {
   LadyOfTheLake = 'Lady of the Lake',

src/gameplay/game.ts → src/gameplay/gameEngine/game.ts

@@ -2,14 +2,14 @@
 import _ from 'lodash';
 
 import Room, { RoomConfig } from './room';
-import usernamesIndexes from '../myFunctions/usernamesIndexes';
-import User from '../models/user';
-import GameRecord from '../models/gameRecord';
-import RatingPeriodGameRecord from '../models/RatingPeriodGameRecord';
-import { isMod } from '../modsadmins/mods';
-import { isTO } from '../modsadmins/tournamentOrganizers';
-import { isDev } from '../modsadmins/developers';
-import { modOrTOString } from '../modsadmins/modOrTO';
+import usernamesIndexes from '../../myFunctions/usernamesIndexes';
+import User from '../../models/user';
+import GameRecord from '../../models/gameRecord';
+import RatingPeriodGameRecord from '../../models/RatingPeriodGameRecord';
+import { isMod } from '../../modsadmins/mods';
+import { isTO } from '../../modsadmins/tournamentOrganizers';
+import { isDev } from '../../modsadmins/developers';
+import { modOrTOString } from '../../modsadmins/modOrTO';
 
 import { RoomCreationType } from './roomTypes';
 import { Phase } from './phases/types';
@@ -22,17 +22,17 @@ import {
 } from './types';
 import { GameTimer, Timeouts } from './gameTimer';
 import { VoidGameTracker } from './voidGameTracker';
-import { SocketUser } from '../sockets/types';
+import { SocketUser } from '../../sockets/types';
 import { avalonRoles, rolesThatCantGuessMerlin } from './roles/roles';
 import { avalonCards } from './cards/cards';
 import { avalonPhases, commonPhases } from './phases/phases';
 import { Card } from './cards/types';
 import { Role } from './roles/types';
-import { millisToStr } from '../util/time';
-import shuffleArray from '../util/shuffleArray';
+import { millisToStr } from '../../util/time';
+import shuffleArray from '../../util/shuffleArray';
 import { Anonymizer } from './anonymizer';
-import { sendReplyToCommand } from '../sockets/sockets';
-import { gamesPlayedMetric } from '../metrics/gameMetrics';
+import { sendReplyToCommand } from '../../sockets/sockets';
+import { gamesPlayedMetric } from '../../metrics/gameMetrics';
 
 export const WAITING = 'Waiting';
 export const MIN_PLAYERS = 5;

src/gameplay/gameTimer.ts → src/gameplay/gameEngine/gameTimer.ts

@@ -1,6 +1,6 @@
 import { ButtonSettings, isGamePhase, Phase } from './phases/types';
 import Game, { getRandomInt } from './game';
-import { postGameMoveChecks } from '../sockets/sockets';
+import { postGameMoveChecks } from '../../sockets/sockets';
 import { Alliance } from './types';
 
 // All in milliseconds

src/gameplay/gameWrapper.ts → src/gameplay/gameEngine/gameWrapper.ts

@@ -2,7 +2,7 @@
 // This wrapper mainly serves as a way to detect and make callbacks
 // to the socket.js file for updates.
 import Game, { GameConfig } from './game';
-import { SocketUser } from '../sockets/types';
+import { SocketUser } from '../../sockets/types';
 import { Alliance } from './types';
 
 type SocketServerCallback = (action: string, game: GameWrapper) => void;

src/gameplay/phases/avalon/assassination.ts → src/gameplay/gameEngine/phases/avalon/assassination.ts

@@ -1,6 +1,6 @@
-import usernamesIndexes from '../../../myFunctions/usernamesIndexes';
+import usernamesIndexes from '../../../../myFunctions/usernamesIndexes';
 import { ButtonSettings, IPhase, Phase } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 import { Alliance } from '../../types';
 import { Role } from '../../roles/types';
 

src/gameplay/phases/avalon/lady.js → src/gameplay/gameEngine/phases/avalon/lady.js

@@ -1,4 +1,4 @@
-import usernamesIndexes from '../../../myFunctions/usernamesIndexes';
+import usernamesIndexes from '../../../../myFunctions/usernamesIndexes';
 import { Phase } from '../types';
 import { Card } from '../../cards/types';
 

src/gameplay/phases/avalon/ref.js → src/gameplay/gameEngine/phases/avalon/ref.js

@@ -1,4 +1,4 @@
-import usernamesIndexes from '../../../myFunctions/usernamesIndexes';
+import usernamesIndexes from '../../../../myFunctions/usernamesIndexes';
 import { Phase } from '../types';
 
 class Ref {

src/gameplay/phases/avalon/sire.js → src/gameplay/gameEngine/phases/avalon/sire.js

@@ -1,4 +1,4 @@
-import usernamesIndexes from '../../../myFunctions/usernamesIndexes';
+import usernamesIndexes from '../../../../myFunctions/usernamesIndexes';
 import { Phase } from '../types';
 
 class Sire {

src/gameplay/phases/common/finished.ts → src/gameplay/gameEngine/phases/common/finished.ts

@@ -1,5 +1,5 @@
 import { ButtonSettings, IPhase, Phase } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 import { Alliance } from '../../types';
 
 class Finished implements IPhase {

src/gameplay/phases/common/frozen.ts → src/gameplay/gameEngine/phases/common/frozen.ts

@@ -1,5 +1,5 @@
 import { ButtonSettings, IPhase, Phase } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class Frozen implements IPhase {
   static phase = Phase.Frozen;

src/gameplay/phases/common/paused.ts → src/gameplay/gameEngine/phases/common/paused.ts

@@ -1,5 +1,5 @@
 import { ButtonSettings, IPhase, Phase } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class Paused implements IPhase {
   static phase = Phase.Paused;

src/gameplay/phases/common/pickingTeam.ts → src/gameplay/gameEngine/phases/common/pickingTeam.ts

@@ -1,7 +1,7 @@
-import usernamesIndexes from '../../../myFunctions/usernamesIndexes';
+import usernamesIndexes from '../../../../myFunctions/usernamesIndexes';
 import { ButtonSettings, IPhase, Phase } from '../types';
 import { MIN_PLAYERS, NUM_PLAYERS_ON_MISSION } from '../../game';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class PickingTeam implements IPhase {
   static phase = Phase.PickingTeam;

src/gameplay/phases/common/voided.ts → src/gameplay/gameEngine/phases/common/voided.ts

@@ -1,5 +1,5 @@
 import { ButtonSettings, IPhase, Phase } from '../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 import { Alliance } from '../../types';
 
 class Voided implements IPhase {

src/gameplay/phases/common/votingMission.ts → src/gameplay/gameEngine/phases/common/votingMission.ts

@@ -1,7 +1,7 @@
-import usernamesIndexes from '../../../myFunctions/usernamesIndexes';
+import usernamesIndexes from '../../../../myFunctions/usernamesIndexes';
 import { ButtonSettings, IPhase, Phase } from '../types';
 import { Alliance } from '../../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class VotingMission implements IPhase {
   static phase = Phase.VotingMission;

src/gameplay/phases/common/votingTeam.ts → src/gameplay/gameEngine/phases/common/votingTeam.ts

@@ -1,7 +1,7 @@
-import usernamesIndexes from '../../../myFunctions/usernamesIndexes';
+import usernamesIndexes from '../../../../myFunctions/usernamesIndexes';
 import { ButtonSettings, IPhase, Phase } from '../types';
 import { Alliance } from '../../types';
-import { SocketUser } from '../../../sockets/types';
+import { SocketUser } from '../../../../sockets/types';
 
 class VotingTeam implements IPhase {
   static phase = Phase.VotingTeam;

src/gameplay/phases/types.ts → src/gameplay/gameEngine/phases/types.ts

@@ -1,4 +1,4 @@
-import { SocketUser } from '../../sockets/types';
+import { SocketUser } from '../../../sockets/types';
 
 export enum Phase {
   // Core phases

src/gameplay/room.ts → src/gameplay/gameEngine/room.ts

@@ -1,18 +1,18 @@
 // @ts-nocheck
 import { GAME_MODE_NAMES, GameMode } from './gameModes';
-import { SocketUser } from '../sockets/types';
+import { SocketUser } from '../../sockets/types';
 import Game, { MIN_PLAYERS } from './game';
 import { Timeouts } from './gameTimer';
-import { ReadyPrompt } from '../sockets/readyPrompt';
+import { ReadyPrompt } from '../../sockets/readyPrompt';
 import { avalonRoles } from './roles/roles';
 import { avalonCards } from './cards/cards';
 import { avalonPhases, commonPhases } from './phases/phases';
 import { Role } from './roles/types';
 import { Phase } from './phases/types';
-import { millisToStr } from '../util/time';
+import { millisToStr } from '../../util/time';
 import { RoomPlayer } from './types';
-import { isMod } from '../modsadmins/mods';
-import { isAdmin } from '../modsadmins/admins';
+import { isMod } from '../../modsadmins/mods';
+import { isAdmin } from '../../modsadmins/admins';
 
 export class RoomConfig {
   host: string;

src/gameplay/tests/game.test.ts → src/gameplay/gameEngine/tests/game.test.ts

@@ -1,17 +1,17 @@
 import Game, { GameConfig, NUM_PLAYERS_ON_MISSION } from '../game';
 import { RoomConfig } from '../room';
 import { GameMode } from '../gameModes';
-import { ReadyPrompt } from '../../sockets/readyPrompt';
+import { ReadyPrompt } from '../../../sockets/readyPrompt';
 import { RoomCreationType } from '../roomTypes';
 import { Phase } from '../phases/types';
 import { Alliance } from '../types';
 import { Card } from '../cards/types';
 import { Role } from '../roles/types';
 
 jest.mock('../gameWrapper');
-jest.mock('../../models/gameRecord');
-jest.mock('../../models/user');
-jest.mock('../../models/RatingPeriodGameRecord');
+jest.mock('../../../models/gameRecord');
+jest.mock('../../../models/user');
+jest.mock('../../../models/RatingPeriodGameRecord');
 
 describe('Game Engine', () => {
   let game: Game;

src/models/user.ts

@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 // @ts-ignore
 import passportLocalMongoose from 'passport-local-mongoose';
-import type { IUser } from '../gameplay/types';
+import type { IUser } from '../gameplay/gameEngine/types';
 
 const UserSchema = new mongoose.Schema<IUser>({
   username: {

src/rewards/constants.ts

@@ -1,4 +1,4 @@
-import { Role } from '../gameplay/roles/types';
+import { Role } from '../gameplay/gameEngine/roles/types';
 
 const constants = {
   ADMIN_BADGE: 'ADMIN_BADGE',

src/rewards/getRewards.ts

@@ -10,7 +10,7 @@ import { isMod } from '../modsadmins/mods';
 import { isTO } from '../modsadmins/tournamentOrganizers';
 import { isDev } from '../modsadmins/developers';
 import { PatreonAgent } from '../clients/patreon/patreonAgent';
-import { IUser } from '../gameplay/types';
+import { IUser } from '../gameplay/gameEngine/types';
 import { PatreonController } from '../clients/patreon/patreonController';
 import constants from './constants';
 import { S3Agent } from '../clients/s3/S3Agent';

src/routes/index.js

@@ -13,8 +13,12 @@ import { sendEmailVerification } from '../myFunctions/sendEmailVerification';
 
 import { disallowVPNs } from '../util/vpnDetection';
 import Settings from '../settings';
-import { Alliance } from '../gameplay/types';
-import { resRoles, rolesToAlliances, spyRoles } from '../gameplay/roles/roles';
+import { Alliance } from '../gameplay/gameEngine/types';
+import {
+  resRoles,
+  rolesToAlliances,
+  spyRoles,
+} from '../gameplay/gameEngine/roles/roles';
 import { sendResetPassword } from '../myFunctions/sendResetPassword';
 import uuid from 'uuid';
 import { captchaMiddleware } from '../util/captcha';

src/routes/types.ts

@@ -1,5 +1,5 @@
 import { Request } from 'express';
-import { IUser } from '../gameplay/types';
+import { IUser } from '../gameplay/gameEngine/types';
 
 export interface EnrichedRequest extends Request {
   user: IUser;

src/sockets/bot.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { Phase } from '../gameplay/phases/types';
+import { Phase } from '../gameplay/gameEngine/phases/types';
 
 export const enabledBots = [];
 enabledBots.push({

src/sockets/commands/admin/atestgame.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 
 import { Command } from '../types';
-import gameRoom from '../../../gameplay/gameWrapper';
+import gameRoom from '../../../gameplay/gameEngine/gameWrapper';
 import { SocketUser } from '../../types';
 import { SimpleBotSocket } from '../../bot';
 import {
@@ -12,9 +12,9 @@ import {
   sendToAllChat,
   socketCallback,
 } from '../../sockets';
-import { RoomCreationType } from '../../../gameplay/roomTypes';
-import { Role } from '../../../gameplay/roles/types';
-import { Card } from '../../../gameplay/cards/types';
+import { RoomCreationType } from '../../../gameplay/gameEngine/roomTypes';
+import { Role } from '../../../gameplay/gameEngine/roles/types';
+import { Card } from '../../../gameplay/gameEngine/cards/types';
 
 function addBots(args: string[], senderSocket: SocketUser, roomId: number) {
   if (!args[1]) {

src/sockets/commands/mod/mforcemove.ts

@@ -1,8 +1,8 @@
 import { Command } from '../types';
 import { modOrTOString } from '../../../modsadmins/modOrTO';
 import { getIndexFromUsername, rooms } from '../../sockets';
-import { Alliance } from '../../../gameplay/types';
-import { Phase } from '../../../gameplay/phases/types';
+import { Alliance } from '../../../gameplay/gameEngine/types';
+import { Phase } from '../../../gameplay/gameEngine/phases/types';
 
 export const mforcemove: Command = {
   command: 'mforcemove',

src/sockets/commands/mod/mtogglepause.ts

@@ -1,6 +1,6 @@
 import { Command } from '../types';
 import { rooms } from '../../sockets';
-import { Phase } from '../../../gameplay/phases/types';
+import { Phase } from '../../../gameplay/gameEngine/phases/types';
 
 export const mtogglepause: Command = {
   command: 'mtogglepause',

src/sockets/filters/createRoomFilter.ts

@@ -1,5 +1,5 @@
-import GameWrapper from '../../gameplay/gameWrapper';
-import { WAITING } from '../../gameplay/game';
+import GameWrapper from '../../gameplay/gameEngine/gameWrapper';
+import { WAITING } from '../../gameplay/gameEngine/game';
 
 export class CreateRoomFilter {
   // Returns true if user can create a room. Else false.