farming-weight 0.7.0 → 0.7.2

package/dist/classes/weightcalc.js

@@ -1,197 +1,192 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
 exports.createFarmingWeightCalculator = void 0;
-const crops_1 = require("../constants/crops");
-const weight_1 = require("../constants/weight");
-const jacob_1 = require("../util/jacob");
-const pests_1 = require("../util/pests");
+const CROPS_1 = require('../constants/crops');
+const WEIGHT_1 = require('../constants/weight');
+const JACOB_1 = require('../util/jacob');
+const PESTS_1 = require('../util/pests');
 function createFarmingWeightCalculator(info) {
-    return new FarmingWeight(info);
+	return new FarmingWeight(info);
 }
 exports.createFarmingWeightCalculator = createFarmingWeightCalculator;
-const crops = [
-    crops_1.Crop.Cactus,
-    crops_1.Crop.Carrot,
-    crops_1.Crop.CocoaBeans,
-    crops_1.Crop.Melon,
-    crops_1.Crop.Mushroom,
-    crops_1.Crop.NetherWart,
-    crops_1.Crop.Potato,
-    crops_1.Crop.Pumpkin,
-    crops_1.Crop.SugarCane,
-    crops_1.Crop.Wheat,
+const CROPS = [
+	CROPS_1.Crop.Cactus,
+	CROPS_1.Crop.Carrot,
+	CROPS_1.Crop.CocoaBeans,
+	CROPS_1.Crop.Melon,
+	CROPS_1.Crop.Mushroom,
+	CROPS_1.Crop.NetherWart,
+	CROPS_1.Crop.Potato,
+	CROPS_1.Crop.Pumpkin,
+	CROPS_1.Crop.SugarCane,
+	CROPS_1.Crop.Wheat,
 ];
 class FarmingWeight {
-    info;
-    constructor(info) {
-        this.info = info;
-        this.collection = {};
-        this.levelCapUpgrade = info?.levelCapUpgrade ?? 0;
-        this.anitaBonusFarmingFortuneLevel = info?.anitaBonusFarmingFortuneLevel ?? 0;
-        this.farmingXp = info?.farmingXp ?? 0;
-        this.earnedMedals = { diamond: 0, platinum: 0, gold: 0 };
-        this.tier12MinionCount = 0;
-        this.bonusSources = {};
-        this.uncountedCrops = {};
-        this.setContests(info?.contests ?? []);
-        this.calcUncountedCrops(info?.pests ?? {});
-        this.setCropsFromCollections(info?.collection ?? {});
-        this.addMinions(info?.minions ?? []);
-    }
-    /**
-     * Expectes a dictionary of collections and amounts with the default Hypixel SkyBlock IDs
-     * @param {Record<string, number>} collections
-     * @returns {FarmingWeight}
-     */
-    setCropsFromCollections(collections) {
-        for (const crop of crops) {
-            this.collection[crop] = collections[crop] ?? 0;
-        }
-        this.getCropWeights();
-        return this;
-    }
-    setCrop = (crop, collection) => {
-        this.collection[crop] = collection;
-        this.getCropWeights();
-        return this;
-    };
-    setLevelCap = (levelCap) => {
-        this.levelCapUpgrade = levelCap;
-        return this;
-    };
-    setFarmingXp = (farmingXp) => {
-        this.farmingXp = farmingXp;
-        return this;
-    };
-    setAnitaBonusLevel = (anitaBonusFarmingFortuneLevel) => {
-        this.anitaBonusFarmingFortuneLevel = anitaBonusFarmingFortuneLevel;
-        return this;
-    };
-    addMinions = (minions) => {
-        for (const minion of minions) {
-            if (!minion.endsWith('_12'))
-                continue;
-            if (!weight_1.TIER_12_MINIONS.includes(minion))
-                continue;
-            this.tier12MinionCount++;
-        }
-        return this;
-    };
-    setEarnedMedals = ({ diamond, platinum, gold }) => {
-        this.earnedMedals = {
-            diamond: diamond ?? this.earnedMedals.diamond,
-            platinum: platinum ?? this.earnedMedals.platinum,
-            gold: gold ?? this.earnedMedals.gold,
-        };
-        return this;
-    };
-    setTier12MinionCount = (count) => {
-        this.tier12MinionCount = count;
-        return this;
-    };
-    setContests = (contests) => {
-        if (!contests?.length)
-            return this;
-        for (const contest of contests) {
-            const medal = (0, jacob_1.calculateJacobContestMedal)(contest);
-            if (!medal)
-                continue;
-            if (medal === 'diamond') {
-                this.earnedMedals.diamond++;
-            }
-            else if (medal === 'platinum') {
-                this.earnedMedals.platinum++;
-            }
-            else if (medal === 'gold') {
-                this.earnedMedals.gold++;
-            }
-        }
-        this.getBonusWeights();
-        return this;
-    };
-    getWeightInfo = () => {
-        const bonus = this.getBonusWeights();
-        const crops = this.getCropWeights();
-        const bonusTotal = Object.values(bonus).reduce((a, b) => a + b, 0);
-        const cropTotal = Object.values(crops).reduce((a, b) => a + b, 0);
-        return {
-            totalWeight: bonusTotal + cropTotal,
-            bonusWeight: bonusTotal,
-            cropWeight: cropTotal,
-            bonusSources: bonus,
-            uncountedCrops: this.uncountedCrops,
-        };
-    };
-    getBonusWeights = () => {
-        this.bonusSources = {};
-        if (this.farmingXp >= 111_672_425 && this.levelCapUpgrade >= 10) {
-            // Farming 60 bonus
-            this.bonusSources['Farming 60'] = weight_1.BONUS_WEIGHT.Farming60Bonus;
-        }
-        else if (this.farmingXp >= 55_172_425) {
-            // Farming 50 bonus
-            this.bonusSources['Farming 50'] = weight_1.BONUS_WEIGHT.Farming50Bonus;
-        }
-        // Tier 12 minion bonus
-        if (this.tier12MinionCount > 0) {
-            this.bonusSources['Tier 12 Minions'] = this.tier12MinionCount * weight_1.BONUS_WEIGHT.MinionRewardWeight;
-        }
-        // Anita bonus
-        if (this.anitaBonusFarmingFortuneLevel > 0) {
-            this.bonusSources['Anita Bonus'] =
-                this.anitaBonusFarmingFortuneLevel * weight_1.BONUS_WEIGHT.AnitaBuffBonusMultiplier;
-        }
-        const maxMedals = weight_1.BONUS_WEIGHT.MaxMedalsCounted;
-        if (this.earnedMedals.diamond >= maxMedals) {
-            this.bonusSources['Contest Medals'] = weight_1.BONUS_WEIGHT.WeightPerDiamondMedal * weight_1.BONUS_WEIGHT.MaxMedalsCounted;
-        }
-        else {
-            const diamond = this.earnedMedals.diamond;
-            const platinum = Math.min(maxMedals - diamond, this.earnedMedals.platinum);
-            const gold = Math.min(maxMedals - diamond - platinum, this.earnedMedals.gold);
-            const medals = diamond * weight_1.BONUS_WEIGHT.WeightPerDiamondMedal +
-                platinum * weight_1.BONUS_WEIGHT.WeightPerPlatinumMedal +
-                gold * weight_1.BONUS_WEIGHT.WeightPerGoldMedal;
-            this.bonusSources['Contest Medals'] = medals;
-        }
-        return this.bonusSources;
-    };
-    getCropWeights = () => {
-        const cropWeight = {};
-        let totalWeight = 0;
-        let doubleBreakWeight = 0;
-        for (const crop of crops) {
-            let collected = this.collection[crop] ?? 0;
-            // Subtract uncounted crops
-            if (this.uncountedCrops[crop]) {
-                collected = Math.max(0, collected - (this.uncountedCrops[crop] ?? 0));
-            }
-            const weight = collected / weight_1.CROP_WEIGHT[crop];
-            totalWeight += weight;
-            if (crop === crops_1.Crop.Cactus || crop === crops_1.Crop.SugarCane) {
-                doubleBreakWeight += weight;
-            }
-            cropWeight[crop] = weight;
-        }
-        // Mushroom is a special case, it needs to be calculated dynamically based on the
-        // ratio between the farmed crops that give two mushrooms per break with cow pet
-        // and the farmed crops that give one mushroom per break with cow pet
-        const mushroomCollection = this.collection[crops_1.Crop.Mushroom] ?? 0;
-        const mushroomWeightNumber = weight_1.CROP_WEIGHT[crops_1.Crop.Mushroom];
-        const doubleBreakRatio = doubleBreakWeight / totalWeight;
-        const normalCropRatio = (totalWeight - doubleBreakWeight) / totalWeight;
-        const mushroomWeight = doubleBreakRatio * (mushroomCollection / (mushroomWeightNumber * 2)) +
-            normalCropRatio * (mushroomCollection / mushroomWeightNumber);
-        cropWeight[crops_1.Crop.Mushroom] = mushroomWeight;
-        return cropWeight;
-    };
-    calcUncountedCrops = (bestiary) => {
-        this.uncountedCrops = (0, pests_1.uncountedCropsFromPests)(bestiary);
-        this.getCropWeights();
-        return this;
-    };
-    getCropWeight = (crop) => {
-        weight_1.CROP_WEIGHT[crop];
-    };
+	info;
+	constructor(info) {
+		this.info = info;
+		this.collection = {};
+		this.levelCapUpgrade = info?.levelCapUpgrade ?? 0;
+		this.anitaBonusFarmingFortuneLevel = info?.anitaBonusFarmingFortuneLevel ?? 0;
+		this.farmingXp = info?.farmingXp ?? 0;
+		this.earnedMedals = { diamond: 0, platinum: 0, gold: 0 };
+		this.tier12MinionCount = 0;
+		this.bonusSources = {};
+		this.uncountedCrops = {};
+		this.setContests(info?.contests ?? []);
+		this.calcUncountedCrops(info?.pests ?? {});
+		this.setCropsFromCollections(info?.collection ?? {});
+		this.addMinions(info?.minions ?? []);
+	}
+	/**
+	 * Expectes a dictionary of collections and amounts with the default Hypixel SkyBlock IDs
+	 * @param {Record<string, number>} collections
+	 * @returns {FarmingWeight}
+	 */
+	setCropsFromCollections(collections) {
+		for (const CROP of CROPS) {
+			this.collection[CROP] = collections[CROP] ?? 0;
+		}
+		this.getCropWeights();
+		return this;
+	}
+	setCrop = (crop, collection) => {
+		this.collection[crop] = collection;
+		this.getCropWeights();
+		return this;
+	};
+	setLevelCap = (levelCap) => {
+		this.levelCapUpgrade = levelCap;
+		return this;
+	};
+	setFarmingXp = (farmingXp) => {
+		this.farmingXp = farmingXp;
+		return this;
+	};
+	setAnitaBonusLevel = (anitaBonusFarmingFortuneLevel) => {
+		this.anitaBonusFarmingFortuneLevel = anitaBonusFarmingFortuneLevel;
+		return this;
+	};
+	addMinions = (minions) => {
+		for (const MINION of minions) {
+			if (!MINION.endsWith('_12')) continue;
+			if (!WEIGHT_1.TIER_12_MINIONS.includes(MINION)) continue;
+			this.tier12MinionCount++;
+		}
+		return this;
+	};
+	setEarnedMedals = ({ diamond, platinum, gold }) => {
+		this.earnedMedals = {
+			diamond: diamond ?? this.earnedMedals.diamond,
+			platinum: platinum ?? this.earnedMedals.platinum,
+			gold: gold ?? this.earnedMedals.gold,
+		};
+		return this;
+	};
+	setTier12MinionCount = (count) => {
+		this.tier12MinionCount = count;
+		return this;
+	};
+	setContests = (contests) => {
+		if (!contests?.length) return this;
+		for (const CONTEST of contests) {
+			const MEDAL = (0, JACOB_1.calculateJacobContestMedal)(CONTEST);
+			if (!MEDAL) continue;
+			if (MEDAL === 'diamond') {
+				this.earnedMedals.diamond++;
+			} else if (MEDAL === 'platinum') {
+				this.earnedMedals.platinum++;
+			} else if (MEDAL === 'gold') {
+				this.earnedMedals.gold++;
+			}
+		}
+		this.getBonusWeights();
+		return this;
+	};
+	getWeightInfo = () => {
+		const BONUS = this.getBonusWeights();
+		const crops = this.getCropWeights();
+		const BONUS_TOTAL = Object.values(BONUS).reduce((a, b) => a + b, 0);
+		const CROP_TOTAL = Object.values(crops).reduce((a, b) => a + b, 0);
+		return {
+			totalWeight: BONUS_TOTAL + CROP_TOTAL,
+			bonusWeight: BONUS_TOTAL,
+			cropWeight: CROP_TOTAL,
+			bonusSources: BONUS,
+			uncountedCrops: this.uncountedCrops,
+		};
+	};
+	getBonusWeights = () => {
+		this.bonusSources = {};
+		if (this.farmingXp >= 111_672_425 && this.levelCapUpgrade >= 10) {
+			// Farming 60 bonus
+			this.bonusSources['Farming 60'] = WEIGHT_1.BONUS_WEIGHT.Farming60Bonus;
+		} else if (this.farmingXp >= 55_172_425) {
+			// Farming 50 bonus
+			this.bonusSources['Farming 50'] = WEIGHT_1.BONUS_WEIGHT.Farming50Bonus;
+		}
+		// Tier 12 minion bonus
+		if (this.tier12MinionCount > 0) {
+			this.bonusSources['Tier 12 Minions'] = this.tier12MinionCount * WEIGHT_1.BONUS_WEIGHT.MinionRewardWeight;
+		}
+		// Anita bonus
+		if (this.anitaBonusFarmingFortuneLevel > 0) {
+			this.bonusSources['Anita Bonus'] =
+				this.anitaBonusFarmingFortuneLevel * WEIGHT_1.BONUS_WEIGHT.AnitaBuffBonusMultiplier;
+		}
+		const MAX_MEDALS = WEIGHT_1.BONUS_WEIGHT.MaxMedalsCounted;
+		if (this.earnedMedals.diamond >= MAX_MEDALS) {
+			this.bonusSources['Contest Medals'] =
+				WEIGHT_1.BONUS_WEIGHT.WeightPerDiamondMedal * WEIGHT_1.BONUS_WEIGHT.MaxMedalsCounted;
+		} else {
+			const DIAMOND = this.earnedMedals.diamond;
+			const PLATINUM = Math.min(MAX_MEDALS - DIAMOND, this.earnedMedals.platinum);
+			const GOLD = Math.min(MAX_MEDALS - DIAMOND - PLATINUM, this.earnedMedals.gold);
+			const MEDALS =
+				DIAMOND * WEIGHT_1.BONUS_WEIGHT.WeightPerDiamondMedal +
+				PLATINUM * WEIGHT_1.BONUS_WEIGHT.WeightPerPlatinumMedal +
+				GOLD * WEIGHT_1.BONUS_WEIGHT.WeightPerGoldMedal;
+			this.bonusSources['Contest Medals'] = MEDALS;
+		}
+		return this.bonusSources;
+	};
+	getCropWeights = () => {
+		const CROP_WEIGHT = {};
+		let TOTAL_WEIGHT = 0;
+		let DOUBLE_BREAK_WEIGHT = 0;
+		for (const CROP of CROPS) {
+			let COLLECTED = this.collection[CROP] ?? 0;
+			// Subtract uncounted crops
+			if (this.uncountedCrops[CROP]) {
+				COLLECTED = Math.max(0, COLLECTED - (this.uncountedCrops[CROP] ?? 0));
+			}
+			const WEIGHT = COLLECTED / WEIGHT_1.CROP_WEIGHT[CROP];
+			TOTAL_WEIGHT += WEIGHT;
+			if (CROP === CROPS_1.Crop.Cactus || CROP === CROPS_1.Crop.SugarCane) {
+				DOUBLE_BREAK_WEIGHT += WEIGHT;
+			}
+			CROP_WEIGHT[CROP] = WEIGHT;
+		}
+		// Mushroom is a special case, it needs to be calculated dynamically based on the
+		// ratio between the farmed crops that give two mushrooms per break with cow pet
+		// and the farmed crops that give one mushroom per break with cow pet
+		const MUSHROOM_COLLECTION = this.collection[CROPS_1.Crop.Mushroom] ?? 0;
+		const MUSHROOM_WEIGHT_NUMBER = WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Mushroom];
+		const DOUBLE_BREAK_RATIO = DOUBLE_BREAK_WEIGHT / TOTAL_WEIGHT;
+		const NORMAL_CROP_RATIO = (TOTAL_WEIGHT - DOUBLE_BREAK_WEIGHT) / TOTAL_WEIGHT;
+		const MUSHROOM_WEIGHT =
+			DOUBLE_BREAK_RATIO * (MUSHROOM_COLLECTION / (MUSHROOM_WEIGHT_NUMBER * 2)) +
+			NORMAL_CROP_RATIO * (MUSHROOM_COLLECTION / MUSHROOM_WEIGHT_NUMBER);
+		CROP_WEIGHT[CROPS_1.Crop.Mushroom] = MUSHROOM_WEIGHT;
+		return CROP_WEIGHT;
+	};
+	calcUncountedCrops = (bestiary) => {
+		this.uncountedCrops = (0, PESTS_1.uncountedCropsFromPests)(bestiary);
+		this.getCropWeights();
+		return this;
+	};
+	getCropWeight = (crop) => {
+		WEIGHT_1.CROP_WEIGHT[crop];
+	};
 }
