farming-weight 0.3.11 → 0.4.1

package/dist/util/pests.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uncountedCropsFromPests = exports.fortuneFromPestBestiary = exports.fortuneFromPests = void 0;
+const pests_1 = require("../constants/pests");
+function fortuneFromPests(pests) {
+    return pests_1.PEST_EXCHANGE_RATES[pests] ?? 0;
+}
+exports.fortuneFromPests = fortuneFromPests;
+function fortuneFromPestBestiary(bestiaryKills) {
+    let reachedBrackets = 0;
+    const brackets = Object.entries(pests_1.KILLS_PER_PEST_BRACKET).sort((a, b) => b[1] - a[1]);
+    for (const pestId of pests_1.PEST_IDS) {
+        const kills = bestiaryKills[`pest_${pestId}_1`];
+        if (!kills)
+            continue;
+        // Find the highest reached bracket for this pest
+        const bracket = brackets.find((b) => +kills >= b[1]);
+        reachedBrackets += bracket ? +bracket[0] : 0;
+    }
+    return reachedBrackets * pests_1.FORTUNE_PER_PEST_BRACKET;
+}
+exports.fortuneFromPestBestiary = fortuneFromPestBestiary;
+function uncountedCropsFromPests(pestKills) {
+    const crops = {};
+    const brackets = pests_1.PEST_COLLECTION_BRACKETS;
+    for (const pestId of pests_1.PEST_IDS) {
+        let kills = pestKills[`pest_${pestId}_1`];
+        if (!kills)
+            continue;
+        const crop = pests_1.PEST_TO_CROP[pestId];
+        if (!crop)
+            continue;
+        let pestsToCount = 0;
+        let totalDrops = 0;
+        for (let i = 0; i < brackets.length; i++) {
+            const bracket = brackets[i];
+            // Exit if there are no more pests to calculate
+            if (kills <= 0)
+                break;
+            const bracketCrops = pests_1.PEST_COLLECTION_ADJUSTMENTS[pestId][bracket] ?? 0;
+            // Use the last bracket for all remaining pests
+            if (i === brackets.length - 1) {
+                totalDrops += Math.ceil(bracketCrops * kills);
+                continue;
+            }
+            // Get the next bracket to find the maximum pests in the current bracket
+            const nextBracket = brackets.at(i + 1);
+            if (nextBracket === undefined)
+                break;
+            if (!Number.isInteger(nextBracket))
+                continue;
+            // Calculate the pests to count in the current bracket
+            pestsToCount = Math.min(nextBracket - pestsToCount, kills);
+            if (bracketCrops === 0) {
+                // If the value is 0, we don't need to calculate the drops
+                kills -= pestsToCount;
+                continue;
+            }
+            // Calculate the drops for the current bracket
+            kills -= pestsToCount;
+            totalDrops += Math.ceil(bracketCrops * pestsToCount);
+        }
+        crops[crop] = totalDrops;
+    }
+    return crops;
+}
+exports.uncountedCropsFromPests = uncountedCropsFromPests;
+//# sourceMappingURL=pests.js.map

package/dist/util/pests.js.map

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

package/dist/util/pests.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/util/pests.test.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const pests_1 = require("./pests");
+const crops_1 = require("../constants/crops");
+const pests_2 = require("../constants/pests");
+(0, vitest_1.test)('Pest bestiary fortune', () => {
+    const bestiaryKills = {
+        pest_fly_1: 1,
+        pest_beetle_1: 2,
+        random_thing: 100
+    };
+    (0, vitest_1.expect)((0, pests_1.fortuneFromPestBestiary)(bestiaryKills)).toBeCloseTo(1.2);
+});
+(0, vitest_1.test)('Uncounted crops from pests', () => {
+    const bestiaryKills = {
+        pest_fly_1: 13414,
+        pest_beetle_1: 10,
+        pest_worm_1: 51,
+    };
+    const uncounted = (0, pests_1.uncountedCropsFromPests)(bestiaryKills);
+    (0, vitest_1.expect)(Object.values(uncounted)).toHaveLength(3);
+    (0, vitest_1.expect)(uncounted[crops_1.Crop.NetherWart]).toBe(0);
+    (0, vitest_1.expect)(uncounted[crops_1.Crop.Melon]).toBe(Math.ceil(pests_2.PEST_COLLECTION_ADJUSTMENTS[pests_2.Pest.Worm][50] ?? 0));
+    (0, vitest_1.expect)(uncounted[crops_1.Crop.Wheat]).toBe(311892563);
+});
+//# sourceMappingURL=pests.test.js.map

package/dist/util/pests.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pests.test.js","sourceRoot":"","sources":["../../src/util/pests.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AACtC,mCAA2E;AAC3E,8CAA0C;AAC1C,8CAAuE;AAEvE,IAAA,aAAI,EAAC,uBAAuB,EAAE,GAAG,EAAE;IAClC,MAAM,aAAa,GAAG;QACrB,UAAU,EAAE,CAAC;QACb,aAAa,EAAE,CAAC;QAChB,YAAY,EAAE,GAAG;KACjB,CAAA;IAED,IAAA,eAAM,EAAC,IAAA,+BAAuB,EAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;AAChE,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,4BAA4B,EAAE,GAAG,EAAE;IACvC,MAAM,aAAa,GAAG;QACrB,UAAU,EAAE,KAAK;QACjB,aAAa,EAAE,EAAE;QACjB,WAAW,EAAE,EAAE;KACf,CAAA;IAED,MAAM,SAAS,GAAG,IAAA,+BAAuB,EAAC,aAAa,CAAC,CAAC;IAEzD,IAAA,eAAM,EAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACjD,IAAA,eAAM,EAAC,SAAS,CAAC,YAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAA,eAAM,EAAC,SAAS,CAAC,YAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,mCAA2B,CAAC,YAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/F,IAAA,eAAM,EAAC,SAAS,CAAC,YAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "farming-weight",
-  "version": "0.3.11",
+  "version": "0.4.1",
   "description": "Tools for calculating farming weight and fortune in Hypixel Skyblock",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "eslint"
+    "lint": "eslint",
+    "test": "vitest"
   },
   "keywords": [
     "farming",
@@ -22,7 +23,9 @@
     "type": "git",
     "url": "git+https://github.com/EliteFarmers/Tools.git"
   },
-  "files": [ "dist/**/*" ],
+  "files": [
+    "dist/**/*"
+  ],
   "bugs": {
     "url": "https://github.com/EliteFarmers/Tools/issues"
   },
@@ -37,6 +40,7 @@
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "eslint": "^8.50.0",
     "prettier": "^3.0.3",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "vitest": "^1.6.0"
   }
 }