Add toggle for Clue Buttons (#5635)

oldschoolgg · Feb 2, 2024 · 27fb5d8 · 27fb5d8
1 parent 5530682
commit 27fb5d8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/src/lib/clues/clueUtils.ts b/src/lib/clues/clueUtils.ts
@@ -1,6 +1,7 @@
 import { ButtonBuilder, ButtonStyle } from 'discord.js';
 import { Bank } from 'oldschooljs';
 
+import { BitField } from '../constants';
 import { ClueTiers } from './clueTiers';
 
 export function getClueScoresFromOpenables(openableScores: Bank, mutate = false) {
@@ -23,9 +24,9 @@ export function deduplicateClueScrolls({ loot, currentBank }: { loot: Bank; curr
 	return newLoot;
 }
 
-export function buildClueButtons(loot: Bank | null, perkTier: number) {
+export function buildClueButtons(loot: Bank | null, perkTier: number, user: MUser) {
 	const components: ButtonBuilder[] = [];
-	if (loot && perkTier > 1) {
+	if (loot && perkTier > 1 && !user.bitfield.includes(BitField.DisableClueButtons)) {
 		const clueReceived = ClueTiers.filter(tier => loot.amount(tier.scrollID) > 0);
 		components.push(
 			...clueReceived.map(clue =>

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -258,7 +258,8 @@ export enum BitField {
 	UsedFrozenTablet = 34,
 	CleanHerbsFarming = 35,
 	SelfGamblingLocked = 36,
-	DisabledFarmingReminders = 37
+	DisabledFarmingReminders = 37,
+	DisableClueButtons = 38
 }
 
 interface BitFieldData {
@@ -338,6 +339,11 @@ export const BitFieldData: Record<BitField, BitFieldData> = {
 		name: 'Disable Farming Reminders',
 		protected: false,
 		userConfigurable: true
+	},
+	[BitField.DisableClueButtons]: {
+		name: 'Disable Clue Buttons',
+		protected: false,
+		userConfigurable: true
 	}
 } as const;
 

diff --git a/src/lib/util/handleTripFinish.ts b/src/lib/util/handleTripFinish.ts
@@ -135,7 +135,7 @@ export async function handleTripFinish(
 	const casketReceived = loot ? ClueTiers.find(i => loot?.has(i.id)) : undefined;
 	if (casketReceived) components.push(makeOpenCasketButton(casketReceived));
 	if (perkTier > PerkTier.One) {
-		components.push(...buildClueButtons(loot, perkTier));
+		components.push(...buildClueButtons(loot, perkTier, user));
 		const birdHousedetails = await calculateBirdhouseDetails(user.id);
 		if (birdHousedetails.isReady && !user.bitfield.includes(BitField.DisableBirdhouseRunButton))
 			components.push(makeBirdHouseTripButton());

diff --git a/src/mahoji/commands/config.ts b/src/mahoji/commands/config.ts
@@ -119,6 +119,10 @@ const toggles: UserConfigToggle[] = [
 	{
 		name: 'Disable farming reminders',
 		bit: BitField.DisabledFarmingReminders
+	},
+	{
+		name: 'Disable Clue Buttons',
+		bit: BitField.DisableClueButtons
 	}
 ];
 

diff --git a/src/mahoji/lib/abstracted_commands/barbAssault.ts b/src/mahoji/lib/abstracted_commands/barbAssault.ts
@@ -226,7 +226,7 @@ export async function barbAssaultGambleCommand(
 	const { itemsAdded, previousCL } = await user.addItemsToBank({ items: loot, collectionLog: true });
 
 	const perkTier = user.perkTier();
-	const components: ButtonBuilder[] = buildClueButtons(loot, perkTier);
+	const components: ButtonBuilder[] = buildClueButtons(loot, perkTier, user);
 
 	let response: Awaited<CommandResponse> = {
 		content: `You spent ${(

diff --git a/src/mahoji/lib/abstracted_commands/minionStatusCommand.ts b/src/mahoji/lib/abstracted_commands/minionStatusCommand.ts
@@ -134,7 +134,7 @@ export async function minionStatusCommand(user: MUser): Promise<BaseMessageOptio
 
 	const { bank } = user;
 
-	if (!minionIsBusy) {
+	if (!minionIsBusy && !user.bitfield.includes(BitField.DisableClueButtons)) {
 		for (const tier of ClueTiers.filter(t => bank.has(t.scrollID))
 			.reverse()
 			.slice(0, 3)) {

diff --git a/src/mahoji/lib/abstracted_commands/openCommand.ts b/src/mahoji/lib/abstracted_commands/openCommand.ts
@@ -127,7 +127,7 @@ async function finalizeOpening({
 		.join(', ');
 
 	const perkTier = user.perkTier();
-	const components: ButtonBuilder[] = buildClueButtons(loot, perkTier);
+	const components: ButtonBuilder[] = buildClueButtons(loot, perkTier, user);
 
 	let response: Awaited<CommandResponse> = {
 		files: [image.file],