farming-weight 0.3.2 → 0.3.3
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/dist/classes/farmingaccessory.js +8 -12
- package/dist/classes/farmingaccessory.js.map +1 -1
- package/dist/classes/farmingarmor.js +27 -32
- package/dist/classes/farmingarmor.js.map +1 -1
- package/dist/classes/farmingpet.d.ts +2 -1
- package/dist/classes/farmingpet.js +24 -24
- package/dist/classes/farmingpet.js.map +1 -1
- package/dist/classes/farmingtool.d.ts +4 -0
- package/dist/classes/farmingtool.js +59 -34
- package/dist/classes/farmingtool.js.map +1 -1
- package/dist/classes/item.js +1 -2
- package/dist/classes/lotusgear.d.ts +2 -1
- package/dist/classes/lotusgear.js +19 -19
- package/dist/classes/lotusgear.js.map +1 -1
- package/dist/classes/player.d.ts +3 -0
- package/dist/classes/player.js +49 -38
- package/dist/classes/player.js.map +1 -1
- package/dist/classes/weightcalc.js +27 -31
- package/dist/classes/weightcalc.js.map +1 -1
- package/dist/constants/accessories.js +11 -14
- package/dist/constants/accessories.js.map +1 -1
- package/dist/constants/armor.js +125 -128
- package/dist/constants/armor.js.map +1 -1
- package/dist/constants/crops.js +7 -10
- package/dist/constants/crops.js.map +1 -1
- package/dist/constants/enchants.js +67 -70
- package/dist/constants/enchants.js.map +1 -1
- package/dist/constants/lotus.js +26 -29
- package/dist/constants/lotus.js.map +1 -1
- package/dist/constants/personalbests.js +17 -21
- package/dist/constants/personalbests.js.map +1 -1
- package/dist/constants/pests.js +6 -11
- package/dist/constants/pests.js.map +1 -1
- package/dist/constants/pets.js +22 -25
- package/dist/constants/pets.js.map +1 -1
- package/dist/constants/reforges.d.ts +5 -1
- package/dist/constants/reforges.js +25 -12
- package/dist/constants/reforges.js.map +1 -1
- package/dist/constants/skills.js +2 -5
- package/dist/constants/skills.js.map +1 -1
- package/dist/constants/specialcrops.js +16 -19
- package/dist/constants/specialcrops.js.map +1 -1
- package/dist/constants/specific.js +5 -8
- package/dist/constants/specific.js.map +1 -1
- package/dist/constants/tools.js +105 -108
- package/dist/constants/tools.js.map +1 -1
- package/dist/constants/weight.js +15 -18
- package/dist/constants/weight.js.map +1 -1
- package/dist/crops/melon.d.ts +1 -1
- package/dist/crops/melon.js +37 -5
- package/dist/crops/melon.js.map +1 -1
- package/dist/crops/pumpkin.d.ts +1 -1
- package/dist/crops/pumpkin.js +37 -5
- package/dist/crops/pumpkin.js.map +1 -1
- package/dist/crops/special.js +6 -10
- package/dist/crops/special.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +26 -41
- package/dist/index.js.map +1 -1
- package/dist/util/itemstats.js +58 -52
- package/dist/util/itemstats.js.map +1 -1
- package/dist/util/jacob.js +2 -7
- package/dist/util/jacob.js.map +1 -1
- package/dist/util/lore.js +1 -5
- package/dist/util/lore.js.map +1 -1
- package/dist/util/names.d.ts +2 -0
- package/dist/util/names.js +81 -85
- package/dist/util/names.js.map +1 -1
- package/dist/util/ratecalc.d.ts +1 -0
- package/dist/util/ratecalc.js +59 -69
- package/dist/util/ratecalc.js.map +1 -1
- package/dist/util/skyblocktime.js +1 -5
- package/dist/util/skyblocktime.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,7 +14,8 @@ export declare class LotusGear {
|
|
|
14
14
|
fortuneBreakdown: Record<string, number>;
|
|
15
15
|
private options?;
|
|
16
16
|
constructor(item: EliteItemDto, options?: PlayerOptions);
|
|
17
|
-
|
|
17
|
+
setOptions(options: PlayerOptions): void;
|
|
18
|
+
getFortune(): number;
|
|
18
19
|
private getFortuneFromVisitors;
|
|
19
20
|
private getPieceBonus;
|
|
20
21
|
static isValid(item: EliteItemDto): boolean;
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const itemstats_1 = require("../util/itemstats");
|
|
7
|
-
const lore_1 = require("../util/lore");
|
|
8
|
-
class LotusGear {
|
|
1
|
+
import { LOTUS_GEAR_INFO } from '../constants/lotus';
|
|
2
|
+
import { REFORGES, Stat } from '../constants/reforges';
|
|
3
|
+
import { getRarityFromLore } from '../util/itemstats';
|
|
4
|
+
import { extractNumberFromLine } from '../util/lore';
|
|
5
|
+
export class LotusGear {
|
|
9
6
|
item;
|
|
10
7
|
info;
|
|
11
8
|
get slot() {
|
|
@@ -14,30 +11,34 @@ class LotusGear {
|
|
|
14
11
|
constructor(item, options) {
|
|
15
12
|
this.options = options;
|
|
16
13
|
this.item = item;
|
|
17
|
-
const info =
|
|
14
|
+
const info = LOTUS_GEAR_INFO[item.skyblockId];
|
|
18
15
|
if (!info) {
|
|
19
16
|
throw new Error(`Unknown lotus gear: ${item.name} (${item.skyblockId})`);
|
|
20
17
|
}
|
|
21
18
|
this.info = info;
|
|
22
19
|
if (item.lore) {
|
|
23
|
-
this.rarity =
|
|
20
|
+
this.rarity = getRarityFromLore(item.lore);
|
|
24
21
|
}
|
|
25
|
-
this.reforge =
|
|
22
|
+
this.reforge = REFORGES[item.attributes?.modifier ?? ''] ?? undefined;
|
|
26
23
|
this.reforgeStats = this.reforge?.tiers?.[this.rarity];
|
|
27
24
|
this.recombobulated = this.item.attributes?.rarity_upgrades === '1';
|
|
28
|
-
this.
|
|
25
|
+
this.getFortune();
|
|
29
26
|
}
|
|
30
|
-
|
|
27
|
+
setOptions(options) {
|
|
28
|
+
this.options = options;
|
|
29
|
+
this.getFortune();
|
|
30
|
+
}
|
|
31
|
+
getFortune() {
|
|
31
32
|
this.fortuneBreakdown = {};
|
|
32
33
|
let sum = 0;
|
|
33
34
|
// Base fortune
|
|
34
|
-
const base = this.info.stats?.[
|
|
35
|
+
const base = this.info.stats?.[Stat.FarmingFortune] ?? 0;
|
|
35
36
|
if (base > 0) {
|
|
36
37
|
this.fortuneBreakdown['Base Stats'] = base;
|
|
37
38
|
sum += base;
|
|
38
39
|
}
|
|
39
40
|
// Reforge
|
|
40
|
-
const reforge = this.reforgeStats?.stats?.[
|
|
41
|
+
const reforge = this.reforgeStats?.stats?.[Stat.FarmingFortune] ?? 0;
|
|
41
42
|
if (reforge > 0) {
|
|
42
43
|
this.fortuneBreakdown['Reforge'] = reforge;
|
|
43
44
|
sum += reforge;
|
|
@@ -63,7 +64,7 @@ class LotusGear {
|
|
|
63
64
|
const regex = /§7Farming Fortune: §a\+(\d+.?\d+)/g;
|
|
64
65
|
let found = 0;
|
|
65
66
|
for (const line of this.item.lore ?? []) {
|
|
66
|
-
const number =
|
|
67
|
+
const number = extractNumberFromLine(line, regex) ?? 0;
|
|
67
68
|
if (!number)
|
|
68
69
|
continue;
|
|
69
70
|
found = +number;
|
|
@@ -77,7 +78,7 @@ class LotusGear {
|
|
|
77
78
|
const regex = /§7Piece Bonus: §6\+(\d+)☘/g;
|
|
78
79
|
let found = 0;
|
|
79
80
|
for (const line of (this.item.lore ?? []).reverse()) {
|
|
80
|
-
const number =
|
|
81
|
+
const number = extractNumberFromLine(line, regex) ?? 0;
|
|
81
82
|
if (!number)
|
|
82
83
|
continue;
|
|
83
84
|
found = number;
|
|
@@ -86,7 +87,7 @@ class LotusGear {
|
|
|
86
87
|
return found;
|
|
87
88
|
}
|
|
88
89
|
static isValid(item) {
|
|
89
|
-
return
|
|
90
|
+
return LOTUS_GEAR_INFO[item.skyblockId] !== undefined;
|
|
90
91
|
}
|
|
91
92
|
static fromArray(items, options) {
|
|
92
93
|
return items
|
|
@@ -95,5 +96,4 @@ class LotusGear {
|
|
|
95
96
|
.sort((a, b) => b.fortune - a.fortune);
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
|
-
exports.LotusGear = LotusGear;
|
|
99
99
|
//# sourceMappingURL=lotusgear.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lotusgear.js","sourceRoot":"","sources":["../../src/classes/lotusgear.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lotusgear.js","sourceRoot":"","sources":["../../src/classes/lotusgear.ts"],"names":[],"mappings":"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"}
|
package/dist/classes/player.d.ts
CHANGED
|
@@ -24,6 +24,8 @@ export interface PlayerOptions extends FortuneMissingFromAPI {
|
|
|
24
24
|
equipment: EliteItemDto[] | LotusGear[];
|
|
25
25
|
accessories: EliteItemDto[] | FarmingAccessory[];
|
|
26
26
|
pets: FarmingPetType[] | FarmingPet[];
|
|
27
|
+
selectedTool?: FarmingTool;
|
|
28
|
+
selectedPet?: FarmingPet;
|
|
27
29
|
personalBests?: Record<string, number>;
|
|
28
30
|
bestiaryKills?: Record<string, number>;
|
|
29
31
|
anitaBonus?: number;
|
|
@@ -45,6 +47,7 @@ export declare class FarmingPlayer {
|
|
|
45
47
|
changeArmor(armor: FarmingArmor[]): void;
|
|
46
48
|
selectTool(tool: FarmingTool): void;
|
|
47
49
|
selectPet(pet: FarmingPet): void;
|
|
50
|
+
setStrength(strength: number): void;
|
|
48
51
|
getGeneralFortune(): number;
|
|
49
52
|
getCropFortune(crop: Crop, tool?: FarmingTool | undefined): {
|
|
50
53
|
fortune: number;
|
package/dist/classes/player.js
CHANGED
|
@@ -1,83 +1,95 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const farmingtool_1 = require("./farmingtool");
|
|
12
|
-
const lotusgear_1 = require("./lotusgear");
|
|
13
|
-
function createFarmingPlayer(options) {
|
|
1
|
+
import { fortuneFromPersonalBestContest } from '../constants/personalbests';
|
|
2
|
+
import { fortuneFromPestBestiary } from '../constants/pests';
|
|
3
|
+
import { FORTUNE_PER_ANITA_BONUS, FORTUNE_PER_COMMUNITY_CENTER, FORTUNE_PER_CROP_UPGRADE, FORTUNE_PER_FARMING_LEVEL, FORTUNE_PER_PLOT, } from '../constants/specific';
|
|
4
|
+
import { getCropDisplayName, getItemIdFromCrop } from '../util/names';
|
|
5
|
+
import { FarmingAccessory } from './farmingaccessory';
|
|
6
|
+
import { ArmorSet, FarmingArmor } from './farmingarmor';
|
|
7
|
+
import { FarmingPet } from './farmingpet';
|
|
8
|
+
import { FarmingTool } from './farmingtool';
|
|
9
|
+
import { LotusGear } from './lotusgear';
|
|
10
|
+
export function createFarmingPlayer(options) {
|
|
14
11
|
return new FarmingPlayer(options);
|
|
15
12
|
}
|
|
16
|
-
|
|
17
|
-
class FarmingPlayer {
|
|
13
|
+
export class FarmingPlayer {
|
|
18
14
|
constructor(options) {
|
|
19
15
|
this.options = options;
|
|
20
|
-
if (options.tools[0] instanceof
|
|
16
|
+
if (options.tools[0] instanceof FarmingTool) {
|
|
21
17
|
this.tools = options.tools;
|
|
18
|
+
for (const tool of this.tools) {
|
|
19
|
+
tool.setOptions(options);
|
|
20
|
+
}
|
|
22
21
|
}
|
|
23
22
|
else {
|
|
24
|
-
this.tools =
|
|
23
|
+
this.tools = FarmingTool.fromArray(options.tools, options);
|
|
25
24
|
}
|
|
26
|
-
|
|
25
|
+
this.selectedTool = this.options.selectedTool ?? this.tools[0];
|
|
26
|
+
if (options.pets[0] instanceof FarmingPet) {
|
|
27
27
|
this.pets = options.pets.sort((a, b) => b.fortune - a.fortune);
|
|
28
|
+
for (const pet of this.pets) {
|
|
29
|
+
pet.setOptions(options);
|
|
30
|
+
}
|
|
28
31
|
}
|
|
29
32
|
else {
|
|
30
|
-
this.pets =
|
|
33
|
+
this.pets = FarmingPet.fromArray(options.pets, options);
|
|
31
34
|
}
|
|
32
|
-
this.selectedPet = this.
|
|
33
|
-
if (options.armor[0] instanceof
|
|
35
|
+
this.selectedPet = this.options.selectedPet;
|
|
36
|
+
if (options.armor[0] instanceof FarmingArmor) {
|
|
34
37
|
this.armor = options.armor.sort((a, b) => b.fortune - a.fortune);
|
|
35
38
|
}
|
|
36
39
|
else {
|
|
37
|
-
this.armor =
|
|
40
|
+
this.armor = FarmingArmor.fromArray(options.armor, options);
|
|
38
41
|
}
|
|
39
|
-
this.armorSet = new
|
|
40
|
-
if (options.equipment[0] instanceof
|
|
42
|
+
this.armorSet = new ArmorSet(this.armor);
|
|
43
|
+
if (options.equipment[0] instanceof LotusGear) {
|
|
41
44
|
this.equipment = options.equipment.sort((a, b) => b.fortune - a.fortune);
|
|
42
45
|
}
|
|
43
46
|
else {
|
|
44
|
-
this.equipment =
|
|
47
|
+
this.equipment = LotusGear.fromArray(options.equipment, options);
|
|
45
48
|
}
|
|
46
|
-
if (options.accessories[0] instanceof
|
|
49
|
+
if (options.accessories[0] instanceof FarmingAccessory) {
|
|
47
50
|
this.accessories = options.accessories.sort((a, b) => b.fortune - a.fortune);
|
|
48
51
|
}
|
|
49
52
|
else {
|
|
50
|
-
this.accessories =
|
|
53
|
+
this.accessories = FarmingAccessory.fromArray(options.accessories);
|
|
51
54
|
}
|
|
52
55
|
this.fortune = this.getGeneralFortune();
|
|
53
56
|
}
|
|
54
57
|
changeArmor(armor) {
|
|
55
|
-
this.armorSet = new
|
|
58
|
+
this.armorSet = new ArmorSet(armor.sort((a, b) => b.fortune - a.fortune));
|
|
56
59
|
}
|
|
57
60
|
selectTool(tool) {
|
|
58
61
|
this.selectedTool = tool;
|
|
62
|
+
this.fortune = this.getGeneralFortune();
|
|
59
63
|
}
|
|
60
64
|
selectPet(pet) {
|
|
61
65
|
this.selectedPet = pet;
|
|
66
|
+
this.fortune = this.getGeneralFortune();
|
|
67
|
+
}
|
|
68
|
+
setStrength(strength) {
|
|
69
|
+
this.options.strength = strength;
|
|
70
|
+
for (const pet of this.pets) {
|
|
71
|
+
pet.fortune = pet.getFortune();
|
|
72
|
+
}
|
|
73
|
+
this.fortune = this.getGeneralFortune();
|
|
62
74
|
}
|
|
63
75
|
getGeneralFortune() {
|
|
64
76
|
let sum = 0;
|
|
65
77
|
const breakdown = {};
|
|
66
78
|
// Plots
|
|
67
|
-
const plots =
|
|
79
|
+
const plots = FORTUNE_PER_PLOT * (this.options.plotsUnlocked ?? 0);
|
|
68
80
|
if (plots > 0) {
|
|
69
81
|
breakdown['Unlocked Plots'] = plots;
|
|
70
82
|
sum += plots;
|
|
71
83
|
}
|
|
72
84
|
// Farming Level
|
|
73
|
-
const level =
|
|
85
|
+
const level = FORTUNE_PER_FARMING_LEVEL * (this.options.farmingLevel ?? 0);
|
|
74
86
|
if (level > 0) {
|
|
75
87
|
breakdown['Farming Level'] = level;
|
|
76
88
|
sum += level;
|
|
77
89
|
}
|
|
78
90
|
// Bestiary
|
|
79
91
|
if (this.options.bestiaryKills) {
|
|
80
|
-
const bestiary =
|
|
92
|
+
const bestiary = fortuneFromPestBestiary(this.options.bestiaryKills);
|
|
81
93
|
if (bestiary > 0) {
|
|
82
94
|
breakdown['Pest Bestiary'] = bestiary;
|
|
83
95
|
sum += bestiary;
|
|
@@ -96,13 +108,13 @@ class FarmingPlayer {
|
|
|
96
108
|
sum += lotusGear;
|
|
97
109
|
}
|
|
98
110
|
// Anita Bonus
|
|
99
|
-
const anitaBonus = (this.options.anitaBonus ?? 0) *
|
|
111
|
+
const anitaBonus = (this.options.anitaBonus ?? 0) * FORTUNE_PER_ANITA_BONUS;
|
|
100
112
|
if (anitaBonus > 0) {
|
|
101
113
|
breakdown['Anita Bonus Drops'] = anitaBonus;
|
|
102
114
|
sum += anitaBonus;
|
|
103
115
|
}
|
|
104
116
|
// Community Center
|
|
105
|
-
const communityCenter = (this.options.communityCenter ?? 0) *
|
|
117
|
+
const communityCenter = (this.options.communityCenter ?? 0) * FORTUNE_PER_COMMUNITY_CENTER;
|
|
106
118
|
if (communityCenter > 0) {
|
|
107
119
|
breakdown['Community Center'] = communityCenter;
|
|
108
120
|
sum += communityCenter;
|
|
@@ -130,16 +142,16 @@ class FarmingPlayer {
|
|
|
130
142
|
let sum = 0;
|
|
131
143
|
const breakdown = {};
|
|
132
144
|
// Crop upgrades
|
|
133
|
-
const upgrade =
|
|
145
|
+
const upgrade = FORTUNE_PER_CROP_UPGRADE * (this.options.cropUpgrades?.[crop] ?? 0);
|
|
134
146
|
if (upgrade > 0) {
|
|
135
147
|
breakdown['Crop Upgrade'] = upgrade;
|
|
136
148
|
sum += upgrade;
|
|
137
149
|
}
|
|
138
150
|
// Personal bests
|
|
139
|
-
const personalBest = this.options.personalBests?.[
|
|
140
|
-
this.options.personalBests?.[
|
|
151
|
+
const personalBest = this.options.personalBests?.[getItemIdFromCrop(crop)] ??
|
|
152
|
+
this.options.personalBests?.[getCropDisplayName(crop).replace(/ /g, '')];
|
|
141
153
|
if (personalBest) {
|
|
142
|
-
const fortune =
|
|
154
|
+
const fortune = fortuneFromPersonalBestContest(crop, personalBest);
|
|
143
155
|
if (fortune > 0) {
|
|
144
156
|
breakdown['Personal Best'] = fortune;
|
|
145
157
|
sum += fortune;
|
|
@@ -164,5 +176,4 @@ class FarmingPlayer {
|
|
|
164
176
|
};
|
|
165
177
|
}
|
|
166
178
|
}
|
|
167
|
-
exports.FarmingPlayer = FarmingPlayer;
|
|
168
179
|
//# sourceMappingURL=player.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"player.js","sourceRoot":"","sources":["../../src/classes/player.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"player.js","sourceRoot":"","sources":["../../src/classes/player.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const crops_1 = require("../constants/crops");
|
|
5
|
-
const weight_1 = require("../constants/weight");
|
|
6
|
-
function createFarmingWeightCalculator(info) {
|
|
1
|
+
import { Crop } from '../constants/crops';
|
|
2
|
+
import { BONUS_WEIGHT, CROP_WEIGHT, TIER_12_MINIONS } from '../constants/weight';
|
|
3
|
+
export function createFarmingWeightCalculator(info) {
|
|
7
4
|
return new FarmingWeight(info);
|
|
8
5
|
}
|
|
9
|
-
exports.createFarmingWeightCalculator = createFarmingWeightCalculator;
|
|
10
6
|
const crops = [
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
7
|
+
Crop.Cactus,
|
|
8
|
+
Crop.Carrot,
|
|
9
|
+
Crop.CocoaBeans,
|
|
10
|
+
Crop.Melon,
|
|
11
|
+
Crop.Mushroom,
|
|
12
|
+
Crop.NetherWart,
|
|
13
|
+
Crop.Potato,
|
|
14
|
+
Crop.Pumpkin,
|
|
15
|
+
Crop.SugarCane,
|
|
16
|
+
Crop.Wheat,
|
|
21
17
|
];
|
|
22
18
|
class FarmingWeight {
|
|
23
19
|
constructor(info) {
|
|
@@ -63,7 +59,7 @@ class FarmingWeight {
|
|
|
63
59
|
for (const minion of minions) {
|
|
64
60
|
if (!minion.endsWith('_12'))
|
|
65
61
|
continue;
|
|
66
|
-
if (!
|
|
62
|
+
if (!TIER_12_MINIONS.includes(minion))
|
|
67
63
|
continue;
|
|
68
64
|
this.tier12MinionCount++;
|
|
69
65
|
}
|
|
@@ -110,28 +106,28 @@ class FarmingWeight {
|
|
|
110
106
|
getBonusWeights = () => {
|
|
111
107
|
if (this.farmingXp >= 111_672_425 && this.levelCapUpgrade >= 10) {
|
|
112
108
|
// Farming 60 bonus
|
|
113
|
-
this.bonusSources['Farming 60'] =
|
|
109
|
+
this.bonusSources['Farming 60'] = BONUS_WEIGHT.Farming60Bonus;
|
|
114
110
|
}
|
|
115
111
|
else if (this.farmingXp >= 55_172_425) {
|
|
116
112
|
// Farming 50 bonus
|
|
117
|
-
this.bonusSources['Farming 50'] =
|
|
113
|
+
this.bonusSources['Farming 50'] = BONUS_WEIGHT.Farming50Bonus;
|
|
118
114
|
}
|
|
119
115
|
// Tier 12 minion bonus
|
|
120
116
|
if (this.tier12MinionCount > 0) {
|
|
121
|
-
this.bonusSources['Tier 12 Minions'] = this.tier12MinionCount *
|
|
117
|
+
this.bonusSources['Tier 12 Minions'] = this.tier12MinionCount * BONUS_WEIGHT.MinionRewardWeight;
|
|
122
118
|
}
|
|
123
119
|
// Anita bonus
|
|
124
120
|
if (this.anitaBonusFarmingFortuneLevel > 0) {
|
|
125
121
|
this.bonusSources['Anita Bonus'] =
|
|
126
|
-
this.anitaBonusFarmingFortuneLevel *
|
|
122
|
+
this.anitaBonusFarmingFortuneLevel * BONUS_WEIGHT.AnitaBuffBonusMultiplier;
|
|
127
123
|
}
|
|
128
|
-
if (this.earnedGoldMedals >
|
|
129
|
-
this.bonusSources['Gold Medals'] = Math.floor(
|
|
124
|
+
if (this.earnedGoldMedals > BONUS_WEIGHT.MaxMedalsCounted) {
|
|
125
|
+
this.bonusSources['Gold Medals'] = Math.floor(BONUS_WEIGHT.WeightPerGoldMedal * BONUS_WEIGHT.MaxMedalsCounted);
|
|
130
126
|
}
|
|
131
127
|
else {
|
|
132
128
|
const rewardCount = Math.floor((this.earnedGoldMedals / 50) * 50);
|
|
133
129
|
if (rewardCount > 0) {
|
|
134
|
-
this.bonusSources['Gold Medals'] = Math.floor(
|
|
130
|
+
this.bonusSources['Gold Medals'] = Math.floor(BONUS_WEIGHT.WeightPerGoldMedal * rewardCount);
|
|
135
131
|
}
|
|
136
132
|
}
|
|
137
133
|
return this.bonusSources;
|
|
@@ -142,9 +138,9 @@ class FarmingWeight {
|
|
|
142
138
|
let doubleBreakWeight = 0;
|
|
143
139
|
for (const crop of crops) {
|
|
144
140
|
const collected = this.collection[crop] ?? 0;
|
|
145
|
-
const weight = collected /
|
|
141
|
+
const weight = collected / CROP_WEIGHT[crop];
|
|
146
142
|
totalWeight += weight;
|
|
147
|
-
if (crop ===
|
|
143
|
+
if (crop === Crop.Cactus || crop === Crop.SugarCane) {
|
|
148
144
|
doubleBreakWeight += weight;
|
|
149
145
|
}
|
|
150
146
|
cropWeight[crop] = weight;
|
|
@@ -152,17 +148,17 @@ class FarmingWeight {
|
|
|
152
148
|
// Mushroom is a special case, it needs to be calculated dynamically based on the
|
|
153
149
|
// ratio between the farmed crops that give two mushrooms per break with cow pet
|
|
154
150
|
// and the farmed crops that give one mushroom per break with cow pet
|
|
155
|
-
const mushroomCollection = this.collection[
|
|
156
|
-
const mushroomWeightNumber =
|
|
151
|
+
const mushroomCollection = this.collection[Crop.Mushroom] ?? 0;
|
|
152
|
+
const mushroomWeightNumber = CROP_WEIGHT[Crop.Mushroom];
|
|
157
153
|
const doubleBreakRatio = doubleBreakWeight / totalWeight;
|
|
158
154
|
const normalCropRatio = (totalWeight - doubleBreakWeight) / totalWeight;
|
|
159
155
|
const mushroomWeight = doubleBreakRatio * (mushroomCollection / (mushroomWeightNumber * 2)) +
|
|
160
156
|
normalCropRatio * (mushroomCollection / mushroomWeightNumber);
|
|
161
|
-
cropWeight[
|
|
157
|
+
cropWeight[Crop.Mushroom] = mushroomWeight;
|
|
162
158
|
return cropWeight;
|
|
163
159
|
};
|
|
164
160
|
getCropWeight = (crop) => {
|
|
165
|
-
|
|
161
|
+
CROP_WEIGHT[crop];
|
|
166
162
|
};
|
|
167
163
|
}
|
|
168
164
|
//# sourceMappingURL=weightcalc.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"weightcalc.js","sourceRoot":"","sources":["../../src/classes/weightcalc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"weightcalc.js","sourceRoot":"","sources":["../../src/classes/weightcalc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const crops_1 = require("./crops");
|
|
5
|
-
const reforges_1 = require("./reforges");
|
|
6
|
-
exports.FARMING_ACCESSORIES_INFO = {
|
|
1
|
+
import { Crop } from './crops';
|
|
2
|
+
import { Rarity, Stat } from './reforges';
|
|
3
|
+
export const FARMING_ACCESSORIES_INFO = {
|
|
7
4
|
FERMENTO_ARTIFACT: {
|
|
8
5
|
name: 'Fermento Artifact',
|
|
9
6
|
wiki: 'https://wiki.hypixel.net/Fermento_Artifact',
|
|
10
7
|
family: 'Fermento',
|
|
11
|
-
maxRarity:
|
|
8
|
+
maxRarity: Rarity.Epic,
|
|
12
9
|
stats: {
|
|
13
|
-
[
|
|
10
|
+
[Stat.FarmingFortune]: 30,
|
|
14
11
|
},
|
|
15
12
|
},
|
|
16
13
|
SQUASH_RING: {
|
|
@@ -18,10 +15,10 @@ exports.FARMING_ACCESSORIES_INFO = {
|
|
|
18
15
|
wiki: 'https://wiki.hypixel.net/Squash_Ring',
|
|
19
16
|
family: 'Fermento',
|
|
20
17
|
upgrade: 'FERMENTO_ARTIFACT',
|
|
21
|
-
maxRarity:
|
|
22
|
-
crops: [
|
|
18
|
+
maxRarity: Rarity.Rare,
|
|
19
|
+
crops: [Crop.Wheat, Crop.Carrot, Crop.Potato, Crop.Pumpkin, Crop.Melon, Crop.Mushroom, Crop.CocoaBeans],
|
|
23
20
|
stats: {
|
|
24
|
-
[
|
|
21
|
+
[Stat.FarmingFortune]: 20,
|
|
25
22
|
},
|
|
26
23
|
},
|
|
27
24
|
CROPIE_TALISMAN: {
|
|
@@ -29,10 +26,10 @@ exports.FARMING_ACCESSORIES_INFO = {
|
|
|
29
26
|
wiki: 'https://wiki.hypixel.net/Cropie_Talisman',
|
|
30
27
|
family: 'Fermento',
|
|
31
28
|
upgrade: 'SQUASH_RING',
|
|
32
|
-
maxRarity:
|
|
33
|
-
crops: [
|
|
29
|
+
maxRarity: Rarity.Uncommon,
|
|
30
|
+
crops: [Crop.Wheat, Crop.Carrot, Crop.Potato],
|
|
34
31
|
stats: {
|
|
35
|
-
[
|
|
32
|
+
[Stat.FarmingFortune]: 10,
|
|
36
33
|
},
|
|
37
34
|
},
|
|
38
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessories.js","sourceRoot":"","sources":["../../src/constants/accessories.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accessories.js","sourceRoot":"","sources":["../../src/constants/accessories.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAc1C,MAAM,CAAC,MAAM,wBAAwB,GAAkD;IACtF,iBAAiB,EAAE;QAClB,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE,UAAU;QAClB,SAAS,EAAE,MAAM,CAAC,IAAI;QACtB,KAAK,EAAE;YACN,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;SACzB;KACD;IACD,WAAW,EAAE;QACZ,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,sCAAsC;QAC5C,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,mBAAmB;QAC5B,SAAS,EAAE,MAAM,CAAC,IAAI;QACtB,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC;QACvG,KAAK,EAAE;YACN,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;SACzB;KACD;IACD,eAAe,EAAE;QAChB,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,0CAA0C;QAChD,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,aAAa;QACtB,SAAS,EAAE,MAAM,CAAC,QAAQ;QAC1B,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QAC7C,KAAK,EAAE;YACN,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE;SACzB;KACD;CACD,CAAC"}
|