fix(prefixes): fix coloring of prefixes and some misc changes (#314)

ugcodrr · web-flow · commit 847f60a5517a · 2022-07-23T20:59:12.000-06:00
diff --git a/apps/discord-bot/src/commands/arenabrawl/arenabrawl.profile.tsx b/apps/discord-bot/src/commands/arenabrawl/arenabrawl.profile.tsx
@@ -40,8 +40,8 @@ export const ArenaBrawlProfile = ({
   const sidebar: SidebarItem[] = [
     [t("stats.coins"), t(arenabrawl.coins), "§6"],
     [t("stats.tokens"), t(arenabrawl.tokens), "§e"],
-    [t("stats.keys"), t(arenabrawl.keys), "§b"],
-    [t("stats.magicalChests"), t(arenabrawl.magicalChests), "§a"],
+    [t("stats.magicalKeys"), t(arenabrawl.keys), "§b"],
+    [t("stats.magicalChests"), t(arenabrawl.magicalChests), "§5"],
     [t("stats.rune"), prettify(arenabrawl.rune), "§9"],
   ];
 
@@ -53,7 +53,7 @@ export const ArenaBrawlProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.ARENA_BRAWL} §fStats §r(${mode.formatted})`}
-        description={`§7Kill ${formatProgression({
+        description={`§7Win ${formatProgression({
           t,
           progression: arenabrawl.progression,
           currentLevel: arenabrawl.currentPrefix,
diff --git a/apps/discord-bot/src/commands/bedwars/bedwars.profile.tsx b/apps/discord-bot/src/commands/bedwars/bedwars.profile.tsx
@@ -56,7 +56,7 @@ export const BedWarsProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.BEDWARS} §fStats §r(${mode.formatted})`}
-        description={`§7Level: ${bedwars.levelFormatted}\n${formatProgression({
+        description={`§7Level: ${bedwars.levelFormatted}\n§7EXP ${formatProgression({
           t,
           progression: bedwars.progression,
           currentLevel: bedwars.levelFormatted,
diff --git a/apps/discord-bot/src/commands/buildbattle/buildbattle.profile.tsx b/apps/discord-bot/src/commands/buildbattle/buildbattle.profile.tsx
@@ -61,13 +61,15 @@ export const BuildBattleProfile = ({
         sidebar={sidebar}
         historicalSidebar
         title={`§l${FormattedGame.BUILD_BATTLE} §fStats`}
-        description={`§7Title: ${buildbattle.titleFormatted}\n${formatProgression({
-          t,
-          progression: buildbattle.progression,
-          currentLevel: buildbattle.titleFormatted,
-          nextLevel: buildbattle.nextTitleFormatted,
-          showLevelWhenMaxed: false,
-        })}`}
+        description={`§7Title: ${buildbattle.titleFormatted}\n§7Score ${formatProgression(
+          {
+            t,
+            progression: buildbattle.progression,
+            currentLevel: buildbattle.titleFormatted,
+            nextLevel: buildbattle.nextTitleFormatted,
+            showLevelWhenMaxed: false,
+          }
+        )}`}
         time={time}
       />
       <Table.table>
diff --git a/apps/discord-bot/src/commands/duels/bridge.profile.tsx b/apps/discord-bot/src/commands/duels/bridge.profile.tsx
@@ -51,7 +51,7 @@ export const BridgeProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.BRIDGE} §fStats §r(${mode.formatted})`}
-        description={`§7Title: ${bridge.titleFormatted}\n${formatProgression({
+        description={`§7Title: ${bridge.titleFormatted}\n§7Win ${formatProgression({
           t,
           progression: bridge.progression,
           currentLevel: bridge.titleLevelFormatted,
diff --git a/apps/discord-bot/src/commands/duels/duels.profile.tsx b/apps/discord-bot/src/commands/duels/duels.profile.tsx
@@ -68,7 +68,7 @@ export const DuelsProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.DUELS} §fStats §r(${mode.formatted})`}
-        description={`§7Title: ${duels[api].titleFormatted}\n${formatProgression({
+        description={`§7Title: ${duels[api].titleFormatted}\n§7Win ${formatProgression({
           t,
           progression: duels[api].progression,
           currentLevel: duels[api].titleLevelFormatted,
diff --git a/apps/discord-bot/src/commands/guild/guild.profile.tsx b/apps/discord-bot/src/commands/guild/guild.profile.tsx
@@ -238,7 +238,7 @@ const GuildGexpPage = ({ guild, t }: GuildGexpPageProps) => {
 
   const leveling = `§7${t("stats.guild.level")}: ${guildColor}${t(
     guild.level
-  )}\n${formatProgression({
+  )}\n§7GEXP ${formatProgression({
     t,
     progression: guild.levelProgression,
     currentLevel: `${guildColor}${t(Math.floor(guild.level))}`,
diff --git a/apps/discord-bot/src/commands/pit/pit.profile.tsx b/apps/discord-bot/src/commands/pit/pit.profile.tsx
@@ -46,10 +46,8 @@ export const PitProfile = ({
         name={player.doc.colouredName}
         skin={skin}
         time="LIVE"
-        title="§l§eThe §aPit §fStats"
-        description={`${FormattedGame.PIT} §7Level: ${
-          player.doc.formattedLevel
-        }\n${formatProgression({
+        title={`§l${FormattedGame.PIT} §fStats`}
+        description={`§7Level: ${player.doc.formattedLevel}\n§7EXP ${formatProgression({
           t,
           progression: new Progression(
             player.xpProgress.displayCurrent,
diff --git a/apps/discord-bot/src/commands/skywars/skywars.profile.tsx b/apps/discord-bot/src/commands/skywars/skywars.profile.tsx
@@ -141,7 +141,7 @@ export const SkyWarsProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.SKYWARS} Stats §r(${mode.formatted})`}
-        description={`§7Level: ${skywars.levelFormatted}\n${formatProgression({
+        description={`§7Level: ${skywars.levelFormatted}\n§EXP ${formatProgression({
           t,
           progression: skywars.progression,
           currentLevel: skywars.levelFormatted,
diff --git a/apps/discord-bot/src/commands/speeduhc/speeduhc.profile.tsx b/apps/discord-bot/src/commands/speeduhc/speeduhc.profile.tsx
@@ -52,7 +52,7 @@ export const SpeedUHCProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.SPEED_UHC} §fStats §r(${mode.formatted})`}
-        description={`§7Level: ${speeduhc.levelFormatted}\n${formatProgression({
+        description={`§7Level: ${speeduhc.levelFormatted}\n§7Score ${formatProgression({
           t,
           progression: speeduhc.progression,
           currentLevel: speeduhc.levelFormatted,
diff --git a/apps/discord-bot/src/commands/uhc/uhc.profile.tsx b/apps/discord-bot/src/commands/uhc/uhc.profile.tsx
@@ -51,7 +51,7 @@ export const UHCProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.UHC} §fStats §r(${mode.formatted})`}
-        description={`§7Level: ${uhc.levelFormatted}\n${formatProgression({
+        description={`§7Level: ${uhc.levelFormatted}\n§7Score ${formatProgression({
           t,
           progression: uhc.progression,
           currentLevel: uhc.levelFormatted,
diff --git a/apps/discord-bot/src/commands/vampirez/vampirez.profile.tsx b/apps/discord-bot/src/commands/vampirez/vampirez.profile.tsx
@@ -40,9 +40,11 @@ export const VampireZProfile = ({
     [t("stats.tokens"), t(vampirez.tokens), "§e"],
     [t("stats.overallWins"), t(vampirez.overallWins), "§a"],
     [t("stats.zombieKills"), t(vampirez.zombieKills), "§2"],
-    [t("stats.mostVampireKills"), t(vampirez.mostVampireKills), "§c"],
   ];
 
+  if (time === "LIVE")
+    sidebar.push([t("stats.mostVampireKills"), t(vampirez.mostVampireKills), "§c"]);
+
   return (
     <Container background={background}>
       <Header
@@ -51,13 +53,14 @@ export const VampireZProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.VAMPIREZ} §fStats §r(${mode.formatted})`}
-        description={`§7Win ${formatProgression({
+        description={`§7${api === "human" ? "Win" : "Kill"} ${formatProgression({
           t,
           progression: vampirez[api].progression,
           currentLevel: vampirez[api].currentPrefix,
           nextLevel: vampirez[api].nextPrefix,
         })}`}
         time={time}
+        historicalSidebar
       />
       <Table.table>
         <Table.tr>
diff --git a/apps/discord-bot/src/commands/woolwars/woolwars.profile.tsx b/apps/discord-bot/src/commands/woolwars/woolwars.profile.tsx
@@ -58,7 +58,7 @@ export const WoolWarsProfile = ({
         badge={badge}
         sidebar={sidebar}
         title={`§l${FormattedGame.WOOLWARS} §fStats §r(${mode.formatted})`}
-        description={`§7Level: ${woolwars.levelFormatted}\n${formatProgression({
+        description={`§7Level: ${woolwars.levelFormatted}\n§7EXP ${formatProgression({
           t,
           progression: woolwars.progression,
           currentLevel: woolwars.levelFormatted,
diff --git a/apps/discord-bot/src/services/pit-panda.service.ts b/apps/discord-bot/src/services/pit-panda.service.ts
@@ -68,7 +68,7 @@ export class PitPandaService {
             (t) => t("errors.noPitStats.title"),
             (t) => t("errors.noPitStats.description", { displayName: input })
           );
-        if (e.response.status === 400) throw this.apiService.missingPlayer(type, input);
+        if (e?.response?.status === 400) throw this.apiService.missingPlayer(type, input);
 
         throw this.apiService.unknownError();
       });
diff --git a/apps/support-bot/src/commands/commands.command.ts b/apps/support-bot/src/commands/commands.command.ts
@@ -13,14 +13,19 @@ import {
   EmbedBuilder,
   ErrorMessage,
   PaginateService,
+  TextArgument,
 } from "@statsify/discord";
 import { STATUS_COLORS } from "@statsify/logger";
 import { UserTier } from "@statsify/schemas";
 import { arrayGroup, prettify } from "@statsify/util";
 
 const COMMANDS_PER_PAGE = 25;
 
-@Command({ description: (t) => t("commands.commands"), tier: UserTier.CORE })
+@Command({
+  description: (t) => t("commands.commands"),
+  tier: UserTier.CORE,
+  args: [new TextArgument("highlight", "The string to highlight", false)],
+})
 export class CommandsCommand {
   public constructor(
     private readonly apiService: ApiService,
@@ -40,29 +45,44 @@ export class CommandsCommand {
 
     return this.paginateService.scrollingPagination(
       context,
-      groups.map((group, index) => () => this.createTopPage(index, group, totalCommands))
+      groups.map(
+        (group, index) => () =>
+          this.createTopPage(
+            index,
+            group,
+            totalCommands,
+            context.option<string>("highlight")?.toLowerCase().replace(" ", "_")
+          )
+      )
     );
   }
 
   private createTopPage(
     page: number,
     commands: [commandName: string, usage: number][],
-    totalCommands: number
+    totalCommands: number,
+    highlight: string
   ) {
     const embed = new EmbedBuilder()
       .title("Commands")
-      .footer((t) => `Total: ${t(totalCommands)}`)
+      .footer(
+        (t) =>
+          `Total: ${t(totalCommands)}${highlight ? ` | Highlighting: ${highlight}` : ""}`
+      )
       .color(STATUS_COLORS.info)
       .description((t) =>
         commands
           .map(([command, usage], index) => {
             const position = page * COMMANDS_PER_PAGE + index + 1;
-            const commandName = prettify(command);
+            const commandName = `${command.includes(highlight) ? "**" : ""}${prettify(
+              command
+            )}${command.includes(highlight) ? "**" : ""}`;
             const percentage = Math.round((usage / totalCommands) * 100);
 
-            return `\`#${position}\`${commandName}: **${t(usage)}** \`(${t(
-              percentage
-            )}%)\``;
+            return `\`#${String(position).padStart(
+              String(page * COMMANDS_PER_PAGE + COMMANDS_PER_PAGE).length,
+              "0"
+            )}\` ${commandName}: **${t(usage)}** \`(${t(percentage)}%)\``;
           })
           .join("\n")
       );
diff --git a/locales/en-US/default.json b/locales/en-US/default.json
@@ -578,7 +578,7 @@
     "iron": "Iron",
     "karma": "Karma",
     "kdr": "KDR",
-    "keys": "Keys",
+    "magicalKeys": "Magical Keys",
     "kicks": "Kicks",
     "kills": "Kills",
     "killsAsInfected": "Kills as Infected",
diff --git a/packages/rendering/src/font/font-renderer.ts b/packages/rendering/src/font/font-renderer.ts
@@ -110,7 +110,7 @@ export class FontRenderer {
     const lines = text.split("\n");
 
     return lines.map((line) => {
-      const defualtState: Omit<TextNode, "text"> = {
+      const defaultState: Omit<TextNode, "text"> = {
         bold: false,
         italic: false,
         underline: false,
@@ -120,7 +120,7 @@ export class FontRenderer {
         ...inputState,
       };
 
-      let state = defualtState;
+      let state = defaultState;
 
       line = line.startsWith("§") ? line : `§f${line}`;
 
@@ -140,7 +140,7 @@ export class FontRenderer {
             }
           }
 
-          const effect = token?.effect(part, matches as RegExpMatchArray, defualtState);
+          const effect = token?.effect(part, matches as RegExpMatchArray, defaultState);
           let text = effect?.text ?? part;
 
           if (matches) text = text.slice(matches[0].length);
diff --git a/packages/schemas/src/friends/friend.ts b/packages/schemas/src/friends/friend.ts
@@ -23,7 +23,7 @@ export class Friend {
     this.uuid = uuid;
 
     //Sk1er doesn't know how to use color codes
-    this.displayName = data.display.replace("§7+", "§8+").replace("MVP+", "MVP§c+");
+    this.displayName = data?.display?.replace("§7+", "§8+").replace("MVP+", "MVP§c+");
     this.createdAt = data.time;
   }
 }
diff --git a/packages/schemas/src/player/gamemodes/blitzsg/index.ts b/packages/schemas/src/player/gamemodes/blitzsg/index.ts
@@ -71,11 +71,11 @@ const prefixes = [
   { color: "a", score: 25_000 },
   { color: "c", score: 50_000 },
   { color: "b", score: 75_000 },
-  { color: "6", score: 100_000 },
-  { color: "d", score: 150_000 },
-  { color: "4", score: 200_000 },
-  { color: "9", score: 250_000 },
-  { color: "2", score: 300_000 },
+  { color: "6§l", score: 100_000 },
+  { color: "5§l", score: 150_000 },
+  { color: "4§l", score: 200_000 },
+  { color: "9§l", score: 250_000 },
+  { color: "2§l", score: 300_000 },
 ];
 
 export type BlitzSGModes = IGameModes<typeof BLITZSG_MODES>;
diff --git a/packages/schemas/src/player/gamemodes/turbokartracers/index.ts b/packages/schemas/src/player/gamemodes/turbokartracers/index.ts
@@ -23,14 +23,14 @@ const prefixes = [
   { color: "3", score: 50 },
   { color: "a", score: 100 },
   { color: "e", score: 200 },
-  { color: "b", score: 300 },
+  { color: "9", score: 300 },
   { color: "d", score: 400 },
   { color: "6", score: 500 },
   { color: "2", score: 750 },
-  { color: "9", score: 1000 },
+  { color: "1", score: 1000 },
   { color: "5", score: 2500 },
   { color: "4", score: 5000 },
-  { color: "8", score: 10_000 },
+  { color: "0", score: 10_000 },
 ];
 
 export class TurboKartRacers {
diff --git a/packages/schemas/src/player/gamemodes/vampirez/life.ts b/packages/schemas/src/player/gamemodes/vampirez/life.ts
@@ -52,16 +52,15 @@ export class VampireZLife {
     const prefixes = mode === "human" ? humanPrefixes : vampirePrefixes;
     const stat = mode === "human" ? this.wins : this.kills;
 
-    const prefixScore = this.wins;
-    this.currentPrefix = getFormattedLevel({ prefixes, prefixScore });
+    this.currentPrefix = getFormattedLevel({ prefixes, prefixScore: stat });
     this.naturalPrefix = getFormattedLevel({
       prefixes,
-      prefixScore,
+      prefixScore: stat,
       trueScore: true,
     });
     this.nextPrefix = getFormattedLevel({
       prefixes,
-      prefixScore,
+      prefixScore: stat,
       skip: true,
     });
 
diff --git a/packages/schemas/src/player/gamemodes/vampirez/prefixes.ts b/packages/schemas/src/player/gamemodes/vampirez/prefixes.ts
@@ -23,7 +23,7 @@ export const humanPrefixes = [
   { color: "b§l", score: 2500 },
   { color: "c§l", score: 3000 },
   { color: "4§l", score: 5000 },
-  { color: "0§l", score: 7500 },
+  { color: "0§l", score: 10_000 },
   { color: "rainbow", score: 15_000 },
 ];
 
diff --git a/packages/schemas/src/player/gamemodes/walls/index.ts b/packages/schemas/src/player/gamemodes/walls/index.ts
@@ -19,16 +19,16 @@ export type WallsModes = IGameModes<typeof WALLS_MODES>;
 const prefixes = [
   { color: "8", score: 0 },
   { color: "7", score: 25 },
-  { color: "f", score: 50 },
-  { color: "e", score: 100 },
-  { color: "a", score: 200 },
-  { color: "2", score: 300 },
-  { color: "9", score: 400 },
-  { color: "1", score: 500 },
-  { color: "d", score: 750 },
-  { color: "4", score: 1000 },
-  { color: "6", score: 2000 },
-  { color: "rainbow", score: 2500 },
+  { color: "6", score: 50 },
+  { color: "a", score: 100 },
+  { color: "2", score: 200 },
+  { color: "9", score: 300 },
+  { color: "1", score: 400 },
+  { color: "d", score: 500 },
+  { color: "4", score: 750 },
+  { color: "6", score: 1000 },
+  { color: "0", score: 2000 },
+  { color: "rainbow", score: 2001 },
 ];
 
 export class Walls {
diff --git a/packages/schemas/src/player/gamemodes/woolwars/index.ts b/packages/schemas/src/player/gamemodes/woolwars/index.ts
@@ -107,7 +107,7 @@ export class WoolWars {
     this.swordsman = new WoolWarsClass(data.wool_wars?.stats?.classes?.swordsman);
     this.engineer = new WoolWarsClass(data.wool_wars?.stats?.classes?.engineer);
     this.golem = new WoolWarsClass(data.wool_wars?.stats?.classes?.golem);
-    this.assault = new WoolWarsClass(data.wool_wars?.stats?.classes?.assult);
+    this.assault = new WoolWarsClass(data.wool_wars?.stats?.classes?.assault);
   }
 }
 
diff --git a/packages/schemas/src/player/gamemodes/woolwars/util.ts b/packages/schemas/src/player/gamemodes/woolwars/util.ts
@@ -49,6 +49,7 @@ export const getFormattedLevel = (star: number): string => {
     { req: 0, format: ["§7[", "✫]"] },
     { req: 100, format: ["§f[", "✫]"] },
     { req: 200, format: ["§c[", "✫]"] },
+    { req: 300, format: ["§6[", "✫]"] },
   ];
 
   return applyFormat(findScore(prestigeColors, star), star);
diff --git a/packages/util/src/index.ts b/packages/util/src/index.ts
