farming-weight 0.3.11 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -7
- package/dist/classes/farmingequipment.d.ts +24 -0
- package/dist/classes/farmingequipment.js +116 -0
- package/dist/classes/farmingequipment.js.map +1 -0
- package/dist/classes/player.d.ts +4 -3
- package/dist/classes/player.js +8 -8
- package/dist/classes/player.js.map +1 -1
- package/dist/classes/weightcalc.d.ts +12 -3
- package/dist/classes/weightcalc.js +43 -18
- package/dist/classes/weightcalc.js.map +1 -1
- package/dist/classes/weightcalc.test.d.ts +1 -0
- package/dist/classes/weightcalc.test.js +108 -0
- package/dist/classes/weightcalc.test.js.map +1 -0
- package/dist/constants/armor.d.ts +3 -1
- package/dist/constants/armor.js +99 -13
- package/dist/constants/armor.js.map +1 -1
- package/dist/constants/lotus.d.ts +1 -1
- package/dist/constants/lotus.js +26 -2
- package/dist/constants/lotus.js.map +1 -1
- package/dist/constants/pests.d.ts +20 -3
- package/dist/constants/pests.js +169 -46
- package/dist/constants/pests.js.map +1 -1
- package/dist/constants/tools.d.ts +2 -1
- package/dist/constants/tools.js +57 -14
- package/dist/constants/tools.js.map +1 -1
- package/dist/constants/upgrades.d.ts +19 -0
- package/dist/constants/upgrades.js +37 -0
- package/dist/constants/upgrades.js.map +1 -0
- package/dist/constants/weight.d.ts +4 -2
- package/dist/constants/weight.js +4 -2
- package/dist/constants/weight.js.map +1 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/util/pests.d.ts +4 -0
- package/dist/util/pests.js +68 -0
- package/dist/util/pests.js.map +1 -0
- package/dist/util/pests.test.d.ts +1 -0
- package/dist/util/pests.test.js +27 -0
- package/dist/util/pests.test.js.map +1 -0
- package/package.json +46 -42
package/README.md
CHANGED
|
@@ -15,16 +15,24 @@ npm install farming-weight
|
|
|
15
15
|
```js
|
|
16
16
|
import { CreateFarmingWeightCalculator } from 'farming-weight';
|
|
17
17
|
|
|
18
|
-
const member = // Get SkyBlock member from elsewhere
|
|
18
|
+
const member = // Get SkyBlock member from elsewhere (https://api.hypixel.net/)
|
|
19
19
|
|
|
20
20
|
const calculator = CreateFarmingWeightCalculator({
|
|
21
21
|
collection: member.collection,
|
|
22
|
-
farmingXp: member.
|
|
23
|
-
levelCapUpgrade: member.
|
|
24
|
-
anitaBonusFarmingFortuneLevel?: member.
|
|
25
|
-
minions: member.crafted_generators, // You should also include minions crafted from other members on the same profile
|
|
26
|
-
contests: member.
|
|
27
|
-
|
|
22
|
+
farmingXp: member.player_data?.experience?.SKILL_FARMING,
|
|
23
|
+
levelCapUpgrade: member.jacobs_contest?.perks?.farming_level_cap,
|
|
24
|
+
anitaBonusFarmingFortuneLevel?: member.jacobs_contest?.perks?.double_drops,
|
|
25
|
+
minions: member.player_data?.crafted_generators, // You should also include minions crafted from other members on the same profile
|
|
26
|
+
contests: member.jacob_contest?.contests,
|
|
27
|
+
pests: member.bestiary
|
|
28
|
+
})
|
|
29
|
+
|
|
30
|
+
// Can pass in some values instead of calculating them (you can exclude contests above if you do this)
|
|
31
|
+
calculator.setEarnedMedals({
|
|
32
|
+
diamond: /* Number of diamond medals */,
|
|
33
|
+
platinum: /* Number of platinum medals */,
|
|
34
|
+
gold: /* Number of gold medals */,
|
|
35
|
+
})
|
|
28
36
|
|
|
29
37
|
const weight = calculator.getWeightInfo();
|
|
30
38
|
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { FarmingArmorInfo } from '../constants/armor';
|
|
2
|
+
import { Rarity, Reforge, ReforgeTier } from '../constants/reforges';
|
|
3
|
+
import { EliteItemDto } from './item';
|
|
4
|
+
import { PlayerOptions } from './player';
|
|
5
|
+
export declare class FarmingEquipment {
|
|
6
|
+
readonly item: EliteItemDto;
|
|
7
|
+
readonly info: FarmingArmorInfo;
|
|
8
|
+
get slot(): import("../constants/armor").GearSlot;
|
|
9
|
+
readonly rarity: Rarity;
|
|
10
|
+
readonly reforge: Reforge | undefined;
|
|
11
|
+
readonly reforgeStats: ReforgeTier | undefined;
|
|
12
|
+
readonly recombobulated: boolean;
|
|
13
|
+
fortune: number;
|
|
14
|
+
fortuneBreakdown: Record<string, number>;
|
|
15
|
+
private options?;
|
|
16
|
+
constructor(item: EliteItemDto, options?: PlayerOptions);
|
|
17
|
+
setOptions(options: PlayerOptions): void;
|
|
18
|
+
getFortune(): number;
|
|
19
|
+
private getFortuneFromVisitors;
|
|
20
|
+
private getPieceBonus;
|
|
21
|
+
static isValid(item: EliteItemDto): boolean;
|
|
22
|
+
static fromArray(items: EliteItemDto[], options?: PlayerOptions): FarmingEquipment[];
|
|
23
|
+
}
|
|
24
|
+
export declare const LotusGear: typeof FarmingEquipment;
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LotusGear = exports.FarmingEquipment = void 0;
|
|
4
|
+
const lotus_1 = require("../constants/lotus");
|
|
5
|
+
const reforges_1 = require("../constants/reforges");
|
|
6
|
+
const itemstats_1 = require("../util/itemstats");
|
|
7
|
+
const lore_1 = require("../util/lore");
|
|
8
|
+
class FarmingEquipment {
|
|
9
|
+
item;
|
|
10
|
+
info;
|
|
11
|
+
get slot() {
|
|
12
|
+
return this.info.slot;
|
|
13
|
+
}
|
|
14
|
+
constructor(item, options) {
|
|
15
|
+
this.options = options;
|
|
16
|
+
this.item = item;
|
|
17
|
+
const info = lotus_1.EQUIPMENT_INFO[item.skyblockId];
|
|
18
|
+
if (!info) {
|
|
19
|
+
throw new Error(`Unknown equipment: ${item.name} (${item.skyblockId})`);
|
|
20
|
+
}
|
|
21
|
+
this.info = info;
|
|
22
|
+
if (item.lore) {
|
|
23
|
+
this.rarity = (0, itemstats_1.getRarityFromLore)(item.lore);
|
|
24
|
+
}
|
|
25
|
+
this.reforge = reforges_1.REFORGES[item.attributes?.modifier ?? ''] ?? undefined;
|
|
26
|
+
this.reforgeStats = this.reforge?.tiers?.[this.rarity];
|
|
27
|
+
this.recombobulated = this.item.attributes?.rarity_upgrades === '1';
|
|
28
|
+
this.getFortune();
|
|
29
|
+
}
|
|
30
|
+
setOptions(options) {
|
|
31
|
+
this.options = options;
|
|
32
|
+
this.getFortune();
|
|
33
|
+
}
|
|
34
|
+
getFortune() {
|
|
35
|
+
this.fortuneBreakdown = {};
|
|
36
|
+
let sum = 0;
|
|
37
|
+
// Base fortune
|
|
38
|
+
const base = this.info.stats?.[reforges_1.Stat.FarmingFortune] ?? 0;
|
|
39
|
+
if (base > 0) {
|
|
40
|
+
this.fortuneBreakdown['Base Stats'] = base;
|
|
41
|
+
sum += base;
|
|
42
|
+
}
|
|
43
|
+
// Reforge
|
|
44
|
+
const reforge = this.reforgeStats?.stats?.[reforges_1.Stat.FarmingFortune] ?? 0;
|
|
45
|
+
if (reforge > 0) {
|
|
46
|
+
this.fortuneBreakdown['Reforge'] = reforge;
|
|
47
|
+
sum += reforge;
|
|
48
|
+
}
|
|
49
|
+
// Green Thumb Visitors
|
|
50
|
+
const visitors = this.getFortuneFromVisitors(base, reforge);
|
|
51
|
+
if (visitors > 0) {
|
|
52
|
+
this.fortuneBreakdown['Green Thumb'] = visitors;
|
|
53
|
+
sum += visitors;
|
|
54
|
+
}
|
|
55
|
+
// Lotus Piece bonus
|
|
56
|
+
if (this.info.family === 'LOTUS') {
|
|
57
|
+
const pieceBonus = this.getPieceBonus();
|
|
58
|
+
if (pieceBonus > 0) {
|
|
59
|
+
this.fortuneBreakdown['Salesperson'] = pieceBonus;
|
|
60
|
+
sum += pieceBonus;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
this.fortune = sum;
|
|
64
|
+
return sum;
|
|
65
|
+
}
|
|
66
|
+
getFortuneFromVisitors(base, reforge) {
|
|
67
|
+
if (!this.item.enchantments?.green_thumb)
|
|
68
|
+
return 0;
|
|
69
|
+
const regex = /§7Farming Fortune: §a\+(\d+.?\d+)/g;
|
|
70
|
+
let found = 0;
|
|
71
|
+
for (const line of this.item.lore ?? []) {
|
|
72
|
+
const number = (0, lore_1.extractNumberFromLine)(line, regex) ?? 0;
|
|
73
|
+
if (!number)
|
|
74
|
+
continue;
|
|
75
|
+
found = +number;
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
78
|
+
if (found === 0)
|
|
79
|
+
return 0;
|
|
80
|
+
return Math.max(0, found - base - reforge);
|
|
81
|
+
}
|
|
82
|
+
getPieceBonus() {
|
|
83
|
+
const regex = /§7Piece Bonus: §6\+(\d+)☘/g;
|
|
84
|
+
let found = 0;
|
|
85
|
+
for (const line of (this.item.lore ?? []).reverse()) {
|
|
86
|
+
const number = (0, lore_1.extractNumberFromLine)(line, regex) ?? 0;
|
|
87
|
+
if (!number)
|
|
88
|
+
continue;
|
|
89
|
+
found = number;
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
return found;
|
|
93
|
+
}
|
|
94
|
+
static isValid(item) {
|
|
95
|
+
return lotus_1.EQUIPMENT_INFO[item.skyblockId] !== undefined;
|
|
96
|
+
}
|
|
97
|
+
static fromArray(items, options) {
|
|
98
|
+
const gear = items
|
|
99
|
+
.filter((item) => FarmingEquipment.isValid(item))
|
|
100
|
+
.map((item) => new FarmingEquipment(item, options))
|
|
101
|
+
.sort((a, b) => b.fortune - a.fortune);
|
|
102
|
+
// Get only the best piece of each slot
|
|
103
|
+
const best = {};
|
|
104
|
+
for (const piece of gear) {
|
|
105
|
+
if (!best[piece.slot] || piece.fortune > (best[piece.slot]?.fortune ?? 0)) {
|
|
106
|
+
best[piece.slot] = piece;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
return Object.values(best);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
exports.FarmingEquipment = FarmingEquipment;
|
|
113
|
+
// For backwards compatibility
|
|
114
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
115
|
+
exports.LotusGear = FarmingEquipment;
|
|
116
|
+
//# sourceMappingURL=farmingequipment.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"farmingequipment.js","sourceRoot":"","sources":["../../src/classes/farmingequipment.ts"],"names":[],"mappings":"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"}
|
package/dist/classes/player.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { ArmorSet, FarmingArmor } from './farmingarmor';
|
|
|
5
5
|
import { FarmingPet } from './farmingpet';
|
|
6
6
|
import { FarmingTool } from './farmingtool';
|
|
7
7
|
import { EliteItemDto } from './item';
|
|
8
|
-
import {
|
|
8
|
+
import { FarmingEquipment } from './farmingequipment';
|
|
9
9
|
export interface FortuneMissingFromAPI {
|
|
10
10
|
cropUpgrades?: Record<Crop, number>;
|
|
11
11
|
gardenLevel?: number;
|
|
@@ -26,7 +26,7 @@ export interface PlayerOptions extends FortuneMissingFromAPI {
|
|
|
26
26
|
strength?: number;
|
|
27
27
|
tools: EliteItemDto[] | FarmingTool[];
|
|
28
28
|
armor: EliteItemDto[] | FarmingArmor[] | ArmorSet;
|
|
29
|
-
equipment: EliteItemDto[] |
|
|
29
|
+
equipment: EliteItemDto[] | FarmingEquipment[];
|
|
30
30
|
accessories: EliteItemDto[] | FarmingAccessory[];
|
|
31
31
|
pets: FarmingPetType[] | FarmingPet[];
|
|
32
32
|
selectedTool?: FarmingTool;
|
|
@@ -35,6 +35,7 @@ export interface PlayerOptions extends FortuneMissingFromAPI {
|
|
|
35
35
|
bestiaryKills?: Record<string, number>;
|
|
36
36
|
anitaBonus?: number;
|
|
37
37
|
extraFortune?: ExtraFarmingFortune[];
|
|
38
|
+
zorro?: boolean;
|
|
38
39
|
}
|
|
39
40
|
export declare function createFarmingPlayer(options: PlayerOptions): FarmingPlayer;
|
|
40
41
|
export declare class FarmingPlayer {
|
|
@@ -44,7 +45,7 @@ export declare class FarmingPlayer {
|
|
|
44
45
|
tools: FarmingTool[];
|
|
45
46
|
armor: FarmingArmor[];
|
|
46
47
|
armorSet: ArmorSet;
|
|
47
|
-
equipment:
|
|
48
|
+
equipment: FarmingEquipment[];
|
|
48
49
|
accessories: FarmingAccessory[];
|
|
49
50
|
pets: FarmingPet[];
|
|
50
51
|
selectedTool?: FarmingTool;
|
package/dist/classes/player.js
CHANGED
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FarmingPlayer = exports.createFarmingPlayer = void 0;
|
|
4
4
|
const personalbests_1 = require("../constants/personalbests");
|
|
5
|
-
const pests_1 = require("../
|
|
5
|
+
const pests_1 = require("../util/pests");
|
|
6
6
|
const specific_1 = require("../constants/specific");
|
|
7
7
|
const names_1 = require("../util/names");
|
|
8
8
|
const farmingaccessory_1 = require("./farmingaccessory");
|
|
9
9
|
const farmingarmor_1 = require("./farmingarmor");
|
|
10
10
|
const farmingpet_1 = require("./farmingpet");
|
|
11
11
|
const farmingtool_1 = require("./farmingtool");
|
|
12
|
-
const
|
|
12
|
+
const farmingequipment_1 = require("./farmingequipment");
|
|
13
13
|
function createFarmingPlayer(options) {
|
|
14
14
|
return new FarmingPlayer(options);
|
|
15
15
|
}
|
|
@@ -52,13 +52,13 @@ class FarmingPlayer {
|
|
|
52
52
|
this.armor = farmingarmor_1.FarmingArmor.fromArray(options.armor, options);
|
|
53
53
|
this.armorSet = new farmingarmor_1.ArmorSet(this.armor);
|
|
54
54
|
}
|
|
55
|
-
if (options.equipment[0] instanceof
|
|
55
|
+
if (options.equipment[0] instanceof farmingequipment_1.FarmingEquipment) {
|
|
56
56
|
this.equipment = options.equipment.sort((a, b) => b.fortune - a.fortune);
|
|
57
57
|
for (const e of this.equipment)
|
|
58
58
|
e.setOptions(options);
|
|
59
59
|
}
|
|
60
60
|
else {
|
|
61
|
-
this.equipment =
|
|
61
|
+
this.equipment = farmingequipment_1.FarmingEquipment.fromArray(options.equipment, options);
|
|
62
62
|
}
|
|
63
63
|
if (options.accessories[0] instanceof farmingaccessory_1.FarmingAccessory) {
|
|
64
64
|
this.accessories = options.accessories.sort((a, b) => b.fortune - a.fortune);
|
|
@@ -116,10 +116,10 @@ class FarmingPlayer {
|
|
|
116
116
|
sum += armorSet;
|
|
117
117
|
}
|
|
118
118
|
// Lotus Gear
|
|
119
|
-
const
|
|
120
|
-
if (
|
|
121
|
-
breakdown['
|
|
122
|
-
sum +=
|
|
119
|
+
const equipment = this.equipment.reduce((a, b) => a + b.fortune, 0);
|
|
120
|
+
if (equipment > 0) {
|
|
121
|
+
breakdown['Equipment'] = equipment;
|
|
122
|
+
sum += equipment;
|
|
123
123
|
}
|
|
124
124
|
// Anita Bonus
|
|
125
125
|
const anitaBonus = (this.options.anitaBonus ?? 0) * specific_1.FORTUNE_PER_ANITA_BONUS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"player.js","sourceRoot":"","sources":["../../src/classes/player.ts"],"names":[],"mappings":";;;AACA,8DAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"player.js","sourceRoot":"","sources":["../../src/classes/player.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,9 @@ export interface FarmingWeightInfo {
|
|
|
10
10
|
collected: number;
|
|
11
11
|
claimed_position?: number;
|
|
12
12
|
claimed_participants?: number;
|
|
13
|
-
claimed_medal?: 'bronze' | 'silver' | 'gold';
|
|
13
|
+
claimed_medal?: 'bronze' | 'silver' | 'gold' | 'platinum' | 'diamond';
|
|
14
14
|
}[];
|
|
15
|
+
pests?: Record<string, number>;
|
|
15
16
|
}
|
|
16
17
|
declare class FarmingWeight {
|
|
17
18
|
collection: Record<Crop, number>;
|
|
@@ -19,9 +20,11 @@ declare class FarmingWeight {
|
|
|
19
20
|
farmingXp: number;
|
|
20
21
|
anitaBonusFarmingFortuneLevel: number;
|
|
21
22
|
tier12MinionCount: number;
|
|
22
|
-
|
|
23
|
+
earnedMedals: Record<'diamond' | 'platinum' | 'gold', number>;
|
|
23
24
|
cropWeights: Record<Crop, number>;
|
|
24
25
|
bonusSources: Record<string, number>;
|
|
26
|
+
uncountedCrops: Partial<Record<Crop, number>>;
|
|
27
|
+
readonly info?: FarmingWeightInfo;
|
|
25
28
|
constructor(info?: FarmingWeightInfo);
|
|
26
29
|
/**
|
|
27
30
|
* Expectes a dictionary of collections and amounts with the default Hypixel SkyBlock IDs
|
|
@@ -34,7 +37,11 @@ declare class FarmingWeight {
|
|
|
34
37
|
setFarmingXp: (farmingXp: number) => this;
|
|
35
38
|
setAnitaBonusLevel: (anitaBonusFarmingFortuneLevel: number) => this;
|
|
36
39
|
addMinions: (minions: string[]) => this;
|
|
37
|
-
|
|
40
|
+
setEarnedMedals: ({ diamond, platinum, gold }: {
|
|
41
|
+
diamond?: number | undefined;
|
|
42
|
+
platinum?: number | undefined;
|
|
43
|
+
gold?: number | undefined;
|
|
44
|
+
}) => this;
|
|
38
45
|
setTier12MinionCount: (count: number) => this;
|
|
39
46
|
setContests: (contests: FarmingWeightInfo['contests']) => this;
|
|
40
47
|
getWeightInfo: () => {
|
|
@@ -42,9 +49,11 @@ declare class FarmingWeight {
|
|
|
42
49
|
bonusWeight: number;
|
|
43
50
|
cropWeight: number;
|
|
44
51
|
bonusSources: Record<string, number>;
|
|
52
|
+
uncountedCrops: Partial<Record<Crop, number>>;
|
|
45
53
|
};
|
|
46
54
|
getBonusWeights: () => Record<string, number>;
|
|
47
55
|
getCropWeights: () => Record<Crop, number>;
|
|
56
|
+
calcUncountedCrops: (bestiary: Record<string, number>) => this;
|
|
48
57
|
getCropWeight: (crop: Crop) => void;
|
|
49
58
|
}
|
|
50
59
|
export {};
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.createFarmingWeightCalculator = void 0;
|
|
4
4
|
const crops_1 = require("../constants/crops");
|
|
5
5
|
const weight_1 = require("../constants/weight");
|
|
6
|
+
const jacob_1 = require("../util/jacob");
|
|
7
|
+
const pests_1 = require("../util/pests");
|
|
6
8
|
function createFarmingWeightCalculator(info) {
|
|
7
9
|
return new FarmingWeight(info);
|
|
8
10
|
}
|
|
@@ -20,14 +22,18 @@ const crops = [
|
|
|
20
22
|
crops_1.Crop.Wheat,
|
|
21
23
|
];
|
|
22
24
|
class FarmingWeight {
|
|
25
|
+
info;
|
|
23
26
|
constructor(info) {
|
|
27
|
+
this.info = info;
|
|
24
28
|
this.collection = {};
|
|
25
29
|
this.levelCapUpgrade = info?.levelCapUpgrade ?? 0;
|
|
26
30
|
this.anitaBonusFarmingFortuneLevel = info?.anitaBonusFarmingFortuneLevel ?? 0;
|
|
27
31
|
this.farmingXp = info?.farmingXp ?? 0;
|
|
28
|
-
this.
|
|
32
|
+
this.earnedMedals = { diamond: 0, platinum: 0, gold: 0 };
|
|
29
33
|
this.tier12MinionCount = 0;
|
|
30
34
|
this.bonusSources = {};
|
|
35
|
+
this.uncountedCrops = {};
|
|
36
|
+
this.calcUncountedCrops(info?.pests ?? {});
|
|
31
37
|
this.setCropsFromCollections(info?.collection ?? {});
|
|
32
38
|
this.addMinions(info?.minions ?? []);
|
|
33
39
|
}
|
|
@@ -70,8 +76,12 @@ class FarmingWeight {
|
|
|
70
76
|
}
|
|
71
77
|
return this;
|
|
72
78
|
};
|
|
73
|
-
|
|
74
|
-
this.
|
|
79
|
+
setEarnedMedals = ({ diamond, platinum, gold }) => {
|
|
80
|
+
this.earnedMedals = {
|
|
81
|
+
diamond: diamond ?? this.earnedMedals.diamond,
|
|
82
|
+
platinum: platinum ?? this.earnedMedals.platinum,
|
|
83
|
+
gold: gold ?? this.earnedMedals.gold,
|
|
84
|
+
};
|
|
75
85
|
return this;
|
|
76
86
|
};
|
|
77
87
|
setTier12MinionCount = (count) => {
|
|
@@ -82,16 +92,17 @@ class FarmingWeight {
|
|
|
82
92
|
if (!contests?.length)
|
|
83
93
|
return this;
|
|
84
94
|
for (const contest of contests) {
|
|
85
|
-
|
|
86
|
-
|
|
95
|
+
const medal = (0, jacob_1.calculateJacobContestMedal)(contest);
|
|
96
|
+
if (!medal)
|
|
87
97
|
continue;
|
|
98
|
+
if (medal === 'diamond') {
|
|
99
|
+
this.earnedMedals.diamond += contest.collected;
|
|
88
100
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
this.earnedGoldMedals++;
|
|
101
|
+
else if (medal === 'platinum') {
|
|
102
|
+
this.earnedMedals.platinum += contest.collected;
|
|
103
|
+
}
|
|
104
|
+
else if (medal === 'gold') {
|
|
105
|
+
this.earnedMedals.gold += contest.collected;
|
|
95
106
|
}
|
|
96
107
|
}
|
|
97
108
|
return this;
|
|
@@ -106,6 +117,7 @@ class FarmingWeight {
|
|
|
106
117
|
bonusWeight: bonusTotal,
|
|
107
118
|
cropWeight: cropTotal,
|
|
108
119
|
bonusSources: bonus,
|
|
120
|
+
uncountedCrops: this.uncountedCrops,
|
|
109
121
|
};
|
|
110
122
|
};
|
|
111
123
|
getBonusWeights = () => {
|
|
@@ -127,14 +139,18 @@ class FarmingWeight {
|
|
|
127
139
|
this.bonusSources['Anita Bonus'] =
|
|
128
140
|
this.anitaBonusFarmingFortuneLevel * weight_1.BONUS_WEIGHT.AnitaBuffBonusMultiplier;
|
|
129
141
|
}
|
|
130
|
-
|
|
131
|
-
|
|
142
|
+
const maxMedals = weight_1.BONUS_WEIGHT.MaxMedalsCounted;
|
|
143
|
+
if (this.earnedMedals.diamond >= maxMedals) {
|
|
144
|
+
this.bonusSources['Contest Medals'] = weight_1.BONUS_WEIGHT.WeightPerDiamondMedal * weight_1.BONUS_WEIGHT.MaxMedalsCounted;
|
|
132
145
|
}
|
|
133
146
|
else {
|
|
134
|
-
const
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
147
|
+
const diamond = this.earnedMedals.diamond;
|
|
148
|
+
const platinum = Math.min(maxMedals - diamond, this.earnedMedals.platinum);
|
|
149
|
+
const gold = Math.min(maxMedals - diamond - platinum, this.earnedMedals.gold);
|
|
150
|
+
const medals = diamond * weight_1.BONUS_WEIGHT.WeightPerDiamondMedal +
|
|
151
|
+
platinum * weight_1.BONUS_WEIGHT.WeightPerPlatinumMedal +
|
|
152
|
+
gold * weight_1.BONUS_WEIGHT.WeightPerGoldMedal;
|
|
153
|
+
this.bonusSources['Contest Medals'] = medals;
|
|
138
154
|
}
|
|
139
155
|
return this.bonusSources;
|
|
140
156
|
};
|
|
@@ -143,7 +159,11 @@ class FarmingWeight {
|
|
|
143
159
|
let totalWeight = 0;
|
|
144
160
|
let doubleBreakWeight = 0;
|
|
145
161
|
for (const crop of crops) {
|
|
146
|
-
|
|
162
|
+
let collected = this.collection[crop] ?? 0;
|
|
163
|
+
// Subtract uncounted crops
|
|
164
|
+
if (this.uncountedCrops[crop]) {
|
|
165
|
+
collected = Math.max(0, collected - (this.uncountedCrops[crop] ?? 0));
|
|
166
|
+
}
|
|
147
167
|
const weight = collected / weight_1.CROP_WEIGHT[crop];
|
|
148
168
|
totalWeight += weight;
|
|
149
169
|
if (crop === crops_1.Crop.Cactus || crop === crops_1.Crop.SugarCane) {
|
|
@@ -163,6 +183,11 @@ class FarmingWeight {
|
|
|
163
183
|
cropWeight[crops_1.Crop.Mushroom] = mushroomWeight;
|
|
164
184
|
return cropWeight;
|
|
165
185
|
};
|
|
186
|
+
calcUncountedCrops = (bestiary) => {
|
|
187
|
+
this.uncountedCrops = (0, pests_1.uncountedCropsFromPests)(bestiary);
|
|
188
|
+
this.getCropWeights();
|
|
189
|
+
return this;
|
|
190
|
+
};
|
|
166
191
|
getCropWeight = (crop) => {
|
|
167
192
|
weight_1.CROP_WEIGHT[crop];
|
|
168
193
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"weightcalc.js","sourceRoot":"","sources":["../../src/classes/weightcalc.ts"],"names":[],"mappings":";;;AAAA,8CAA0C;AAC1C,gDAAiF;
|
|
1
|
+
{"version":3,"file":"weightcalc.js","sourceRoot":"","sources":["../../src/classes/weightcalc.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const vitest_1 = require("vitest");
|
|
4
|
+
const weightcalc_1 = require("./weightcalc");
|
|
5
|
+
const crops_1 = require("../constants/crops");
|
|
6
|
+
const weight_1 = require("../constants/weight");
|
|
7
|
+
const pests_1 = require("../util/pests");
|
|
8
|
+
const crops = {
|
|
9
|
+
[crops_1.Crop.Cactus]: weight_1.CROP_WEIGHT[crops_1.Crop.Cactus] * 50,
|
|
10
|
+
[crops_1.Crop.Carrot]: weight_1.CROP_WEIGHT[crops_1.Crop.Carrot] * 10,
|
|
11
|
+
[crops_1.Crop.CocoaBeans]: weight_1.CROP_WEIGHT[crops_1.Crop.CocoaBeans] * 10,
|
|
12
|
+
[crops_1.Crop.Melon]: weight_1.CROP_WEIGHT[crops_1.Crop.Melon] * 10,
|
|
13
|
+
[crops_1.Crop.NetherWart]: weight_1.CROP_WEIGHT[crops_1.Crop.NetherWart] * 10,
|
|
14
|
+
[crops_1.Crop.Potato]: weight_1.CROP_WEIGHT[crops_1.Crop.Potato] * 10,
|
|
15
|
+
[crops_1.Crop.Pumpkin]: weight_1.CROP_WEIGHT[crops_1.Crop.Pumpkin] * 10,
|
|
16
|
+
[crops_1.Crop.SugarCane]: weight_1.CROP_WEIGHT[crops_1.Crop.SugarCane] * 50,
|
|
17
|
+
[crops_1.Crop.Wheat]: weight_1.CROP_WEIGHT[crops_1.Crop.Wheat] * 10,
|
|
18
|
+
};
|
|
19
|
+
const pests = {
|
|
20
|
+
pest_fly_1: 150,
|
|
21
|
+
pest_beetle_1: 86,
|
|
22
|
+
};
|
|
23
|
+
(0, vitest_1.test)('Basic weight calculation', () => {
|
|
24
|
+
const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
|
|
25
|
+
collection: crops,
|
|
26
|
+
});
|
|
27
|
+
(0, vitest_1.expect)(weight.getWeightInfo().totalWeight).toBeCloseTo(170);
|
|
28
|
+
});
|
|
29
|
+
(0, vitest_1.test)('Mushroom weight calculation', () => {
|
|
30
|
+
const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
|
|
31
|
+
collection: {
|
|
32
|
+
...crops,
|
|
33
|
+
[crops_1.Crop.Mushroom]: weight_1.CROP_WEIGHT[crops_1.Crop.Mushroom] * 13.74,
|
|
34
|
+
},
|
|
35
|
+
});
|
|
36
|
+
(0, vitest_1.expect)(weight.getWeightInfo().totalWeight).toBeCloseTo(180);
|
|
37
|
+
});
|
|
38
|
+
(0, vitest_1.test)('Pest debuff weight calculation', () => {
|
|
39
|
+
const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
|
|
40
|
+
collection: crops,
|
|
41
|
+
pests: pests,
|
|
42
|
+
});
|
|
43
|
+
const uncounted = (0, pests_1.uncountedCropsFromPests)(pests);
|
|
44
|
+
const uncountedWheat = uncounted[crops_1.Crop.Wheat] ?? 0;
|
|
45
|
+
const uncountedWart = uncounted[crops_1.Crop.NetherWart] ?? 0;
|
|
46
|
+
(0, vitest_1.expect)(weight.getWeightInfo().uncountedCrops[crops_1.Crop.Wheat]).toBeCloseTo(uncountedWheat);
|
|
47
|
+
(0, vitest_1.expect)(weight.getWeightInfo().uncountedCrops[crops_1.Crop.NetherWart]).toBeCloseTo(uncountedWart);
|
|
48
|
+
const weightExpected = (0, weightcalc_1.createFarmingWeightCalculator)({
|
|
49
|
+
collection: {
|
|
50
|
+
...crops,
|
|
51
|
+
[crops_1.Crop.Wheat]: crops[crops_1.Crop.Wheat] - uncountedWheat,
|
|
52
|
+
[crops_1.Crop.NetherWart]: crops[crops_1.Crop.NetherWart] - uncountedWart,
|
|
53
|
+
},
|
|
54
|
+
});
|
|
55
|
+
(0, vitest_1.expect)(weight.getWeightInfo().cropWeight).toBeCloseTo(weightExpected.getWeightInfo().cropWeight);
|
|
56
|
+
});
|
|
57
|
+
(0, vitest_1.test)('Full weight calculation', () => {
|
|
58
|
+
const crops = {
|
|
59
|
+
[crops_1.Crop.Cactus]: 1219395,
|
|
60
|
+
[crops_1.Crop.Carrot]: 14238991,
|
|
61
|
+
[crops_1.Crop.CocoaBeans]: 901826,
|
|
62
|
+
[crops_1.Crop.Melon]: 5041491,
|
|
63
|
+
[crops_1.Crop.Mushroom]: 9063168,
|
|
64
|
+
[crops_1.Crop.NetherWart]: 897212645,
|
|
65
|
+
[crops_1.Crop.Potato]: 171017100,
|
|
66
|
+
[crops_1.Crop.Pumpkin]: 1496477,
|
|
67
|
+
[crops_1.Crop.SugarCane]: 15509429,
|
|
68
|
+
[crops_1.Crop.Wheat]: 21996256,
|
|
69
|
+
};
|
|
70
|
+
const pests = {
|
|
71
|
+
pest_fly_1: 222,
|
|
72
|
+
pest_rat_1: 40,
|
|
73
|
+
pest_mite_1: 43,
|
|
74
|
+
pest_moth_1: 40,
|
|
75
|
+
pest_slug_1: 34,
|
|
76
|
+
pest_worm_1: 32,
|
|
77
|
+
pest_beetle_1: 265,
|
|
78
|
+
pest_locust_1: 41,
|
|
79
|
+
pest_cricket_1: 36,
|
|
80
|
+
pest_mosquito_1: 41,
|
|
81
|
+
};
|
|
82
|
+
const minions = [
|
|
83
|
+
'WHEAT_11',
|
|
84
|
+
'CARROT_11',
|
|
85
|
+
'POTATO_12',
|
|
86
|
+
'PUMPKIN_12',
|
|
87
|
+
'MELON_12',
|
|
88
|
+
'MUSHROOM_12',
|
|
89
|
+
'COCOA_11',
|
|
90
|
+
'CACTUS_11',
|
|
91
|
+
'SUGAR_CANE_12',
|
|
92
|
+
'NETHER_WARTS_12',
|
|
93
|
+
];
|
|
94
|
+
const weight = (0, weightcalc_1.createFarmingWeightCalculator)({
|
|
95
|
+
collection: crops,
|
|
96
|
+
pests: pests,
|
|
97
|
+
farmingXp: 286958923.31966937,
|
|
98
|
+
levelCapUpgrade: 10,
|
|
99
|
+
anitaBonusFarmingFortuneLevel: 15,
|
|
100
|
+
minions: minions,
|
|
101
|
+
}).setEarnedMedals({
|
|
102
|
+
diamond: 246,
|
|
103
|
+
platinum: 75,
|
|
104
|
+
gold: 99,
|
|
105
|
+
});
|
|
106
|
+
(0, vitest_1.expect)(weight.getWeightInfo().totalWeight).toBeCloseTo(5176.617);
|
|
107
|
+
});
|
|
108
|
+
//# sourceMappingURL=weightcalc.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"weightcalc.test.js","sourceRoot":"","sources":["../../src/classes/weightcalc.test.ts"],"names":[],"mappings":"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"}
|