farming-weight 0.4.14 → 0.5.0

package/dist/player/player.js

@@ -0,0 +1,285 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FarmingPlayer = exports.createFarmingPlayer = exports.ZorroMode = void 0;
+const crops_1 = require("../constants/crops");
+const personalbests_1 = require("../constants/personalbests");
+const pests_1 = require("../util/pests");
+const specific_1 = require("../constants/specific");
+const names_1 = require("../util/names");
+const farmingaccessory_1 = require("../fortune/farmingaccessory");
+const farmingarmor_1 = require("../fortune/farmingarmor");
+const farmingpet_1 = require("../fortune/farmingpet");
+const farmingtool_1 = require("../fortune/farmingtool");
+const farmingequipment_1 = require("../fortune/farmingequipment");
+const tempfortune_1 = require("../constants/tempfortune");
+const weightcalc_1 = require("../weight/weightcalc");
+var ZorroMode;
+(function (ZorroMode) {
+    ZorroMode["Normal"] = "normal";
+    ZorroMode["Averaged"] = "averaged";
+    ZorroMode["Contest"] = "contest";
+})(ZorroMode || (exports.ZorroMode = ZorroMode = {}));
+function createFarmingPlayer(options) {
+    return new FarmingPlayer(options);
+}
+exports.createFarmingPlayer = createFarmingPlayer;
+class FarmingPlayer {
+    get fortune() {
+        return this.permFortune + this.tempFortune;
+    }
+    constructor(options) {
+        this.options = options;
+        options.tools ??= [];
+        if (options.tools[0] instanceof farmingtool_1.FarmingTool) {
+            this.tools = options.tools;
+            for (const tool of this.tools)
+                tool.setOptions(options);
+        }
+        else {
+            this.tools = farmingtool_1.FarmingTool.fromArray(options.tools, options);
+        }
+        this.selectedTool = this.options.selectedTool ?? this.tools[0];
+        options.pets ??= [];
+        if (options.pets[0] instanceof farmingpet_1.FarmingPet) {
+            this.pets = options.pets.sort((a, b) => b.fortune - a.fortune);
+            for (const pet of this.pets)
+                pet.setOptions(options);
+        }
+        else {
+            this.pets = farmingpet_1.FarmingPet.fromArray(options.pets, options);
+        }
+        this.selectedPet = this.options.selectedPet;
+        options.armor ??= [];
+        if (options.armor instanceof farmingarmor_1.ArmorSet) {
+            this.armorSet = options.armor;
+            this.armor = this.armorSet.pieces;
+            this.armor.sort((a, b) => b.fortune - a.fortune);
+            this.equipment = this.armorSet.equipmentPieces;
+            this.equipment.sort((a, b) => b.fortune - a.fortune);
+            this.armorSet.getFortuneBreakdown(true);
+        }
+        else if (options.armor[0] instanceof farmingarmor_1.FarmingArmor) {
+            this.armor = options.armor.sort((a, b) => b.potential - a.potential);
+            for (const a of this.armor)
+                a.setOptions(options);
+            this.armorSet = new farmingarmor_1.ArmorSet(this.armor);
+        }
+        else {
+            this.armor = farmingarmor_1.FarmingArmor.fromArray(options.armor, options);
+            this.armorSet = new farmingarmor_1.ArmorSet(this.armor);
+        }
+        options.equipment ??= [];
+        if (options.equipment[0] instanceof farmingequipment_1.FarmingEquipment) {
+            this.equipment = options.equipment.sort((a, b) => b.fortune - a.fortune);
+            for (const e of this.equipment)
+                e.setOptions(options);
+        }
+        else {
+            this.equipment = farmingequipment_1.FarmingEquipment.fromArray(options.equipment, options);
+        }
+        // Load in equipment to armor set if it's empty
+        if (this.armorSet.equipment.filter((e) => e).length === 0) {
+            this.armorSet.setEquipment(this.equipment);
+        }
+        options.accessories ??= [];
+        if (options.accessories[0] instanceof farmingaccessory_1.FarmingAccessory) {
+            this.accessories = options.accessories.sort((a, b) => b.fortune - a.fortune);
+        }
+        else {
+            this.accessories = farmingaccessory_1.FarmingAccessory.fromArray(options.accessories);
+        }
+        this.permFortune = this.getGeneralFortune();
+        this.tempFortune = this.getTempFortune();
+    }
+    changeArmor(armor) {
+        this.armorSet = new farmingarmor_1.ArmorSet(armor.sort((a, b) => b.fortune - a.fortune));
+    }
+    selectTool(tool) {
+        this.selectedTool = tool;
+        this.permFortune = this.getGeneralFortune();
+    }
+    selectPet(pet) {
+        this.selectedPet = pet;
+        this.permFortune = this.getGeneralFortune();
+    }
+    setStrength(strength) {
+        this.options.strength = strength;
+        for (const pet of this.pets) {
+            pet.fortune = pet.getFortune();
+        }
+        this.permFortune = this.getGeneralFortune();
+    }
+    getGeneralFortune() {
+        let sum = 0;
+        const breakdown = {};
+        // Plots
+        const plots = specific_1.FORTUNE_PER_PLOT * (this.options.plotsUnlocked ?? 0);
+        if (plots > 0) {
+            breakdown['Unlocked Plots'] = plots;
+            sum += plots;
+        }
+        // Farming Level
+        const level = specific_1.FORTUNE_PER_FARMING_LEVEL * (this.options.farmingLevel ?? 0);
+        if (level > 0) {
+            breakdown['Farming Level'] = level;
+            sum += level;
+        }
+        // Bestiary
+        if (this.options.bestiaryKills) {
+            const bestiary = (0, pests_1.fortuneFromPestBestiary)(this.options.bestiaryKills);
+            if (bestiary > 0) {
+                breakdown['Pest Bestiary'] = bestiary;
+                sum += bestiary;
+            }
+        }
+        // Armor Set
+        const armorSet = this.armorSet.armorFortune;
+        if (armorSet > 0) {
+            breakdown['Armor Set'] = armorSet;
+            sum += armorSet;
+        }
+        // Eqiupment
+        const equipment = this.armorSet.equipmentFortune;
+        if (equipment > 0) {
+            breakdown['Equipment'] = equipment;
+            sum += equipment;
+        }
+        // Anita Bonus
+        const anitaBonus = (this.options.anitaBonus ?? 0) * specific_1.FORTUNE_PER_ANITA_BONUS;
+        if (anitaBonus > 0) {
+            breakdown['Anita Bonus Drops'] = anitaBonus;
+            sum += anitaBonus;
+        }
+        // Community Center
+        const communityCenter = (this.options.communityCenter ?? 0) * specific_1.FORTUNE_PER_COMMUNITY_CENTER;
+        if (communityCenter > 0) {
+            breakdown['Community Center'] = communityCenter;
+            sum += communityCenter;
+        }
+        // Selected Pet
+        const pet = this.selectedPet;
+        if (pet && pet.fortune > 0) {
+            breakdown[pet.info.name ?? 'Selected Pet'] = pet.fortune;
+            sum += pet.fortune;
+        }
+        // Accessories, only count highest fortune from each family
+        const families = new Map();
+        for (const accessory of this.accessories.filter((a) => a.fortune > 0).sort((a, b) => b.fortune - a.fortune)) {
+            if (accessory.info.family) {
+                if (!families.has(accessory.info.family)) {
+                    families.set(accessory.info.family, accessory);
+                }
+                else {
+                    continue;
+                }
+            }
+            breakdown[accessory.item.name ?? accessory.item.skyblockId ?? 'Accessory [Error]'] = accessory.fortune;
+            sum += accessory.fortune;
+        }
+        // Refined Truffles
+        const truffles = Math.min(5, (this.options.refinedTruffles ?? 0));
+        if (truffles > 0) {
+            breakdown['Refined Truffles'] = truffles;
+            sum += truffles;
+        }
+        // Extra Fortune
+        for (const extra of this.options.extraFortune ?? []) {
+            if (extra.crop)
+                continue;
+            breakdown[extra.name ?? 'Extra Fortune'] = extra.fortune;
+            sum += extra.fortune;
+        }
+        const temp = this.getTempFortune();
+        if (temp > 0) {
+            breakdown['Temporary Fortune'] = temp;
+        }
+        this.breakdown = breakdown;
+        return sum;
+    }
+    getTempFortune() {
+        let sum = 0;
+        const breakdown = {};
+        if (!this.options.temporaryFortune) {
+            this.tempFortuneBreakdown = breakdown;
+            return sum;
+        }
+        for (const entry of Object.keys(this.options.temporaryFortune)) {
+            const source = tempfortune_1.TEMPORARY_FORTUNE[entry];
+            if (!source)
+                continue;
+            const fortune = source.fortune(this.options.temporaryFortune);
+            if (fortune) {
+                breakdown[source.name] = fortune;
+                sum += fortune;
+            }
+        }
+        this.tempFortuneBreakdown = breakdown;
+        return sum;
+    }
+    getCropFortune(crop, tool = this.selectedTool) {
+        if (tool) {
+            this.selectTool(tool);
+        }
+        let sum = 0;
+        const breakdown = {};
+        // Crop upgrades
+        const upgrade = specific_1.FORTUNE_PER_CROP_UPGRADE * (this.options.cropUpgrades?.[crop] ?? 0);
+        if (upgrade > 0) {
+            breakdown['Crop Upgrade'] = upgrade;
+            sum += upgrade;
+        }
+        // Personal bests
+        const personalBest = this.options.personalBests?.[(0, names_1.getItemIdFromCrop)(crop)] ??
+            this.options.personalBests?.[(0, names_1.getCropDisplayName)(crop).replace(/ /g, '')];
+        if (personalBest) {
+            const fortune = (0, personalbests_1.fortuneFromPersonalBestContest)(crop, personalBest);
+            if (fortune > 0) {
+                breakdown['Personal Best'] = fortune;
+                sum += fortune;
+            }
+        }
+        // Tool
+        const toolFortune = this.selectedTool?.fortune ?? 0;
+        if (toolFortune > 0) {
+            breakdown['Selected Tool'] = toolFortune;
+            sum += toolFortune;
+        }
+        // Accessories
+        //* There's only one accessory family for farming right now
+        const accessory = this.accessories.find((a) => a.info.crops && a.info.crops.includes(crop));
+        if (accessory && accessory.fortune > 0) {
+            breakdown[accessory.item.name ?? 'Accessories'] = accessory.fortune ?? 0;
+            sum += accessory.fortune ?? 0;
+        }
+        // Exportable Crops
+        if (this.options.exportableCrops?.[crop]) {
+            const exportable = this.options.exportableCrops[crop];
+            if (exportable) {
+                breakdown['Exportable Crop'] = crops_1.EXPORTABLE_CROP_FORTUNE;
+                sum += crops_1.EXPORTABLE_CROP_FORTUNE;
+            }
+        }
+        // Extra Fortune
+        for (const extra of this.options.extraFortune ?? []) {
+            if (extra.crop !== crop)
+                continue;
+            breakdown[extra.name ?? 'Extra Fortune'] = extra.fortune;
+            sum += extra.fortune;
+        }
+        return {
+            fortune: sum,
+            breakdown,
+        };
+    }
+    getWeightCalc(info) {
+        return (0, weightcalc_1.createFarmingWeightCalculator)({
+            collection: this.options.collection,
+            pests: this.options.bestiaryKills,
+            farmingXp: this.options.farmingXp,
+            levelCapUpgrade: Math.min((this.options.farmingLevel ?? 0) - 50, 0),
+            ...info,
+        });
+    }
+}
+exports.FarmingPlayer = FarmingPlayer;
+//# sourceMappingURL=player.js.map

