Setting up crouch cancel command

Author: bartdebever

package-lock.json

@@ -26,11 +26,11 @@
   },
   "homepage": "https://github.com/FightCore/bot-js#readme",
   "dependencies": {
-    "@apollo/client": "^3.10.4",
+    "@apollo/client": "^3.10.5",
     "@datalust/winston-seq": "^2.0.0",
-    "@elastic/elasticsearch": "^8.13.1",
-    "axios": "^1.6.8",
-    "discord.js": "^14.15.2",
+    "@elastic/elasticsearch": "^8.14.0",
+    "axios": "^1.7.2",
+    "discord.js": "^14.15.3",
     "dotenv": "^16.4.5",
     "inversify": "^6.0.2",
     "jaro-winkler-typescript": "^1.0.1",
@@ -39,12 +39,12 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/node": "^16.18.97",
+    "@types/node": "^16.18.100",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.1.5",
     "typescript": "^5.4.5"
   }
 }

package.json

@@ -1,30 +1,111 @@
-import { EmbedBuilder } from 'discord.js';
+import { Colors, EmbedBuilder } from 'discord.js';
 import { CrouchCancelCalculator } from '../calculation/crouch-cancel-calculator';
 import { Character } from '../models/character';
 import { Move } from '../models/move';
 import { BaseEmbedCreator } from './base-embed-creator';
 import { InfoLine } from './formatting/info-line';
