farming-weight 0.10.8 → 0.11.0

package/dist/upgrades/sources/cropsources.js

@@ -23,12 +23,22 @@ export const CROP_FORTUNE_SOURCES = [
             const progress = tool?.getProgress();
             return progress?.reduce((acc, p) => acc + p.fortune, 0) ?? 0;
         },
-        progress: ({ player, crop }) => {
+        maxStat: ({ crop }, stat) => {
+            const fake = getFakeItem(CROP_INFO[crop].startingTool);
+            const progress = fake?.getProgress(true, [stat]) ?? [];
+            return progress.reduce((acc, p) => acc + (p.stats?.[stat]?.max ?? (stat === Stat.FarmingFortune ? p.maxFortune : 0)), 0);
+        },
+        currentStat: ({ player, crop }, stat) => {
+            const tool = player.getSelectedCropTool(crop);
+            const progress = tool?.getProgress(false, [stat]) ?? [];
+            return progress.reduce((acc, p) => acc + (p.stats?.[stat]?.current ?? (stat === Stat.FarmingFortune ? p.fortune : 0)), 0);
+        },
+        progress: ({ player, crop }, stats) => {
             const tool = player.getSelectedCropTool(crop);
             if (tool)
-                return tool.getProgress();
+                return tool.getProgress(false, stats);
             const fake = getFakeItem(CROP_INFO[crop].startingTool);
-            return fake?.getProgress(true) ?? [];
+            return fake?.getProgress(true, stats) ?? [];
         },
         info: ({ player, crop }) => {
             const tool = player.selectedTool?.crop === crop ? player.selectedTool : player.getSelectedCropTool(crop);
@@ -57,6 +67,9 @@ export const CROP_FORTUNE_SOURCES = [
                 {
                     title: 'Exportable Crop',
                     increase: EXPORTABLE_CROP_FORTUNE,
+                    stats: {
+                        [Stat.FarmingFortune]: EXPORTABLE_CROP_FORTUNE,
+                    },
                     action: UpgradeAction.Unlock,
                     category: UpgradeCategory.Misc,
                     api: false,
@@ -82,10 +95,18 @@ export const CROP_FORTUNE_SOURCES = [
                 {
                     title: GARDEN_CROP_UPGRADES.name,
                     increase: GARDEN_CROP_UPGRADES.fortunePerLevel,
+                    stats: {
+                        [Stat.FarmingFortune]: GARDEN_CROP_UPGRADES.fortunePerLevel,
+                    },
                     action: UpgradeAction.Upgrade,
                     wiki: GARDEN_CROP_UPGRADES.wiki,
                     category: UpgradeCategory.Misc,
                     cost: GARDEN_CROP_UPGRADES.upgradeCosts?.[level + 1],
+                    meta: {
+                        type: 'crop_upgrade',
+                        key: crop,
+                        value: level + 1,
+                    },
                 },
             ];
         },
@@ -106,10 +127,18 @@ export const CROP_FORTUNE_SOURCES = [
                 {
                     title: COCOA_FORTUNE_UPGRADE.name,
                     increase: COCOA_FORTUNE_UPGRADE.fortunePerLevel,
+                    stats: {
+                        [Stat.FarmingFortune]: COCOA_FORTUNE_UPGRADE.fortunePerLevel,
+                    },
                     action: UpgradeAction.Upgrade,
                     repeatable: COCOA_FORTUNE_UPGRADE.maxLevel - level,
                     wiki: COCOA_FORTUNE_UPGRADE.wiki,
                     category: UpgradeCategory.Misc,
+                    meta: {
+                        type: 'setting',
+                        key: 'cocoaFortuneUpgrade',
+                        value: level + 1,
+                    },
                 },
             ];
         },
@@ -172,6 +201,9 @@ export const CROP_FORTUNE_SOURCES = [
                 {
                     title: 'Personal Best Fortune',
                     increase: increase,
+                    stats: {
+                        [Stat.FarmingFortune]: increase,
+                    },
                     action: UpgradeAction.Unlock,
                     wiki: 'https://wiki.hypixel.net/Anita#Personal_Bests',
                     category: UpgradeCategory.Anita,
@@ -183,6 +215,10 @@ export const CROP_FORTUNE_SOURCES = [
                             gold: 2,
                         },
                     },
+                    meta: {
+                        type: 'unlock',
+                        id: 'personal_best',
+                    },
                 },
             ];
         },

