farming-weight 0.1.1 → 0.1.2

package/lib/constants/crops.d.ts

@@ -17,3 +17,4 @@ export interface CropInfo {
     drops: number;
 }
 export declare const CROP_INFO: Record<Crop, CropInfo>;
+export declare const MAX_CROP_FORTUNE: Record<Crop, number>;

package/lib/constants/crops.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CROP_INFO = exports.Crop = void 0;
+exports.MAX_CROP_FORTUNE = exports.CROP_INFO = exports.Crop = void 0;
 var Crop;
 (function (Crop) {
     Crop["Cactus"] = "CACTUS";
@@ -72,3 +72,17 @@ exports.CROP_INFO = {
         drops: 1.5,
     },
 };
+// TODO: Calculate this from a list of sources
+exports.MAX_CROP_FORTUNE = {
+    [Crop.Cactus]: 1575,
+    [Crop.Carrot]: 1784,
+    [Crop.CocoaBeans]: 1584,
+    [Crop.Melon]: 1567.8,
+    [Crop.Mushroom]: 1603,
+    [Crop.NetherWart]: 1772,
+    [Crop.Potato]: 1772,
+    [Crop.Pumpkin]: 1567.5,
+    [Crop.SugarCane]: 1772,
+    [Crop.Wheat]: 1772,
+    [Crop.Seeds]: 1772, // Not a crop, same as wheat
+};

package/lib/crops/melon.d.ts

@@ -1 +1 @@
-export declare function MelonPerkBonus(level: 1 | 2 | 3): number;
+export declare function MelonPerkBonus(blocksBroken: number, level?: 3): number;

package/lib/crops/melon.js

@@ -1,7 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MelonPerkBonus = void 0;
-function MelonPerkBonus(level) {
-    return 0.05 * level;
+const MELON_DICER_ROLLEM = {
+    3: [
+        {
+            drops: 640,
+            chance: 155 / 100208,
+        },
+        {
+            drops: 2560,
+            chance: 45 / 100208,
+        },
+        {
+            drops: 51200,
+            chance: 7 / 100208,
+        },
+        {
+            drops: 204800,
+            chance: 1 / 100208,
+        },
+    ],
+};
+function MelonPerkBonus(blocksBroken, level = 3) {
+    let total = 0;
+    for (const { drops, chance } of MELON_DICER_ROLLEM[level]) {
+        total += drops * chance * blocksBroken;
+    }
+    return total;
 }
 exports.MelonPerkBonus = MelonPerkBonus;

package/lib/crops/pumpkin.d.ts

@@ -0,0 +1 @@
+export declare function PumpkinPerkBonus(blocksBroken: number, level?: 3): number;

package/lib/crops/pumpkin.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PumpkinPerkBonus = void 0;
+const PUMPKIN_DICER_ROLLEM = {
+    3: [
+        {
+            drops: 480,
+            chance: 90 / 100141,
+        },
+        {
+            drops: 800,
+            chance: 40 / 100141,
+        },
+        {
+            drops: 7200,
+            chance: 7 / 100141,
+        },
+        {
+            drops: 51200,
+            chance: 1 / 100141,
+        },
+    ],
+};
+function PumpkinPerkBonus(blocksBroken, level = 3) {
+    let total = 0;
+    for (const { drops, chance } of PUMPKIN_DICER_ROLLEM[level]) {
+        total += drops * chance * blocksBroken;
+    }
+    return total;
+}
+exports.PumpkinPerkBonus = PumpkinPerkBonus;

package/lib/index.d.ts

@@ -1,2 +1,3 @@
-import { CalculateExpectedDrops, CalculateAverageDrops } from "./ratecalc";
-export { CalculateExpectedDrops, CalculateAverageDrops };
+import { CalculateExpectedDrops, CalculateAverageDrops, GetCropInfo } from './ratecalc';
+import { CropInfo, Crop, MAX_CROP_FORTUNE } from './constants/crops';
+export { CalculateExpectedDrops, CalculateAverageDrops, GetCropInfo, CropInfo, Crop, MAX_CROP_FORTUNE };

package/lib/index.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CalculateAverageDrops = exports.CalculateExpectedDrops = void 0;
+exports.MAX_CROP_FORTUNE = exports.Crop = exports.GetCropInfo = 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; } });
+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; } });

