BIS gear command improvements

oldschoolgg · Feb 21, 2024 · de7239d · de7239d
1 parent f194d23
commit de7239d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/lib/gear/functions/generateGearImage.ts b/src/lib/gear/functions/generateGearImage.ts
@@ -243,7 +243,8 @@ export async function generateGearImage(
 	user: MUser,
 	gearSetup: Gear | GearSetup,
 	gearType: GearSetupType | null,
-	petID: number | null
+	petID: number | null,
+	titleOverride?: string
 ) {
 	debugLog('Generating gear image', { user_id: user.id });
 	const transmogItem = (gearType && transmogItems.find(t => user.gear[gearType].hasEquipped(t.item.name))) ?? null;
@@ -301,8 +302,13 @@ export async function generateGearImage(
 
 	ctx.font = '16px OSRSFontCompact';
 	// Draw preset title
-	if (gearType) {
-		drawTitleText(ctx, toTitleCase(gearType), Math.floor(176 / 2) + (transMogImage ? 200 : 0), 25);
+	if (titleOverride || gearType) {
+		drawTitleText(
+			ctx,
+			toTitleCase(titleOverride ?? gearType ?? ''),
+			Math.floor(176 / 2) + (transMogImage ? 200 : 0),
+			25
+		);
 	}
 
 	// Draw items

diff --git a/src/lib/util/findBISGear.ts b/src/lib/util/findBISGear.ts
@@ -42,7 +42,8 @@ export function findBestGearSetups(stat: GearStat): Gear[] {
 			EquipmentSlot.Hands,
 			EquipmentSlot.Legs,
 			EquipmentSlot.Neck,
-			EquipmentSlot.Ring
+			EquipmentSlot.Ring,
+			EquipmentSlot.Body
 		]) {
 			const item = findItem([slot]);
 			if (item) {

diff --git a/src/mahoji/commands/gear.ts b/src/mahoji/commands/gear.ts
@@ -1,8 +1,10 @@
+import { Canvas, loadImage } from '@napi-rs/canvas';
 import { toTitleCase } from '@oldschoolgg/toolkit';
 import { ApplicationCommandOptionType, CommandRunOptions } from 'mahoji';
 
 import { gearValidationChecks } from '../../lib/constants';
 import { allPetIDs } from '../../lib/data/CollectionsExport';
+import { generateGearImage } from '../../lib/gear/functions/generateGearImage';
 import { GearSetupType, GearSetupTypes, GearStat } from '../../lib/gear/types';
 import { equipPet } from '../../lib/minions/functions/equipPet';
 import { unequipPet } from '../../lib/minions/functions/unequipPet';
@@ -209,7 +211,14 @@ export const gearCommand: OSBMahojiCommand = {
 
 		if (options.best_in_slot?.stat) {
 			const res = findBestGearSetups(options.best_in_slot.stat);
-			return `These are the best in slot items for ${options.best_in_slot.stat}.
+			const totalCanvas = new Canvas(5 * 175, 240);
+			const ctx = totalCanvas.getContext('2d');
+			for (let i = 0; i < 5; i++) {
+				const gearImage = await generateGearImage(user, res[i], 'melee', null, `${i + 1}`);
+				ctx.drawImage(await loadImage(gearImage), i * 175, 0);
+			}
+			return {
+				content: `These are the best in slot items for ${options.best_in_slot.stat}.
 
 ${res
 	.slice(0, 10)
@@ -219,7 +228,9 @@ ${res
 				options.best_in_slot!.stat
 			}`
 	)
-	.join('\n')}`;
+	.join('\n')}`,
+				files: [await totalCanvas.encode('png')]
+			};
 		}
 		if ((options.equip || options.unequip) && !gearValidationChecks.has(userID)) {
 			const { itemsUnequippedAndRefunded } = await user.validateEquippedGear();