farming-weight 0.6.2 → 0.6.4
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/constants/crops.js +7 -10
- package/dist/constants/crops.js.map +1 -1
- package/dist/constants/enchants.d.ts +5 -4
- package/dist/constants/enchants.js +83 -86
- package/dist/constants/enchants.js.map +1 -1
- package/dist/constants/garden.d.ts +2 -2
- package/dist/constants/garden.js +100 -103
- package/dist/constants/garden.js.map +1 -1
- package/dist/constants/gems.d.ts +2 -2
- package/dist/constants/gems.js +39 -42
- package/dist/constants/gems.js.map +1 -1
- package/dist/constants/personalbests.d.ts +1 -1
- package/dist/constants/personalbests.js +17 -21
- package/dist/constants/personalbests.js.map +1 -1
- package/dist/constants/pests.d.ts +1 -1
- package/dist/constants/pests.js +32 -35
- package/dist/constants/pests.js.map +1 -1
- package/dist/constants/reforges.d.ts +1 -1
- package/dist/constants/reforges.js +162 -166
- 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.d.ts +1 -1
- package/dist/constants/specialcrops.js +19 -22
- package/dist/constants/specialcrops.js.map +1 -1
- package/dist/constants/specific.d.ts +1 -1
- package/dist/constants/specific.js +8 -11
- package/dist/constants/specific.js.map +1 -1
- package/dist/constants/stats.d.ts +1 -1
- package/dist/constants/stats.js +3 -7
- package/dist/constants/stats.js.map +1 -1
- package/dist/constants/tempfortune.js +1 -4
- package/dist/constants/tempfortune.js.map +1 -1
- package/dist/constants/upgrades.d.ts +6 -6
- package/dist/constants/upgrades.js +6 -9
- package/dist/constants/upgrades.js.map +1 -1
- package/dist/constants/weight.d.ts +1 -1
- package/dist/constants/weight.js +15 -18
- package/dist/constants/weight.js.map +1 -1
- package/dist/crops/melon.js +1 -5
- package/dist/crops/melon.js.map +1 -1
- package/dist/crops/pumpkin.js +1 -5
- package/dist/crops/pumpkin.js.map +1 -1
- package/dist/crops/special.d.ts +2 -2
- package/dist/crops/special.js +6 -10
- package/dist/crops/special.js.map +1 -1
- package/dist/fortune/farmingaccessory.d.ts +6 -6
- package/dist/fortune/farmingaccessory.js +12 -16
- package/dist/fortune/farmingaccessory.js.map +1 -1
- package/dist/fortune/farmingarmor.d.ts +12 -12
- package/dist/fortune/farmingarmor.js +79 -84
- package/dist/fortune/farmingarmor.js.map +1 -1
- package/dist/fortune/farmingequipment.d.ts +7 -7
- package/dist/fortune/farmingequipment.js +26 -30
- package/dist/fortune/farmingequipment.js.map +1 -1
- package/dist/fortune/farmingpet.d.ts +5 -5
- package/dist/fortune/farmingpet.js +29 -34
- package/dist/fortune/farmingpet.js.map +1 -1
- package/dist/fortune/farmingtool.d.ts +8 -8
- package/dist/fortune/farmingtool.js +30 -34
- package/dist/fortune/farmingtool.js.map +1 -1
- package/dist/fortune/item.js +2 -5
- package/dist/fortune/item.js.map +1 -1
- package/dist/fortune/upgradeable.d.ts +6 -6
- package/dist/fortune/upgradeable.js +11 -15
- package/dist/fortune/upgradeable.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +39 -54
- package/dist/index.js.map +1 -1
- package/dist/items/accessories.d.ts +4 -4
- package/dist/items/accessories.js +16 -19
- package/dist/items/accessories.js.map +1 -1
- package/dist/items/armor.d.ts +6 -6
- package/dist/items/armor.js +164 -167
- package/dist/items/armor.js.map +1 -1
- package/dist/items/equipment.d.ts +1 -1
- package/dist/items/equipment.js +39 -42
- package/dist/items/equipment.js.map +1 -1
- package/dist/items/pets.d.ts +5 -5
- package/dist/items/pets.js +53 -56
- package/dist/items/pets.js.map +1 -1
- package/dist/items/tools.d.ts +3 -3
- package/dist/items/tools.js +171 -174
- package/dist/items/tools.js.map +1 -1
- package/dist/player/player.d.ts +11 -63
- package/dist/player/player.js +54 -65
- package/dist/player/player.js.map +1 -1
- package/dist/player/playeroptions.d.ts +59 -0
- package/dist/player/playeroptions.js +7 -0
- package/dist/player/playeroptions.js.map +1 -0
- package/dist/upgrades/progress.d.ts +2 -2
- package/dist/upgrades/progress.js +4 -9
- package/dist/upgrades/progress.js.map +1 -1
- package/dist/upgrades/sources/accessorysources.d.ts +2 -2
- package/dist/upgrades/sources/accessorysources.js +10 -13
- package/dist/upgrades/sources/accessorysources.js.map +1 -1
- package/dist/upgrades/sources/armorsetsources.d.ts +2 -2
- package/dist/upgrades/sources/armorsetsources.js +25 -28
- package/dist/upgrades/sources/armorsetsources.js.map +1 -1
- package/dist/upgrades/sources/cropsources.d.ts +3 -3
- package/dist/upgrades/sources/cropsources.js +37 -40
- package/dist/upgrades/sources/cropsources.js.map +1 -1
- package/dist/upgrades/sources/gearsources.d.ts +3 -3
- package/dist/upgrades/sources/gearsources.js +30 -36
- package/dist/upgrades/sources/gearsources.js.map +1 -1
- package/dist/upgrades/sources/generalsources.d.ts +2 -2
- package/dist/upgrades/sources/generalsources.js +32 -35
- package/dist/upgrades/sources/generalsources.js.map +1 -1
- package/dist/upgrades/sources/toolsources.d.ts +5 -5
- package/dist/upgrades/sources/toolsources.js +28 -31
- package/dist/upgrades/sources/toolsources.js.map +1 -1
- package/dist/upgrades/upgrades.d.ts +4 -4
- package/dist/upgrades/upgrades.js +51 -63
- package/dist/upgrades/upgrades.js.map +1 -1
- package/dist/util/enchants.d.ts +3 -3
- package/dist/util/enchants.js +7 -12
- package/dist/util/enchants.js.map +1 -1
- package/dist/util/garden.d.ts +3 -3
- package/dist/util/garden.js +18 -29
- package/dist/util/garden.js.map +1 -1
- package/dist/util/gems.d.ts +2 -2
- package/dist/util/gems.js +19 -27
- package/dist/util/gems.js.map +1 -1
- package/dist/util/itemstats.d.ts +1 -1
- package/dist/util/itemstats.js +51 -57
- 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 -2
- package/dist/util/names.js +80 -89
- package/dist/util/names.js.map +1 -1
- package/dist/util/pests.d.ts +1 -1
- package/dist/util/pests.js +13 -20
- package/dist/util/pests.js.map +1 -1
- package/dist/util/ratecalc.d.ts +1 -1
- 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/dist/weight/weightcalc.d.ts +1 -1
- package/dist/weight/weightcalc.js +35 -39
- package/dist/weight/weightcalc.js.map +1 -1
- package/package.json +3 -1
|
@@ -1,22 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const item_1 = require("../../fortune/item");
|
|
7
|
-
const gems_1 = require("../../util/gems");
|
|
8
|
-
exports.ACCESSORY_FORTUNE_SOURCES = [
|
|
1
|
+
import { Rarity } from "../../constants/reforges.js";
|
|
2
|
+
import { Stat } from "../../constants/stats.js";
|
|
3
|
+
import { GemRarity } from "../../fortune/item.js";
|
|
4
|
+
import { getPeridotFortune, getPeridotGemFortune } from "../../util/gems.js";
|
|
5
|
+
export const ACCESSORY_FORTUNE_SOURCES = [
|
|
9
6
|
{
|
|
10
7
|
name: 'Base Stats',
|
|
11
8
|
wiki: (accessory) => accessory.info.wiki,
|
|
12
9
|
exists: (accessory) => {
|
|
13
|
-
return (accessory.getLastItemUpgrade() ?? accessory)?.info?.baseStats?.[
|
|
10
|
+
return (accessory.getLastItemUpgrade() ?? accessory)?.info?.baseStats?.[Stat.FarmingFortune] !== undefined;
|
|
14
11
|
},
|
|
15
12
|
max: (accessory) => {
|
|
16
|
-
return (accessory.getLastItemUpgrade() ?? accessory)?.info?.baseStats?.[
|
|
13
|
+
return (accessory.getLastItemUpgrade() ?? accessory)?.info?.baseStats?.[Stat.FarmingFortune] ?? 0;
|
|
17
14
|
},
|
|
18
15
|
current: (accessory) => {
|
|
19
|
-
return accessory.info.baseStats?.[
|
|
16
|
+
return accessory.info.baseStats?.[Stat.FarmingFortune] ?? 0;
|
|
20
17
|
}
|
|
21
18
|
},
|
|
22
19
|
{
|
|
@@ -28,10 +25,10 @@ exports.ACCESSORY_FORTUNE_SOURCES = [
|
|
|
28
25
|
},
|
|
29
26
|
max: (accessory) => {
|
|
30
27
|
const last = (accessory.getLastItemUpgrade() ?? accessory)?.info;
|
|
31
|
-
return 0.5 * (last?.gemSlots?.peridot ?? 0) *
|
|
28
|
+
return 0.5 * (last?.gemSlots?.peridot ?? 0) * getPeridotGemFortune(last?.maxRarity ?? Rarity.Common, GemRarity.Perfect);
|
|
32
29
|
},
|
|
33
30
|
current: (accessory) => {
|
|
34
|
-
return 0.5 *
|
|
31
|
+
return 0.5 * getPeridotFortune(accessory.rarity, accessory.item);
|
|
35
32
|
}
|
|
36
33
|
}
|
|
37
34
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessorysources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/accessorysources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accessorysources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/accessorysources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAG7E,MAAM,CAAC,MAAM,yBAAyB,GAA6C;IAClF;QACC,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;QACxC,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE;YACrB,OAAO,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,SAAS,CAAA;QAC3G,CAAC;QACD,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE;YAClB,OAAO,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACnG,CAAC;QACD,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE;YACtB,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC;KACD;IACD;QACC,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,GAAG,EAAE,CAAC,kDAAkD;QAC9D,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE;YACrB,MAAM,IAAI,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,SAAS,CAAC,EAAE,IAAI,CAAC;YACjE,OAAO,IAAI,EAAE,QAAQ,EAAE,OAAO,KAAK,SAAS,CAAA;QAC7C,CAAC;QACD,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE;YAClB,MAAM,IAAI,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,SAAS,CAAC,EAAE,IAAI,CAAC;YACjE,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,IAAI,CAAC,CAAC,GAAG,oBAAoB,CAAC,IAAI,EAAE,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QACzH,CAAC;QACD,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE;YACtB,OAAO,GAAG,GAAG,iBAAiB,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAClE,CAAC;KACD;CACD,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { ArmorSet } from "../../fortune/farmingarmor";
|
|
2
|
-
import { DynamicFortuneSource } from "./toolsources";
|
|
1
|
+
import { ArmorSet } from "../../fortune/farmingarmor.js";
|
|
2
|
+
import { DynamicFortuneSource } from "./toolsources.js";
|
|
3
3
|
export declare const ARMOR_SET_FORTUNE_SOURCES: DynamicFortuneSource<ArmorSet>[];
|
|
@@ -1,27 +1,24 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
exports.ARMOR_SET_FORTUNE_SOURCES = [
|
|
11
|
-
...Object.entries(armor_1.GEAR_SLOTS)
|
|
12
|
-
.filter(([, info]) => info.target === reforges_1.ReforgeTarget.Armor)
|
|
1
|
+
import { ARMOR_INFO, ARMOR_SET_BONUS, GEAR_SLOTS } from "../../items/armor.js";
|
|
2
|
+
import { EQUIPMENT_INFO } from "../../items/equipment.js";
|
|
3
|
+
import { ReforgeTarget } from "../../constants/reforges.js";
|
|
4
|
+
import { Stat } from "../../constants/stats.js";
|
|
5
|
+
import { FarmingArmor } from "../../fortune/farmingarmor.js";
|
|
6
|
+
import { FarmingEquipment } from "../../fortune/farmingequipment.js";
|
|
7
|
+
export const ARMOR_SET_FORTUNE_SOURCES = [
|
|
8
|
+
...Object.entries(GEAR_SLOTS)
|
|
9
|
+
.filter(([, info]) => info.target === ReforgeTarget.Armor)
|
|
13
10
|
.map(gearslot),
|
|
14
11
|
{
|
|
15
12
|
name: 'Armor Set Bonus',
|
|
16
13
|
exists: () => true,
|
|
17
14
|
wiki: () => 'https://wiki.hypixel.net/Fermento_Armor#Four_Pieces_',
|
|
18
|
-
max: () =>
|
|
15
|
+
max: () => ARMOR_SET_BONUS.FERMENTO?.stats[4]?.[Stat.FarmingFortune] ?? 0,
|
|
19
16
|
current: (set) => set.setBonuses.reduce((acc, bonus) => {
|
|
20
|
-
return acc + (bonus.bonus.stats[bonus.count]?.[
|
|
17
|
+
return acc + (bonus.bonus.stats[bonus.count]?.[Stat.FarmingFortune] ?? 0);
|
|
21
18
|
}, 0)
|
|
22
19
|
},
|
|
23
|
-
...Object.entries(
|
|
24
|
-
.filter(([, info]) => info.target ===
|
|
20
|
+
...Object.entries(GEAR_SLOTS)
|
|
21
|
+
.filter(([, info]) => info.target === ReforgeTarget.Equipment)
|
|
25
22
|
.map(gearslot),
|
|
26
23
|
];
|
|
27
24
|
function gearslot([slot, info]) {
|
|
@@ -30,14 +27,14 @@ function gearslot([slot, info]) {
|
|
|
30
27
|
exists: () => true,
|
|
31
28
|
wiki: (set) => {
|
|
32
29
|
const current = set.getPiece(slot);
|
|
33
|
-
return current?.info.wiki ?? (info.target ===
|
|
34
|
-
?
|
|
35
|
-
:
|
|
30
|
+
return current?.info.wiki ?? (info.target === ReforgeTarget.Armor
|
|
31
|
+
? ARMOR_INFO[info.startingItem]?.wiki
|
|
32
|
+
: EQUIPMENT_INFO[info.startingItem]?.wiki);
|
|
36
33
|
},
|
|
37
34
|
max: () => {
|
|
38
|
-
const item = info.target ===
|
|
39
|
-
?
|
|
40
|
-
:
|
|
35
|
+
const item = info.target === ReforgeTarget.Armor
|
|
36
|
+
? FarmingArmor.fakeItem(ARMOR_INFO[info.startingItem])
|
|
37
|
+
: FarmingEquipment.fakeItem(EQUIPMENT_INFO[info.startingItem]);
|
|
41
38
|
const progress = item?.getProgress();
|
|
42
39
|
const maxed = progress?.reduce((acc, p) => acc + p.maxFortune, 0) ?? 0;
|
|
43
40
|
return maxed;
|
|
@@ -51,17 +48,17 @@ function gearslot([slot, info]) {
|
|
|
51
48
|
const item = set.getPiece(slot);
|
|
52
49
|
if (item)
|
|
53
50
|
return item.getProgress();
|
|
54
|
-
const fake = info.target ===
|
|
55
|
-
?
|
|
56
|
-
:
|
|
51
|
+
const fake = info.target === ReforgeTarget.Armor
|
|
52
|
+
? FarmingArmor.fakeItem(ARMOR_INFO[info.startingItem])
|
|
53
|
+
: FarmingEquipment.fakeItem(EQUIPMENT_INFO[info.startingItem]);
|
|
57
54
|
return fake?.getProgress(true) ?? [];
|
|
58
55
|
},
|
|
59
56
|
info: (set) => {
|
|
60
57
|
const piece = set.getPiece(slot);
|
|
61
58
|
const fake = !piece
|
|
62
|
-
? info.target ===
|
|
63
|
-
?
|
|
64
|
-
:
|
|
59
|
+
? info.target === ReforgeTarget.Armor
|
|
60
|
+
? FarmingArmor.fakeItem(ARMOR_INFO[info.startingItem])
|
|
61
|
+
: FarmingEquipment.fakeItem(EQUIPMENT_INFO[info.startingItem])
|
|
65
62
|
: undefined;
|
|
66
63
|
return {
|
|
67
64
|
item: piece?.item,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"armorsetsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/armorsetsources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"armorsetsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/armorsetsources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Crop } from "../../constants/crops";
|
|
2
|
-
import { FarmingPlayer } from "../../player/player";
|
|
3
|
-
import { DynamicFortuneSource } from "./toolsources";
|
|
1
|
+
import { Crop } from "../../constants/crops.js";
|
|
2
|
+
import { FarmingPlayer } from "../../player/player.js";
|
|
3
|
+
import { DynamicFortuneSource } from "./toolsources.js";
|
|
4
4
|
export declare const CROP_FORTUNE_SOURCES: DynamicFortuneSource<{
|
|
5
5
|
player: FarmingPlayer;
|
|
6
6
|
crop: Crop;
|
|
@@ -1,26 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const
|
|
10
|
-
const personalbests_1 = require("../../constants/personalbests");
|
|
11
|
-
const names_1 = require("../../util/names");
|
|
12
|
-
exports.CROP_FORTUNE_SOURCES = [
|
|
1
|
+
import { FARMING_ACCESSORIES_INFO } from "../../items/accessories.js";
|
|
2
|
+
import { Crop, CROP_INFO, EXPORTABLE_CROP_FORTUNE } from "../../constants/crops.js";
|
|
3
|
+
import { COCOA_FORTUNE_UPGRADE, GARDEN_CROP_UPGRADES } from "../../constants/specific.js";
|
|
4
|
+
import { Stat } from "../../constants/stats.js";
|
|
5
|
+
import { FARMING_TOOLS } from "../../items/tools.js";
|
|
6
|
+
import { FarmingTool } from "../../fortune/farmingtool.js";
|
|
7
|
+
import { fortuneFromPersonalBestContest } from "../../constants/personalbests.js";
|
|
8
|
+
import { getCropDisplayName, getItemIdFromCrop } from "../../util/names.js";
|
|
9
|
+
export const CROP_FORTUNE_SOURCES = [
|
|
13
10
|
{
|
|
14
11
|
name: 'Farming Tool',
|
|
15
12
|
exists: () => true,
|
|
16
13
|
wiki: ({ player, crop }) => {
|
|
17
|
-
return player.getSelectedCropTool(crop)?.info.wiki ??
|
|
14
|
+
return player.getSelectedCropTool(crop)?.info.wiki ?? FARMING_TOOLS[CROP_INFO[crop].startingTool]?.wiki;
|
|
18
15
|
},
|
|
19
16
|
max: ({ crop }) => {
|
|
20
|
-
const tool =
|
|
17
|
+
const tool = FARMING_TOOLS[CROP_INFO[crop].startingTool];
|
|
21
18
|
if (!tool)
|
|
22
19
|
return 0;
|
|
23
|
-
const progress =
|
|
20
|
+
const progress = FarmingTool.fakeItem(tool)?.getProgress();
|
|
24
21
|
return progress?.reduce((acc, p) => acc + p.maxFortune, 0) ?? 0;
|
|
25
22
|
},
|
|
26
23
|
current: ({ player, crop }) => {
|
|
@@ -32,14 +29,14 @@ exports.CROP_FORTUNE_SOURCES = [
|
|
|
32
29
|
const tool = player.getSelectedCropTool(crop);
|
|
33
30
|
if (tool)
|
|
34
31
|
return tool.getProgress();
|
|
35
|
-
const fake =
|
|
32
|
+
const fake = FarmingTool.fakeItem(FARMING_TOOLS[CROP_INFO[crop].startingTool]);
|
|
36
33
|
return fake?.getProgress(true) ?? [];
|
|
37
34
|
},
|
|
38
35
|
info: ({ player, crop }) => {
|
|
39
36
|
const tool = player.selectedTool?.crop === crop
|
|
40
37
|
? player.selectedTool
|
|
41
38
|
: player.getSelectedCropTool(crop);
|
|
42
|
-
const fake = !tool ?
|
|
39
|
+
const fake = !tool ? FarmingTool.fakeItem(FARMING_TOOLS[CROP_INFO[crop].startingTool]) : undefined;
|
|
43
40
|
return {
|
|
44
41
|
item: tool?.item,
|
|
45
42
|
info: tool?.info,
|
|
@@ -52,55 +49,55 @@ exports.CROP_FORTUNE_SOURCES = [
|
|
|
52
49
|
name: 'Exportable Crop',
|
|
53
50
|
api: false,
|
|
54
51
|
wiki: () => 'https://wiki.hypixel.net/Carrolyn',
|
|
55
|
-
exists: ({ crop }) =>
|
|
56
|
-
max: () =>
|
|
52
|
+
exists: ({ crop }) => CROP_INFO[crop].exportable === true,
|
|
53
|
+
max: () => EXPORTABLE_CROP_FORTUNE,
|
|
57
54
|
current: ({ player, crop }) => {
|
|
58
|
-
return player.options.exportableCrops?.[crop] ?
|
|
55
|
+
return player.options.exportableCrops?.[crop] ? EXPORTABLE_CROP_FORTUNE : 0;
|
|
59
56
|
}
|
|
60
57
|
},
|
|
61
58
|
{
|
|
62
|
-
name:
|
|
59
|
+
name: GARDEN_CROP_UPGRADES.name,
|
|
63
60
|
exists: () => true,
|
|
64
|
-
wiki: () =>
|
|
65
|
-
max: () =>
|
|
61
|
+
wiki: () => GARDEN_CROP_UPGRADES.wiki,
|
|
62
|
+
max: () => GARDEN_CROP_UPGRADES.fortunePerLevel * GARDEN_CROP_UPGRADES.maxLevel,
|
|
66
63
|
current: ({ player, crop }) => {
|
|
67
|
-
return (player.options.cropUpgrades?.[crop] ?? 0) *
|
|
64
|
+
return (player.options.cropUpgrades?.[crop] ?? 0) * GARDEN_CROP_UPGRADES.fortunePerLevel;
|
|
68
65
|
}
|
|
69
66
|
},
|
|
70
67
|
{
|
|
71
|
-
name:
|
|
72
|
-
exists: ({ crop }) => crop ===
|
|
73
|
-
wiki: () =>
|
|
74
|
-
max: () =>
|
|
68
|
+
name: COCOA_FORTUNE_UPGRADE.name,
|
|
69
|
+
exists: ({ crop }) => crop === Crop.CocoaBeans,
|
|
70
|
+
wiki: () => COCOA_FORTUNE_UPGRADE.wiki,
|
|
71
|
+
max: () => COCOA_FORTUNE_UPGRADE.fortunePerLevel * COCOA_FORTUNE_UPGRADE.maxLevel,
|
|
75
72
|
current: ({ player }) => {
|
|
76
|
-
return (player.options.cocoaFortuneUpgrade ?? 0) *
|
|
73
|
+
return (player.options.cocoaFortuneUpgrade ?? 0) * COCOA_FORTUNE_UPGRADE.fortunePerLevel;
|
|
77
74
|
}
|
|
78
75
|
},
|
|
79
76
|
{
|
|
80
77
|
name: 'Fermento Artifact Family',
|
|
81
78
|
exists: () => true,
|
|
82
79
|
wiki: ({ player }) => {
|
|
83
|
-
const highest = player.activeAccessories.find(a => a.info.family ===
|
|
84
|
-
return highest?.info.wiki ??
|
|
80
|
+
const highest = player.activeAccessories.find(a => a.info.family === FARMING_ACCESSORIES_INFO.FERMENTO_ARTIFACT?.family);
|
|
81
|
+
return highest?.info.wiki ?? FARMING_ACCESSORIES_INFO.CROPIE_TALISMAN?.wiki;
|
|
85
82
|
},
|
|
86
|
-
max: () =>
|
|
83
|
+
max: () => FARMING_ACCESSORIES_INFO.FERMENTO_ARTIFACT?.baseStats?.[Stat.FarmingFortune] ?? 0,
|
|
87
84
|
current: ({ player, crop }) => {
|
|
88
|
-
const highest = player.activeAccessories.find(a => a.info.family ===
|
|
85
|
+
const highest = player.activeAccessories.find(a => a.info.family === FARMING_ACCESSORIES_INFO.FERMENTO_ARTIFACT?.family);
|
|
89
86
|
if (!highest)
|
|
90
87
|
return 0;
|
|
91
88
|
if (highest.info.crops && !highest.info.crops.includes(crop)) {
|
|
92
89
|
return 0;
|
|
93
90
|
}
|
|
94
|
-
return highest.info.baseStats?.[
|
|
91
|
+
return highest.info.baseStats?.[Stat.FarmingFortune] ?? 0;
|
|
95
92
|
},
|
|
96
93
|
info: ({ player }) => {
|
|
97
|
-
const highest = player.activeAccessories.find(a => a.info.family ===
|
|
98
|
-
const first = !highest ?
|
|
94
|
+
const highest = player.activeAccessories.find(a => a.info.family === FARMING_ACCESSORIES_INFO.FERMENTO_ARTIFACT?.family);
|
|
95
|
+
const first = !highest ? FARMING_ACCESSORIES_INFO.CROPIE_TALISMAN : undefined;
|
|
99
96
|
return {
|
|
100
97
|
item: highest?.item,
|
|
101
98
|
info: highest?.info,
|
|
102
99
|
nextInfo: first ?? highest?.getNextItemUpgrade()?.info,
|
|
103
|
-
maxInfo: highest?.getLastItemUpgrade()?.info ??
|
|
100
|
+
maxInfo: highest?.getLastItemUpgrade()?.info ?? FARMING_ACCESSORIES_INFO.FERMENTO_ARTIFACT
|
|
104
101
|
};
|
|
105
102
|
},
|
|
106
103
|
},
|
|
@@ -110,9 +107,9 @@ exports.CROP_FORTUNE_SOURCES = [
|
|
|
110
107
|
wiki: () => 'https://wiki.hypixel.net/Anita#Personal_Bests',
|
|
111
108
|
max: () => 100,
|
|
112
109
|
current: ({ player, crop }) => {
|
|
113
|
-
const personalBest = player.options.personalBests?.[
|
|
114
|
-
player.options.personalBests?.[
|
|
115
|
-
return
|
|
110
|
+
const personalBest = player.options.personalBests?.[getItemIdFromCrop(crop)] ??
|
|
111
|
+
player.options.personalBests?.[getCropDisplayName(crop).replace(/ /g, '')];
|
|
112
|
+
return fortuneFromPersonalBestContest(crop, personalBest ?? 0);
|
|
116
113
|
}
|
|
117
114
|
}
|
|
118
115
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cropsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/cropsources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cropsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/cropsources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FarmingArmor } from "../../fortune/farmingarmor";
|
|
2
|
-
import { FarmingEquipment } from "../../fortune/farmingequipment";
|
|
3
|
-
import { DynamicFortuneSource } from "./toolsources";
|
|
1
|
+
import type { FarmingArmor } from "../../fortune/farmingarmor.js";
|
|
2
|
+
import { FarmingEquipment } from "../../fortune/farmingequipment.js";
|
|
3
|
+
import { DynamicFortuneSource } from "./toolsources.js";
|
|
4
4
|
export declare const GEAR_FORTUNE_SOURCES: DynamicFortuneSource<FarmingArmor | FarmingEquipment>[];
|
|
@@ -1,43 +1,39 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
const item_1 = require("../../fortune/item");
|
|
10
|
-
const enchants_2 = require("../../util/enchants");
|
|
11
|
-
const gems_1 = require("../../util/gems");
|
|
12
|
-
exports.GEAR_FORTUNE_SOURCES = [
|
|
1
|
+
import { FARMING_ENCHANTS } from "../../constants/enchants.js";
|
|
2
|
+
import { Rarity, REFORGES, ReforgeTarget } from "../../constants/reforges.js";
|
|
3
|
+
import { Skill } from "../../constants/skills.js";
|
|
4
|
+
import { Stat } from "../../constants/stats.js";
|
|
5
|
+
import { GemRarity } from "../../fortune/item.js";
|
|
6
|
+
import { getFortuneFromEnchant, getMaxFortuneFromEnchant } from "../../util/enchants.js";
|
|
7
|
+
import { getPeridotFortune, getPeridotGemFortune } from "../../util/gems.js";
|
|
8
|
+
export const GEAR_FORTUNE_SOURCES = [
|
|
13
9
|
{
|
|
14
10
|
name: 'Base Stats',
|
|
15
11
|
exists: (gear) => {
|
|
16
|
-
return (gear.getLastItemUpgrade() ?? gear)?.info?.baseStats?.[
|
|
12
|
+
return (gear.getLastItemUpgrade() ?? gear)?.info?.baseStats?.[Stat.FarmingFortune] !== undefined;
|
|
17
13
|
},
|
|
18
14
|
max: (gear) => {
|
|
19
|
-
return (gear.getLastItemUpgrade() ?? gear)?.info?.baseStats?.[
|
|
15
|
+
return (gear.getLastItemUpgrade() ?? gear)?.info?.baseStats?.[Stat.FarmingFortune] ?? 0;
|
|
20
16
|
},
|
|
21
17
|
current: (gear) => {
|
|
22
|
-
return gear.info.baseStats?.[
|
|
18
|
+
return gear.info.baseStats?.[Stat.FarmingFortune] ?? 0;
|
|
23
19
|
}
|
|
24
20
|
},
|
|
25
21
|
{
|
|
26
22
|
name: 'Reforge Stats',
|
|
27
23
|
exists: () => true,
|
|
28
24
|
wiki: (gear) => {
|
|
29
|
-
return gear.type ===
|
|
30
|
-
?
|
|
31
|
-
:
|
|
25
|
+
return gear.type === ReforgeTarget.Equipment
|
|
26
|
+
? REFORGES?.rooted?.wiki
|
|
27
|
+
: REFORGES?.mossy?.wiki;
|
|
32
28
|
},
|
|
33
29
|
max: (gear) => {
|
|
34
30
|
const maxRarity = (gear.getLastItemUpgrade()?.info.maxRarity ?? gear.info.maxRarity);
|
|
35
|
-
return gear.type ===
|
|
36
|
-
?
|
|
37
|
-
:
|
|
31
|
+
return gear.type === ReforgeTarget.Equipment
|
|
32
|
+
? REFORGES.rooted?.tiers[maxRarity]?.stats[Stat.FarmingFortune] ?? 0
|
|
33
|
+
: REFORGES.mossy?.tiers[maxRarity]?.stats[Stat.FarmingFortune] ?? 0;
|
|
38
34
|
},
|
|
39
35
|
current: (gear) => {
|
|
40
|
-
return gear.reforgeStats?.stats?.[
|
|
36
|
+
return gear.reforgeStats?.stats?.[Stat.FarmingFortune] ?? 0;
|
|
41
37
|
}
|
|
42
38
|
},
|
|
43
39
|
{
|
|
@@ -49,45 +45,43 @@ exports.GEAR_FORTUNE_SOURCES = [
|
|
|
49
45
|
},
|
|
50
46
|
max: (gear) => {
|
|
51
47
|
const last = (gear.getLastItemUpgrade() ?? gear)?.info;
|
|
52
|
-
return (last?.gemSlots?.peridot ?? 0) *
|
|
48
|
+
return (last?.gemSlots?.peridot ?? 0) * getPeridotGemFortune(last?.maxRarity ?? Rarity.Common, GemRarity.Perfect);
|
|
53
49
|
},
|
|
54
50
|
current: (gear) => {
|
|
55
|
-
return
|
|
51
|
+
return getPeridotFortune(gear.rarity, gear.item);
|
|
56
52
|
}
|
|
57
53
|
},
|
|
58
54
|
{
|
|
59
55
|
name: 'Salesperson Ability',
|
|
60
56
|
wiki: (gear) => gear.info.wiki,
|
|
61
|
-
exists: (gear) => gear.type ===
|
|
57
|
+
exists: (gear) => gear.type === ReforgeTarget.Equipment && gear.info.family === 'LOTUS',
|
|
62
58
|
max: () => 15,
|
|
63
59
|
current: (gear) => {
|
|
64
|
-
if (gear instanceof farmingarmor_1.FarmingArmor)
|
|
65
|
-
return 0;
|
|
66
60
|
return gear.getPieceBonus();
|
|
67
61
|
}
|
|
68
62
|
},
|
|
69
63
|
{
|
|
70
64
|
name: 'Farming Level',
|
|
71
65
|
wiki: (gear) => gear.info.wiki,
|
|
72
|
-
exists: (gear) => gear.type ===
|
|
66
|
+
exists: (gear) => gear.type === ReforgeTarget.Armor && gear.info.perLevelStats?.skill === Skill.Farming,
|
|
73
67
|
max: (gear) => {
|
|
74
68
|
const last = (gear.getLastItemUpgrade() ?? gear)?.info;
|
|
75
|
-
return 'perLevelStats' in last && last.perLevelStats?.skill ===
|
|
76
|
-
? (last?.perLevelStats?.stats[
|
|
77
|
-
: (gear.info?.perLevelStats?.stats[
|
|
69
|
+
return 'perLevelStats' in last && last.perLevelStats?.skill === Skill.Farming
|
|
70
|
+
? (last?.perLevelStats?.stats[Stat.FarmingFortune] ?? 0) * 60
|
|
71
|
+
: (gear.info?.perLevelStats?.stats[Stat.FarmingFortune] ?? 0) * 60;
|
|
78
72
|
},
|
|
79
73
|
current: (gear) => {
|
|
80
|
-
return (gear.info.perLevelStats?.stats[
|
|
74
|
+
return (gear.info.perLevelStats?.stats[Stat.FarmingFortune] ?? 0) * (gear.options?.farmingLevel ?? 0);
|
|
81
75
|
}
|
|
82
76
|
},
|
|
83
|
-
...Object.entries(
|
|
84
|
-
.filter(([, enchant]) => enchant.appliesTo.includes(
|
|
77
|
+
...Object.entries(FARMING_ENCHANTS)
|
|
78
|
+
.filter(([, enchant]) => enchant.appliesTo.includes(ReforgeTarget.Armor) || enchant.appliesTo.includes(ReforgeTarget.Equipment))
|
|
85
79
|
.map(([id, enchant]) => ({
|
|
86
80
|
name: enchant.name,
|
|
87
81
|
wiki: () => enchant.wiki,
|
|
88
82
|
exists: (gear) => enchant.appliesTo.includes(gear.type),
|
|
89
|
-
max: (gear) =>
|
|
90
|
-
current: (gear) =>
|
|
83
|
+
max: (gear) => getMaxFortuneFromEnchant(enchant, gear.options),
|
|
84
|
+
current: (gear) => getFortuneFromEnchant(gear.item.enchantments?.[id] ?? 0, enchant, gear.options),
|
|
91
85
|
}))
|
|
92
86
|
];
|
|
93
87
|
//# sourceMappingURL=gearsources.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gearsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/gearsources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gearsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/gearsources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { FarmingPlayer } from "../../player/player";
|
|
2
|
-
import { DynamicFortuneSource } from "./toolsources";
|
|
1
|
+
import { FarmingPlayer } from "../../player/player.js";
|
|
2
|
+
import { DynamicFortuneSource } from "./toolsources.js";
|
|
3
3
|
export declare const GENERAL_FORTUNE_SOURCES: DynamicFortuneSource<FarmingPlayer>[];
|