package/dist/player/player.js.map

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

package/dist/util/gems.d.ts

@@ -1,3 +1,3 @@
-import type { EliteItemDto } from "../classes/item";
+import type { EliteItemDto } from "../fortune/item";
 import { Rarity } from "../constants/reforges";
 export declare function getPeridotFortune(rarity: Rarity, item: EliteItemDto): number;

package/dist/util/skyblocktime.d.ts

@@ -17,6 +17,10 @@ export declare class SkyBlockTime {
      * The Unix timestamp in seconds.
      */
     readonly unixSeconds: number;
+    /**
+     * The Unix timestamp in seconds at the start of the day.
+     */
+    readonly dayUnixSeconds: number;
     /**
      * The day of the SkyBlock year, 1-indexed.
      */

package/dist/util/skyblocktime.js

@@ -40,14 +40,14 @@ class SkyBlockTime {
      * @param unixMs Unix timestamp in milliseconds
      */
     constructor(unixMs) {
-        const seconds = Math.floor(unixMs / 1000);
-        const elapsedSeconds = seconds - SkyBlockTime.SkyBlockEpochSeconds;
+        this.unixSeconds = Math.floor(unixMs / 1000);
+        const elapsedSeconds = this.unixSeconds - SkyBlockTime.SkyBlockEpochSeconds;
         const elapsedDays = Math.floor(elapsedSeconds / 1200);
         this.year = Math.floor(elapsedDays / 372) + 1;
         this.month = Math.floor((elapsedDays % 372) / 31) + 1;
         this.day = Math.floor((elapsedDays % 372) % 31) + 1;
         // Round down to the nearest skyblock day
-        this.unixSeconds = (elapsedSeconds - (elapsedSeconds % 1200)) + SkyBlockTime.SkyBlockEpochSeconds;
+        this.dayUnixSeconds = (elapsedSeconds - (elapsedSeconds % 1200)) + SkyBlockTime.SkyBlockEpochSeconds;
     }
     /**
      * Create a SkyBlockTime object from a skyblock year, month, and day.

package/dist/util/skyblocktime.js.map

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

package/dist/weight/weightcalc.d.ts

@@ -1,6 +1,6 @@
 import { Crop } from '../constants/crops';
-export declare function CreateFarmingWeightCalculator(info?: FarmingWeightInfo): FarmingWeight;
-interface FarmingWeightInfo {
+export declare function createFarmingWeightCalculator(info?: FarmingWeightInfo): FarmingWeight;
+export interface FarmingWeightInfo {
     collection?: Record<string, number>;
     farmingXp?: number;
     levelCapUpgrade?: number;
@@ -10,8 +10,9 @@ interface FarmingWeightInfo {
         collected: number;
         claimed_position?: number;
         claimed_participants?: number;
-        claimed_medal?: 'bronze' | 'silver' | 'gold';
+        claimed_medal?: 'bronze' | 'silver' | 'gold' | 'platinum' | 'diamond' | string;
     }[];
+    pests?: Record<string, number>;
 }
 declare class FarmingWeight {
     collection: Record<Crop, number>;
@@ -19,9 +20,11 @@ declare class FarmingWeight {
     farmingXp: number;
     anitaBonusFarmingFortuneLevel: number;
     tier12MinionCount: number;
-    earnedGoldMedals: number;
+    earnedMedals: Record<'diamond' | 'platinum' | 'gold', number>;
     cropWeights: Record<Crop, number>;
     bonusSources: Record<string, number>;
+    uncountedCrops: Partial<Record<Crop, number>>;
+    readonly info?: FarmingWeightInfo;
     constructor(info?: FarmingWeightInfo);
     /**
      * Expectes a dictionary of collections and amounts with the default Hypixel SkyBlock IDs
@@ -34,7 +37,11 @@ declare class FarmingWeight {
     setFarmingXp: (farmingXp: number) => this;
     setAnitaBonusLevel: (anitaBonusFarmingFortuneLevel: number) => this;
     addMinions: (minions: string[]) => this;
-    setEarnedGoldMedals: (count: number) => this;
+    setEarnedMedals: ({ diamond, platinum, gold }: {
+        diamond?: number | undefined;
+        platinum?: number | undefined;
+        gold?: number | undefined;
+    }) => this;
     setTier12MinionCount: (count: number) => this;
     setContests: (contests: FarmingWeightInfo['contests']) => this;
     getWeightInfo: () => {
@@ -42,9 +49,11 @@ declare class FarmingWeight {
         bonusWeight: number;
         cropWeight: number;
         bonusSources: Record<string, number>;
+        uncountedCrops: Partial<Record<Crop, number>>;
     };
     getBonusWeights: () => Record<string, number>;
     getCropWeights: () => Record<Crop, number>;
+    calcUncountedCrops: (bestiary: Record<string, number>) => this;
     getCropWeight: (crop: Crop) => void;
 }
 export {};

package/dist/weight/weightcalc.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateFarmingWeightCalculator = void 0;
+exports.createFarmingWeightCalculator = void 0;
 const crops_1 = require("../constants/crops");
 const weight_1 = require("../constants/weight");
-function CreateFarmingWeightCalculator(info) {
+const jacob_1 = require("../util/jacob");
+const pests_1 = require("../util/pests");
+function createFarmingWeightCalculator(info) {
     return new FarmingWeight(info);
 }
-exports.CreateFarmingWeightCalculator = CreateFarmingWeightCalculator;
+exports.createFarmingWeightCalculator = createFarmingWeightCalculator;
 const crops = [
     crops_1.Crop.Cactus,
     crops_1.Crop.Carrot,
@@ -20,13 +22,19 @@ const crops = [
     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.earnedGoldMedals = 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 ?? []);
     }
@@ -69,8 +77,12 @@ class FarmingWeight {
         }
         return this;
     };
-    setEarnedGoldMedals = (count) => {
-        this.earnedGoldMedals = count;
+    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) => {
@@ -81,18 +93,20 @@ class FarmingWeight {
         if (!contests?.length)
             return this;
         for (const contest of contests) {
-            if (contest.claimed_medal === 'gold') {
-                this.earnedGoldMedals++;
+            const medal = (0, jacob_1.calculateJacobContestMedal)(contest);
+            if (!medal)
                 continue;
+            if (medal === 'diamond') {
+                this.earnedMedals.diamond++;
             }
-            const position = contest.claimed_position;
-            const participants = contest.claimed_participants;
-            if (position === undefined || participants === undefined)
-                continue;
-            if (position <= participants * 0.05 + 1) {
-                this.earnedGoldMedals++;
+            else if (medal === 'platinum') {
+                this.earnedMedals.platinum++;
+            }
+            else if (medal === 'gold') {
+                this.earnedMedals.gold++;
             }
         }
+        this.getBonusWeights();
         return this;
     };
     getWeightInfo = () => {
@@ -105,9 +119,11 @@ class FarmingWeight {
             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;
@@ -125,14 +141,18 @@ class FarmingWeight {
             this.bonusSources['Anita Bonus'] =
                 this.anitaBonusFarmingFortuneLevel * weight_1.BONUS_WEIGHT.AnitaBuffBonusMultiplier;
         }
-        if (this.earnedGoldMedals > weight_1.BONUS_WEIGHT.MaxMedalsCounted) {
-            this.bonusSources['Gold Medals'] = Math.floor(weight_1.BONUS_WEIGHT.WeightPerGoldMedal * weight_1.BONUS_WEIGHT.MaxMedalsCounted);
+        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 rewardCount = Math.floor((this.earnedGoldMedals / 50) * 50);
-            if (rewardCount > 0) {
-                this.bonusSources['Gold Medals'] = Math.floor(weight_1.BONUS_WEIGHT.WeightPerGoldMedal * rewardCount);
-            }
+            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;
     };
@@ -141,7 +161,11 @@ class FarmingWeight {
         let totalWeight = 0;
         let doubleBreakWeight = 0;
         for (const crop of crops) {
-            const collected = this.collection[crop] ?? 0;
+            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) {
@@ -161,6 +185,11 @@ class FarmingWeight {
         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];
     };

package/dist/weight/weightcalc.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "farming-weight",
-  "version": "0.4.14",
+  "version": "0.5.0",
   "description": "Tools for calculating farming weight and fortune in Hypixel Skyblock",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",