[BSO] Grimy spirit weed now available, added subtext, cleans if toggled during harvest runs

src/lib/bankImage.ts

@@ -248,21 +248,16 @@
 	[i('Mango seed'), 'mango'],
 	[i('Avocado seed'), 'avocado'],
 	[i('Lychee seed'), 'lychee'],
-	[i('Blood orange seed'), 'b.orange'],
 	[i('Spirit weed seed'), 'spirit.w'],
 	[i('Spirit weed'), 'spirit.w'],
+	[i('Grimy spirit weed'), 'spirit.w'],
 	[i('Advax berry seed'), 'advax'],
 	[i('Advax berry'), 'advax'],
 	[i('Divination Potion'), 'div'],
-	[i('Elder logs'), 'elder'],
+	[i('Elder logs'), 'Elder'],
 	[i('Clue scroll (grandmaster)'), 'grandmaster'],
 	[i('Reward casket (grandmaster)'), 'grandmaster'],
-	[i('Atomic energy'), 'atomic'],
-	[i('Fruity zygomite spores'), 'fruity'],
-	[i('Barky zygomite spores'), 'barky'],
-	[i('Herbal zygomite spores'), 'herbal'],
-	[i('Clue scroll (elder)'), 'elder'],
-	[i('Reward casket (elder)'), 'elder']
+	[i('Atomic energy'), 'Atomic']
 ]);
 
 for (const energy of divinationEnergies) {
@@ -422,7 +417,7 @@
 		}
 	}
 
 	async getItemImage(itemID: number, user?: MUser): Promise<Image> {
 		if (user && user.user.icon_pack_id !== null) {
 			for (const pack of ItemIconPacks) {
 				if (pack.id === user.user.icon_pack_id) {
@@ -456,7 +451,7 @@
 		}
 	}
 
 	async fetchAndCacheImage(itemID: number) {
 		const imageBuffer = await fetch(`https://static.runelite.net/cache/item/icon/${itemID}.png`).then(result =>
 			result.buffer()
 		);
@@ -533,7 +528,7 @@
 	}
 
 	getBgAndSprite(bankBgId: number = 1, user?: MUser) {
 		let background = this.backgroundImages.find(i => i.id === bankBgId)!;
 
 		const currentContract = user?.farmingContract();
 		const isFarmingContractReadyToHarvest = Boolean(
@@ -545,10 +540,10 @@
 
 		let backgroundImage = background.image!;
 		if (bankBgId === 29 && isFarmingContractReadyToHarvest) {
 			backgroundImage = this.alternateImages.find(i => i.bgId === 29)!.image;
 		}
 		if (bankBgId === 30 && isFarmingContractReadyToHarvest) {
 			backgroundImage = this.alternateImages.find(i => i.bgId === 30)!.image;
 		}
 
 		const hasBgSprite = Boolean(this.bgSpriteList[background.name.toLowerCase()]);
@@ -583,7 +578,7 @@
 
 		let xLoc = 0;
 		let yLoc = compact ? 5 : 0;
 		for (let i = 0; i < items.length; i++) {
 			if (i % itemsPerRow === 0) yLoc += floor((itemSize + spacer / 2) * (compact ? 0.9 : 1.08)) + verticalSpacer;
 			// For some reason, it starts drawing at -2 so we compensate that
 			// Adds the border width
@@ -651,24 +646,24 @@
 				const group = findDisassemblyGroup(item);
 				const inventionLevel = user.skillLevel(SkillsEnum.Invention);
 				const xp = group && inventionLevel >= group.data.lvl && calcWholeDisXP(user, item, quantity);
 				if (xp) {
 					bottomItemText = `${toKMB(xp)}XP`;
 				} else {
 					bottomItemText = 0;
 				}
 			} else if (mahojiFlags?.includes('show_weights') && weightings && weightings[item.id]) {
 				bottomItemText = weightings[item.id];
 			} else if (mahojiFlags?.includes('show_market_price')) {
 				bottomItemText = marketPriceOrBotPrice(item.id) * quantity;
 			}
 
 			const forcedShortName = forcedShortNameMap.get(item.id);
 			if (forcedShortName && !bottomItemText) {
 				ctx.font = '10px Smallest Pixel-7';
 				bottomItemText = forcedShortName.toUpperCase();
 			}
 
 			if (bottomItemText) {
 				let text =
 					typeof bottomItemText === 'number' ? toKMB(bottomItemText) : bottomItemText.toString().slice(0, 8);
 				ctx.fillStyle = 'black';

src/lib/skilling/skills/farming/herbPlants.ts

@@ -652,7 +652,8 @@ const herbPlants: Plant[] = [
 		name: 'Spirit weed',
 		aliases: ['spirit weed', 'spirit weed seed'],
 		inputItems: new Bank({ 'Spirit weed seed': 1 }),
-		outputCrop: itemID('Spirit weed'),
+		outputCrop: itemID('Grimy spirit weed'),
+		cleanHerbCrop: itemID('Spirit weed'),
 		petChance: 98_364,
 		seedType: 'herb',
 		growthTime: 80,

src/lib/skilling/skills/herblore/mixables/grimy.ts

@@ -156,7 +156,7 @@ const Grimy: Mixable[] = [
 	},
 	{
 		item: getOSItem('Spirit weed'),
-		aliases: ['grimy spirit weed'],
+		aliases: ['grimy spirit weed', 'spirit weed'],
 		level: 105,
 		xp: 25,
 		inputItems: new Bank({ 'Grimy spirit weed': 1 }),