Merge branch 'master' into updaeprisma

.github/workflows/test.yml → .github/workflows/unit_tests.yml

@@ -40,6 +40,15 @@ jobs:
         run: cp .env.example .env
       - name: Generate Prisma Client
         run: yarn gen
+      - name: Run ESLint on changed files
+        uses: tj-actions/eslint-changed-files@v21
+        with:
+          skip_annotations: true
+          config_path: ".eslintrc.json"
+          ignore_path: ".eslintignore"
+          file_extensions: |
+            **/*.ts
+            **/*.tsx
       - name: Build
         run: yarn build
       - name: Test

src/lib/MUser.ts

@@ -824,6 +824,24 @@ GROUP BY data->>'clueID';`);
 	async validateEquippedGear() {
 		let itemsUnequippedAndRefunded = new Bank();
 		for (const [gearSetupName, gearSetup] of Object.entries(this.gear) as [GearSetupType, GearSetup][]) {
+			if (gearSetup['2h'] !== null) {
+				if (gearSetup.weapon?.item) {
+					const { refundBank } = await this.forceUnequip(
+						gearSetupName,
+						EquipmentSlot.Weapon,
+						'2h Already equipped'
+					);
+					itemsUnequippedAndRefunded.add(refundBank);
+				}
+				if (gearSetup.shield?.item) {
+					const { refundBank } = await this.forceUnequip(
+						gearSetupName,
+						EquipmentSlot.Shield,
+						'2h Already equipped'
+					);
+					itemsUnequippedAndRefunded.add(refundBank);
+				}
+			}
 			for (const slot of Object.values(EquipmentSlot)) {
 				const item = gearSetup[slot];
 				if (!item) continue;

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 =>

src/lib/constants.ts

@@ -258,7 +258,10 @@ export enum BitField {
 	UsedFrozenTablet = 34,
 	CleanHerbsFarming = 35,
 	SelfGamblingLocked = 36,
-	DisabledFarmingReminders = 37
+	DisabledFarmingReminders = 37,
+	DisableClueButtons = 38,
+	DisableAutoSlayButton = 39,
+	DisableHighPeakTimeWarning = 40
 }
 
 interface BitFieldData {
@@ -338,6 +341,21 @@ export const BitFieldData: Record<BitField, BitFieldData> = {
 		name: 'Disable Farming Reminders',
 		protected: false,
 		userConfigurable: true
+	},
+	[BitField.DisableClueButtons]: {
+		name: 'Disable Clue Buttons',
+		protected: false,
+		userConfigurable: true
+	},
+	[BitField.DisableAutoSlayButton]: {
+		name: 'Disable Auto Slay Button',
+		protected: false,
+		userConfigurable: true
+	},
+	[BitField.DisableHighPeakTimeWarning]: {
+		name: 'Disable Wilderness High Peak Time Warning',
+		protected: false,
+		userConfigurable: true
 	}
 } as const;
 

src/lib/data/Collections.ts

@@ -143,7 +143,7 @@ function kcProg(mon: Monster): FormatProgressFunction {
 }
 
 function mgProg(minigameName: MinigameName): FormatProgressFunction {
-	return ({ minigames }) => `${minigames[minigameName]} KC`;
+	return ({ minigames }) => `${minigames[minigameName]} Completions`;
 }
 
 function skillProg(skillName: SkillsEnum): FormatProgressFunction {
@@ -502,7 +502,7 @@ export const allCollectionLogs: ICollection = {
 	},
 	Raids: {
 		activities: {
-			"Chamber's of Xeric": {
+			'Chambers of Xeric': {
 				alias: ChambersOfXeric.aliases,
 				kcActivity: {
 					Default: async (_, minigameScores) =>
@@ -807,7 +807,7 @@ export const allCollectionLogs: ICollection = {
 			"Shades of Mort'ton": {
 				items: shadesOfMorttonCL,
 				isActivity: true,
-				fmtProg: () => '0 KC'
+				fmtProg: mgProg('shades_of_morton')
 			},
 			'Soul Wars': {
 				alias: ['soul wars', 'sw'],

src/lib/data/cox.ts

@@ -263,10 +263,10 @@ export async function checkCoxTeam(users: MUser[], cm: boolean, quantity: number
 	for (const user of users) {
 		const { total } = calculateUserGearPercents(user);
 		if (total < 20) {
-			return "Your gear is terrible! You do not stand a chance in the Chamber's of Xeric.";
+			return 'Your gear is terrible! You do not stand a chance in the Chambers of Xeric.';
 		}
 		if (!hasMinRaidsRequirements(user)) {
-			return `${user.usernameOrMention} doesn't meet the stat requirements to do the Chamber's of Xeric.`;
+			return `${user.usernameOrMention} doesn't meet the stat requirements to do the Chambers of Xeric.`;
 		}
 		if (cm) {
 			if (users.length === 1 && !user.hasEquippedOrInBank('Twisted bow')) {

src/lib/data/creatables/caCreatables.ts

@@ -14,6 +14,12 @@ export const caCreatables: Createable[] = [
 			return null;
 		}
 	},
+	{
+		name: 'Revert Tztok slayer helmet',
+		outputItems: new Bank().add('Slayer helmet'),
+		inputItems: new Bank().add('Tztok slayer helmet'),
+		noCl: true
+	},
 	{
 		name: 'Tztok slayer helmet (i)',
 		inputItems: new Bank().add('Slayer helmet (i)'),
@@ -25,6 +31,12 @@ export const caCreatables: Createable[] = [
 			return null;
 		}
 	},
+	{
+		name: 'Revert Tztok slayer helmet (i)',
+		outputItems: new Bank().add('Slayer helmet (i)'),
+		inputItems: new Bank().add('Tztok slayer helmet (i)'),
+		noCl: true
+	},
 	//
 	{
 		name: 'Dragon hunter crossbow (t)',
@@ -73,6 +85,12 @@ export const caCreatables: Createable[] = [
 			return null;
 		}
 	},
+	{
+		name: 'Revert Tzkal slayer helmet',
+		outputItems: new Bank().add('Slayer helmet'),
+		inputItems: new Bank().add('Tzkal slayer helmet'),
+		noCl: true
+	},
 	{
 		name: 'Tzkal slayer helmet (i)',
 		inputItems: new Bank().add('Slayer helmet (i)'),
@@ -84,6 +102,12 @@ export const caCreatables: Createable[] = [
 			return null;
 		}
 	},
+	{
+		name: 'Revert Tzkal slayer helmet (i)',
+		outputItems: new Bank().add('Slayer helmet (i)'),
+		inputItems: new Bank().add('Tzkal slayer helmet (i)'),
+		noCl: true
+	},
 	//
 	{
 		name: 'Vampyric slayer helmet',
@@ -96,6 +120,12 @@ export const caCreatables: Createable[] = [
 			return null;
 		}
 	},
+	{
+		name: 'Revert Vampyric slayer helmet',
+		outputItems: new Bank().add('Slayer helmet'),
+		inputItems: new Bank().add('Vampyric slayer helmet'),
+		noCl: true
+	},
 	{
 		name: 'Vampyric slayer helmet (i)',
 		inputItems: new Bank().add('Slayer helmet (i)'),
@@ -107,6 +137,12 @@ export const caCreatables: Createable[] = [
 			return null;
 		}
 	},
+	{
+		name: 'Revert Vampyric slayer helmet (i)',
+		outputItems: new Bank().add('Slayer helmet (i)'),
+		inputItems: new Bank().add('Vampyric slayer helmet (i)'),
+		noCl: true
+	},
 	//
 	{
 		name: "Ghommal's avernic defender 5",