package/lib/player.d.ts

@@ -1,4 +1,4 @@
-import { Crop } from "./constants/crops";
+import { Crop } from './constants/crops';
 interface PlayerOptions {
     collection?: Record<string, number>;
     fortuneSources?: Record<string, number>;

package/lib/player.js

@@ -21,8 +21,7 @@ class Player {
         this.cropSpecificFortune[crop] = amount;
         return this;
     }
-    setLotusGear() {
-    }
+    setLotusGear() { }
     getFortune() {
         const general = Object.values(this.fortuneSources).reduce((a, b) => a + b, 0);
         return general;

package/lib/ratecalc.d.ts

@@ -1,6 +1,6 @@
 import { Crop, CropInfo } from './constants/crops';
 interface CalculateDropsOptions {
-    farmingFortune: number;
+    farmingFortune?: number;
     blocksBroken: number;
 }
 export declare function CalculateAverageDrops(options: CalculateDropsOptions): Record<Crop, number>;

package/lib/ratecalc.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetCropInfo = exports.CalculateExpectedDrops = exports.CalculateAverageDrops = void 0;
 const crops_1 = require("./constants/crops");
+const melon_1 = require("./crops/melon");
+const pumpkin_1 = require("./crops/pumpkin");
 function CalculateAverageDrops(options) {
     const { farmingFortune, blocksBroken } = options;
     const result = {
@@ -15,13 +17,13 @@ function CalculateAverageDrops(options) {
         [crops_1.Crop.Pumpkin]: 0,
         [crops_1.Crop.SugarCane]: 0,
         [crops_1.Crop.Wheat]: 0,
-        [crops_1.Crop.Seeds]: 0
+        [crops_1.Crop.Seeds]: 0,
     };
     for (const crop of Object.keys(result)) {
         result[crop] = CalculateExpectedDrops({
             farmingFortune,
             crop: crop,
-            blocksBroken
+            blocksBroken,
         });
     }
     return result;
@@ -29,11 +31,13 @@ function CalculateAverageDrops(options) {
 exports.CalculateAverageDrops = CalculateAverageDrops;
 function CalculateExpectedDrops(options) {
     const { farmingFortune, blocksBroken, crop } = options;
-    if (farmingFortune <= 0 || blocksBroken < 0)
+    const fortune = farmingFortune ?? crops_1.MAX_CROP_FORTUNE[crop] ?? 0;
+    if (fortune <= 0 || blocksBroken < 0)
         return 0;
     const { drops } = GetCropInfo(crop);
     if (!drops)
         return 0;
+    const normal = blocksBroken * drops * (fortune * 0.1);
     switch (crop) {
         case crops_1.Crop.Cactus:
         case crops_1.Crop.Carrot:
@@ -44,11 +48,11 @@ function CalculateExpectedDrops(options) {
         case crops_1.Crop.SugarCane:
         case crops_1.Crop.Wheat:
         case crops_1.Crop.Seeds:
-            return blocksBroken * drops * (farmingFortune * 0.1);
+            return normal;
         case crops_1.Crop.Pumpkin:
-            return blocksBroken * drops * (farmingFortune * 0.1) * 0.5;
+            return normal + (0, pumpkin_1.PumpkinPerkBonus)(blocksBroken);
         case crops_1.Crop.Melon:
-            return blocksBroken * drops * (farmingFortune * 0.1) * 0.5;
+            return normal + (0, melon_1.MelonPerkBonus)(blocksBroken);
         default:
             return 0;
     }

package/package.json

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