+import { CharacterEmoji } from '../utils/character-emoji';
+import { Loader } from '../data/loader';
 
 export class CrouchCancelEmbedCreator extends BaseEmbedCreator {
-  public static create(character: Character, move: Move, target: Character | undefined): EmbedBuilder[] {
+  public static create(character: Character, move: Move, target: Character | undefined, dataLoader: Loader): EmbedBuilder[] {
     const embedCreator = this.baseEmbed();
 
-    const hitboxMap = new Map<string, string>();
-    if (target) {
-      embedCreator.setTitle(`${character.name} - ${move.name} vs ${target.name}`);
+    if (move.gifUrl) {
+      embedCreator.setImage(move.gifUrl);
     } else {
-      embedCreator.setTitle(`${character.name} - ${move.name}`);
+      embedCreator.addFields({
+        name: 'No GIF available',
+        value: 'There is no GIF available for this move. Visit https://www.fightcore.gg to help us out.',
+      });
+    }
+    embedCreator.setURL(
+      `https://fightcore.gg/characters/${character.fightCoreId}/${character.normalizedName}/moves/${move.id}/${move.normalizedName}/?utm_source=fightcore_bot`
+    );
+
+    if (target) {
+      return this.createForTarget(character, move, target, embedCreator);
     }
+
+    return this.createForAll(character, move, embedCreator, dataLoader);
+  }
+
+  private static createForTarget(
+    character: Character,
+    move: Move,
+    target: Character,
+    embedBuilder: EmbedBuilder
+  ): EmbedBuilder[] {
+    const hitboxMap = new Map<string, string>();
+    const characterEmote = CharacterEmoji.getEmoteId(character.normalizedName);
+    const targetEmote = CharacterEmoji.getEmoteId(target.normalizedName);
+    embedBuilder.setTitle(`${characterEmote} ${character.name} - ${move.name} vs ${target.name} ${targetEmote} `);
     for (const hitbox of move.hitboxes) {
-      const crouchCancelPercentage = CrouchCancelCalculator.calculateCrouchCancel(hitbox, target!).toFixed(2);
-      hitboxMap.set(hitbox.name, crouchCancelPercentage);
+      if (hitbox.angle > 179 && hitbox.angle != 361) {
+        hitboxMap.set(hitbox.name, `Can not be CCed due to angle being higher than 179 (${hitbox.angle})`);
+      } else if (hitbox.angle === 0) {
+        hitboxMap.set(hitbox.name, `Can not be CCed due to angle being 0`);
+      } else {
+        const crouchCancelPercentage = CrouchCancelCalculator.calculateCrouchCancel(hitbox, target).toFixed(2);
+        hitboxMap.set(hitbox.name, crouchCancelPercentage);
+      }
     }
     let result = 'Crouch cancel breaks at the following percentages for each hitbox.\n';
     for (const keyValuePair of hitboxMap) {
       result += InfoLine.createLineWithTitle(keyValuePair[0], keyValuePair[1]) + '\n';
     }
-    embedCreator.setDescription(result);
+    embedBuilder.addFields({ name: 'Crouch Cancel Percentage', value: result });
+    return [embedBuilder];
+  }
+
+  private static createForAll(character: Character, move: Move, embedBuilder: EmbedBuilder, dataLoader: Loader): EmbedBuilder[] {
+    const characterEmote = CharacterEmoji.getEmoteId(character.normalizedName);
+    embedBuilder.setTitle(`${characterEmote} ${character.name} - ${move.name}`);
+
+    for (const hitbox of move.hitboxes) {
+      if (hitbox.angle > 179 && hitbox.angle != 361) {
+        embedBuilder.addFields({
+          name: hitbox.name,
+          value: `Can not be CCed due to angle being higher than 179 (${hitbox.angle})`,
+        });
+        continue;
+      } else if (hitbox.angle === 0) {
+        embedBuilder.addFields({ name: hitbox.name, value: `Can not be CCed due to angle being 0` });
+        continue;
+      }
+
+      const hitboxMap = new Map<Character, string>();
+      for (const target of dataLoader.data) {
+        const crouchCancelPercentage = CrouchCancelCalculator.calculateCrouchCancel(hitbox, target).toFixed(2);
+        hitboxMap.set(target, crouchCancelPercentage);
+      }
 
-    return [embedCreator];
+      let fieldText = '';
+      let iterator = 0;
+      for (const keyValuePair of hitboxMap) {
+        const emote = CharacterEmoji.getEmoteId(keyValuePair[0].normalizedName);
+        fieldText += `${emote} ${keyValuePair[1]}% `;
+        iterator++;
+        if (iterator === 4) {
+          iterator = 0;
+          fieldText += '\n';
+        }
+      }
+
+      embedBuilder.addFields({ name: hitbox.name, value: fieldText });
+    }
+    if (embedBuilder.length >= 6000) {
+      const errorEmbed = this.baseEmbed();
+      errorEmbed.setColor(Colors.DarkRed);
+      errorEmbed.setTitle(embedBuilder.data.title!);
+      errorEmbed.addFields({
+        name: 'Too many hitboxes',
+        value: `This move has too many hitboxes to be displayed on Discord, either supply a target character or visit our [website](${embedBuilder
+          .data.url!})`,
+      });
+
+      return [errorEmbed];
+    }
+    return [embedBuilder];
   }
 }

src/assets/framedata.json

@@ -98,11 +98,21 @@ export class MoveEmbedCreator extends BaseEmbedCreator {
 
     const moveEmbed = this.baseEmbed()
       .setTitle(`${this.character.name} - ${this.move.name}`)
-      .setURL(this.move.source)
+      .setURL(
+        `https://fightcore.gg/characters/${this.character.normalizedName}/moves/${this.move.normalizedName}?referer=fightcore_bot`
+      )
       .setColor(this.embedColor)
-      .setImage(`https://i.fightcore.gg/melee/moves/${this.character.normalizedName}/${this.move.normalizedName}.gif`)
       .addFields(moveEmbedFields);
 
+    if (this.move.gifUrl) {
+      moveEmbed.setImage(this.move.gifUrl);
+    } else {
+      moveEmbed.addFields({
+        name: 'No GIF available',
+        value: 'There is no GIF available for this move. Visit https://www.fightcore.gg to help us out.',
+      });
+    }
+
     // Return the embed inside of an array.
     // Multiple embeds could be created and returned but this is not needed for this use case.
     return [moveEmbed];

src/embeds/crouch-cancel-embed-creator.ts

@@ -11,10 +11,16 @@ import { SearchResultType } from '../models/search/search-result-type';
 import { MessageCleaner } from '../utils/message-cleaner';
 import { BaseInteractionHandler } from './base-interaction-handler';
 import { CrouchCancelEmbedCreator } from '../embeds/crouch-cancel-embed-creator';
+import { Loader } from '../data/loader';
 
 @injectable()
 export class CommandInteractionHandler extends BaseInteractionHandler {
-  constructor(search: Search, @inject(Symbols.Logger) logger: Logger, failureStore: FailureStore) {
+  constructor(
+    search: Search,
+    @inject(Symbols.Logger) logger: Logger,
+    failureStore: FailureStore,
+    @inject(Loader) private loader: Loader
+  ) {
     super(search, logger, failureStore);
   }
   async handle(interaction: CommandInteraction): Promise<void> {
@@ -37,15 +43,15 @@ export class CommandInteractionHandler extends BaseInteractionHandler {
         return;
       }
 
-      const target = interaction.options.get('target', true).value;
+      const target = interaction.options.get('target', false)?.value;
       const targetCharacter = this.search.searchCharacter([target as string]);
 
       if (target && !targetCharacter) {
         await this.sendNoMoveFoundErrorToInteraction(interaction, `${target} `, new SearchResult(SearchResultType.NotFound));
         return;
       }
 
-      const embeds = CrouchCancelEmbedCreator.create(searchResult.character, searchResult.move, targetCharacter);
+      const embeds = CrouchCancelEmbedCreator.create(searchResult.character, searchResult.move, targetCharacter, this.loader);
       await interaction.reply({
         embeds: embeds,
       });

src/embeds/move-embed-creator.ts

@@ -19,4 +19,5 @@ export interface Move {
   percent?: string;
   source: string;
   landingFallSpecialLag: number;
+  gifUrl: string;
 }

src/interactions/command-interaction-handler.ts

@@ -0,0 +1,39 @@
+export class CharacterEmoji {
+  static getEmoteId(normalizedName: string): string | undefined {
+    const emotes = [
+      { id: '1253321851405467710', name: 'bowser' },
+      { id: '1253321852504510464', name: 'captainfalcon' },
+      { id: '1253321853536047225', name: 'donkeykong' },
+      { id: '1253321854924357674', name: 'drmario' },
+      { id: '1253321856753209426', name: 'falco' },
+      { id: '1253321858057769111', name: 'fwireframe' },
+      { id: '1253321859181842442', name: 'fox' },
+      { id: '1253321860721016832', name: 'ganondorf' },
+      { id: '1253321863988383764', name: 'jigglypuff' },
+      { id: '1253321866840510555', name: 'link' },
+      { id: '1253321868946182164', name: 'luigi' },
+      { id: '1253321872628514868', name: 'marth' },
+      { id: '1253321876722421882', name: 'mrgame&watch' },
+      { id: '1253321880006299699', name: 'peach' },
+      { id: '1253321883663859722', name: 'pikachu' },
+      { id: '1253321888068010064', name: 'samus' },
+      { id: '1253321891884695675', name: 'yoshi' },
+      { id: '1253321895458111568', name: 'zelda' },
+      { id: '1253322051796598797', name: 'iceclimbers' },
+      { id: '1253322053424124065', name: 'kirby' },
+      { id: '1253322054523162634', name: 'mario' },
+      { id: '1253322178330628148', name: 'mewtwo' },
+      { id: '1253322179169353809', name: 'ness' },
+      { id: '1253322180473786561', name: 'pichu' },
+      { id: '1253322182118080512', name: 'roy' },
+      { id: '1253322183569178705', name: 'sheik' },
+      { id: '1253322184290467861', name: 'younglink' },
+    ];
+    const id = emotes.find((emote) => emote.name === normalizedName)?.id;
+    if (id) {
+      return `<:a:${id}>`;
+    }
+
+    return undefined;
+  }
+}