Fix grammar (oldschoolgg#5992)

src/lib/MUser.ts

@@ -137,7 +137,7 @@ export class MUserClass {
 		this.bitfield = this.user.bitfield as readonly BitField[];
 	}
 
-	countSkillsAtleast99() {
+	countSkillsAtLeast99() {
 		return Object.values(this.skillsAsLevels).filter(lvl => lvl >= 99).length;
 	}
 

src/lib/colosseum.ts

@@ -600,7 +600,7 @@ export async function colosseumCommand(user: MUser, channelID: string) {
 		cost.add('Dragon arrow', 50);
 	} else {
 		messages.push(
-			'Missed 7% Venator bow boost. If you have one, charge it and keep it in your bank. You also need atleast 50 dragon arrows equipped.'
+			'Missed 7% Venator bow boost. If you have one, charge it and keep it in your bank. You also need at least 50 dragon arrows equipped.'
 		);
 	}
 

src/lib/data/buyables/skillCapeBuyables.ts

@@ -12,7 +12,7 @@ for (const skillcape of Skillcapes) {
 		outputItems: (user: MUser) => {
 			const output = new Bank().add(skillcape.hood);
 
-			if (user.countSkillsAtleast99() > 1) {
+			if (user.countSkillsAtLeast99() > 1) {
 				output.add(skillcape.trimmed);
 			} else {
 				output.add(skillcape.untrimmed);

src/lib/data/cox.ts

@@ -240,11 +240,11 @@ export const minimumCoxSuppliesNeeded = new Bank({
 export async function checkCoxTeam(users: MUser[], cm: boolean, quantity = 1): Promise<string | null> {
 	const hasHerbalist = users.some(u => u.skillLevel(SkillsEnum.Herblore) >= 78);
 	if (!hasHerbalist) {
-		return 'nobody with atleast level 78 Herblore';
+		return 'nobody with at least level 78 Herblore';
 	}
 	const hasFarmer = users.some(u => u.skillLevel(SkillsEnum.Farming) >= 55);
 	if (!hasFarmer) {
-		return 'nobody with atleast level 55 Farming';
+		return 'nobody with at least level 55 Farming';
 	}
 	const suppliesNeeded = minimumCoxSuppliesNeeded.clone().multiply(quantity);
 	const userWithoutSupplies = users.find(u => !u.bank.has(suppliesNeeded));

src/lib/degradeableItems.ts

@@ -396,10 +396,8 @@ export async function degradeItem({
 	const chargesAfter = user.user[degItem.settingsKey];
 	assert(typeof chargesAfter === 'number' && chargesAfter > 0);
 	return {
-		userMessage: `Your ${
-			item.name
-		} degraded by ${chargesToDegrade} charges, and now has ${chargesAfter} remaining.${
-			pennyReduction > 0 ? ` Your Ghommal's lucky penny saved ${pennyReduction} charges` : ''
+		userMessage: `Your ${item.name} degraded by ${chargesToDegrade} charges, and now has ${chargesAfter} remaining${
+			pennyReduction > 0 ? `. Your Ghommal's lucky penny saved ${pennyReduction} charges` : ''
 		}`
 	};
 }

src/lib/minions/functions/lmsSimCommand.ts

@@ -125,7 +125,7 @@ export async function lmsSimCommand(channel: Channel | undefined, names?: string
 
 		if (filtered.size < 4) {
 			return channel.send(
-				'Please specify atleast 4 players for Last Man Standing, like so: `+lms Alex, Kyra, Magna, Rick`, or type `+lms auto` to automatically pick people from the chat.'
+				'Please specify at least 4 players for Last Man Standing, like so: `+lms Alex, Kyra, Magna, Rick`, or type `+lms auto` to automatically pick people from the chat.'
 			);
 		}
 

src/lib/musicCape.ts

@@ -100,7 +100,7 @@ export const musicCapeRequirements = new Requirements()
 		}
 	})
 	.add({
-		name: 'Runecraft all runes atleast once',
+		name: 'Runecraft all runes at least once',
 		has: ({ uniqueRunesCrafted }) => {
 			const runesToCheck = resolveItems([
 				'Mind rune',

src/lib/simulation/nex.ts

@@ -59,7 +59,7 @@ export function checkNexUser(user: MUser): [false] | [true, string] {
 	if (!user.hasSkillReqs(minStats)) {
 		return [true, `${tag} doesn't have the skill requirements: ${formatSkillRequirements(minStats)}.`];
 	}
-	if (user.GP < 1_000_000) return [true, `${tag} needs atleast 1m GP to cover potential deaths.`];
+	if (user.GP < 1_000_000) return [true, `${tag} needs at least 1m GP to cover potential deaths.`];
 	const { offence, defence, rangeGear } = nexGearStats(user);
 	if (offence < 50) {
 		return [

src/lib/simulation/toa.ts

@@ -247,7 +247,7 @@ const toaRequirements: {
 			return true;
 		},
 		desc: () =>
-			`atleast ${BP_DARTS_NEEDED}x darts per raid, and using one of: ${ALLOWED_DARTS.map(i => i.name).join(
+			`at least ${BP_DARTS_NEEDED}x darts per raid, and using one of: ${ALLOWED_DARTS.map(i => i.name).join(
 				', '
 			)}, loaded in Blowpipe`
 	},
@@ -278,7 +278,7 @@ const toaRequirements: {
 			return true;
 		},
 		desc: () =>
-			`decent range gear (BiS is ${maxRangeGear.toString()}), atleast ${BOW_ARROWS_NEEDED}x arrows equipped, and one of these bows: ${REQUIRED_RANGE_WEAPONS.map(
+			`decent range gear (BiS is ${maxRangeGear.toString()}), at least ${BOW_ARROWS_NEEDED}x arrows equipped, and one of these bows: ${REQUIRED_RANGE_WEAPONS.map(
 				itemNameFromID
 			).join(', ')}`
 	},
@@ -335,11 +335,11 @@ const toaRequirements: {
 				minimumSuppliesNeeded = minSuppliesWithAtkStr;
 			}
 			if (!user.owns(minimumSuppliesNeeded.clone().multiply(quantity))) {
-				return `You need atleast this much supplies: ${minimumSuppliesNeeded}.`;
+				return `You need at least this much supplies: ${minimumSuppliesNeeded}.`;
 			}
 			const bfCharges = BLOOD_FURY_CHARGES_PER_RAID * quantity;
 			if (user.gear.melee.hasEquipped('Amulet of blood fury') && user.user.blood_fury_charges < bfCharges) {
-				return `You need atleast ${bfCharges} Blood fury charges to use it, otherwise it has to be unequipped: ${mentionCommand(
+				return `You need at least ${bfCharges} Blood fury charges to use it, otherwise it has to be unequipped: ${mentionCommand(
 					globalClient,
 					'minion',
 					'charge'
@@ -348,7 +348,7 @@ const toaRequirements: {
 
 			const tumCharges = TUMEKEN_SHADOW_PER_RAID * quantity;
 			if (user.gear.mage.hasEquipped("Tumeken's shadow") && user.user.tum_shadow_charges < tumCharges) {
-				return `You need atleast ${tumCharges} Tumeken's shadow charges to use it, otherwise it has to be unequipped: ${mentionCommand(
+				return `You need at least ${tumCharges} Tumeken's shadow charges to use it, otherwise it has to be unequipped: ${mentionCommand(
 					globalClient,
 					'minion',
 					'charge'
@@ -357,7 +357,7 @@ const toaRequirements: {
 
 			return true;
 		},
-		desc: () => `Need atleast ${minimumSuppliesNeeded}`
+		desc: () => `Need at least ${minimumSuppliesNeeded}`
 	},
 	{
 		name: 'Rune Pouch',
@@ -368,7 +368,7 @@ const toaRequirements: {
 			}
 			return true;
 		},
-		desc: () => `Need atleast ${minimumSuppliesNeeded}`
+		desc: () => `Need at least ${minimumSuppliesNeeded}`
 	},
 	{
 		name: 'Poison Protection',
@@ -1044,7 +1044,7 @@ async function checkTOAUser(
 			true,
 			`${
 				user.usernameOrMention
-			} doesn't have enough Serpentine helm charges. You need atleast ${serpHelmCharges} charges to do a ${formatDuration(
+			} doesn't have enough Serpentine helm charges. You need at least ${serpHelmCharges} charges to do a ${formatDuration(
 				duration
 			)} TOA raid.`
 		];
@@ -1057,7 +1057,7 @@ async function checkTOAUser(
 		if (kc < dividedRaidLevel) {
 			return [
 				true,
-				`${user.usernameOrMention}, you need atleast ${dividedRaidLevel} TOA KC to ${
+				`${user.usernameOrMention}, you need at least ${dividedRaidLevel} TOA KC to ${
 					teamSize === 2 ? 'duo' : 'solo'
 				} a level ${raidLevel} TOA raid.`
 			];

src/lib/skilling/types.ts

@@ -313,7 +313,7 @@ export enum HunterTechniqueEnum {
 	BoxTrapping = 'box trapping',
 	ButterflyNetting = 'butterfly netting',
 	DeadfallTrapping = 'deadfall trapping',
-	Falconry = 'falconry',
+	Falconry = 'hawking',
 	MagicBoxTrapping = 'magic box trapping',
 	NetTrapping = 'net trapping',
 	PitfallTrapping = 'pitfall trapping',

src/lib/util/chatHeadImage.ts

@@ -34,7 +34,7 @@ const names: Record<keyof typeof chatHeads, string> = {
 	santa: 'Santa',
 	izzy: "Cap'n Izzy No-Beard",
 	alry: 'Alry the Angler',
-	ketKeh: 'Tzhaar-Ket-Keh',
+	ketKeh: 'TzHaar-Ket-Keh',
 	gertrude: 'Gertrude',
 	antiSanta: 'Anti-Santa',
 	bunny: 'Easter Bunny',

src/mahoji/commands/admin.ts

@@ -986,7 +986,7 @@ ${guildCommands.length} Guild commands`;
 FROM users
 WHERE bank->>'${item.id}' IS NOT NULL;`);
 			return `There are ${ownedResult[0].qty.toLocaleString()} ${item.name} owned by everyone.
-There are ${await countUsersWithItemInCl(item.id, isIron)} ${isIron ? 'ironmen' : 'people'} with atleast 1 ${
+There are ${await countUsersWithItemInCl(item.id, isIron)} ${isIron ? 'ironmen' : 'people'} with at least 1 ${
 				item.name
 			} in their collection log.`;
 		}

src/mahoji/commands/bingo.ts

@@ -675,7 +675,7 @@ export const bingoCommand: OSBMahojiCommand = {
 			const fee = BOT_TYPE === 'OSB' ? 20_000_000 : 50_000_000;
 			const creationCost = new Bank().add('Coins', fee);
 			if (user.GP < creationCost.amount('Coins')) {
-				return `You need atleast ${creationCost} to create a bingo.`;
+				return `You need at least ${creationCost} to create a bingo.`;
 			}
 
 			const channel = globalClient.channels.cache.get(options.create_bingo.notifications_channel_id);
@@ -713,9 +713,9 @@ export const bingoCommand: OSBMahojiCommand = {
 				return 'Team size must be between 1 and 5.';
 			}
 
-			// Start date must be atleast 3 hours into the future
+			// Start date must be at least 3 hours into the future
 			if (createOptions.start_date.getTime() < Date.now() + Time.Minute * 3) {
-				return 'Start date must be atleast 3 minutes into the future.';
+				return 'Start date must be at least 3 minutes into the future.';
 			}
 
 			// Start date cannot be more than 31 days into the future
@@ -914,7 +914,7 @@ Example: \`add_tile:Coal|Trout|Egg\` is a tile where you have to receive a coal
 
 				const cost = new Bank().add('Coins', amount);
 				if (user.GP < cost.amount('Coins')) {
-					return `You need atleast ${cost} to add that much GP to the prize pool.`;
+					return `You need at least ${cost} to add that much GP to the prize pool.`;
 				}
 
 				await handleMahojiConfirmation(

src/mahoji/commands/drycalc.ts

@@ -39,7 +39,7 @@ export const dryCalcCommand: OSBMahojiCommand = {
 		)}%** chance of not receiving any drop, and a **${round(
 			dropChance,
 			2
-		)}%** chance of receiving atleast one drop.`;
+		)}%** chance of receiving at least one drop.`;
 
 		return output;
 	}

src/mahoji/commands/hunt.ts

@@ -280,8 +280,8 @@ export const huntCommand: OSBMahojiCommand = {
 			type: 'Hunter'
 		});
 
-		let response = `${user.minionName} is now ${crystalImpling ? 'hunting' : `${creature.huntTechnique}`} ${
-			crystalImpling ? '' : ` ${quantity}x `
+		let response = `${user.minionName} is now ${crystalImpling ? 'hunting' : `${creature.huntTechnique}`}${
+			crystalImpling ? ' ' : ` ${quantity}x `
 		}${creature.name}, it'll take around ${formatDuration(duration)} to finish.`;
 
 		if (boosts.length > 0) {

src/mahoji/commands/laps.ts

@@ -127,7 +127,7 @@ export const lapsCommand: OSBMahojiCommand = {
 		}
 
 		if (course.qpRequired && user.QP < course.qpRequired) {
-			return `You need atleast ${course.qpRequired} Quest Points to do this course.`;
+			return `You need at least ${course.qpRequired} Quest Points to do this course.`;
 		}
 
 		const maxTripLength = calcMaxTripLength(user, 'Agility');

src/mahoji/commands/mine.ts

@@ -91,7 +91,7 @@ export const mineCommand: OSBMahojiCommand = {
 				return `To mine ${ore.name}, you need ${formatSkillRequirements(sinsOfTheFatherSkillRequirements)}.`;
 			}
 			if (user.QP < 125) {
-				return `To mine ${ore.name}, you need atleast 125 Quest Points.`;
+				return `To mine ${ore.name}, you need at least 125 Quest Points.`;
 			}
 		}
 

src/mahoji/commands/mix.ts

@@ -72,7 +72,7 @@ export const mixCommand: OSBMahojiCommand = {
 		}
 
 		if (mixableItem.qpRequired && user.QP < mixableItem.qpRequired) {
-			return `You need atleast **${mixableItem.qpRequired}** QP to make ${mixableItem.item.name}.`;
+			return `You need at least **${mixableItem.qpRequired}** QP to make ${mixableItem.item.name}.`;
 		}
 
 		const requiredItems = new Bank(mixableItem.inputItems);

src/mahoji/commands/offer.ts

@@ -208,10 +208,10 @@ export const offerCommand: OSBMahojiCommand = {
 		const specialBone = specialBones.find(bone => stringMatches(bone.item.name, options.name));
 		if (specialBone) {
 			if (user.QP < 8) {
-				return 'You need atleast 8 QP to offer long/curved bones for XP.';
+				return 'You need at least 8 QP to offer long/curved bones for XP.';
 			}
 			if (user.skillLevel(SkillsEnum.Construction) < 30) {
-				return 'You need atleast level 30 Construction to offer long/curved bones for XP.';
+				return 'You need at least level 30 Construction to offer long/curved bones for XP.';
 			}
 			const amountHas = userBank.amount(specialBone.item.id);
 			if (!quantity) quantity = Math.max(amountHas, 1);

src/mahoji/commands/smelt.ts

@@ -145,7 +145,7 @@ export const smeltingCommand: OSBMahojiCommand = {
 			coinsToRemove = Math.floor(gpPerHour * (duration / Time.Hour));
 			const gp = user.GP;
 			if (gp < coinsToRemove) {
-				return `You need atleast ${coinsToRemove} GP to work at the Blast Furnace.`;
+				return `You need at least ${coinsToRemove} GP to work at the Blast Furnace.`;
 			}
 
 			cost.add('Coins', coinsToRemove);

src/mahoji/commands/steal.ts

@@ -70,7 +70,7 @@ export const stealCommand: OSBMahojiCommand = {
 		}
 
 		if (stealable.qpRequired && user.QP < stealable.qpRequired) {
-			return `You need atleast **${stealable.qpRequired}** QP to ${
+			return `You need at least **${stealable.qpRequired}** QP to ${
 				stealable.type === 'pickpockable' ? 'pickpocket' : 'steal from'
 			} a ${stealable.name}.`;
 		}

src/mahoji/lib/abstracted_commands/aerialFishingCommand.ts

@@ -8,7 +8,7 @@ import { calcMaxTripLength } from '../../../lib/util/calcMaxTripLength';
 
 export async function aerialFishingCommand(user: MUser, channelID: string) {
 	if (user.skillLevel(SkillsEnum.Fishing) < 43 || user.skillLevel(SkillsEnum.Hunter) < 35) {
-		return 'You need atleast level 35 Hunter and 43 Fishing to do Aerial fishing.';
+		return 'You need at least level 35 Hunter and 43 Fishing to do Aerial fishing.';
 	}
 
 	const timePerFish = randomVariation(2, 7.5) * Time.Second;

src/mahoji/lib/abstracted_commands/bankBgCommand.ts

@@ -36,7 +36,7 @@ export async function bankBgCommand(interaction: ChatInputCommandInteraction, us
 	if (selectedImage.sacValueRequired) {
 		const sac = Number(user.user.sacrificedValue);
 		if (sac < selectedImage.sacValueRequired) {
-			return `You have to have sacrificed atleast ${toKMB(
+			return `You have to have sacrificed at least ${toKMB(
 				selectedImage.sacValueRequired
 			)} GP worth of items to use this background.`;
 		}

src/mahoji/lib/abstracted_commands/chompyHuntCommand.ts

@@ -40,7 +40,7 @@ export async function chompyHuntClaimCommand(user: MUser) {
 
 export async function chompyHuntCommand(user: MUser, channelID: string) {
 	if (user.QP < 10) {
-		return 'You need atleast 10 QP to hunt Chompy birds.';
+		return 'You need at least 10 QP to hunt Chompy birds.';
 	}
 
 	const rangeGear = user.gear.range;

src/mahoji/lib/abstracted_commands/coxCommand.ts

@@ -95,7 +95,7 @@ export async function coxCommand(
 	if (isChallengeMode) {
 		const normalKC = await getMinigameScore(user.id, 'raids');
 		if (normalKC < 200) {
-			return 'You need atleast 200 completions of the Chambers of Xeric before you can attempt Challenge Mode.';
+			return 'You need at least 200 completions of the Chambers of Xeric before you can attempt Challenge Mode.';
 		}
 	}
 	if (user.minionIsBusy) {

src/mahoji/lib/abstracted_commands/diceCommand.ts

@@ -29,7 +29,7 @@ export async function diceCommand(user: MUser, interaction: ChatInputCommandInte
 	}
 
 	if (amount < 1_000_000) {
-		return 'You have to dice atleast 1,000,000.';
+		return 'You have to dice at least 1,000,000.';
 	}
 
 	const gp = user.GP;

src/mahoji/lib/abstracted_commands/driftNetCommand.ts

@@ -21,7 +21,7 @@ export async function driftNetCommand(
 	}
 
 	if (user.skillLevel(SkillsEnum.Fishing) < 47 || user.skillLevel(SkillsEnum.Hunter) < 44) {
-		return 'You need atleast level 44 Hunter and 47 Fishing to do Drift net fishing.';
+		return 'You need at least level 44 Hunter and 47 Fishing to do Drift net fishing.';
 	}
 
 	if (!user.hasEquipped(['Graceful gloves', 'Graceful top', 'Graceful legs'])) {

src/mahoji/lib/abstracted_commands/fightCavesCommand.ts

@@ -86,11 +86,11 @@ function checkGear(user: MUser): string | undefined {
 	}
 
 	if (!user.owns(fightCavesCost)) {
-		return `JalYt, you need supplies to have a chance in the caves...come back with ${fightCavesCost}.`;
+		return `JalYt, you need supplies to have a chance in the caves... Come back with ${fightCavesCost}.`;
 	}
 
 	if (user.skillLevel('prayer') < 43) {
-		return 'JalYt, come back when you have atleast 43 Prayer, TzTok-Jad annihilate you without protection from gods.';
+		return 'JalYt, come back when you have at least 43 Prayer, TzTok-Jad annihilate you without protection from gods.';
 	}
 }
 

src/mahoji/lib/abstracted_commands/fishingTrawler.ts

@@ -8,7 +8,7 @@ import { calcMaxTripLength } from '../../../lib/util/calcMaxTripLength';
 
 export async function fishingTrawlerCommand(user: MUser, channelID: string) {
 	if (user.skillLevel('fishing') < 15) {
-		return 'You need atleast level 15 Fishing to do the Fishing Trawler.';
+		return 'You need at least level 15 Fishing to do the Fishing Trawler.';
 	}
 
 	const tripsDone = await getMinigameScore(user.id, 'fishing_trawler');

src/mahoji/lib/abstracted_commands/gauntletCommand.ts

@@ -44,7 +44,7 @@ const corruptedRequirements = {
 export async function gauntletCommand(user: MUser, channelID: string, type: 'corrupted' | 'normal' = 'normal') {
 	if (user.minionIsBusy) return `${user.minionName} is busy.`;
 	if (user.QP < 200) {
-		return 'You need atleast 200 QP to do the Gauntlet.';
+		return 'You need at least 200 QP to do the Gauntlet.';
 	}
 	const readableName = `${toTitleCase(type)} Gauntlet`;
 	const requiredSkills = type === 'corrupted' ? corruptedRequirements : standardRequirements;

src/mahoji/lib/abstracted_commands/gearCommands.ts

@@ -406,7 +406,7 @@ export async function gearViewCommand(user: MUser, input: string, text: boolean)
 			})
 			.join('\n\n');
 
-		const updatedContent = `${content}\n\nThese assume you have atleast 25 prayer for the protect item prayer.`;
+		const updatedContent = `${content}\n\nThese assume you have at least 25 prayer for the protect item prayer.`;
 
 		return { content: updatedContent };
 	}

src/mahoji/lib/abstracted_commands/giantsFoundryCommand.ts

@@ -172,7 +172,7 @@ export async function giantsFoundryStartCommand(
 	}
 
 	if (userSmithingLevel < alloy.level) {
-		return `${user.minionName} needs atleast level ${alloy.level} Smithing to user ${alloy.name} alloy in the Giants' Foundry.`;
+		return `${user.minionName} needs at least level ${alloy.level} Smithing to user ${alloy.name} alloy in the Giants' Foundry.`;
 	}
 
 	// If they have the entire Smiths' Uniform, give an extra 15% speed bonus