package/dist/upgrades/sources/cropsources.js.map

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

package/dist/upgrades/sources/dynamicfortunesources.d.ts

@@ -1,4 +1,5 @@
 import type { Crop } from '../../constants/crops.js';
+import type { Stat } from '../../constants/stats.js';
 import type { FortuneSourceProgress, FortuneUpgrade, UpgradeInfo } from '../../constants/upgrades.js';
 import type { EliteItemDto } from '../../fortune/item.js';
 import type { UpgradeableInfo } from '../../fortune/upgradeable.js';
@@ -14,16 +15,23 @@ export interface DynamicFortuneSource<T> {
         reason?: string;
         fortune?: number;
     };
+    activeStat?: (source: T, stat: Stat) => {
+        active: boolean;
+        reason?: string;
+        value?: number;
+    };
     max: (source: T) => number;
     current: (source: T) => number;
-    progress?: (source: T) => FortuneSourceProgress[];
+    maxStat?: (source: T, stat: Stat) => number;
+    currentStat?: (source: T, stat: Stat) => number;
+    progress?: (source: T, stats?: Stat[]) => FortuneSourceProgress[];
     info?: (source: T) => {
         item?: EliteItemDto;
         info?: UpgradeableInfo;
         nextInfo?: UpgradeableInfo;
         maxInfo?: UpgradeableInfo;
     };
