farming-weight 0.10.8 → 0.11.0

package/dist/fortune/farmingtool.js

@@ -1,19 +1,27 @@
 import { FARMING_ENCHANTS } from '../constants/enchants.js';
-import { REFORGES } from '../constants/reforges.js';
+import { REFORGES, ReforgeTarget } from '../constants/reforges.js';
 import { getStatValue, Stat } from '../constants/stats.js';
 import { FARMING_TOOLS, FarmingToolType } from '../items/tools.js';
 import { getSourceProgress } from '../upgrades/getsourceprogress.js';
 import { registerItem } from '../upgrades/itemregistry.js';
 import { TOOL_FORTUNE_SOURCES } from '../upgrades/sources/toolsources.js';
 import { getSelfFortuneUpgrade, getUpgradeableRarityUpgrade } from '../upgrades/upgrades.js';
-import { getFortuneFromEnchant } from '../util/enchants.js';
-import { getPeridotFortune } from '../util/gems.js';
+import { filterAndSortUpgrades } from '../upgrades/upgradeutils.js';
+import { getFortuneFromEnchant, getStatFromEnchant } from '../util/enchants.js';
+import { getGemStat, getPeridotFortune } from '../util/gems.js';
 import { getRarityFromLore, previousRarity } from '../util/itemstats.js';
 import { extractNumberFromLine, getNumberFromMatchingLine } from '../util/lore.js';
 import { UpgradeableBase } from './upgradeablebase.js';
 export class FarmingTool extends UpgradeableBase {
     get type() {
-        return this.info.reforgeType;
+        const t = this.info.type;
+        if (t === FarmingToolType.Dicer)
+            return ReforgeTarget.Axe;
+        if (t === FarmingToolType.MathematicalHoe)
+            return ReforgeTarget.Hoe;
+        if (Object.values(ReforgeTarget).includes(t))
+            return t;
+        return ReforgeTarget.Hoe;
     }
     // Backwards compatibility
     get tool() {
@@ -29,14 +37,15 @@ export class FarmingTool extends UpgradeableBase {
         super({ item, options, items: FARMING_TOOLS });
         this.rebuildTool(item, options);
     }
-    getProgress(zeroed = false) {
-        return getSourceProgress(this, TOOL_FORTUNE_SOURCES, zeroed);
+    getProgress(zeroed = false, stats) {
+        return getSourceProgress(this, TOOL_FORTUNE_SOURCES, zeroed, stats);
     }
-    getUpgrades() {
+    getUpgrades(options) {
         const { deadEnd, upgrade: self } = getSelfFortuneUpgrade(this) ?? {};
         if (deadEnd && self)
-            return [self];
-        const upgrades = getSourceProgress(this, TOOL_FORTUNE_SOURCES, false).flatMap((source) => source.upgrades ?? []);
+            return filterAndSortUpgrades([self], options);
+        const stats = options?.stat ? [options.stat] : undefined;
+        const upgrades = getSourceProgress(this, TOOL_FORTUNE_SOURCES, false, stats).flatMap((source) => source.upgrades ?? []);
         if (self) {
             upgrades.push(self);
         }
@@ -44,8 +53,7 @@ export class FarmingTool extends UpgradeableBase {
         if (rarityUpgrade) {
             upgrades.push(rarityUpgrade);
         }
-        upgrades.sort((a, b) => b.increase - a.increase);
-        return upgrades;
+        return filterAndSortUpgrades(upgrades, options);
     }
     setOptions(options) {
         this.options = options;
@@ -99,6 +107,36 @@ export class FarmingTool extends UpgradeableBase {
         }
         this.fortune = this.getFortune();
     }
+    getStat(stat) {
+        if (stat === Stat.FarmingFortune) {
+            return this.getFortune();
+        }
+        let sum = 0;
+        // Base fortune
+        sum += this.tool.baseStats?.[stat] ?? 0;
+        // Computed stats
+        sum += this.getCalculatedStats()?.[stat] ?? 0;
+        // Gems
+        sum += getGemStat(this.item, stat, this.rarity);
+        // Tool rarity stats
+        const baseRarity = this.recombobulated ? previousRarity(this.rarity) : this.rarity;
+        sum += getStatValue(this.tool.stats?.[baseRarity]?.[stat]);
+        // Reforge stats
+        sum += this.reforgeStats?.stats?.[stat] ?? 0;
+        // Enchantments
+        const enchantments = Object.entries(this.item.enchantments ?? {});
+        for (const [enchant, level] of enchantments) {
+            if (!level)
+                continue;
+            const enchantment = FARMING_ENCHANTS[enchant];
+            if (!enchantment || !level)
+                continue;
+            if (enchantment.cropSpecific && enchantment.cropSpecific !== this.crop)
+                continue;
+            sum += getStatFromEnchant(level, enchantment, stat, this.options, this.crop);
+        }
+        return sum;
+    }
     getFortune() {
         this.fortuneBreakdown = {};
         let sum = 0;
@@ -197,7 +235,7 @@ export class FarmingTool extends UpgradeableBase {
         return false;
     }
     supportsCultivating() {
-        return FARMING_ENCHANTS.cultivating?.appliesTo.includes(this.type) ?? false;
+        return this.type ? (FARMING_ENCHANTS.cultivating?.appliesTo.includes(this.type) ?? false) : false;
     }
     isMissingDedication() {
         if (!this.crop)
@@ -251,9 +289,10 @@ export class FarmingTool extends UpgradeableBase {
     }
     static fakeItem(info, options) {
         const fake = {
-            name: 'Fake Item',
+            name: info.name,
             skyblockId: info.skyblockId,
-            lore: [],
+            uuid: crypto.randomUUID(),
+            lore: ['This is a fake item used for upgrade calculations!'],
             attributes: {},
             enchantments: {},
         };

package/dist/fortune/farmingtool.js.map

@@ -1 +1 @@
-{"version":3,"file":"farmingtool.js","sourceRoot":"","sources":["../../src/fortune/farmingtool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"farmingtool.js","sourceRoot":"","sources":["../../src/fortune/farmingtool.ts"],"names":[],"mappings":"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"}

package/dist/fortune/upgradeable.d.ts

@@ -26,6 +26,7 @@ export interface UpgradeableInfo {
     baseStats?: Partial<Record<Stat, number>>;
     cost?: UpgradeCost;
     computedStats?: (opt: PlayerOptions) => Partial<Record<Stat, number>>;
+    skillReq?: Partial<Record<string, number>>;
 }
 export interface Upgradeable {
     item: EliteItemDto;
@@ -39,11 +40,15 @@ export interface Upgradeable {
     reforgeStats?: ReforgeTier | undefined;
     fortune: number;
     getFortune(): number;
-    getUpgrades(): FortuneUpgrade[];
+    getStat(stat: Stat): number;
+    getStats(): Partial<Record<Stat, number>>;
+    getUpgrades(options?: {
+        stat?: Stat;
+    }): FortuneUpgrade[];
     getItemUpgrade(): Upgrade | undefined;
     getLastItemUpgrade(): {
         upgrade: Upgrade;
         info: UpgradeableInfo;
     } | undefined;
-    getProgress(zeroed: boolean): FortuneSourceProgress[];
+    getProgress(zeroed?: boolean, stats?: Stat[]): FortuneSourceProgress[];
 }

package/dist/fortune/upgradeablebase.d.ts

@@ -1,6 +1,6 @@
 import type { Crop } from '../constants/crops.js';
 import { Rarity, type Reforge, type ReforgeTarget, type ReforgeTier } from '../constants/reforges.js';
-import type { Stat } from '../constants/stats.js';
+import { Stat } from '../constants/stats.js';
 import type { FortuneSourceProgress, FortuneUpgrade, Upgrade } from '../constants/upgrades.js';
 import type { PlayerOptions } from '../player/playeroptions.js';
 import type { EliteItemDto } from './item.js';
@@ -25,9 +25,13 @@ export declare class UpgradeableBase implements Upgradeable {
         items: Partial<Record<string, UpgradeableInfo>>;
     });
     getFortune(): number;
+    getStat(stat: Stat): number;
+    getStats(): Partial<Record<Stat, number>>;
     getCalculatedStats(): Partial<Record<Stat, number>>;
-    getUpgrades(): FortuneUpgrade[];
-    getProgress(): FortuneSourceProgress[];
+    getUpgrades(options?: {
+        stat?: Stat;
+    }): FortuneUpgrade[];
+    getProgress(_zeroed?: boolean, _stats?: Stat[]): FortuneSourceProgress[];
     getItemUpgrade(): Upgrade | undefined;
     getNextItemUpgrade(): {
         upgrade: Upgrade;

package/dist/fortune/upgradeablebase.js

@@ -1,5 +1,8 @@
 import { Rarity, REFORGES } from '../constants/reforges.js';
+import { Stat } from '../constants/stats.js';
+import { getItemProgress } from '../upgrades/progress.js';
 import { getItemUpgrades, getLastItemUpgradeableTo, getNextItemUpgradeableTo } from '../upgrades/upgrades.js';
+import { filterAndSortUpgrades } from '../upgrades/upgradeutils.js';
 import { getRarityFromLore, previousRarity } from '../util/itemstats.js';
 export class UpgradeableBase {
     item;
@@ -43,16 +46,29 @@ export class UpgradeableBase {
     getFortune() {
         return this.fortune;
     }
+    getStat(stat) {
+        return stat === Stat.FarmingFortune ? this.getFortune() : 0;
+    }
+    getStats() {
+        const result = {};
+        for (const key of Object.values(Stat)) {
+            const val = this.getStat(key);
+            if (val > 0)
+                result[key] = val;
+        }
+        return result;
+    }
     getCalculatedStats() {
         if (!this.info.computedStats || !this.options)
             return {};
         return this.info.computedStats?.(this.options) ?? {};
     }
-    getUpgrades() {
-        return getItemUpgrades(this);
+    getUpgrades(options) {
+        const upgrades = getItemUpgrades(this, options);
+        return filterAndSortUpgrades(upgrades, options);
     }
-    getProgress() {
-        return [];
+    getProgress(_zeroed, _stats) {
+        return [getItemProgress(this)];
     }
     getItemUpgrade() {
         return this.info.upgrade;

package/dist/fortune/upgradeablebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgradeablebase.js","sourceRoot":"","sources":["../../src/fortune/upgradeablebase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upgradeablebase.js","sourceRoot":"","sources":["../../src/fortune/upgradeablebase.ts"],"names":[],"mappings":"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"}

package/dist/items/accessories.d.ts

@@ -1,14 +1,3 @@
-import { Crop } from '../constants/crops.js';
-import { Rarity } from '../constants/reforges.js';
-import type { Skill } from '../constants/skills.js';
-import type { UpgradeableInfo } from '../fortune/upgradeable.js';
-export interface FarmingAccessoryInfo extends UpgradeableInfo {
-    name: string;
-    wiki: string;
-    family?: string;
-    familyOrder?: number;
-    maxRarity: Rarity;
-    crops?: Crop[];
-    skillReq?: Partial<Record<Skill, number>>;
-}
-export declare const FARMING_ACCESSORIES_INFO: Partial<Record<string, FarmingAccessoryInfo>>;
+import type { ItemDefinition } from './definitions.js';
+export type { ItemDefinition as FarmingAccessoryInfo };
+export declare const FARMING_ACCESSORIES_INFO: Partial<Record<string, ItemDefinition>>;

package/dist/items/accessories.js

@@ -82,5 +82,14 @@ export const FARMING_ACCESSORIES_INFO = {
         },
         maxRarity: Rarity.Mythic,
     },
+    MAGIC_8_BALL: {
+        skyblockId: 'MAGIC_8_BALL',
+        name: 'Magic 8 Ball',
+        wiki: 'https://wiki.hypixel.net/Magic_8_Ball',
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            [Stat.FarmingFortune]: 0, // Effect is special
+        },
+    },
 };
 //# sourceMappingURL=accessories.js.map

package/dist/items/accessories.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessories.js","sourceRoot":"","sources":["../../src/items/accessories.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accessories.js","sourceRoot":"","sources":["../../src/items/accessories.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,MAAM,CAAC,MAAM,wBAAwB,GAA4C;IAChF,iBAAiB,EAAE;QAClB,UAAU,EAAE,mBAAmB;QAC/B,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,MAAM,CAAC,IAAI;QACtB,SAAS,EAAE;YACV,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;SACzB;KACD;IACD,WAAW,EAAE;QACZ,UAAU,EAAE,aAAa;QACzB,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,sCAAsC;QAC5C,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,CAAC;QACd,OAAO,EAAE;YACR,EAAE,EAAE,mBAAmB;YACvB,MAAM,EAAE,aAAa,CAAC,QAAQ;YAC9B,IAAI,EAAE;gBACL,KAAK,EAAE;oBACN,kBAAkB,EAAE,CAAC;iBACrB;aACD;SACD;QACD,SAAS,EAAE,MAAM,CAAC,IAAI;QACtB,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC;QACvG,SAAS,EAAE;YACV,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;SACzB;KACD;IACD,eAAe,EAAE;QAChB,UAAU,EAAE,iBAAiB;QAC7B,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,0CAA0C;QAChD,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,CAAC;QACd,OAAO,EAAE;YACR,EAAE,EAAE,aAAa;YACjB,MAAM,EAAE,aAAa,CAAC,QAAQ;YAC9B,IAAI,EAAE;gBACL,KAAK,EAAE;oBACN,MAAM,EAAE,GAAG;iBACX;aACD;SACD;QACD,SAAS,EAAE,MAAM,CAAC,QAAQ;QAC1B,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QAC7C,SAAS,EAAE;YACV,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;SACzB;KACD;IACD,WAAW,EAAE;QACZ,UAAU,EAAE,aAAa;QACzB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,yCAAyC;QAC/C,QAAQ,EAAE;YACT,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YAChC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;YACjC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;YACjC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE;YACpC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE;YACpC,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;YAClC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YAChC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YAChC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YAChC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;YACnC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;YACnC,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE;SACtC;QACD,IAAI,EAAE;YACL,KAAK,EAAE;gBACN,aAAa,EAAE,CAAC;gBAChB,oBAAoB,EAAE,EAAE;aACxB;SACD;QACD,SAAS,EAAE,MAAM,CAAC,MAAM;KACxB;IACD,YAAY,EAAE;QACb,UAAU,EAAE,cAAc;QAC1B,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,uCAAuC;QAC7C,SAAS,EAAE,MAAM,CAAC,IAAI;QACtB,SAAS,EAAE;YACV,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,oBAAoB;SAC9C;KACD;CACD,CAAC"}

package/dist/items/armor.d.ts

@@ -1,40 +1,8 @@
-import { Rarity, ReforgeTarget } from '../constants/reforges.js';
-import { Skill } from '../constants/skills.js';
 import { SpecialCrop } from '../constants/specialcrops.js';
 import { Stat } from '../constants/stats.js';
-import { type Upgrade } from '../constants/upgrades.js';
-import type { UpgradeableInfo } from '../fortune/upgradeable.js';
-export declare enum GearSlot {
-    Boots = "Boots",
-    Leggings = "Leggings",
-    Chestplate = "Chestplate",
-    Helmet = "Helmet",
-    Necklace = "Necklace",
-    Cloak = "Cloak",
-    Belt = "Belt",
-    Gloves = "Gloves"
-}
-export interface GearSlotInfo {
-    name: string;
-    startingItem: string;
-    target: ReforgeTarget;
-}
-export declare const GEAR_SLOTS: Record<GearSlot, GearSlotInfo>;
-export interface FarmingArmorInfo extends UpgradeableInfo {
-    special?: SpecialCrop[];
-    slot: GearSlot;
-    family?: string;
-    maxRarity: Rarity;
-    upgrade?: Upgrade;
-    wiki: string;
-    contestStatsMultiplier?: number;
-    perLevelStats?: {
-        skill: Skill;
-        appliesTo?: ReforgeTarget[];
-        stats: Partial<Record<Stat, number>>;
-    };
-    skillReq?: Partial<Record<Skill, number>>;
-}
+import { GEAR_SLOTS, GearSlot, type GearSlotInfo, type ItemDefinition } from './definitions.js';
+export { GEAR_SLOTS, GearSlot, type GearSlotInfo, type ItemDefinition as FarmingArmorInfo };
+type FarmingArmorInfo = ItemDefinition;
 export declare const FARMING_ARMOR_INFO: Record<string, FarmingArmorInfo>;
 export type ArmorSetBonusStats = Partial<Record<number, Partial<Record<Stat, number>>>>;
 export interface ArmorSetBonus {

package/dist/items/armor.js

@@ -3,72 +3,17 @@ import { Skill } from '../constants/skills.js';
 import { SpecialCrop } from '../constants/specialcrops.js';
 import { Stat } from '../constants/stats.js';
 import { UpgradeReason } from '../constants/upgrades.js';
-export var GearSlot;
-(function (GearSlot) {
-    GearSlot["Boots"] = "Boots";
-    GearSlot["Leggings"] = "Leggings";
-    GearSlot["Chestplate"] = "Chestplate";
-    GearSlot["Helmet"] = "Helmet";
-    GearSlot["Necklace"] = "Necklace";
-    GearSlot["Cloak"] = "Cloak";
-    GearSlot["Belt"] = "Belt";
-    GearSlot["Gloves"] = "Gloves";
-})(GearSlot || (GearSlot = {}));
-export const GEAR_SLOTS = {
-    [GearSlot.Helmet]: {
-        name: 'Helmet',
-        target: ReforgeTarget.Armor,
-        startingItem: 'FARM_ARMOR_HELMET',
-    },
-    [GearSlot.Chestplate]: {
-        name: 'Chestplate',
-        target: ReforgeTarget.Armor,
-        startingItem: 'FARM_ARMOR_CHESTPLATE',
-    },
-    [GearSlot.Leggings]: {
-        name: 'Leggings',
-        target: ReforgeTarget.Armor,
-        startingItem: 'FARM_ARMOR_LEGGINGS',
-    },
-    [GearSlot.Boots]: {
-        name: 'Boots',
-        target: ReforgeTarget.Armor,
-        startingItem: 'FARM_ARMOR_BOOTS',
-    },
-    [GearSlot.Necklace]: {
-        name: 'Necklace',
-        target: ReforgeTarget.Equipment,
-        startingItem: 'LOTUS_NECKLACE',
-    },
-    [GearSlot.Cloak]: {
-        name: 'Cloak',
-        target: ReforgeTarget.Equipment,
-        startingItem: 'LOTUS_CLOAK',
-    },
-    [GearSlot.Belt]: {
-        name: 'Belt',
-        target: ReforgeTarget.Equipment,
-        startingItem: 'LOTUS_BELT',
-    },
-    [GearSlot.Gloves]: {
-        name: 'Gloves',
-        target: ReforgeTarget.Equipment,
-        startingItem: 'LOTUS_BRACELET',
-    },
-};
+import { GEAR_SLOTS, GearSlot } from './definitions.js';
+export { GEAR_SLOTS, GearSlot };
 export const FARMING_ARMOR_INFO = {
     FARMER_BOOTS: {
         skyblockId: 'FARMER_BOOTS',
         name: 'Farmer Boots',
         wiki: 'https://wiki.hypixel.net/Farmer_Boots',
         upgrade: {
-            id: 'RANCHERS_BOOTS',
-            reason: UpgradeReason.NextTier,
-            cost: {
-                items: {
-                    ENCHANTED_PUMPKIN: 256,
-                },
-            },
+            id: 'MELON_BOOTS',
+            reason: UpgradeReason.DeadEnd,
+            why: 'You can control your speed with the sundial on the Garden!',
         },
         maxRarity: Rarity.Rare,
         slot: GearSlot.Boots,
@@ -97,9 +42,8 @@ export const FARMING_ARMOR_INFO = {
         wiki: 'https://wiki.hypixel.net/Rancher%27s_Boots',
         upgrade: {
             id: 'FERMENTO_BOOTS',
-            reason: UpgradeReason.Situational,
-            why: 'Fermento Boots provide more farming fortune, with the tradeoff of not being able to control your speed.',
-            preferred: true,
+            reason: UpgradeReason.DeadEnd,
+            why: 'Fermento Boots provide better overall stats! Your speed is still controllable with the sundial on the Garden.',
         },
         maxRarity: Rarity.Legendary,
         slot: GearSlot.Boots,
@@ -1065,6 +1009,138 @@ export const FARMING_ARMOR_INFO = {
             [Skill.Farming]: 40,
         },
     },
+    MUSHROOM_HELMET: {
+        skyblockId: 'MUSHROOM_HELMET',
+        name: 'Mushroom Helmet',
+        wiki: 'https://wiki.hypixel.net/Mushroom_Armor',
+        upgrade: {
+            id: 'BIOHAZARD_HELMET',
+            reason: UpgradeReason.NextTier,
+        },
+        family: 'MUSHROOM_ARMOR',
+        slot: GearSlot.Helmet,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            // Placeholder
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
+    MUSHROOM_CHESTPLATE: {
+        skyblockId: 'MUSHROOM_CHESTPLATE',
+        name: 'Mushroom Chestplate',
+        wiki: 'https://wiki.hypixel.net/Mushroom_Armor',
+        upgrade: {
+            id: 'BIOHAZARD_CHESTPLATE',
+            reason: UpgradeReason.NextTier,
+        },
+        family: 'MUSHROOM_ARMOR',
+        slot: GearSlot.Chestplate,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            // Placeholder
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
+    MUSHROOM_LEGGINGS: {
+        skyblockId: 'MUSHROOM_LEGGINGS',
+        name: 'Mushroom Leggings',
+        wiki: 'https://wiki.hypixel.net/Mushroom_Armor',
+        upgrade: {
+            id: 'BIOHAZARD_LEGGINGS',
+            reason: UpgradeReason.NextTier,
+        },
+        family: 'MUSHROOM_ARMOR',
+        slot: GearSlot.Leggings,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            // Placeholder
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
+    MUSHROOM_BOOTS: {
+        skyblockId: 'MUSHROOM_BOOTS',
+        name: 'Mushroom Boots',
+        wiki: 'https://wiki.hypixel.net/Mushroom_Armor',
+        upgrade: {
+            id: 'BIOHAZARD_BOOTS',
+            reason: UpgradeReason.NextTier,
+        },
+        family: 'MUSHROOM_ARMOR',
+        slot: GearSlot.Boots,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            // Placeholder
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
+    BIOHAZARD_HELMET: {
+        skyblockId: 'BIOHAZARD_HELMET',
+        name: 'Biohazard Helmet',
+        wiki: 'https://wiki.hypixel.net/Biohazard_Armor',
+        family: 'BIOHAZARD_ARMOR',
+        slot: GearSlot.Helmet,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
+    BIOHAZARD_CHESTPLATE: {
+        skyblockId: 'BIOHAZARD_CHESTPLATE',
+        name: 'Biohazard Chestplate',
+        wiki: 'https://wiki.hypixel.net/Biohazard_Armor',
+        family: 'BIOHAZARD_ARMOR',
+        slot: GearSlot.Chestplate,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
+    BIOHAZARD_LEGGINGS: {
+        skyblockId: 'BIOHAZARD_LEGGINGS',
+        name: 'Biohazard Leggings',
+        wiki: 'https://wiki.hypixel.net/Biohazard_Armor',
+        family: 'BIOHAZARD_ARMOR',
+        slot: GearSlot.Leggings,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
+    BIOHAZARD_BOOTS: {
+        skyblockId: 'BIOHAZARD_BOOTS',
+        name: 'Biohazard Boots',
+        wiki: 'https://wiki.hypixel.net/Biohazard_Armor',
+        family: 'BIOHAZARD_ARMOR',
+        slot: GearSlot.Boots,
+        maxRarity: Rarity.Epic,
+        baseStats: {
+            [Stat.BonusPestChance]: 16.5,
+        },
+        skillReq: {
+            [Skill.Farming]: 7,
+        },
+    },
 };
 export const ARMOR_SET_BONUS = {
     RABBIT: {