Merge branch 'master' into dt2-ca

src/lib/skilling/skills/construction/constructables.ts

@@ -24,7 +24,7 @@ const Constructables: Constructable[] = [
 		input: [Plank.Plank, 2],
 		xp: 58,
 		level: 1,
-		ticks: 5,
+		ticks: 6.5,
 		nails: 2
 	},
 	{
@@ -33,7 +33,7 @@ const Constructables: Constructable[] = [
 		input: [Plank.Plank, 4],
 		xp: 115,
 		level: 4,
-		ticks: 5,
+		ticks: 6.5,
 		nails: 4
 	},
 	{
@@ -42,7 +42,7 @@ const Constructables: Constructable[] = [
 		input: [Plank.Plank, 3],
 		xp: 87,
 		level: 8,
-		ticks: 5,
+		ticks: 6.5,
 		nails: 3
 	},
 	{
@@ -51,7 +51,7 @@ const Constructables: Constructable[] = [
 		input: [Plank.Plank, 8],
 		xp: 228,
 		level: 9,
-		ticks: 5,
+		ticks: 6.5,
 		nails: 8
 	},
 	{
@@ -60,7 +60,7 @@ const Constructables: Constructable[] = [
 		input: [Plank.Plank, 4],
 		xp: 115,
 		level: 10,
-		ticks: 5,
+		ticks: 6.5,
 		nails: 4
 	},
 	{
@@ -69,7 +69,7 @@ const Constructables: Constructable[] = [
 		input: [Plank.Plank, 3],
 		xp: 87,
 		level: 14,
-		ticks: 5,
+		ticks: 6.5,
 		nails: 3
 	},
 	{
@@ -78,124 +78,120 @@ const Constructables: Constructable[] = [
 		input: [Plank.OakPlank, 2],
 		xp: 120,
 		level: 15,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Crafting table 1'),
 		name: 'Crafting table 1',
 		input: [Plank.OakPlank, 4],
 		xp: 240,
 		level: 16,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Oak chair'),
 		name: 'Oak chair',
 		input: [Plank.OakPlank, 2],
 		xp: 120,
 		level: 19,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Oak dining table'),
 		name: 'Oak dining table',
 		input: [Plank.OakPlank, 4],
 		xp: 240,
 		level: 22,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Oak armchair'),
 		name: 'Oak armchair',
 		input: [Plank.OakPlank, 3],
 		xp: 180,
 		level: 26,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Carved oak table'),
 		name: 'Carved oak table',
 		input: [Plank.OakPlank, 6],
 		xp: 360,
 		level: 31,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Oak larder'),
 		name: 'Oak larder',
 		input: [Plank.OakPlank, 8],
 		xp: 480,
 		level: 33,
-		ticks: 5
+		ticks: 6
 	},
 	{
 		id: itemID('Teak armchair'),
 		name: 'Teak armchair',
 		input: [Plank.TeakPlank, 2],
 		xp: 180,
 		level: 35,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Teak table'),
 		name: 'Teak table',
 		input: [Plank.TeakPlank, 4],
 		xp: 360,
 		level: 38,
-		ticks: 5
+		ticks: 5.6
 	},
 	{
 		id: 21_913,
 		name: 'Mythical cape (mounted)',
 		input: [Plank.TeakPlank, 3],
 		xp: 370,
 		level: 47,
-		ticks: 5
+		ticks: 5.2
 	},
 	{
 		id: itemID('Mahogany armchair'),
 		name: 'Mahogany armchair',
 		input: [Plank.MahoganyPlank, 2],
 		xp: 280,
 		level: 50,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Mahogany table'),
 		name: 'Mahogany table',
 		input: [Plank.MahoganyPlank, 6],
 		xp: 840,
 		level: 52,
-		ticks: 5
+		ticks: 5.6
 	},
 	{
 		id: itemID('Teak garden bench'),
 		name: 'Teak garden bench',
 		input: [Plank.TeakPlank, 6],
 		xp: 540,
 		level: 66,
-		ticks: 5
+		ticks: 4.6
 	},
 	{
 		id: itemID('Oak door'),
 		name: 'Oak door',
 		input: [Plank.OakPlank, 10],
 		xp: 600,
 		level: 74,
-		ticks: 5
+		ticks: 6.5
 	},
 	{
 		id: itemID('Gnome bench'),
 		name: 'Gnome bench',
 		input: [Plank.MahoganyPlank, 6],
 		xp: 840,
 		level: 77,
-		ticks: 5
+		ticks: 4.6
 	}
 ];
 
-for (const obj of Constructables) {
-	obj.ticks *= 2.6;
-}
-
 export default Constructables;

src/mahoji/commands/build.ts

@@ -97,7 +97,7 @@ export const buildCommand: OSBMahojiCommand = {
 			}
 		}
 
-		const timeToBuildSingleObject = object.ticks * 300;
+		const timeToBuildSingleObject = object.ticks * Time.Second * 0.6;
 
 		const [plank, planksQtyCost] = object.input;
 

src/mahoji/commands/clue.ts

@@ -1,18 +1,20 @@
-import type { CommandRunOptions } from '@oldschoolgg/toolkit/util';
+import type { CommandResponse, CommandRunOptions } from '@oldschoolgg/toolkit/util';
 import { ApplicationCommandOptionType } from 'discord.js';
 import { Time, notEmpty, randInt } from 'e';
 import { Bank } from 'oldschooljs';
 import type { Item, ItemBank } from 'oldschooljs/dist/meta/types';
 
 import type { ClueTier } from '../../lib/clues/clueTiers';
 import { ClueTiers } from '../../lib/clues/clueTiers';
+import { BitField } from '../../lib/constants';
 import { allOpenables, getOpenableLoot } from '../../lib/openables';
 import { getPOHObject } from '../../lib/poh';
 import type { ClueActivityTaskOptions } from '../../lib/types/minions';
 import { formatDuration, isWeekend, stringMatches } from '../../lib/util';
 import addSubTaskToActivityTask from '../../lib/util/addSubTaskToActivityTask';
 import { calcMaxTripLength } from '../../lib/util/calcMaxTripLength';
 import getOSItem, { getItem } from '../../lib/util/getOSItem';
+import { makeBankImage } from '../../lib/util/makeBankImage';
 import { getPOH } from '../lib/abstracted_commands/pohCommand';
 import type { OSBMahojiCommand } from '../lib/util';
 import { addToOpenablesScores, getMahojiBank, mahojiUsersSettingsFetch } from '../mahojiSettings';
@@ -323,6 +325,8 @@ export const clueCommand: OSBMahojiCommand = {
 
 		timeToFinish = result.duration;
 
+		const response: Awaited<CommandResponse> = {};
+
 		let implingLootString = '';
 		let implingClues = 0;
 		if (!clueImpling) {
@@ -350,18 +354,31 @@ export const clueCommand: OSBMahojiCommand = {
 			}
 
 			await addToOpenablesScores(user, new Bank().add(implingJarOpenable.id, openedImplings));
-			await user.transactItems({
+
+			const { previousCL } = await user.transactItems({
 				itemsToAdd: implingLoot,
 				itemsToRemove: new Bank().add(clueImpling, openedImplings).add(clueTier.scrollID, bankedClues),
 				collectionLog: true
 			});
+
+			const image = await makeBankImage({
+				bank: implingLoot,
+				title: `Loot from ${openedImplings}x ${implingJarOpenable.name}`,
+				user,
+				previousCL,
+				mahojiFlags: user.bitfield.includes(BitField.DisableOpenableNames) ? undefined : ['show_names']
+			});
+
+			response.files = [image.file];
+
 			if (bankedClues + implingClues === 0) {
-				return `You don't have any clues, and didn't find any in ${openedImplings}x ${clueImpling.name}s. At least you received the following loot: ${implingLoot}.`;
+				response.content = `You don't have any clues, and didn't find any in ${openedImplings}x ${clueImpling.name}s.`;
+				return response;
 			}
 			quantity = bankedClues + implingClues;
 			implingLootString = `\n\nYou will find ${implingClues} clue${
 				implingClues === 0 || implingClues > 1 ? 's' : ''
-			} from ${openedImplings}x ${clueImpling.name}s, and receive the following loot: ${implingLoot}.`;
+			} from ${openedImplings}x ${clueImpling.name}s.`;
 		}
 
 		duration = timeToFinish * quantity;
@@ -376,10 +393,12 @@ export const clueCommand: OSBMahojiCommand = {
 			duration,
 			type: 'ClueCompletion'
 		});
-		return `${user.minionName} is now completing ${quantity}x ${
+
+		response.content = `${user.minionName} is now completing ${quantity}x ${
 			clueTier.name
 		} clues, it'll take around ${formatDuration(duration)} to finish.${
 			boosts.length > 0 ? `\n\n**Boosts:** ${boosts.join(', ')}.` : ''
 		}${implingLootString}`;
+		return response;
 	}
 };