2nd round of adding to Cyr's works in bank project

src/lib/fishingContest.ts

@@ -296,12 +296,12 @@ export async function catchFishAtLocation({ user, location }: { user: MUser; loc
 
 	const boosts: string[] = [];
 
-	if (user.hasEquipped('Ring of luck')) {
+	if (user.hasEquippedOrInBank('Ring of luck')) {
 		maxLength += 1;
 		boosts.push('+1cm max len for RoL');
 	}
 
-	if (user.hasEquipped('Crystal fishing rod')) {
+	if (user.hasEquippedOrInBank('Crystal fishing rod')) {
 		maxLength += 5;
 		boosts.push('+5cm max len for Crystal fishing rod');
 	}

src/lib/skilling/skills/dung/dungDbFunctions.ts

@@ -15,9 +15,9 @@ export function calcMaxFloorUserCanDo(user: MUser) {
 
 export function calcUserGorajanShardChance(user: MUser) {
 	return calcGorajanShardChance({
-		hasMasterCape: user.hasEquipped('Dungeoneering master cape'),
+		hasMasterCape: user.hasEquippedOrInBank('Dungeoneering master cape'),
 		dungLevel: user.skillLevel(SkillsEnum.Dungeoneering),
-		hasRingOfLuck: user.hasEquipped('Ring of luck')
+		hasRingOfLuck: user.hasEquippedOrInBank('Ring of luck')
 	});
 }
 

src/mahoji/commands/hunt.ts

@@ -67,7 +67,7 @@
 	if (
 		creature.name === 'Chimpchompa' &&
 		!Object.values(allGear).some(g =>
 			g.hasEquipped(monkeyTiers.map(i => i.greegrees.map(i => i.id)).flat(2), false)
 		)
 	) {
 		return "You can't hunt Chimpchompa's! You need to be wearing a greegree.";
@@ -259,7 +259,7 @@
 			required: true,
 			autocomplete: async (value: string) => {
 				return creatures
 					.filter(i => (!value ? true : i.name.toLowerCase().includes(value.toLowerCase())))
 					.map(i => ({
 						name: i.name,
 						value: i.name
@@ -292,7 +292,7 @@
 		channelID
 	}: CommandRunOptions<{ name: string; quantity?: number; hunter_potion?: boolean; stamina_potions?: boolean }>) => {
 		const user = await mUserFetch(userID);
 		const creature = Hunter.Creatures.find(creature =>
 			creature.aliases.some(
 				alias => stringMatches(alias, options.name) || stringMatches(alias.split(' ')[0], options.name)
 			)
@@ -306,7 +306,7 @@
 
 		const hunterInputArgs: Parameters<typeof calculateHunterInput>['0'] = {
 			creature,
-			hasHunterMasterCape: user.hasEquipped('Hunter master cape'),
+			hasHunterMasterCape: user.hasEquippedOrInBank('Hunter master cape'),
 			hasGraceful: userHasGracefulEquipped(user),
 			maxTripLength,
 			quantityInput: options.quantity,

src/mahoji/commands/runecraft.ts

@@ -41,7 +41,7 @@
 					'soul rune (zeah)',
 					...Runecraft.Tiaras.map(i => i.name)
 				]
 					.filter(name => (!value ? true : name.toLowerCase().includes(value.toLowerCase())))
 					.map(i => ({
 						name: toTitleCase(i),
 						value: i
@@ -140,7 +140,7 @@
 			tripLength /= 2;
 			boosts.push('2x from Obis (3x more essence)');
 		}
-		if (user.hasEquipped('Runecraft master cape')) {
+		if (user.hasEquippedOrInBank('Runecraft master cape')) {
 			tripLength /= 2;
 			boosts.push(`${Emoji.RunecraftMasterCape} 2x faster`);
 		}
@@ -225,7 +225,7 @@
 			(numEssenceOwned === 0 ||
 				quantity === 0 ||
 				numEssenceOwned < quantity ||
 				!essenceRequired ||
 				numEssenceOwned < essenceRequired)
 		) {
 			return "You don't have enough Pure Essence to craft these runes. You can acquire some through Mining, or purchasing from other players.";
@@ -339,7 +339,7 @@
 		if (!user.owns(totalCost)) return `You don't own: ${totalCost}.`;
 
 		await user.removeItemsFromBank(totalCost);
 		updateBankSetting('runecraft_cost', totalCost);
 
 		await addSubTaskToActivityTask<RunecraftActivityTaskOptions>({
 			runeID: runeObj.id,

src/mahoji/commands/steal.ts

@@ -35,7 +35,7 @@
 			autocomplete: async (value: string, user: User) => {
 				const mUser = await mUserFetch(user.id);
 				const conLevel = mUser.skillLevel('thieving');
 				return stealables
 					.filter(i => (!value ? true : i.name.toLowerCase().includes(value.toLowerCase())))
 					.filter(c => c.level <= conLevel)
 					.map(i => ({
@@ -157,7 +157,7 @@
 				quantity,
 				user.hasEquipped(['Thieving cape', 'Thieving cape(t)']),
 				hasArdyHard,
-				user.hasEquippedOrInBank(["Thieves' armband"])
+				user.hasEquipped(["Thieves' armband"])
 			);
 
 			if (user.hasEquipped(['Thieving cape', 'Thieving cape(t)', 'Thieving master cape'])) {

src/mahoji/lib/abstracted_commands/farmingCommand.ts

@@ -66,7 +66,7 @@
 		return `Please come back when your crops have finished growing in ${formatDuration(patch.readyIn!)}!`;
 	}
 
 	const treeStr = !plant ? null : treeCheck(plant, currentWoodcuttingLevel, GP, patch.lastQuantity);
 	if (treeStr) return treeStr;
 
 	const timePerPatchTravel = Time.Second * plant.timePerPatchTravel;
@@ -221,7 +221,7 @@
 		duration *= 0.9;
 	}
 
-	if (user.hasEquipped('Ring of endurance')) {
+	if (user.hasEquippedOrInBank('Ring of endurance')) {
 		boostStr.push('10% time for Ring of Endurance');
 		duration *= 0.9;
 	}
@@ -285,7 +285,7 @@
 		if (user.owns(compostCost)) {
 			infoStr.push(`You are treating your patches with ${compostCost}.`);
 			cost.add(compostCost);
 			upgradeType = compostTier;
 		}
 	}
 
@@ -297,7 +297,7 @@
 	if (!patchType.patchPlanted) {
 		infoStr.unshift(`${user.minionName} is now planting ${quantity}x ${plant.name}.`);
 	} else if (patchType.patchPlanted) {
 		if (user.hasEquippedOrInBank(['Magic secateurs'])) {
 			boostStr.push('10% crop yield for Magic Secateurs');
 		}
 		if (user.hasEquippedOrInBank(['Farming cape'])) {

src/mahoji/lib/abstracted_commands/monkeyRumbleCommand.ts

@@ -66,7 +66,7 @@ export async function monkeyRumbleCommand(user: MUser, channelID: string): Comma
 	const boosts = [];
 
 	let fightDuration = Time.Minute * 9;
-	if (user.hasEquippedOrInBank('Strength master cape')) {
+	if (user.hasEquipped('Strength master cape')) {
 		fightDuration = reduceNumByPercent(fightDuration, 17);
 		boosts.push('17% faster fights for strength master cape');
 	}

src/mahoji/lib/abstracted_commands/odsCommand.ts

@@ -76,7 +76,7 @@ export async function odsStartCommand(klasaUser: MUser, channelID: string) {
 
 	let waveTime = randomVariation(Time.Minute * 4, 10);
 
-	if (klasaUser.hasEquipped('Runecraft master cape')) {
+	if (klasaUser.hasEquippedOrInBank('Runecraft master cape')) {
 		waveTime /= 2;
 		boosts.push(`${Emoji.RunecraftMasterCape} 2x faster`);
 	}

src/tasks/minions/bso/fishingContestActivity.ts

@@ -44,7 +44,7 @@ export const fishingContestTask: MinionTask = {
 		});
 
 		const loot = new Bank();
-		let tackleBoxChance = user.hasEquipped('Fishing master cape') ? 2 : 3;
+		let tackleBoxChance = user.hasEquippedOrInBank('Fishing master cape') ? 2 : 3;
 		if (roll(tackleBoxChance)) {
 			for (const [tackleBox, fishLevel] of [
 				['Basic tackle box', 75],

src/tasks/minions/miningActivity.ts

@@ -256,7 +256,7 @@ export const miningTask: MinionTask = {
 		const spiritOre = stoneSpirits.find(t => t.ore.id === ore.id);
 		const amountOfSpiritsToUse =
 			spiritOre !== undefined ? Math.min(quantity, user.bank.amount(spiritOre.spirit.id)) : 0;
-		const hasMiningMasterCape = user.hasEquipped('Mining master cape');
+		const hasMiningMasterCape = user.hasEquippedOrInBank('Mining master cape');
 		const portentResult =
 			amountOfSpiritsToUse > 0
 				? await chargePortentIfHasCharges({