-    upgrades?: (source: T) => FortuneUpgrade[];
+    upgrades?: (source: T, stats?: Stat[]) => FortuneUpgrade[];
 }
 export interface DynamicUpgradeSource<T, Output = unknown> {
     name: string;

package/dist/upgrades/sources/gearsources.js

@@ -3,7 +3,7 @@ import { Rarity, REFORGES, ReforgeTarget } from '../../constants/reforges.js';
 import { Skill } from '../../constants/skills.js';
 import { Stat } from '../../constants/stats.js';
 import { GemRarity } from '../../fortune/item.js';
-import { getFortuneFromEnchant, getMaxFortuneFromEnchant } from '../../util/enchants.js';
+import { getMaxStatFromEnchant, getStatFromEnchant } from '../../util/enchants.js';
 import { getPeridotFortune, getPeridotGemFortune } from '../../util/gems.js';
 import { getUpgradeableEnchant } from '../enchantupgrades.js';
 import { getUpgradeableGems, getUpgradeableReforges } from '../upgrades.js';
@@ -11,7 +11,7 @@ export const GEAR_FORTUNE_SOURCES = [
     {
         name: 'Base Stats',
         exists: (gear) => {
-            return (gear.getLastItemUpgrade() ?? gear)?.info?.baseStats?.[Stat.FarmingFortune] !== undefined;
+            return Object.keys((gear.getLastItemUpgrade() ?? gear)?.info?.baseStats ?? {}).length > 0;
         },
         max: (gear) => {
             return (gear.getLastItemUpgrade() ?? gear)?.info?.baseStats?.[Stat.FarmingFortune] ?? 0;
@@ -19,6 +19,12 @@ export const GEAR_FORTUNE_SOURCES = [
         current: (gear) => {
             return gear.info.baseStats?.[Stat.FarmingFortune] ?? 0;
         },
+        maxStat: (gear, stat) => {
+            return (gear.getLastItemUpgrade() ?? gear)?.info?.baseStats?.[stat] ?? 0;
+        },
+        currentStat: (gear, stat) => {
+            return gear.info.baseStats?.[stat] ?? 0;
+        },
     },
     {
         name: 'Reforge Stats',
@@ -35,6 +41,26 @@ export const GEAR_FORTUNE_SOURCES = [
         current: (gear) => {
             return gear.reforgeStats?.stats?.[Stat.FarmingFortune] ?? 0;
         },
+        maxStat: (gear, stat) => {
+            const maxRarity = (gear.getLastItemUpgrade()?.info.maxRarity ?? gear.info.maxRarity);
+            const current = gear.reforgeStats?.stats?.[stat] ?? 0;
+            let best = 0;
+            for (const reforge of Object.values(REFORGES)) {
+                if (!reforge || !reforge.appliesTo.includes(gear.type))
+                    continue;
+                // Keep "max" aligned with what we can suggest/cost (stone-based).
+                if (!reforge.stone?.id)
+                    continue;
+                const tier = reforge.tiers?.[maxRarity];
+                const val = tier?.stats?.[stat] ?? 0;
+                if (val > best)
+                    best = val;
+            }
+            return Math.max(best, current);
+        },
+        currentStat: (gear, stat) => {
+            return gear.reforgeStats?.stats?.[stat] ?? 0;
+        },
         upgrades: getUpgradeableReforges,
     },
     {
@@ -52,6 +78,16 @@ export const GEAR_FORTUNE_SOURCES = [
         current: (upgradeable) => {
             return getPeridotFortune(upgradeable.rarity, upgradeable.item);
         },
+        maxStat: (upgradeable, stat) => {
+            if (stat !== Stat.FarmingFortune)
+                return 0;
+            const last = (upgradeable.getLastItemUpgrade() ?? upgradeable)?.info;
+            return ((last?.gemSlots?.filter((s) => s.slot_type === 'PERIDOT').length ?? 0) *
+                getPeridotGemFortune(last?.maxRarity ?? Rarity.Common, GemRarity.Perfect));
+        },
+        currentStat: (upgradeable, stat) => {
+            return stat === Stat.FarmingFortune ? getPeridotFortune(upgradeable.rarity, upgradeable.item) : 0;
+        },
         upgrades: getUpgradeableGems,
     },
     {
@@ -62,6 +98,8 @@ export const GEAR_FORTUNE_SOURCES = [
         current: (gear) => {
             return gear.getPieceBonus();
         },
+        maxStat: (_gear, stat) => (stat === Stat.FarmingFortune ? 15 : 0),
+        currentStat: (gear, stat) => (stat === Stat.FarmingFortune ? gear.getPieceBonus() : 0),
     },
     {
         name: 'Farming Level',
@@ -76,6 +114,15 @@ export const GEAR_FORTUNE_SOURCES = [
         current: (gear) => {
             return (gear.info.perLevelStats?.stats[Stat.FarmingFortune] ?? 0) * (gear.options?.farmingLevel ?? 0);
         },
+        maxStat: (gear, stat) => {
+            const last = (gear.getLastItemUpgrade() ?? gear)?.info;
+            if (!('perLevelStats' in last) || last.perLevelStats?.skill !== Skill.Farming)
+                return 0;
+            return (last.perLevelStats?.stats?.[stat] ?? 0) * 60;
+        },
+        currentStat: (gear, stat) => {
+            return (gear.info.perLevelStats?.stats?.[stat] ?? 0) * (gear.options?.farmingLevel ?? 0);
+        },
     },
     ...Object.entries(FARMING_ENCHANTS ?? {})
         .filter(([, enchant]) => enchant.appliesTo.includes(ReforgeTarget.Armor) || enchant.appliesTo.includes(ReforgeTarget.Equipment))
@@ -83,9 +130,11 @@ export const GEAR_FORTUNE_SOURCES = [
         name: enchant.name,
         wiki: () => enchant.wiki,
         exists: (gear) => enchant.appliesTo.includes(gear.type),
-        max: (gear) => getMaxFortuneFromEnchant(enchant, gear.options),
-        current: (gear) => getFortuneFromEnchant(gear.item.enchantments?.[id] ?? 0, enchant, gear.options),
-        upgrades: (gear) => getUpgradeableEnchant(gear, id),
+        max: (gear) => getMaxStatFromEnchant(enchant, Stat.FarmingFortune, gear.options),
+        current: (gear) => getStatFromEnchant(gear.item.enchantments?.[id] ?? 0, enchant, Stat.FarmingFortune, gear.options),
+        maxStat: (gear, stat) => getMaxStatFromEnchant(enchant, stat, gear.options),
+        currentStat: (gear, stat) => getStatFromEnchant(gear.item.enchantments?.[id] ?? 0, enchant, stat, gear.options),
+        upgrades: (gear, stats) => getUpgradeableEnchant(gear, id, stats?.[0] ?? Stat.FarmingFortune),
     })),
 ];
 //# sourceMappingURL=gearsources.js.map

package/dist/upgrades/sources/gearsources.js.map

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

package/dist/upgrades/sources/generalsources.js

@@ -1,12 +1,27 @@
-import { FARMING_ATTRIBUTE_SHARDS, getShardFortune, getShardLevel, getShardsForNextLevel, } from '../../constants/attributes.js';
-import { ANITA_FORTUNE_UPGRADE, COMMUNITY_CENTER_UPGRADE, FARMING_LEVEL, PEST_BESTIARY_SOURCE, REFINED_TRUFFLE_SOURCE, UNLOCKED_PLOTS, } from '../../constants/specific.js';
+import { FARMING_ATTRIBUTE_SHARDS, getShardFortune, getShardLevel, getShardsForLevel, getShardsForNextLevel, } from '../../constants/attributes.js';
+import { ANITA_FORTUNE_UPGRADE, COMMUNITY_CENTER_UPGRADE, FARMING_LEVEL, PEST_BESTIARY_SOURCE, REFINED_TRUFFLE_SOURCE, UNLOCKED_PLOTS, WRIGGLING_LARVA_SOURCE, } from '../../constants/specific.js';
 import { Stat } from '../../constants/stats.js';
 import { UpgradeAction, UpgradeCategory } from '../../constants/upgrades.js';
 import { FarmingAccessory } from '../../fortune/farmingaccessory.js';
 import { FARMING_ACCESSORIES_INFO } from '../../items/accessories.js';
 import { getNextPlotCost } from '../../util/garden.js';
 import { fortuneFromPestBestiary } from '../../util/pests.js';
+import { getFortune } from '../getfortune.js';
 import { getSourceProgress } from '../getsourceprogress.js';
+function getLevelDeltaStats(currentLevel, nextLevel, source) {
+    const result = {};
+    // Always include FarmingFortune
+    const ff = (source.fortunePerLevel ?? 0) * (nextLevel - currentLevel);
+    if (ff !== 0)
+        result[Stat.FarmingFortune] = ff;
+    for (const [k, per] of Object.entries(source.statsPerLevel ?? {})) {
+        const stat = k;
+        const diff = (per ?? 0) * (nextLevel - currentLevel);
+        if (diff !== 0)
+            result[stat] = diff;
+    }
+    return result;
+}
 export const GENERAL_FORTUNE_SOURCES = [
     {
         name: FARMING_LEVEL.name,
@@ -16,6 +31,8 @@ export const GENERAL_FORTUNE_SOURCES = [
         current: (player) => {
             return (player.options.farmingLevel ?? 0) * FARMING_LEVEL.fortunePerLevel;
         },
+        maxStat: (_player, stat) => getFortune(FARMING_LEVEL.maxLevel, FARMING_LEVEL, stat),
+        currentStat: (player, stat) => getFortune(player.options.farmingLevel, FARMING_LEVEL, stat),
         upgrades: (player) => {
             const current = player.options.farmingLevel ?? 0;
             if (current < 50 || current >= FARMING_LEVEL.maxLevel)
@@ -23,14 +40,21 @@ export const GENERAL_FORTUNE_SOURCES = [
             const nextCost = FARMING_LEVEL.upgradeCosts?.[current + 1];
             if (!nextCost)
                 return [];
+            const stats = getLevelDeltaStats(current, current + 1, FARMING_LEVEL);
             return [
                 {
                     title: FARMING_LEVEL.name + ' ' + (current + 1),
-                    increase: FARMING_LEVEL.fortunePerLevel,
+                    increase: stats[Stat.FarmingFortune] ?? 0,
+                    stats,
                     action: UpgradeAction.LevelUp,
                     category: UpgradeCategory.Skill,
                     wiki: FARMING_LEVEL.wiki,
                     cost: nextCost,
+                    meta: {
+                        type: 'skill',
+                        key: 'farmingLevel',
+                        value: current + 1,
+                    },
                 },
             ];
         },
@@ -55,8 +79,8 @@ export const GENERAL_FORTUNE_SOURCES = [
                 .flatMap((shard) => shard.upgrades?.(player))
                 .filter(Boolean);
         },
-        progress: (player) => {
-            return getSourceProgress(player, ATTRIBUTE_FORTUNE_SOURCES);
+        progress: (player, stats) => {
+            return getSourceProgress(player, ATTRIBUTE_FORTUNE_SOURCES, false, stats);
         },
     },
     {
@@ -76,6 +100,8 @@ export const GENERAL_FORTUNE_SOURCES = [
         current: (player) => {
             return (player.options.anitaBonus ?? 0) * ANITA_FORTUNE_UPGRADE.fortunePerLevel;
         },
+        maxStat: (_player, stat) => getFortune(ANITA_FORTUNE_UPGRADE.maxLevel, ANITA_FORTUNE_UPGRADE, stat),
+        currentStat: (player, stat) => getFortune(player.options.anitaBonus, ANITA_FORTUNE_UPGRADE, stat),
         upgrades: (player) => {
             const current = player.options.anitaBonus ?? 0;
             if (current >= ANITA_FORTUNE_UPGRADE.maxLevel)
@@ -83,14 +109,21 @@ export const GENERAL_FORTUNE_SOURCES = [
             const nextCost = ANITA_FORTUNE_UPGRADE.upgradeCosts?.[current + 1];
             if (!nextCost)
                 return [];
+            const stats = getLevelDeltaStats(current, current + 1, ANITA_FORTUNE_UPGRADE);
             return [
                 {
                     title: ANITA_FORTUNE_UPGRADE.name,
-                    increase: ANITA_FORTUNE_UPGRADE.fortunePerLevel,
+                    increase: stats[Stat.FarmingFortune] ?? 0,
+                    stats,
                     action: UpgradeAction.Upgrade,
                     category: UpgradeCategory.Anita,
                     wiki: ANITA_FORTUNE_UPGRADE.wiki,
                     cost: nextCost,
+                    meta: {
+                        type: 'skill',
+                        key: 'anitaBonus',
+                        value: current + 1,
+                    },
                 },
             ];
         },
@@ -103,17 +136,27 @@ export const GENERAL_FORTUNE_SOURCES = [
         current: (player) => {
             return (player.options.plots?.length ?? player.options.plotsUnlocked ?? 0) * UNLOCKED_PLOTS.fortunePerLevel;
         },
+        maxStat: (_player, stat) => getFortune(UNLOCKED_PLOTS.maxLevel, UNLOCKED_PLOTS, stat),
+        currentStat: (player, stat) => getFortune(player.options.plots?.length ?? player.options.plotsUnlocked, UNLOCKED_PLOTS, stat),
         upgrades: (player) => {
             const plotUpgrade = getNextPlotCost(player.options.plots ?? []);
             if (!plotUpgrade)
                 return [];
+            const current = player.options.plots?.length ?? player.options.plotsUnlocked ?? 0;
+            const stats = getLevelDeltaStats(current, current + 1, UNLOCKED_PLOTS);
             return [
                 {
                     title: 'Plot ' + plotUpgrade.plot?.name,
-                    increase: UNLOCKED_PLOTS.fortunePerLevel,
+                    increase: stats[Stat.FarmingFortune] ?? 0,
+                    stats,
                     action: UpgradeAction.Purchase,
                     category: UpgradeCategory.Plot,
                     cost: plotUpgrade.cost,
+                    meta: {
+                        type: 'plot',
+                        id: plotUpgrade.plotId,
+                        value: current + 1,
+                    },
                 },
             ];
         },
@@ -127,19 +170,28 @@ export const GENERAL_FORTUNE_SOURCES = [
         current: (player) => {
             return (player.options.communityCenter ?? 0) * COMMUNITY_CENTER_UPGRADE.fortunePerLevel;
         },
+        maxStat: (_player, stat) => getFortune(COMMUNITY_CENTER_UPGRADE.maxLevel, COMMUNITY_CENTER_UPGRADE, stat),
+        currentStat: (player, stat) => getFortune(player.options.communityCenter, COMMUNITY_CENTER_UPGRADE, stat),
         upgrades: (player) => {
             const current = player.options.communityCenter ?? 0;
             if (current >= COMMUNITY_CENTER_UPGRADE.maxLevel)
                 return [];
+            const stats = getLevelDeltaStats(current, current + 1, COMMUNITY_CENTER_UPGRADE);
             return [
                 {
                     title: COMMUNITY_CENTER_UPGRADE.name,
-                    increase: COMMUNITY_CENTER_UPGRADE.fortunePerLevel,
+                    increase: stats[Stat.FarmingFortune] ?? 0,
+                    stats,
                     action: UpgradeAction.Upgrade,
                     repeatable: COMMUNITY_CENTER_UPGRADE.maxLevel - current,
                     api: false,
                     category: UpgradeCategory.CommunityCenter,
                     wiki: COMMUNITY_CENTER_UPGRADE.wiki,
+                    meta: {
+                        type: 'skill',
+                        key: 'communityCenter',
+                        value: current + 1,
+                    },
                 },
             ];
         },
@@ -181,6 +233,9 @@ export const GENERAL_FORTUNE_SOURCES = [
                     {
                         title: cropie.name,
                         increase: cropie.baseStats?.[Stat.FarmingFortune] ?? 0,
+                        stats: {
+                            [Stat.FarmingFortune]: cropie.baseStats?.[Stat.FarmingFortune] ?? 0,
+                        },
                         action: UpgradeAction.Purchase,
                         item: 'CROPIE_TALISMAN',
                         category: UpgradeCategory.Item,
@@ -190,6 +245,11 @@ export const GENERAL_FORTUNE_SOURCES = [
                                 CROPIE_TALISMAN: 1,
                             },
                         },
+                        meta: {
+                            type: 'buy_item',
+                            id: 'CROPIE_TALISMAN',
+                        },
+                        conflictKey: 'accessory:CROPIE_TALISMAN',
                     },
                 ];
             }
@@ -204,6 +264,8 @@ export const GENERAL_FORTUNE_SOURCES = [
         current: (player) => {
             return (player.options.refinedTruffles ?? 0) * REFINED_TRUFFLE_SOURCE.fortunePerLevel;
         },
+        maxStat: (_player, stat) => getFortune(REFINED_TRUFFLE_SOURCE.maxLevel, REFINED_TRUFFLE_SOURCE, stat),
+        currentStat: (player, stat) => getFortune(player.options.refinedTruffles ?? 0, REFINED_TRUFFLE_SOURCE, stat),
         upgrades: (player) => {
             const consumed = player.options.refinedTruffles ?? 0;
             if (consumed >= 5)
@@ -212,6 +274,9 @@ export const GENERAL_FORTUNE_SOURCES = [
                 {
                     title: 'Refined Dark Cacao Truffle',
                     increase: REFINED_TRUFFLE_SOURCE.fortunePerLevel,
+                    stats: {
+                        [Stat.FarmingFortune]: REFINED_TRUFFLE_SOURCE.fortunePerLevel,
+                    },
                     action: UpgradeAction.Consume,
                     repeatable: 5 - consumed,
                     wiki: REFINED_TRUFFLE_SOURCE.wiki,
@@ -221,6 +286,50 @@ export const GENERAL_FORTUNE_SOURCES = [
                             REFINED_DARK_CACAO_TRUFFLE: 1,
                         },
                     },
+                    meta: {
+                        type: 'setting',
+                        key: 'refinedTruffles',
+                        value: consumed + 1,
+                    },
+                },
+            ];
+        },
+    },
+    {
+        name: WRIGGLING_LARVA_SOURCE.name,
+        wiki: () => WRIGGLING_LARVA_SOURCE.wiki,
+        exists: () => true,
+        max: () => 0,
+        current: () => 0,
+        maxStat: (_player, stat) => getFortune(WRIGGLING_LARVA_SOURCE.maxLevel, WRIGGLING_LARVA_SOURCE, stat),
+        currentStat: (player, stat) => getFortune(player.options.wrigglingLarva ?? 0, WRIGGLING_LARVA_SOURCE, stat),
+        upgrades: (player, stats) => {
+            if (!stats?.includes(Stat.BonusPestChance))
+                return [];
+            const consumed = player.options.wrigglingLarva ?? 0;
+            if (consumed >= 5)
+                return [];
+            return [
+                {
+                    title: 'Wriggling Larva',
+                    increase: 0,
+                    stats: {
+                        [Stat.BonusPestChance]: WRIGGLING_LARVA_SOURCE.statsPerLevel?.[Stat.BonusPestChance] ?? 0,
+                    },
+                    action: UpgradeAction.Consume,
+                    repeatable: 5 - consumed,
+                    wiki: WRIGGLING_LARVA_SOURCE.wiki,
+                    category: UpgradeCategory.Item,
+                    cost: {
+                        items: {
+                            WRIGGLING_LARVA: 1,
+                        },
+                    },
+                    meta: {
+                        type: 'setting',
+                        key: 'wrigglingLarva',
+                        value: consumed + 1,
+                    },
                 },
             ];
         },
@@ -256,16 +365,68 @@ export const GENERAL_FORTUNE_SOURCES = [
                     {
                         title: 'Relic of Power',
                         increase: 0,
+                        stats: {
+                            [Stat.FarmingFortune]: 0,
+                        },
                         action: UpgradeAction.Purchase,
                         purchase: 'POWER_RELIC',
                         category: UpgradeCategory.Item,
                         wiki: FARMING_ACCESSORIES_INFO.POWER_RELIC?.wiki,
                         cost: FARMING_ACCESSORIES_INFO.POWER_RELIC?.cost,
+                        meta: {
+                            type: 'buy_item',
+                            id: 'POWER_RELIC',
+                        },
+                        conflictKey: 'accessory:POWER_RELIC',
                     },
                 ];
             return accessory.getUpgrades();
         },
     },
+    {
+        name: 'Magic 8 Ball',
+        exists: () => true,
+        wiki: () => 'https://wiki.hypixel.net/Magic_8_Ball',
+        max: () => 25,
+        active: () => {
+            return {
+                active: true,
+                reason: 'Magic 8 Ball only has a 20% chance to be active each season.',
+            };
+        },
+        current: (player) => {
+            const accessory = player.accessories.find((a) => a.info.skyblockId === 'MAGIC_8_BALL');
+            return accessory ? 25 : 0;
+        },
+        upgrades: (player) => {
+            const accessory = player.accessories.find((a) => a.info.skyblockId === 'MAGIC_8_BALL');
+            if (!accessory)
+                return [
+                    {
+                        title: 'Magic 8 Ball',
+                        increase: 25 * 0.2,
+                        stats: {
+                            [Stat.FarmingFortune]: 25 * 0.2,
+                        },
+                        action: UpgradeAction.Purchase,
+                        purchase: 'MAGIC_8_BALL',
+                        category: UpgradeCategory.Item,
+                        wiki: 'https://wiki.hypixel.net/Magic_8_Ball',
+                        cost: {
+                            items: {
+                                MAGIC_8_BALL: 1,
+                            },
+                        },
+                        meta: {
+                            type: 'buy_item',
+                            id: 'MAGIC_8_BALL',
+                        },
+                        conflictKey: 'accessory:MAGIC_8_BALL',
+                    },
+                ];
+            return [];
+        },
+    },
 ];
 export const ATTRIBUTE_FORTUNE_SOURCES = Object.entries(FARMING_ATTRIBUTE_SHARDS)
     .filter((a) => a[1].effect === 'fortune')
@@ -311,6 +472,9 @@ function mapShardSource(id, shard) {
                     title: shard.name.replace('Shard', level.toString()),
                     api: false,
                     increase: nextFortune - currentFortune,
+                    stats: {
+                        [Stat.FarmingFortune]: nextFortune - currentFortune,
+                    },
                     action: UpgradeAction.LevelUp,
                     category: UpgradeCategory.Attribute,
                     // wiki: shard.wiki, // Wiki page doesn't exist yet
@@ -319,6 +483,11 @@ function mapShardSource(id, shard) {
                             [shard.skyblockId]: nextCost,
                         },
                     },
+                    meta: {
+                        type: 'attribute',
+                        key: id,
+                        value: getShardsForLevel(shard.rarity, level),
+                    },
                 },
             ];
         },