Code cleanup

Author: gc

src/lib/combat_achievements/combatAchievements.ts

@@ -66,7 +66,9 @@ interface CARootItem {
 	taskPoints: number;
 	rewardThreshold: number;
 }
-export type CATier = 'easy' | 'medium' | 'hard' | 'elite' | 'master' | 'grandmaster';
+
+export const caTiers = ['easy', 'medium', 'hard', 'elite', 'master', 'grandmaster'] as const;
+export type CATier = (typeof caTiers)[number];
 type CARoot = Record<CATier, CARootItem>;
 
 const easy: CARootItem = {

src/lib/slayer/slayerUtil.ts

@@ -2,7 +2,7 @@ import { randFloat, randInt, roll } from '@oldschoolgg/rng';
 import { notEmpty, stringMatches } from '@oldschoolgg/toolkit';
 import { Bank, type Monster, Monsters, resolveItems } from 'oldschooljs';
 
-import { CombatAchievements } from '@/lib/combat_achievements/combatAchievements.js';
+import { caTiers } from '@/lib/combat_achievements/combatAchievements.js';
 import type { PvMMethod } from '@/lib/constants.js';
 import { LumbridgeDraynorDiary, userhasDiaryTier } from '@/lib/diaries.js';
 import { CombatOptionsEnum } from '@/lib/minions/data/combatConstants.js';
@@ -189,7 +189,7 @@ export async function assignNewSlayerTask(user: MUser, master: SlayerMaster) {
 	let bossTask = false;
 	let wildyBossTask = false;
 	if (
-		user.user.slayer_unlocks.includes(SlayerTaskUnlocksEnum.LikeABoss) &&
+		user.hasSlayerUnlock(SlayerTaskUnlocksEnum.LikeABoss) &&
 		(master.name.toLowerCase() === 'konar quo maten' ||
 			master.name.toLowerCase() === 'duradel' ||
 			master.name.toLowerCase() === 'nieve' ||
@@ -199,7 +199,7 @@ export async function assignNewSlayerTask(user: MUser, master: SlayerMaster) {
 		bossTask = true;
 	}
 
-	if (user.user.slayer_unlocks.includes(SlayerTaskUnlocksEnum.LikeABoss) && master.id === 8 && roll(25)) {
+	if (user.hasSlayerUnlock(SlayerTaskUnlocksEnum.LikeABoss) && master.id === 8 && roll(25)) {
 		wildyBossTask = true;
 	}
 
@@ -224,8 +224,8 @@ export async function assignNewSlayerTask(user: MUser, master: SlayerMaster) {
 	}
 
 	let maxQuantity = assignedTask?.amount[1];
-	if (bossTask && user.user.slayer_unlocks.includes(SlayerTaskUnlocksEnum.LikeABoss)) {
-		for (const tier of Object.keys(CombatAchievements) as (keyof typeof CombatAchievements)[]) {
+	if (bossTask && user.hasSlayerUnlock(SlayerTaskUnlocksEnum.LikeABoss)) {
+		for (const tier of caTiers) {
 			if (user.hasCompletedCATier(tier)) {
 				maxQuantity += 5;
 			}

src/mahoji/lib/abstracted_commands/autoSlayCommand.ts

@@ -1,4 +1,4 @@
-import { stringMatches } from '@oldschoolgg/toolkit';
+import { stringSearch } from '@oldschoolgg/toolkit';
 import { Monsters } from 'oldschooljs';
 
 import type { PvMMethod } from '@/lib/constants.js';
@@ -412,10 +412,7 @@ export async function autoSlayCommand({
 	const method = modeOverride ?? savedMethod;
 
 	if (modeOverride && saveMode) {
-		const autoslayIdToSave = autoslayModes.find(
-			asm =>
-				stringMatches(modeOverride, asm.name) || asm.aliases.some(alias => stringMatches(modeOverride, alias))
-		);
+		const autoslayIdToSave = autoslayModes.find(asm => stringSearch(modeOverride, asm.name));
 		if (autoslayIdToSave) {
 			await user.update({ slayer_autoslay_options: [autoslayIdToSave.key] });
 		}
@@ -508,7 +505,6 @@ export async function autoSlayCommand({
 	}
 	if (method === 'boss') {
 		// This code handles the 'highest/boss' setting of autoslay.
-		const myQPs = await user.QP;
 		const commonName = getCommonTaskName(usersTask.assignedTask!.monster);
 		if (commonName === 'TzHaar') {
 			return runCommand({
@@ -530,7 +526,7 @@ export async function autoSlayCommand({
 				(m.difficultyRating ?? 0) > maxDiff &&
 				(m.levelRequirements === undefined || user.hasSkillReqs(m.levelRequirements))
 			) {
-				if (m.qpRequired === undefined || m.qpRequired <= myQPs) {
+				if (m.qpRequired === undefined || m.qpRequired <= user.QP) {
 					maxDiff = m.difficultyRating ?? 0;
 					maxMobName = m.name;
 				}