farming-weight 0.1.3 → 0.2.0

package/dist/weight/weightcalc.js

@@ -0,0 +1,168 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateFarmingWeightCalculator = void 0;
+const crops_1 = require("../constants/crops");
+const weight_1 = require("../constants/weight");
+function CreateFarmingWeightCalculator(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,
+];
+class FarmingWeight {
+    constructor(info) {
+        this.collection = {};
+        this.levelCapUpgrade = info?.levelCapUpgrade ?? 0;
+        this.anitaBonusFarmingFortuneLevel = info?.anitaBonusFarmingFortuneLevel ?? 0;
+        this.farmingXp = info?.farmingXp ?? 0;
+        this.earnedGoldMedals = 0;
+        this.tier12MinionCount = 0;
+        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;
+    };
+    setEarnedGoldMedals = (count) => {
+        this.earnedGoldMedals = count;
+        return this;
+    };
+    setTier12MinionCount = (count) => {
+        this.tier12MinionCount = count;
+        return this;
+    };
+    setContests = (contests) => {
+        if (!contests?.length)
+            return this;
+        for (const contest of contests) {
+            if (contest.claimed_medal === 'gold') {
+                this.earnedGoldMedals++;
+                continue;
+            }
+            const position = contest.claimed_position;
+            const participants = contest.claimed_participants;
+            if (position === undefined || participants === undefined)
+                continue;
+            if (position <= participants * 0.05 + 1) {
+                this.earnedGoldMedals++;
+            }
+        }
+        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,
+        };
+    };
+    getBonusWeights = () => {
+        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;
+        }
+        if (this.earnedGoldMedals > weight_1.BONUS_WEIGHT.MaxMedalsCounted) {
+            this.bonusSources['Gold Medals'] = Math.floor(weight_1.BONUS_WEIGHT.WeightPerGoldMedal * 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);
+            }
+        }
+        return this.bonusSources;
+    };
+    getCropWeights = () => {
+        const cropWeight = {};
+        let totalWeight = 0;
+        let doubleBreakWeight = 0;
+        for (const crop of crops) {
+            const collected = this.collection[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;
+    };
+    getCropWeight = (crop) => {
+        weight_1.CROP_WEIGHT[crop];
+    };
+}
+//# sourceMappingURL=weightcalc.js.map

package/dist/weight/weightcalc.js.map

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

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "farming-weight",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Tools for calculating farming weight and fortune in Hypixel Skyblock",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\"",
@@ -22,7 +22,7 @@
     "type": "git",
     "url": "git+https://github.com/EliteFarmers/Tools.git"
   },
-  "files": [ "lib/**/*" ],
+  "files": [ "dist/**/*" ],
   "bugs": {
     "url": "https://github.com/EliteFarmers/Tools/issues"
   },

package/lib/index.d.ts

@@ -1,6 +0,0 @@
-import { CalculateExpectedDrops, CalculateAverageDrops, GetCropInfo, GetNPCProfit, CalculateDetailedAverageDrops, CalculateDetailedDrops } from './ratecalc';
-import { CropInfo, Crop, MAX_CROP_FORTUNE } from './constants/crops';
-import { CropDisplayName } from './util/names';
-import { CreateFarmingWeightCalculator } from './weight/weightcalc';
-import { FormatJacobContests, CalculateJacobContestMedal } from './util/jacob';
-export { CalculateExpectedDrops, CalculateAverageDrops, CalculateDetailedAverageDrops, CalculateDetailedDrops, GetCropInfo, CropInfo, Crop, MAX_CROP_FORTUNE, CropDisplayName, GetNPCProfit, CreateFarmingWeightCalculator, FormatJacobContests, CalculateJacobContestMedal, };

package/lib/index.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CalculateJacobContestMedal = exports.FormatJacobContests = exports.CreateFarmingWeightCalculator = exports.GetNPCProfit = exports.CropDisplayName = exports.MAX_CROP_FORTUNE = exports.Crop = exports.GetCropInfo = exports.CalculateDetailedDrops = exports.CalculateDetailedAverageDrops = exports.CalculateAverageDrops = exports.CalculateExpectedDrops = void 0;
-const ratecalc_1 = require("./ratecalc");
-Object.defineProperty(exports, "CalculateExpectedDrops", { enumerable: true, get: function () { return ratecalc_1.CalculateExpectedDrops; } });
-Object.defineProperty(exports, "CalculateAverageDrops", { enumerable: true, get: function () { return ratecalc_1.CalculateAverageDrops; } });
-Object.defineProperty(exports, "GetCropInfo", { enumerable: true, get: function () { return ratecalc_1.GetCropInfo; } });
-Object.defineProperty(exports, "GetNPCProfit", { enumerable: true, get: function () { return ratecalc_1.GetNPCProfit; } });
-Object.defineProperty(exports, "CalculateDetailedAverageDrops", { enumerable: true, get: function () { return ratecalc_1.CalculateDetailedAverageDrops; } });
-Object.defineProperty(exports, "CalculateDetailedDrops", { enumerable: true, get: function () { return ratecalc_1.CalculateDetailedDrops; } });
-const crops_1 = require("./constants/crops");
-Object.defineProperty(exports, "Crop", { enumerable: true, get: function () { return crops_1.Crop; } });
-Object.defineProperty(exports, "MAX_CROP_FORTUNE", { enumerable: true, get: function () { return crops_1.MAX_CROP_FORTUNE; } });
-const names_1 = require("./util/names");
-Object.defineProperty(exports, "CropDisplayName", { enumerable: true, get: function () { return names_1.CropDisplayName; } });
-const weightcalc_1 = require("./weight/weightcalc");
-Object.defineProperty(exports, "CreateFarmingWeightCalculator", { enumerable: true, get: function () { return weightcalc_1.CreateFarmingWeightCalculator; } });
-const jacob_1 = require("./util/jacob");
-Object.defineProperty(exports, "FormatJacobContests", { enumerable: true, get: function () { return jacob_1.FormatJacobContests; } });
-Object.defineProperty(exports, "CalculateJacobContestMedal", { enumerable: true, get: function () { return jacob_1.CalculateJacobContestMedal; } });