-//# sourceMappingURL=weightcalc.js.map
+//# sourceMappingURL=weightcalc.js.map

package/dist/classes/weightcalc.test.js

@@ -1,108 +1,108 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const vitest_1 = require("vitest");
-const weightcalc_1 = require("./weightcalc");
-const crops_1 = require("../constants/crops");
-const weight_1 = require("../constants/weight");
-const pests_1 = require("../util/pests");
-const crops = {
-    [crops_1.Crop.Cactus]: weight_1.CROP_WEIGHT[crops_1.Crop.Cactus] * 50,
-    [crops_1.Crop.Carrot]: weight_1.CROP_WEIGHT[crops_1.Crop.Carrot] * 10,
-    [crops_1.Crop.CocoaBeans]: weight_1.CROP_WEIGHT[crops_1.Crop.CocoaBeans] * 10,
-    [crops_1.Crop.Melon]: weight_1.CROP_WEIGHT[crops_1.Crop.Melon] * 10,
-    [crops_1.Crop.NetherWart]: weight_1.CROP_WEIGHT[crops_1.Crop.NetherWart] * 10,
-    [crops_1.Crop.Potato]: weight_1.CROP_WEIGHT[crops_1.Crop.Potato] * 10,
-    [crops_1.Crop.Pumpkin]: weight_1.CROP_WEIGHT[crops_1.Crop.Pumpkin] * 10,
-    [crops_1.Crop.SugarCane]: weight_1.CROP_WEIGHT[crops_1.Crop.SugarCane] * 50,
-    [crops_1.Crop.Wheat]: weight_1.CROP_WEIGHT[crops_1.Crop.Wheat] * 10,
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+const VITEST_1 = require('vitest');
+const WEIGHTCALC_1 = require('./weightcalc');
+const CROPS_1 = require('../constants/crops');
+const WEIGHT_1 = require('../constants/weight');
+const PESTS_1 = require('../util/pests');
+const CROPS = {
+	[CROPS_1.Crop.Cactus]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Cactus] * 50,
+	[CROPS_1.Crop.Carrot]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Carrot] * 10,
+	[CROPS_1.Crop.CocoaBeans]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.CocoaBeans] * 10,
+	[CROPS_1.Crop.Melon]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Melon] * 10,
+	[CROPS_1.Crop.NetherWart]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.NetherWart] * 10,
+	[CROPS_1.Crop.Potato]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Potato] * 10,
+	[CROPS_1.Crop.Pumpkin]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Pumpkin] * 10,
+	[CROPS_1.Crop.SugarCane]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.SugarCane] * 50,
+	[CROPS_1.Crop.Wheat]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Wheat] * 10,
 };
