bot: Add DT2 bosses (#206)

* Add DT2 bosses * Bump version
wise-old-man · Jul 26, 2023 · 35242eb · 35242eb
1 parent 6c2607f
commit 35242eb
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 19 deletions.
diff --git a/hack.d.ts b/hack.d.ts
@@ -0,0 +1,19 @@
+// Make sure to export "Competition" type in client-js types, and then delete this
+
+export * from '@wise-old-man/utils';
+
+declare module '@wise-old-man/utils' {
+  export type Competition = {
+    id: number;
+    title: string;
+    metric: Metric;
+    type: CompetitionType;
+    startsAt: Date;
+    endsAt: Date;
+    groupId: number | null;
+    score: number;
+    verificationHash: string;
+    createdAt: Date | null;
+    updatedAt: Date | null;
+  };
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wise-old-man-bot",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "A Discord bot for the Wise Old Man projects (https://github.com/wise-old-man/wise-old-man/)",
   "author": "Psikoi",
   "license": "ISC",
@@ -47,7 +47,7 @@
     "@sapphire/discord.js-utilities": "^4.8.0",
     "@sentry/node": "^7.28.0",
     "@sentry/tracing": "^7.28.0",
-    "@wise-old-man/utils": "^2.2.1",
+    "@wise-old-man/utils": "^2.2.3-beta.0",
     "canvas": "^2.6.1",
     "cors": "^2.8.5",
     "discord-api-types": "^0.27.2",

diff --git a/public/x2/duke_sucellus.png b/public/x2/duke_sucellus.png
diff --git a/public/x2/the_leviathan.png b/public/x2/the_leviathan.png
diff --git a/public/x2/the_whisperer.png b/public/x2/the_whisperer.png
diff --git a/public/x2/vardorvis.png b/public/x2/vardorvis.png
diff --git a/src/commands/instances/player/PlayerBossesCommand.ts b/src/commands/instances/player/PlayerBossesCommand.ts
@@ -12,8 +12,8 @@ import {
   getUsernameParam
 } from '../../../utils';
 
-const RENDER_WIDTH = 350;
-const RENDER_HEIGHT = 355;
+const RENDER_WIDTH = 415;
+const RENDER_HEIGHT = 325;
 const RENDER_PADDING = 15;
 
 enum RenderVariant {
@@ -98,8 +98,8 @@ class PlayerBossesCommand extends Command {
       rank: number,
       ehb?: number
     ) {
-      const x = Math.floor(index / 11);
-      const y = index % 11;
+      const x = Math.floor(index / 10);
+      const y = index % 10;
 
       const originX = RENDER_PADDING - 7 + x * 67;
       const originY = RENDER_PADDING - 5 + y * 31;

diff --git a/src/utils/discord.ts b/src/utils/discord.ts
@@ -61,6 +61,7 @@ const MetricEmoji = {
   [Metric.DAGANNOTH_REX]: '<:dagannoth_rex:729839922097422336>',
   [Metric.DAGANNOTH_SUPREME]: '<:dagannoth_supreme:729839921959010345>',
   [Metric.DERANGED_ARCHAEOLOGIST]: '<:deranged_archaeologist:729839922139234374>',
+  [Metric.DUKE_SUCELLUS]: '<:duke_sucellus:1133832623458881586>',
   [Metric.GENERAL_GRAARDOR]: '<:general_graardor:729839922298618026>',
   [Metric.GIANT_MOLE]: '<:giant_mole:729839922076319875>',
   [Metric.GROTESQUE_GUARDIANS]: '<:grotesque_guardians:729839922286166086>',
@@ -83,13 +84,16 @@ const MetricEmoji = {
   [Metric.TEMPOROSS]: '<:tempoross:823292463456059452>',
   [Metric.THE_GAUNTLET]: '<:the_gauntlet:729840085473820805>',
   [Metric.THE_CORRUPTED_GAUNTLET]: '<:the_corrupted_gauntlet:729840085159247873>',
+  [Metric.THE_LEVIATHAN]: '<:the_leviathan:1133832625006592021>',
+  [Metric.THE_WHISPERER]: '<:the_whisperer:1133832628114567242>',
   [Metric.THEATRE_OF_BLOOD]: '<:theatre_of_blood:729840085406711819>',
   [Metric.THEATRE_OF_BLOOD_HARD_MODE]: '<:theatre_of_blood_hard_mode:850017967164751933>',
   [Metric.THERMONUCLEAR_SMOKE_DEVIL]: '<:thermonuclear_smoke_devil:729840085729673326>',
   [Metric.TOMBS_OF_AMASCUT]: '<:tombs_of_amascut:1011399670125314108>',
   [Metric.TOMBS_OF_AMASCUT_EXPERT]: '<:tombs_of_amascut_expert:1011399690908078190>',
   [Metric.TZKAL_ZUK]: '<:tzkal_zuk:729840085373157497>',
   [Metric.TZTOK_JAD]: '<:tztok_jad:729840085805170698>',
+  [Metric.VARDORVIS]: '<:vardorvis:1133832631419670700>',
   [Metric.VENENATIS]: '<:venenatis:729840086795157595>',
   [Metric.VETION]: '<:vetion:729840085553381387>',
   [Metric.VORKATH]: '<:vorkath:729840086056960100>',