Merge pull request #472 from uwcsc/320-connect-four

Connect 4!

package.json

@@ -28,7 +28,7 @@
     "axios": "^0.27.2",
     "concurrently": "^6.1.0",
     "cron": "^1.8.2",
-    "discord.js": "^13.6.0",
+    "discord.js": "^13.15.0",
     "dotenv": "^8.2.0",
     "emoji-regex": "^10.2.1",
     "engine-blackjack-ts": "^0.9.11",

src/commandDetails/games/connectFour.ts

@@ -0,0 +1,54 @@
+import { container } from '@sapphire/framework';
+import {
+  CodeyCommandDetails,
+  getUserFromMessage,
+  SapphireAfterReplyType,
+  SapphireMessageExecuteType,
+  SapphireMessageResponseWithMetadata,
+} from '../../codeyCommand';
+import { connectFourGameTracker } from '../../components/games/connectFour';
+
+const connectFourExecuteCommand: SapphireMessageExecuteType = async (
+  _client,
+  messageFromUser,
+  _args,
+): Promise<SapphireMessageResponseWithMetadata> => {
+  /*
+    executeCommand sends the initial connectFour embed;
+    the subsequent interactionHandlers handle the rest of the logic
+  */
+
+  const game = await connectFourGameTracker.startGame(
+    messageFromUser.channelId,
+    getUserFromMessage(messageFromUser),
+  );
+
+  // Return initial response
+  return new SapphireMessageResponseWithMetadata(game.getGameResponse(), {
+    gameId: game.id,
+  });
+};
+
+const connectFourAfterMessageReply: SapphireAfterReplyType = async (result, sentMessage) => {
+  if (typeof result.metadata.gameId === 'undefined') return;
+  // Store the message which the game takes place in the game object
+  connectFourGameTracker.runFuncOnGame(<number>result.metadata.gameId, (game) => {
+    game.gameMessage = sentMessage;
+  });
+};
+
+export const connectFourCommandDetails: CodeyCommandDetails = {
+  name: 'connect4',
+  aliases: [],
+  description: 'Play Connect 4!',
+  detailedDescription: `**Examples:**
+\`${container.botPrefix}connect4\`
+\`${container.botPrefix}connect 4 @user\``,
+
+  isCommandResponseEphemeral: false,
+  messageWhenExecutingCommand: 'Setting up your Connect 4 game...',
+  executeCommand: connectFourExecuteCommand,
+  afterMessageReply: connectFourAfterMessageReply,
+  options: [],
+  subcommandDetails: {},
+};

src/commands/games/connectFour.ts

@@ -0,0 +1,16 @@
+import { Command } from '@sapphire/framework';
+import { CodeyCommand } from '../../codeyCommand';
+import { connectFourCommandDetails } from '../../commandDetails/games/connectFour';
+
+export class GamesConnectFourCommand extends CodeyCommand {
+  details = connectFourCommandDetails;
+
+  public constructor(context: Command.Context, options: Command.Options) {
+    super(context, {
+      ...options,
+      aliases: connectFourCommandDetails.aliases,
+      description: connectFourCommandDetails.description,
+      detailedDescription: connectFourCommandDetails.detailedDescription,
+    });
+  }
+}

src/components/db.ts

@@ -140,6 +140,23 @@ const initRpsGameInfo = async (db: Database): Promise<void> => {
   );
 };
 
+const initConnectFourGameInfo = async (db: Database): Promise<void> => {
+  // If player 2 ID is null, the game was against Codey
+  await db.run(
+    `
+      CREATE TABLE IF NOT EXISTS connect_four_game_info (
+        id INTEGER PRIMARY KEY NOT NULL,
+        created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        player1_id VARCHAR(30) NOT NULL,
+        player2_id VARCHAR(30),
+        player1_sign INTEGER NOT NULL DEFAULT 0,
+        player2_sign INTEGER NOT NULL DEFAULT 0,
+        status INTEGER NOT NULL DEFAULT 0
+      )
+    `,
+  );
+};
+
 const initResumePreview = async (db: Database): Promise<void> => {
   await db.run(
     `
@@ -215,6 +232,7 @@ const initTables = async (db: Database): Promise<void> => {
   await initUserCoinTable(db);
   await initUserProfileTable(db);
   await initRpsGameInfo(db);
+  await initConnectFourGameInfo(db);
   await initResumePreview(db);
   await initCompaniesTable(db);
   await initPeopleCompaniesTable(db);