-const pests = {
-    pest_fly_1: 150,
-    pest_beetle_1: 86,
+const PESTS = {
+	pest_fly_1: 150,
+	pest_beetle_1: 86,
 };
-(0, vitest_1.test)('Basic weight calculation', () => {
-    const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
-        collection: crops,
-    });
-    (0, vitest_1.expect)(weight.getWeightInfo().totalWeight).toBeCloseTo(170);
+(0, VITEST_1.test)('Basic weight calculation', () => {
+	const WEIGHT = (0, WEIGHTCALC_1.createFarmingWeightCalculator)({
+		collection: CROPS,
+	});
+	(0, VITEST_1.expect)(WEIGHT.getWeightInfo().totalWeight).toBeCloseTo(170);
 });
-(0, vitest_1.test)('Mushroom weight calculation', () => {
-    const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
-        collection: {
-            ...crops,
-            [crops_1.Crop.Mushroom]: weight_1.CROP_WEIGHT[crops_1.Crop.Mushroom] * 13.74,
-        },
-    });
-    (0, vitest_1.expect)(weight.getWeightInfo().totalWeight).toBeCloseTo(180);
+(0, VITEST_1.test)('Mushroom weight calculation', () => {
+	const WEIGHT = (0, WEIGHTCALC_1.createFarmingWeightCalculator)({
+		collection: {
+			...CROPS,
+			[CROPS_1.Crop.Mushroom]: WEIGHT_1.CROP_WEIGHT[CROPS_1.Crop.Mushroom] * 13.74,
+		},
+	});
+	(0, VITEST_1.expect)(WEIGHT.getWeightInfo().totalWeight).toBeCloseTo(180);
 });
-(0, vitest_1.test)('Pest debuff weight calculation', () => {
-    const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
-        collection: crops,
-        pests: pests,
-    });
-    const uncounted = (0, pests_1.uncountedCropsFromPests)(pests);
-    const uncountedWheat = uncounted[crops_1.Crop.Wheat] ?? 0;
-    const uncountedWart = uncounted[crops_1.Crop.NetherWart] ?? 0;
-    (0, vitest_1.expect)(weight.getWeightInfo().uncountedCrops[crops_1.Crop.Wheat]).toBeCloseTo(uncountedWheat);
-    (0, vitest_1.expect)(weight.getWeightInfo().uncountedCrops[crops_1.Crop.NetherWart]).toBeCloseTo(uncountedWart);
-    const weightExpected = (0, weightcalc_1.createFarmingWeightCalculator)({
-        collection: {
-            ...crops,
-            [crops_1.Crop.Wheat]: crops[crops_1.Crop.Wheat] - uncountedWheat,
-            [crops_1.Crop.NetherWart]: crops[crops_1.Crop.NetherWart] - uncountedWart,
-        },
-    });
-    (0, vitest_1.expect)(weight.getWeightInfo().cropWeight).toBeCloseTo(weightExpected.getWeightInfo().cropWeight);
+(0, VITEST_1.test)('Pest debuff weight calculation', () => {
+	const WEIGHT = (0, WEIGHTCALC_1.createFarmingWeightCalculator)({
+		collection: CROPS,
+		pests: PESTS,
+	});
+	const UNCOUNTED = (0, PESTS_1.uncountedCropsFromPests)(PESTS);
+	const UNCOUNTED_WHEAT = UNCOUNTED[CROPS_1.Crop.Wheat] ?? 0;
+	const UNCOUNTED_WART = UNCOUNTED[CROPS_1.Crop.NetherWart] ?? 0;
+	(0, VITEST_1.expect)(WEIGHT.getWeightInfo().uncountedCrops[CROPS_1.Crop.Wheat]).toBeCloseTo(UNCOUNTED_WHEAT);
+	(0, VITEST_1.expect)(WEIGHT.getWeightInfo().uncountedCrops[CROPS_1.Crop.NetherWart]).toBeCloseTo(UNCOUNTED_WART);
+	const WEIGHT_EXPECTED = (0, WEIGHTCALC_1.createFarmingWeightCalculator)({
+		collection: {
+			...CROPS,
+			[CROPS_1.Crop.Wheat]: CROPS[CROPS_1.Crop.Wheat] - UNCOUNTED_WHEAT,
+			[CROPS_1.Crop.NetherWart]: CROPS[CROPS_1.Crop.NetherWart] - UNCOUNTED_WART,
+		},
+	});
+	(0, VITEST_1.expect)(WEIGHT.getWeightInfo().cropWeight).toBeCloseTo(WEIGHT_EXPECTED.getWeightInfo().cropWeight);
 });
-(0, vitest_1.test)('Full weight calculation', () => {
-    const crops = {
-        [crops_1.Crop.Cactus]: 1219395,
-        [crops_1.Crop.Carrot]: 14238991,
-        [crops_1.Crop.CocoaBeans]: 901826,
-        [crops_1.Crop.Melon]: 5041491,
-        [crops_1.Crop.Mushroom]: 9063168,
-        [crops_1.Crop.NetherWart]: 897212645,
-        [crops_1.Crop.Potato]: 171017100,
-        [crops_1.Crop.Pumpkin]: 1496477,
-        [crops_1.Crop.SugarCane]: 15509429,
-        [crops_1.Crop.Wheat]: 21996256,
-    };
-    const pests = {
-        pest_fly_1: 222,
-        pest_rat_1: 40,
-        pest_mite_1: 43,
-        pest_moth_1: 40,
-        pest_slug_1: 34,
-        pest_worm_1: 32,
-        pest_beetle_1: 265,
-        pest_locust_1: 41,
-        pest_cricket_1: 36,
-        pest_mosquito_1: 41,
-    };
-    const minions = [
-        'WHEAT_11',
-        'CARROT_11',
-        'POTATO_12',
-        'PUMPKIN_12',
-        'MELON_12',
-        'MUSHROOM_12',
-        'COCOA_11',
-        'CACTUS_11',
-        'SUGAR_CANE_12',
-        'NETHER_WARTS_12',
-    ];
-    const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
-        collection: crops,
-        pests: pests,
-        farmingXp: 286958923.31966937,
-        levelCapUpgrade: 10,
-        anitaBonusFarmingFortuneLevel: 15,
-        minions: minions,
-    }).setEarnedMedals({
-        diamond: 246,
-        platinum: 75,
-        gold: 99,
-    });
-    (0, vitest_1.expect)(weight.getWeightInfo().totalWeight).toBeCloseTo(5176.617);
+(0, VITEST_1.test)('Full weight calculation', () => {
+	const crops = {
+		[CROPS_1.Crop.Cactus]: 1219395,
+		[CROPS_1.Crop.Carrot]: 14238991,
+		[CROPS_1.Crop.CocoaBeans]: 901826,
+		[CROPS_1.Crop.Melon]: 5041491,
+		[CROPS_1.Crop.Mushroom]: 9063168,
+		[CROPS_1.Crop.NetherWart]: 897212645,
+		[CROPS_1.Crop.Potato]: 171017100,
+		[CROPS_1.Crop.Pumpkin]: 1496477,
+		[CROPS_1.Crop.SugarCane]: 15509429,
+		[CROPS_1.Crop.Wheat]: 21996256,
+	};
+	const pests = {
+		pest_fly_1: 222,
+		pest_rat_1: 40,
+		pest_mite_1: 43,
+		pest_moth_1: 40,
+		pest_slug_1: 34,
+		pest_worm_1: 32,
+		pest_beetle_1: 265,
+		pest_locust_1: 41,
+		pest_cricket_1: 36,
+		pest_mosquito_1: 41,
+	};
+	const MINIONS = [
+		'WHEAT_11',
+		'CARROT_11',
+		'POTATO_12',
+		'PUMPKIN_12',
+		'MELON_12',
+		'MUSHROOM_12',
+		'COCOA_11',
+		'CACTUS_11',
+		'SUGAR_CANE_12',
+		'NETHER_WARTS_12',
+	];
+	const WEIGHT = (0, WEIGHTCALC_1.createFarmingWeightCalculator)({
+		collection: crops,
+		pests: pests,
+		farmingXp: 286958923.31966937,
+		levelCapUpgrade: 10,
+		anitaBonusFarmingFortuneLevel: 15,
+		minions: MINIONS,
+	}).setEarnedMedals({
+		diamond: 246,
+		platinum: 75,
+		gold: 99,
+	});
+	(0, VITEST_1.expect)(WEIGHT.getWeightInfo().totalWeight).toBeCloseTo(5176.617);
 });
-//# sourceMappingURL=weightcalc.test.js.map
+//# sourceMappingURL=weightcalc.test.js.map

package/dist/constants/accessories.d.ts

@@ -3,11 +3,11 @@ import { Crop } from './crops';
 import { Rarity } from './reforges';
 import { Skill } from './skills';
 export interface FarmingAccessoryInfo extends UpgradeableInfo {
-    name: string;
-    wiki: string;
-    family?: string;
-    maxRarity: Rarity;
-    crops?: Crop[];
-    skillReq?: Partial<Record<Skill, number>>;
+	name: string;
+	wiki: string;
+	family?: string;
+	maxRarity: Rarity;
+	crops?: Crop[];
+	skillReq?: Partial<Record<Skill, number>>;
 }
 export declare const FARMING_ACCESSORIES_INFO: Partial<Record<string, FarmingAccessoryInfo>>;