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,72 +1,69 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const accessories_1 = require("../../items/accessories");
|
|
7
|
-
const pests_1 = require("../../util/pests");
|
|
8
|
-
exports.GENERAL_FORTUNE_SOURCES = [
|
|
1
|
+
import { ANITA_FORTUNE_UPGRADE, COMMUNITY_CENTER_UPGRADE, FARMING_LEVEL, PEST_BESTIARY_SOURCE, REFINED_TRUFFLE_SOURCE, UNLOCKED_PLOTS } from "../../constants/specific.js";
|
|
2
|
+
import { FarmingAccessory } from "../../fortune/farmingaccessory.js";
|
|
3
|
+
import { FARMING_ACCESSORIES_INFO } from "../../items/accessories.js";
|
|
4
|
+
import { fortuneFromPestBestiary } from "../../util/pests.js";
|
|
5
|
+
export const GENERAL_FORTUNE_SOURCES = [
|
|
9
6
|
{
|
|
10
|
-
name:
|
|
11
|
-
wiki: () =>
|
|
7
|
+
name: FARMING_LEVEL.name,
|
|
8
|
+
wiki: () => FARMING_LEVEL.wiki,
|
|
12
9
|
exists: () => true,
|
|
13
|
-
max: () =>
|
|
10
|
+
max: () => FARMING_LEVEL.maxLevel * FARMING_LEVEL.fortunePerLevel,
|
|
14
11
|
current: (player) => {
|
|
15
|
-
return (player.options.farmingLevel ?? 0) *
|
|
12
|
+
return (player.options.farmingLevel ?? 0) * FARMING_LEVEL.fortunePerLevel;
|
|
16
13
|
}
|
|
17
14
|
},
|
|
18
15
|
{
|
|
19
|
-
name:
|
|
20
|
-
wiki: () =>
|
|
16
|
+
name: PEST_BESTIARY_SOURCE.name,
|
|
17
|
+
wiki: () => PEST_BESTIARY_SOURCE.wiki,
|
|
21
18
|
exists: () => true,
|
|
22
|
-
max: () =>
|
|
19
|
+
max: () => PEST_BESTIARY_SOURCE.maxLevel * PEST_BESTIARY_SOURCE.fortunePerLevel,
|
|
23
20
|
current: (player) => {
|
|
24
|
-
return
|
|
21
|
+
return fortuneFromPestBestiary(player.options.bestiaryKills ?? {});
|
|
25
22
|
}
|
|
26
23
|
},
|
|
27
24
|
{
|
|
28
|
-
name:
|
|
29
|
-
wiki: () =>
|
|
25
|
+
name: ANITA_FORTUNE_UPGRADE.name,
|
|
26
|
+
wiki: () => ANITA_FORTUNE_UPGRADE.wiki,
|
|
30
27
|
exists: () => true,
|
|
31
|
-
max: () =>
|
|
28
|
+
max: () => ANITA_FORTUNE_UPGRADE.maxLevel * ANITA_FORTUNE_UPGRADE.fortunePerLevel,
|
|
32
29
|
current: (player) => {
|
|
33
|
-
return (player.options.anitaBonus ?? 0) *
|
|
30
|
+
return (player.options.anitaBonus ?? 0) * ANITA_FORTUNE_UPGRADE.fortunePerLevel;
|
|
34
31
|
}
|
|
35
32
|
},
|
|
36
33
|
{
|
|
37
|
-
name:
|
|
38
|
-
wiki: () =>
|
|
34
|
+
name: UNLOCKED_PLOTS.name,
|
|
35
|
+
wiki: () => UNLOCKED_PLOTS.wiki,
|
|
39
36
|
exists: () => true,
|
|
40
|
-
max: () =>
|
|
37
|
+
max: () => UNLOCKED_PLOTS.maxLevel * UNLOCKED_PLOTS.fortunePerLevel,
|
|
41
38
|
current: (player) => {
|
|
42
|
-
return (player.options.plotsUnlocked ?? 0) *
|
|
39
|
+
return (player.options.plotsUnlocked ?? 0) * UNLOCKED_PLOTS.fortunePerLevel;
|
|
43
40
|
}
|
|
44
41
|
},
|
|
45
42
|
{
|
|
46
|
-
name:
|
|
43
|
+
name: COMMUNITY_CENTER_UPGRADE.name,
|
|
47
44
|
api: false,
|
|
48
|
-
wiki: () =>
|
|
45
|
+
wiki: () => COMMUNITY_CENTER_UPGRADE.wiki,
|
|
49
46
|
exists: () => true,
|
|
50
|
-
max: () =>
|
|
47
|
+
max: () => COMMUNITY_CENTER_UPGRADE.maxLevel * COMMUNITY_CENTER_UPGRADE.fortunePerLevel,
|
|
51
48
|
current: (player) => {
|
|
52
|
-
return (player.options.communityCenter ?? 0) *
|
|
49
|
+
return (player.options.communityCenter ?? 0) * COMMUNITY_CENTER_UPGRADE.fortunePerLevel;
|
|
53
50
|
}
|
|
54
51
|
},
|
|
55
52
|
{
|
|
56
|
-
name:
|
|
57
|
-
wiki: () =>
|
|
53
|
+
name: REFINED_TRUFFLE_SOURCE.name,
|
|
54
|
+
wiki: () => REFINED_TRUFFLE_SOURCE.wiki,
|
|
58
55
|
exists: () => true,
|
|
59
|
-
max: () =>
|
|
56
|
+
max: () => REFINED_TRUFFLE_SOURCE.maxLevel * REFINED_TRUFFLE_SOURCE.fortunePerLevel,
|
|
60
57
|
current: (player) => {
|
|
61
|
-
return (player.options.refinedTruffles ?? 0) *
|
|
58
|
+
return (player.options.refinedTruffles ?? 0) * REFINED_TRUFFLE_SOURCE.fortunePerLevel;
|
|
62
59
|
}
|
|
63
60
|
},
|
|
64
61
|
{
|
|
65
62
|
name: 'Relic of Power',
|
|
66
63
|
exists: () => true,
|
|
67
|
-
wiki: () =>
|
|
64
|
+
wiki: () => FARMING_ACCESSORIES_INFO.POWER_RELIC?.wiki,
|
|
68
65
|
max: () => {
|
|
69
|
-
const accessory =
|
|
66
|
+
const accessory = FarmingAccessory.fakeItem(FARMING_ACCESSORIES_INFO.POWER_RELIC);
|
|
70
67
|
return accessory?.getProgress()?.reduce((acc, p) => acc + p.maxFortune, 0) ?? 0;
|
|
71
68
|
},
|
|
72
69
|
current: (player) => {
|
|
@@ -75,7 +72,7 @@ exports.GENERAL_FORTUNE_SOURCES = [
|
|
|
75
72
|
},
|
|
76
73
|
info: (player) => {
|
|
77
74
|
const accessory = player.accessories.find(a => a.info.skyblockId === 'POWER_RELIC');
|
|
78
|
-
const fake = !accessory ?
|
|
75
|
+
const fake = !accessory ? FarmingAccessory.fakeItem(FARMING_ACCESSORIES_INFO.POWER_RELIC) : undefined;
|
|
79
76
|
return {
|
|
80
77
|
item: accessory?.item,
|
|
81
78
|
info: accessory?.info,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generalsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/generalsources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generalsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/generalsources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Crop } from "../../constants/crops";
|
|
2
|
-
import { FortuneSourceProgress } from "../../constants/upgrades";
|
|
3
|
-
import { FarmingTool } from "../../fortune/farmingtool";
|
|
4
|
-
import { EliteItemDto } from "../../fortune/item";
|
|
5
|
-
import { UpgradeableInfo } from "../../fortune/upgradeable";
|
|
1
|
+
import { Crop } from "../../constants/crops.js";
|
|
2
|
+
import { FortuneSourceProgress } from "../../constants/upgrades.js";
|
|
3
|
+
import { FarmingTool } from "../../fortune/farmingtool.js";
|
|
4
|
+
import { EliteItemDto } from "../../fortune/item.js";
|
|
5
|
+
import { UpgradeableInfo } from "../../fortune/upgradeable.js";
|
|
6
6
|
export interface DynamicFortuneSource<T> {
|
|
7
7
|
name: string;
|
|
8
8
|
crop?: Crop;
|
|
@@ -1,38 +1,35 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
const enchants_2 = require("../../util/enchants");
|
|
10
|
-
const gems_1 = require("../../util/gems");
|
|
11
|
-
exports.TOOL_FORTUNE_SOURCES = [
|
|
1
|
+
import { FARMING_ENCHANTS } from "../../constants/enchants.js";
|
|
2
|
+
import { Rarity, REFORGES, ReforgeTarget } from "../../constants/reforges.js";
|
|
3
|
+
import { getStatValue, Stat } from "../../constants/stats.js";
|
|
4
|
+
import { FarmingToolType } from "../../items/tools.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 TOOL_FORTUNE_SOURCES = [
|
|
12
9
|
{
|
|
13
10
|
name: 'Base Stats',
|
|
14
11
|
exists: (tool) => {
|
|
15
|
-
return (tool.getLastItemUpgrade() ?? tool)?.info?.baseStats?.[
|
|
12
|
+
return (tool.getLastItemUpgrade() ?? tool)?.info?.baseStats?.[Stat.FarmingFortune] !== undefined;
|
|
16
13
|
},
|
|
17
14
|
max: (tool) => {
|
|
18
|
-
return (tool.getLastItemUpgrade() ?? tool)?.info?.baseStats?.[
|
|
15
|
+
return (tool.getLastItemUpgrade() ?? tool)?.info?.baseStats?.[Stat.FarmingFortune] ?? 0;
|
|
19
16
|
},
|
|
20
17
|
current: (tool) => {
|
|
21
|
-
return tool.info.baseStats?.[
|
|
18
|
+
return tool.info.baseStats?.[Stat.FarmingFortune] ?? 0;
|
|
22
19
|
}
|
|
23
20
|
},
|
|
24
21
|
{
|
|
25
22
|
name: 'Base Stats',
|
|
26
23
|
exists: (tool) => {
|
|
27
24
|
const last = (tool.getLastItemUpgrade() ?? tool)?.info;
|
|
28
|
-
return last?.stats?.[last.maxRarity]?.[
|
|
25
|
+
return last?.stats?.[last.maxRarity]?.[Stat.FarmingFortune] !== undefined;
|
|
29
26
|
},
|
|
30
27
|
max: (tool) => {
|
|
31
28
|
const last = (tool.getLastItemUpgrade() ?? tool)?.info;
|
|
32
|
-
return
|
|
29
|
+
return getStatValue(last?.stats?.[last.maxRarity]?.[Stat.FarmingFortune], tool.options);
|
|
33
30
|
},
|
|
34
31
|
current: (tool) => {
|
|
35
|
-
return
|
|
32
|
+
return getStatValue(tool.info.stats?.[tool.rarity]?.[Stat.FarmingFortune], tool.options);
|
|
36
33
|
}
|
|
37
34
|
},
|
|
38
35
|
{
|
|
@@ -41,21 +38,21 @@ exports.TOOL_FORTUNE_SOURCES = [
|
|
|
41
38
|
// Temporary set to max of 170 for deadaalus axe
|
|
42
39
|
max: () => 170,
|
|
43
40
|
current: (tool) => {
|
|
44
|
-
return tool.getCalculatedStats()[
|
|
41
|
+
return tool.getCalculatedStats()[Stat.FarmingFortune] ?? 0;
|
|
45
42
|
}
|
|
46
43
|
},
|
|
47
44
|
{
|
|
48
45
|
name: 'Reforge Stats',
|
|
49
|
-
wiki: () =>
|
|
50
|
-
exists: (tool) => tool.type !==
|
|
46
|
+
wiki: () => REFORGES?.bountiful?.wiki,
|
|
47
|
+
exists: (tool) => tool.type !== ReforgeTarget.Sword,
|
|
51
48
|
max: (tool) => {
|
|
52
49
|
const last = (tool.getLastItemUpgrade() ?? tool)?.info;
|
|
53
50
|
return tool.reforge?.name === 'Blessed'
|
|
54
|
-
?
|
|
55
|
-
:
|
|
51
|
+
? REFORGES.blessed?.tiers[last.maxRarity]?.stats[Stat.FarmingFortune] ?? 0
|
|
52
|
+
: REFORGES.bountiful?.tiers?.[last.maxRarity]?.stats[Stat.FarmingFortune] ?? 0;
|
|
56
53
|
},
|
|
57
54
|
current: (tool) => {
|
|
58
|
-
return tool.reforgeStats?.stats?.[
|
|
55
|
+
return tool.reforgeStats?.stats?.[Stat.FarmingFortune] ?? 0;
|
|
59
56
|
}
|
|
60
57
|
},
|
|
61
58
|
{
|
|
@@ -67,16 +64,16 @@ exports.TOOL_FORTUNE_SOURCES = [
|
|
|
67
64
|
},
|
|
68
65
|
max: (tool) => {
|
|
69
66
|
const last = (tool.getLastItemUpgrade() ?? tool)?.info;
|
|
70
|
-
return (last?.gemSlots?.peridot ?? 0) *
|
|
67
|
+
return (last?.gemSlots?.peridot ?? 0) * getPeridotGemFortune(last?.maxRarity ?? Rarity.Common, GemRarity.Perfect);
|
|
71
68
|
},
|
|
72
69
|
current: (tool) => {
|
|
73
|
-
return
|
|
70
|
+
return getPeridotFortune(tool.rarity, tool.item);
|
|
74
71
|
}
|
|
75
72
|
},
|
|
76
73
|
{
|
|
77
74
|
name: 'Farming For Dummies',
|
|
78
75
|
wiki: () => 'https://wiki.hypixel.net/Farming_For_Dummies',
|
|
79
|
-
exists: (tool) => tool.type !==
|
|
76
|
+
exists: (tool) => tool.type !== ReforgeTarget.Sword,
|
|
80
77
|
max: () => 5,
|
|
81
78
|
current: (tool) => {
|
|
82
79
|
return +(tool.item.attributes?.farming_for_dummies_count ?? 0);
|
|
@@ -85,7 +82,7 @@ exports.TOOL_FORTUNE_SOURCES = [
|
|
|
85
82
|
{
|
|
86
83
|
name: 'Logarithmic Counter',
|
|
87
84
|
wiki: (tool) => tool.info.wiki,
|
|
88
|
-
exists: (tool) => tool.info.type ===
|
|
85
|
+
exists: (tool) => tool.info.type === FarmingToolType.MathematicalHoe,
|
|
89
86
|
max: () => 16 * 7,
|
|
90
87
|
current: (tool) => {
|
|
91
88
|
const numberOfDigits = Math.max(Math.floor(Math.log10(Math.abs(tool.counter ?? 0))), 0) + 1;
|
|
@@ -95,17 +92,17 @@ exports.TOOL_FORTUNE_SOURCES = [
|
|
|
95
92
|
{
|
|
96
93
|
name: 'Collection Analysis',
|
|
97
94
|
wiki: (tool) => tool.info.wiki,
|
|
98
|
-
exists: (tool) => tool.info.type ===
|
|
95
|
+
exists: (tool) => tool.info.type === FarmingToolType.MathematicalHoe,
|
|
99
96
|
max: () => 8 * 7,
|
|
100
97
|
current: (tool) => tool.collAnalysis ?? 0
|
|
101
98
|
},
|
|
102
|
-
...Object.entries(
|
|
99
|
+
...Object.entries(FARMING_ENCHANTS)
|
|
103
100
|
.map(([id, enchant]) => ({
|
|
104
101
|
name: enchant.name,
|
|
105
102
|
wiki: () => enchant.wiki,
|
|
106
103
|
exists: (tool) => enchant.appliesTo.includes(tool.type) && (!enchant.cropSpecific || enchant.cropSpecific === tool.crop),
|
|
107
|
-
max: (tool) =>
|
|
108
|
-
current: (tool) =>
|
|
104
|
+
max: (tool) => getMaxFortuneFromEnchant(enchant, tool.options, tool.crop),
|
|
105
|
+
current: (tool) => getFortuneFromEnchant(tool.item.enchantments?.[id] ?? 0, enchant, tool.options, tool.crop)
|
|
109
106
|
}))
|
|
110
107
|
];
|
|
111
108
|
//# sourceMappingURL=toolsources.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/toolsources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toolsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/toolsources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { FarmingToolInfo } from "../items/tools";
|
|
2
|
-
import { FortuneSource, FortuneSourceProgress, FortuneUpgrade, Upgrade } from "../constants/upgrades";
|
|
3
|
-
import { Upgradeable, UpgradeableInfo } from "../fortune/upgradeable";
|
|
4
|
-
import { DynamicFortuneSource } from "./sources/toolsources";
|
|
1
|
+
import { FarmingToolInfo } from "../items/tools.js";
|
|
2
|
+
import { FortuneSource, FortuneSourceProgress, FortuneUpgrade, Upgrade } from "../constants/upgrades.js";
|
|
3
|
+
import { Upgradeable, UpgradeableInfo } from "../fortune/upgradeable.js";
|
|
4
|
+
import { DynamicFortuneSource } from "./sources/toolsources.js";
|
|
5
5
|
export declare function getFortune(level: number | null | undefined, source: FortuneSource): number;
|
|
6
6
|
export declare function getItemUpgrades(upgradeable: Upgradeable): FortuneUpgrade[];
|
|
7
7
|
export declare function getLastToolUpgrade(tool: FarmingToolInfo): UpgradeableInfo | undefined;
|
|
@@ -1,44 +1,38 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const gems_1 = require("../util/gems");
|
|
11
|
-
const itemstats_1 = require("../util/itemstats");
|
|
12
|
-
function getFortune(level, source) {
|
|
1
|
+
import { EnchantTierProcurement, FARMING_ENCHANTS } from "../constants/enchants.js";
|
|
2
|
+
import { Stat } from "../constants/stats.js";
|
|
3
|
+
import { FARMING_TOOLS } from "../items/tools.js";
|
|
4
|
+
import { UpgradeAction, UpgradeCategory, UpgradeReason } from "../constants/upgrades.js";
|
|
5
|
+
import { GemRarity } from "../fortune/item.js";
|
|
6
|
+
import { getFortuneFromEnchant } from "../util/enchants.js";
|
|
7
|
+
import { getGemRarityName, getNextGemRarity, getPeridotFortune, getPeridotGemFortune, getPeridotGems } from "../util/gems.js";
|
|
8
|
+
import { nextRarity } from "../util/itemstats.js";
|
|
9
|
+
export function getFortune(level, source) {
|
|
13
10
|
return Math.min(Math.max(level ?? 0, 0), source.maxLevel) * source.fortunePerLevel;
|
|
14
11
|
}
|
|
15
|
-
|
|
16
|
-
function getItemUpgrades(upgradeable) {
|
|
12
|
+
export function getItemUpgrades(upgradeable) {
|
|
17
13
|
return [
|
|
18
14
|
getUpgradeableRarityUpgrade(upgradeable),
|
|
19
15
|
...getUpgradeableEnchants(upgradeable),
|
|
20
16
|
...getUpgradeableGems(upgradeable)
|
|
21
17
|
].filter(u => u);
|
|
22
18
|
}
|
|
23
|
-
|
|
24
|
-
function getLastToolUpgrade(tool) {
|
|
19
|
+
export function getLastToolUpgrade(tool) {
|
|
25
20
|
const upgrade = tool.upgrade;
|
|
26
21
|
if (!upgrade)
|
|
27
22
|
return undefined;
|
|
28
23
|
let last = upgrade;
|
|
29
|
-
let item =
|
|
24
|
+
let item = FARMING_TOOLS[upgrade.id];
|
|
30
25
|
if (!item)
|
|
31
26
|
return undefined;
|
|
32
|
-
while (item?.upgrade && item.upgrade.reason !==
|
|
27
|
+
while (item?.upgrade && item.upgrade.reason !== UpgradeReason.Situational) {
|
|
33
28
|
last = item.upgrade;
|
|
34
|
-
item =
|
|
29
|
+
item = FARMING_TOOLS[item.upgrade.id];
|
|
35
30
|
}
|
|
36
31
|
if (!item || last === upgrade)
|
|
37
32
|
return undefined;
|
|
38
33
|
return item;
|
|
39
34
|
}
|
|
40
|
-
|
|
41
|
-
function getNextItemUpgradeableTo(upgradeable, options) {
|
|
35
|
+
export function getNextItemUpgradeableTo(upgradeable, options) {
|
|
42
36
|
const upgrade = upgradeable.getItemUpgrade();
|
|
43
37
|
if (!upgrade)
|
|
44
38
|
return undefined;
|
|
@@ -47,16 +41,15 @@ function getNextItemUpgradeableTo(upgradeable, options) {
|
|
|
47
41
|
return undefined;
|
|
48
42
|
return { upgrade, info: next };
|
|
49
43
|
}
|
|
50
|
-
|
|
51
|
-
function getLastItemUpgradeableTo(upgradeable, options) {
|
|
44
|
+
export function getLastItemUpgradeableTo(upgradeable, options) {
|
|
52
45
|
const upgrade = upgradeable.getItemUpgrade();
|
|
53
|
-
if (!upgrade || upgrade.reason ===
|
|
46
|
+
if (!upgrade || upgrade.reason === UpgradeReason.Situational)
|
|
54
47
|
return undefined;
|
|
55
48
|
let last = upgrade;
|
|
56
49
|
let item = options[upgrade.id];
|
|
57
50
|
if (!item)
|
|
58
51
|
return undefined;
|
|
59
|
-
while (item?.upgrade && item.upgrade.reason !==
|
|
52
|
+
while (item?.upgrade && item.upgrade.reason !== UpgradeReason.Situational) {
|
|
60
53
|
last = item.upgrade;
|
|
61
54
|
item = options[item.upgrade.id];
|
|
62
55
|
}
|
|
@@ -64,8 +57,7 @@ function getLastItemUpgradeableTo(upgradeable, options) {
|
|
|
64
57
|
return undefined;
|
|
65
58
|
return { upgrade: last, info: item };
|
|
66
59
|
}
|
|
67
|
-
|
|
68
|
-
function getSourceProgress(upgradeable, sources, zeroed = false) {
|
|
60
|
+
export function getSourceProgress(upgradeable, sources, zeroed = false) {
|
|
69
61
|
const result = [];
|
|
70
62
|
// Ensure the item fortune is up to date
|
|
71
63
|
if ('getFortune' in upgradeable && typeof upgradeable.getFortune === 'function') {
|
|
@@ -111,24 +103,23 @@ function getSourceProgress(upgradeable, sources, zeroed = false) {
|
|
|
111
103
|
}
|
|
112
104
|
return result;
|
|
113
105
|
}
|
|
114
|
-
|
|
115
|
-
function getUpgradeableRarityUpgrade(upgradeable) {
|
|
106
|
+
export function getUpgradeableRarityUpgrade(upgradeable) {
|
|
116
107
|
// Skip if the item is already recombobulated
|
|
117
108
|
if (upgradeable.recombobulated)
|
|
118
109
|
return;
|
|
119
110
|
const rarity = upgradeable.rarity;
|
|
120
|
-
const next =
|
|
111
|
+
const next = nextRarity(upgradeable.rarity);
|
|
121
112
|
const result = {
|
|
122
113
|
title: 'Recombobulator',
|
|
123
114
|
increase: 0,
|
|
124
|
-
action:
|
|
125
|
-
category:
|
|
115
|
+
action: UpgradeAction.Recombobulate,
|
|
116
|
+
category: UpgradeCategory.Rarity,
|
|
126
117
|
improvements: []
|
|
127
118
|
};
|
|
128
119
|
// Gemstone fortune increases with rarity
|
|
129
120
|
// Calculate the difference in fortune between the current and next rarity
|
|
130
|
-
const currentPeridot =
|
|
131
|
-
const nextPeridot =
|
|
121
|
+
const currentPeridot = getPeridotFortune(upgradeable.rarity, upgradeable.item);
|
|
122
|
+
const nextPeridot = getPeridotFortune(next, upgradeable.item);
|
|
132
123
|
if (nextPeridot > currentPeridot) {
|
|
133
124
|
result.increase += nextPeridot - currentPeridot;
|
|
134
125
|
result.improvements.push({
|
|
@@ -142,8 +133,8 @@ function getUpgradeableRarityUpgrade(upgradeable) {
|
|
|
142
133
|
return result;
|
|
143
134
|
}
|
|
144
135
|
const reforgeTiers = upgradeable.reforge.tiers;
|
|
145
|
-
const currentFortune = reforgeTiers?.[rarity]?.stats?.[
|
|
146
|
-
const nextFortune = reforgeTiers?.[next]?.stats?.[
|
|
136
|
+
const currentFortune = reforgeTiers?.[rarity]?.stats?.[Stat.FarmingFortune] ?? 0;
|
|
137
|
+
const nextFortune = reforgeTiers?.[next]?.stats?.[Stat.FarmingFortune] ?? 0;
|
|
147
138
|
if (nextFortune > currentFortune) {
|
|
148
139
|
result.increase += nextFortune - currentFortune;
|
|
149
140
|
result.improvements.push({
|
|
@@ -153,13 +144,12 @@ function getUpgradeableRarityUpgrade(upgradeable) {
|
|
|
153
144
|
}
|
|
154
145
|
return result;
|
|
155
146
|
}
|
|
156
|
-
|
|
157
|
-
function getUpgradeableEnchants(upgradeable) {
|
|
147
|
+
export function getUpgradeableEnchants(upgradeable) {
|
|
158
148
|
if (!upgradeable.type)
|
|
159
149
|
return [];
|
|
160
150
|
const result = [];
|
|
161
|
-
for (const enchantId in
|
|
162
|
-
const enchant =
|
|
151
|
+
for (const enchantId in FARMING_ENCHANTS) {
|
|
152
|
+
const enchant = FARMING_ENCHANTS[enchantId];
|
|
163
153
|
// Skip if the enchantment doesn't apply to the item
|
|
164
154
|
if (!enchant || !enchant.appliesTo.includes(upgradeable.type))
|
|
165
155
|
continue;
|
|
@@ -172,12 +162,12 @@ function getUpgradeableEnchants(upgradeable) {
|
|
|
172
162
|
const procurement = enchant.levels[enchant.minLevel]?.procurement;
|
|
173
163
|
result.push({
|
|
174
164
|
title: enchant.name + ' 1',
|
|
175
|
-
increase:
|
|
165
|
+
increase: getFortuneFromEnchant(enchant.minLevel, enchant, upgradeable.options, upgradeable.crop),
|
|
176
166
|
wiki: enchant.wiki,
|
|
177
|
-
action: (!procurement || procurement ===
|
|
178
|
-
?
|
|
179
|
-
:
|
|
180
|
-
category:
|
|
167
|
+
action: (!procurement || procurement === EnchantTierProcurement.Normal)
|
|
168
|
+
? UpgradeAction.Apply
|
|
169
|
+
: UpgradeAction.LevelUp,
|
|
170
|
+
category: UpgradeCategory.Enchant
|
|
181
171
|
});
|
|
182
172
|
continue;
|
|
183
173
|
}
|
|
@@ -185,23 +175,22 @@ function getUpgradeableEnchants(upgradeable) {
|
|
|
185
175
|
if (applied >= enchant.maxLevel)
|
|
186
176
|
continue;
|
|
187
177
|
// Add an entry for upgrading the enchantment
|
|
188
|
-
const currentFortune =
|
|
189
|
-
const nextFortune =
|
|
178
|
+
const currentFortune = getFortuneFromEnchant(applied, enchant, upgradeable.options, upgradeable.crop);
|
|
179
|
+
const nextFortune = getFortuneFromEnchant(applied + 1, enchant, upgradeable.options, upgradeable.crop);
|
|
190
180
|
result.push({
|
|
191
181
|
title: enchant.name + ' ' + (applied + 1),
|
|
192
182
|
increase: nextFortune - currentFortune,
|
|
193
|
-
action:
|
|
194
|
-
category:
|
|
183
|
+
action: UpgradeAction.Apply,
|
|
184
|
+
category: UpgradeCategory.Enchant
|
|
195
185
|
});
|
|
196
186
|
}
|
|
197
187
|
return result;
|
|
198
188
|
}
|
|
199
|
-
|
|
200
|
-
function getUpgradeableGems(upgradeable) {
|
|
189
|
+
export function getUpgradeableGems(upgradeable) {
|
|
201
190
|
const peridotSlots = upgradeable.info.gemSlots?.peridot;
|
|
202
191
|
if (!peridotSlots)
|
|
203
192
|
return [];
|
|
204
|
-
const applied =
|
|
193
|
+
const applied = getPeridotGems(upgradeable.item);
|
|
205
194
|
const result = [];
|
|
206
195
|
// Add entries for applying missing gems
|
|
207
196
|
for (let i = applied.length; i < peridotSlots; i++) {
|
|
@@ -209,28 +198,27 @@ function getUpgradeableGems(upgradeable) {
|
|
|
209
198
|
// A way to configure this would be nice at some point
|
|
210
199
|
result.push({
|
|
211
200
|
title: 'Fine Peridot Gemstone',
|
|
212
|
-
increase:
|
|
213
|
-
action:
|
|
214
|
-
category:
|
|
201
|
+
increase: getPeridotGemFortune(upgradeable.rarity, GemRarity.Fine),
|
|
202
|
+
action: UpgradeAction.Apply,
|
|
203
|
+
category: UpgradeCategory.Gem
|
|
215
204
|
});
|
|
216
205
|
}
|
|
217
206
|
// Add entries for upgrading existing gems
|
|
218
207
|
for (const gem of applied) {
|
|
219
|
-
if (gem ===
|
|
208
|
+
if (gem === GemRarity.Perfect)
|
|
220
209
|
continue;
|
|
221
|
-
const nextGem =
|
|
222
|
-
const currentFortune =
|
|
223
|
-
const nextFortune =
|
|
210
|
+
const nextGem = getNextGemRarity(gem);
|
|
211
|
+
const currentFortune = getPeridotGemFortune(upgradeable.rarity, gem);
|
|
212
|
+
const nextFortune = getPeridotGemFortune(upgradeable.rarity, nextGem);
|
|
224
213
|
if (nextFortune > currentFortune) {
|
|
225
214
|
result.push({
|
|
226
|
-
title:
|
|
215
|
+
title: getGemRarityName(nextGem) + ' Peridot Gemstone',
|
|
227
216
|
increase: nextFortune - currentFortune,
|
|
228
|
-
action:
|
|
229
|
-
category:
|
|
217
|
+
action: UpgradeAction.Apply,
|
|
218
|
+
category: UpgradeCategory.Gem
|
|
230
219
|
});
|
|
231
220
|
}
|
|
232
221
|
}
|
|
233
222
|
return result;
|
|
234
223
|
}
|
|
235
|
-
exports.getUpgradeableGems = getUpgradeableGems;
|
|
236
224
|
//# sourceMappingURL=upgrades.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrades.js","sourceRoot":"","sources":["../../src/upgrades/upgrades.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upgrades.js","sourceRoot":"","sources":["../../src/upgrades/upgrades.ts"],"names":[],"mappings":"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"}
|
package/dist/util/enchants.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Crop } from "../constants/crops";
|
|
2
|
-
import { FarmingEnchant } from "../constants/enchants";
|
|
3
|
-
import { PlayerOptions } from "../player/
|
|
1
|
+
import { Crop } from "../constants/crops.js";
|
|
2
|
+
import { FarmingEnchant } from "../constants/enchants.js";
|
|
3
|
+
import { PlayerOptions } from "../player/playeroptions.js";
|
|
4
4
|
export declare function getFortuneFromEnchant(level: number, enchant: FarmingEnchant, options?: PlayerOptions, crop?: Crop): number;
|
|
5
5
|
export declare function getMaxFortuneFromEnchant(enchant: FarmingEnchant, options?: PlayerOptions, crop?: Crop): number;
|