឵឵

src/mahoji/lib/abstracted_commands/fishingContestCommand.ts

@@ -15,10 +15,36 @@
 import addSubTaskToActivityTask from '../../../lib/util/addSubTaskToActivityTask';
 import { updateBankSetting } from '../../../lib/util/updateBankSetting';
 
 export async function fishingContestStartCommand(user: MUser, channelID: string, loc: string | undefined) {
 	const currentFishType = getCurrentFishType();
 	const validLocs = getValidLocationsForFishType(currentFishType);
+	let quantity = 1;
+	let duration = Math.floor(quantity * Time.Minute * 1.69);
+	let quantityBoosts = [];
+
+	const tackleBoxes = ["Champion's tackle box", 'Professional tackle box', 'Standard tackle box', 'Basic tackle box'];
+	for (let i = 0; i < tackleBoxes.length; i++) {
+		if (user.hasEquippedOrInBank(tackleBoxes[i])) {
+			let num = tackleBoxes.length - i;
+			quantityBoosts.push(`${num} for ${tackleBoxes[i]}`);
+			quantity += num;
+			break;
+		}
+	}
+
+	if (user.hasEquippedOrInBank('Crystal fishing rod')) {
+		quantity++;
+		quantityBoosts.push('1 for Crystal fishing rod');
+	}
+}
+
+if (!loc) {
+	for (const location of validLocs) {
+		if (user.bank.amount(location.bait.id) >= quantity) {
+			loc = location.name;
+		}
+	}
 	if (!loc) loc = validLocs[0].name;
 	const fishingLocation = fishingLocations.find(i => stringMatches(i.name, loc!));
 	if (!fishingLocation) {
 		return `That's not a valid location to fish at, you can fish at these locations: ${fishingLocations
@@ -26,7 +52,7 @@
 			.join(', ')}.`;
 	}
 
 	if (!validLocs.includes(fishingLocation)) {
 		return `This Fishing Location isn't valid for todays catch! These ones are: ${validLocs
 			.map(i => i.name)
 			.join(', ')}`;
@@ -35,27 +61,9 @@
 	if (!['Contest rod', "Beginner's tackle box"].every(i => user.hasEquippedOrInBank(i))) {
 		return 'You need to buy a Contest rod and a tackle box to compete in the Fishing contest.';
 	}
 	if (user.minionIsBusy) {
 		return 'Your minion is busy.';
 	}
-	let quantity = 1;
-	let duration = Math.floor(quantity * Time.Minute * 1.69);
-	let quantityBoosts = [];
-
-	const tackleBoxes = ["Champion's tackle box", 'Professional tackle box', 'Standard tackle box', 'Basic tackle box'];
-	for (let i = 0; i < tackleBoxes.length; i++) {
-		if (user.hasEquippedOrInBank(tackleBoxes[i])) {
-			let num = tackleBoxes.length - i;
-			quantityBoosts.push(`${num} for ${tackleBoxes[i]}`);
-			quantity += num;
-			break;
-		}
-	}
-
-	if (user.hasEquippedOrInBank('Crystal fishing rod')) {
-		quantity++;
-		quantityBoosts.push('1 for Crystal fishing rod');
-	}
 
 	const result = await getUsersFishingContestDetails(user);
 	if (result.catchesFromToday.length > 0) {
@@ -65,7 +73,7 @@
 	}
 
 	const cost = new Bank().add(fishingLocation.bait.id, quantity);
 	if (!user.owns(cost)) {
 		return `You need ${cost} to bait fish at ${fishingLocation.name}.`;
 	}
 	await user.removeItemsFromBank(cost);