farming-weight 0.9.6 → 0.10.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/dist/constants/attributes.d.ts +26 -0
- package/dist/constants/attributes.js +251 -0
- package/dist/constants/attributes.js.map +1 -0
- package/dist/constants/crops.d.ts +5 -1
- package/dist/constants/crops.js +8 -0
- package/dist/constants/crops.js.map +1 -1
- package/dist/constants/enchants.d.ts +2 -2
- package/dist/constants/plots.d.ts +1 -1
- package/dist/constants/plots.js +35 -28
- package/dist/constants/plots.js.map +1 -1
- package/dist/constants/reforges.js +61 -61
- package/dist/constants/reforges.js.map +1 -1
- package/dist/constants/specialcrops.js +3 -3
- package/dist/constants/specialcrops.js.map +1 -1
- package/dist/constants/specific.d.ts +1 -1
- package/dist/constants/stats.js.map +1 -1
- package/dist/constants/upgrades.d.ts +14 -8
- package/dist/constants/upgrades.js +1 -0
- package/dist/constants/upgrades.js.map +1 -1
- package/dist/constants/weight.js +1 -1
- package/dist/constants/weight.js.map +1 -1
- package/dist/crops/melon.js.map +1 -1
- package/dist/crops/pumpkin.js.map +1 -1
- package/dist/crops/special.d.ts +2 -2
- package/dist/crops/special.js +2 -2
- package/dist/crops/special.js.map +1 -1
- package/dist/fortune/farmingaccessory.d.ts +7 -6
- package/dist/fortune/farmingaccessory.js +11 -2
- package/dist/fortune/farmingaccessory.js.map +1 -1
- package/dist/fortune/farmingarmor.d.ts +9 -8
- package/dist/fortune/farmingarmor.js +15 -5
- package/dist/fortune/farmingarmor.js.map +1 -1
- package/dist/fortune/farmingequipment.d.ts +6 -5
- package/dist/fortune/farmingequipment.js +11 -2
- package/dist/fortune/farmingequipment.js.map +1 -1
- package/dist/fortune/farmingpet.d.ts +3 -3
- package/dist/fortune/farmingpet.js +2 -2
- package/dist/fortune/farmingpet.js.map +1 -1
- package/dist/fortune/farmingtool.d.ts +8 -7
- package/dist/fortune/farmingtool.js +13 -3
- package/dist/fortune/farmingtool.js.map +1 -1
- package/dist/fortune/upgradeable.d.ts +6 -39
- package/dist/fortune/upgradeable.js +1 -66
- package/dist/fortune/upgradeable.js.map +1 -1
- package/dist/fortune/upgradeablebase.d.ts +40 -0
- package/dist/fortune/upgradeablebase.js +67 -0
- package/dist/fortune/upgradeablebase.js.map +1 -0
- package/dist/index.d.ts +28 -27
- package/dist/index.js +28 -27
- package/dist/index.js.map +1 -1
- package/dist/items/accessories.d.ts +2 -2
- package/dist/items/armor.d.ts +2 -2
- package/dist/items/armor.js.map +1 -1
- package/dist/items/equipment.d.ts +1 -1
- package/dist/items/equipment.js.map +1 -1
- package/dist/items/pets.d.ts +6 -5
- package/dist/items/pets.js +17 -0
- package/dist/items/pets.js.map +1 -1
- package/dist/items/tools.d.ts +1 -1
- package/dist/player/player.d.ts +3 -2
- package/dist/player/player.js +19 -2
- package/dist/player/player.js.map +1 -1
- package/dist/player/playeroptions.d.ts +3 -0
- package/dist/player/playeroptions.js.map +1 -1
- package/dist/upgrades/enchantupgrades.d.ts +4 -0
- package/dist/upgrades/enchantupgrades.js +103 -0
- package/dist/upgrades/enchantupgrades.js.map +1 -0
- package/dist/upgrades/getfortune.d.ts +2 -0
- package/dist/upgrades/getfortune.js +4 -0
- package/dist/upgrades/getfortune.js.map +1 -0
- package/dist/upgrades/getsourceprogress.d.ts +3 -0
- package/dist/upgrades/getsourceprogress.js +60 -0
- package/dist/upgrades/getsourceprogress.js.map +1 -0
- package/dist/upgrades/itemregistry.d.ts +11 -0
- package/dist/upgrades/itemregistry.js +11 -0
- package/dist/upgrades/itemregistry.js.map +1 -0
- package/dist/upgrades/progress.d.ts +2 -2
- package/dist/upgrades/progress.js +1 -1
- package/dist/upgrades/progress.js.map +1 -1
- package/dist/upgrades/sources/accessorysources.d.ts +2 -2
- package/dist/upgrades/sources/armorsetsources.d.ts +2 -2
- package/dist/upgrades/sources/armorsetsources.js +7 -16
- package/dist/upgrades/sources/armorsetsources.js.map +1 -1
- package/dist/upgrades/sources/cropsources.d.ts +2 -2
- package/dist/upgrades/sources/cropsources.js +6 -11
- package/dist/upgrades/sources/cropsources.js.map +1 -1
- package/dist/upgrades/sources/dynamicfortunesources.d.ts +27 -0
- package/dist/upgrades/sources/dynamicfortunesources.js +2 -0
- package/dist/upgrades/sources/dynamicfortunesources.js.map +1 -0
- package/dist/upgrades/sources/gearsources.d.ts +2 -2
- package/dist/upgrades/sources/gearsources.js +4 -3
- package/dist/upgrades/sources/gearsources.js.map +1 -1
- package/dist/upgrades/sources/generalsources.d.ts +4 -2
- package/dist/upgrades/sources/generalsources.js +82 -0
- package/dist/upgrades/sources/generalsources.js.map +1 -1
- package/dist/upgrades/sources/toolsources.d.ts +2 -22
- package/dist/upgrades/sources/toolsources.js +39 -5
- package/dist/upgrades/sources/toolsources.js.map +1 -1
- package/dist/upgrades/upgrades.d.ts +4 -8
- package/dist/upgrades/upgrades.js +10 -185
- package/dist/upgrades/upgrades.js.map +1 -1
- package/dist/util/enchants.d.ts +3 -3
- package/dist/util/enchants.js.map +1 -1
- package/dist/util/garden.d.ts +2 -2
- package/dist/util/garden.js +1 -1
- package/dist/util/garden.js.map +1 -1
- package/dist/util/gems.d.ts +2 -2
- package/dist/util/gems.js.map +1 -1
- package/dist/util/itemstats.js.map +1 -1
- package/dist/util/jacob.js.map +1 -1
- package/dist/util/names.d.ts +1 -1
- package/dist/util/names.js.map +1 -1
- package/dist/util/pests.d.ts +1 -1
- package/dist/util/pests.js.map +1 -1
- package/dist/util/ratecalc.d.ts +10 -5
- package/dist/util/ratecalc.js +20 -2
- package/dist/util/ratecalc.js.map +1 -1
- package/dist/util/skyblocktime.js.map +1 -1
- package/dist/weight/weightcalc.d.ts +4 -4
- package/dist/weight/weightcalc.js +2 -2
- package/dist/weight/weightcalc.js.map +1 -1
- package/package.json +17 -5
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamicfortunesources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/dynamicfortunesources.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { FarmingArmor } from '../../fortune/farmingarmor.js';
|
|
2
|
-
import { FarmingEquipment } from '../../fortune/farmingequipment.js';
|
|
3
|
-
import { DynamicFortuneSource } from './
|
|
2
|
+
import type { FarmingEquipment } from '../../fortune/farmingequipment.js';
|
|
3
|
+
import type { DynamicFortuneSource } from './dynamicfortunesources.js';
|
|
4
4
|
export declare const GEAR_FORTUNE_SOURCES: DynamicFortuneSource<FarmingArmor | FarmingEquipment>[];
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { FARMING_ENCHANTS } from '../../constants/enchants.js';
|
|
2
|
-
import {
|
|
2
|
+
import { Rarity, REFORGES, ReforgeTarget } from '../../constants/reforges.js';
|
|
3
3
|
import { Skill } from '../../constants/skills.js';
|
|
4
4
|
import { Stat } from '../../constants/stats.js';
|
|
5
5
|
import { GemRarity } from '../../fortune/item.js';
|
|
6
6
|
import { getFortuneFromEnchant, getMaxFortuneFromEnchant } from '../../util/enchants.js';
|
|
7
7
|
import { getPeridotFortune, getPeridotGemFortune } from '../../util/gems.js';
|
|
8
|
-
import { getUpgradeableEnchant
|
|
8
|
+
import { getUpgradeableEnchant } from '../enchantupgrades.js';
|
|
9
|
+
import { getUpgradeableGems, getUpgradeableReforges } from '../upgrades.js';
|
|
9
10
|
export const GEAR_FORTUNE_SOURCES = [
|
|
10
11
|
{
|
|
11
12
|
name: 'Base Stats',
|
|
@@ -76,7 +77,7 @@ export const GEAR_FORTUNE_SOURCES = [
|
|
|
76
77
|
return (gear.info.perLevelStats?.stats[Stat.FarmingFortune] ?? 0) * (gear.options?.farmingLevel ?? 0);
|
|
77
78
|
},
|
|
78
79
|
},
|
|
79
|
-
...Object.entries(FARMING_ENCHANTS)
|
|
80
|
+
...Object.entries(FARMING_ENCHANTS ?? {})
|
|
80
81
|
.filter(([, enchant]) => enchant.appliesTo.includes(ReforgeTarget.Armor) || enchant.appliesTo.includes(ReforgeTarget.Equipment))
|
|
81
82
|
.map(([id, enchant]) => ({
|
|
82
83
|
name: enchant.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gearsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/gearsources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"gearsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/gearsources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAG5E,MAAM,CAAC,MAAM,oBAAoB,GAA4D;IAC5F;QACC,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAChB,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,SAAS,CAAC;QAClG,CAAC;QACD,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACjB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACxD,CAAC;KACD;IACD;QACC,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;YACd,OAAO,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC;QAC/F,CAAC;QACD,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;YACb,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAW,CAAC;YAC/F,OAAO,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS;gBAC3C,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACjB,OAAO,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC;QACD,QAAQ,EAAE,sBAAsB;KAChC;IACD;QACC,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,GAAG,EAAE,CAAC,kDAAkD;QAC9D,MAAM,EAAE,CAAC,WAAW,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,WAAW,CAAC,EAAE,IAAI,CAAC;YACrE,OAAO,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,KAAK,SAAS,CAAC;QAC7E,CAAC;QACD,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE;YACpB,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,WAAW,CAAC,EAAE,IAAI,CAAC;YACrE,OAAO,CACN,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;gBACtE,oBAAoB,CAAC,IAAI,EAAE,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CACzE,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC,WAAW,EAAE,EAAE;YACxB,OAAO,iBAAiB,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC;QACD,QAAQ,EAAE,kBAAkB;KAC5B;IACD;QACC,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;QAC9B,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO;QACvF,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE;QACb,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACjB,OAAQ,IAAyB,CAAC,aAAa,EAAE,CAAC;QACnD,CAAC;KACD;IACD;QACC,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;QAC9B,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,KAAK,KAAK,CAAC,OAAO;QACvG,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;YACb,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC;YACvD,OAAO,eAAe,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,KAAK,KAAK,KAAK,CAAC,OAAO;gBAC5E,CAAC,CAAC,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE;gBAC7D,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;QACrE,CAAC;QACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,CAAC,CAAC,CAAC;QACvG,CAAC;KACD;IACD,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC;SACvC,MAAM,CACN,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CACf,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CACvG;SACA,GAAG,CACH,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CACjB,CAAC;QACA,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI;QACxB,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QACvD,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;QAC9D,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;QAClG,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC;KACnD,CAA0D,CAC5D;CACF,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
-
import { FarmingPlayer } from '../../player/player.js';
|
|
2
|
-
import {
|
|
1
|
+
import type { FarmingPlayer } from '../../player/player.js';
|
|
2
|
+
import type { CalculateCropDetailedDropsOptions } from '../../util/ratecalc.js';
|
|
3
|
+
import type { DynamicFortuneSource } from './dynamicfortunesources.js';
|
|
3
4
|
export declare const GENERAL_FORTUNE_SOURCES: DynamicFortuneSource<FarmingPlayer>[];
|
|
5
|
+
export declare const ATTRIBUTE_FORTUNE_SOURCES: DynamicFortuneSource<FarmingPlayer | CalculateCropDetailedDropsOptions>[];
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { FARMING_ATTRIBUTE_SHARDS, getShardFortune, getShardLevel, getShardsForNextLevel, } from '../../constants/attributes.js';
|
|
1
2
|
import { ANITA_FORTUNE_UPGRADE, COMMUNITY_CENTER_UPGRADE, FARMING_LEVEL, PEST_BESTIARY_SOURCE, REFINED_TRUFFLE_SOURCE, UNLOCKED_PLOTS, } from '../../constants/specific.js';
|
|
2
3
|
import { Stat } from '../../constants/stats.js';
|
|
3
4
|
import { UpgradeAction, UpgradeCategory } from '../../constants/upgrades.js';
|
|
@@ -5,6 +6,7 @@ import { FarmingAccessory } from '../../fortune/farmingaccessory.js';
|
|
|
5
6
|
import { FARMING_ACCESSORIES_INFO } from '../../items/accessories.js';
|
|
6
7
|
import { getNextPlotCost } from '../../util/garden.js';
|
|
7
8
|
import { fortuneFromPestBestiary } from '../../util/pests.js';
|
|
9
|
+
import { getSourceProgress } from '../getsourceprogress.js';
|
|
8
10
|
export const GENERAL_FORTUNE_SOURCES = [
|
|
9
11
|
{
|
|
10
12
|
name: FARMING_LEVEL.name,
|
|
@@ -33,6 +35,30 @@ export const GENERAL_FORTUNE_SOURCES = [
|
|
|
33
35
|
];
|
|
34
36
|
},
|
|
35
37
|
},
|
|
38
|
+
{
|
|
39
|
+
name: 'Attribute Shards',
|
|
40
|
+
api: false,
|
|
41
|
+
wiki: () => 'https://wiki.hypixel.net/Attributes',
|
|
42
|
+
exists: () => true,
|
|
43
|
+
max: () => {
|
|
44
|
+
return ATTRIBUTE_FORTUNE_SOURCES.filter((shard) => !shard.active || shard.active(maxShardOptions).active).reduce((acc, shard) => {
|
|
45
|
+
return acc + shard.max(maxShardOptions);
|
|
46
|
+
}, 0);
|
|
47
|
+
},
|
|
48
|
+
current: (player) => {
|
|
49
|
+
return ATTRIBUTE_FORTUNE_SOURCES.reduce((acc, shard) => {
|
|
50
|
+
return acc + shard.current(player);
|
|
51
|
+
}, 0);
|
|
52
|
+
},
|
|
53
|
+
upgrades: (player) => {
|
|
54
|
+
return ATTRIBUTE_FORTUNE_SOURCES.filter((shard) => shard.active?.(player).active !== false)
|
|
55
|
+
.flatMap((shard) => shard.upgrades?.(player))
|
|
56
|
+
.filter(Boolean);
|
|
57
|
+
},
|
|
58
|
+
progress: (player) => {
|
|
59
|
+
return getSourceProgress(player, ATTRIBUTE_FORTUNE_SOURCES);
|
|
60
|
+
},
|
|
61
|
+
},
|
|
36
62
|
{
|
|
37
63
|
name: PEST_BESTIARY_SOURCE.name,
|
|
38
64
|
wiki: () => PEST_BESTIARY_SOURCE.wiki,
|
|
@@ -242,4 +268,60 @@ export const GENERAL_FORTUNE_SOURCES = [
|
|
|
242
268
|
},
|
|
243
269
|
},
|
|
244
270
|
];
|
|
271
|
+
export const ATTRIBUTE_FORTUNE_SOURCES = Object.entries(FARMING_ATTRIBUTE_SHARDS)
|
|
272
|
+
.filter((a) => a[1].effect === 'fortune')
|
|
273
|
+
.map(([id, shard]) => mapShardSource(id, shard));
|
|
274
|
+
const maxShardOptions = {
|
|
275
|
+
attributes: Object.fromEntries(Object.keys(FARMING_ATTRIBUTE_SHARDS).map((id) => [
|
|
276
|
+
id,
|
|
277
|
+
1000, // Max level for all shards
|
|
278
|
+
])),
|
|
279
|
+
blocksBroken: 0,
|
|
280
|
+
crop: 'CACTUS',
|
|
281
|
+
bountiful: false,
|
|
282
|
+
mooshroom: false,
|
|
283
|
+
infestedPlotProbability: 1,
|
|
284
|
+
};
|
|
285
|
+
function mapShardSource(id, shard) {
|
|
286
|
+
const result = {
|
|
287
|
+
name: shard.name,
|
|
288
|
+
wiki: () => shard.wiki,
|
|
289
|
+
exists: () => true,
|
|
290
|
+
active: shard.active,
|
|
291
|
+
max: () => {
|
|
292
|
+
return getShardFortune(shard, {
|
|
293
|
+
...maxShardOptions,
|
|
294
|
+
attributes: { [id]: 1000 },
|
|
295
|
+
}, 10);
|
|
296
|
+
},
|
|
297
|
+
current: (player) => {
|
|
298
|
+
return getShardFortune(shard, player);
|
|
299
|
+
},
|
|
300
|
+
upgrades: (player) => {
|
|
301
|
+
const amount = player.attributes?.[id] ?? 0;
|
|
302
|
+
const nextCost = getShardsForNextLevel(shard.rarity, amount);
|
|
303
|
+
if (!nextCost)
|
|
304
|
+
return [];
|
|
305
|
+
const currentLevel = getShardLevel(shard.rarity, amount);
|
|
306
|
+
const level = currentLevel + 1;
|
|
307
|
+
const currentFortune = getShardFortune(shard, player, currentLevel);
|
|
308
|
+
const nextFortune = getShardFortune(shard, player, level);
|
|
309
|
+
return [
|
|
310
|
+
{
|
|
311
|
+
title: shard.name.replace('Shard', level.toString()),
|
|
312
|
+
increase: nextFortune - currentFortune,
|
|
313
|
+
action: UpgradeAction.LevelUp,
|
|
314
|
+
category: UpgradeCategory.Attribute,
|
|
315
|
+
// wiki: shard.wiki, // Wiki page doesn't exist yet
|
|
316
|
+
cost: {
|
|
317
|
+
items: {
|
|
318
|
+
[shard.skyblockId]: nextCost,
|
|
319
|
+
},
|
|
320
|
+
},
|
|
321
|
+
},
|
|
322
|
+
];
|
|
323
|
+
},
|
|
324
|
+
};
|
|
325
|
+
return result;
|
|
326
|
+
}
|
|
245
327
|
//# sourceMappingURL=generalsources.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generalsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/generalsources.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generalsources.js","sourceRoot":"","sources":["../../../src/upgrades/sources/generalsources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { FarmingTool } from '../../fortune/farmingtool.js';
|
|
4
|
-
import { EliteItemDto } from '../../fortune/item.js';
|
|
5
|
-
import { UpgradeableInfo } from '../../fortune/upgradeable.js';
|
|
6
|
-
export interface DynamicFortuneSource<T> {
|
|
7
|
-
name: string;
|
|
8
|
-
crop?: Crop;
|
|
9
|
-
api?: boolean;
|
|
10
|
-
wiki?: (source: T) => string | undefined;
|
|
11
|
-
exists: (source: T) => boolean;
|
|
12
|
-
max: (source: T) => number;
|
|
13
|
-
current: (source: T) => number;
|
|
14
|
-
progress?: (source: T) => FortuneSourceProgress[];
|
|
15
|
-
info?: (source: T) => {
|
|
16
|
-
item?: EliteItemDto;
|
|
17
|
-
info?: UpgradeableInfo;
|
|
18
|
-
nextInfo?: UpgradeableInfo;
|
|
19
|
-
maxInfo?: UpgradeableInfo;
|
|
20
|
-
};
|
|
21
|
-
upgrades?: (source: T) => FortuneUpgrade[];
|
|
22
|
-
}
|
|
1
|
+
import type { FarmingTool } from '../../fortune/farmingtool.js';
|
|
2
|
+
import type { DynamicFortuneSource } from './dynamicfortunesources.js';
|
|
23
3
|
export declare const TOOL_FORTUNE_SOURCES: DynamicFortuneSource<FarmingTool>[];
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { FARMING_ENCHANTS } from '../../constants/enchants.js';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { Rarity, REFORGES, ReforgeTarget } from '../../constants/reforges.js';
|
|
3
|
+
import { getStatValue, Stat } from '../../constants/stats.js';
|
|
4
4
|
import { UpgradeAction, UpgradeCategory } from '../../constants/upgrades.js';
|
|
5
5
|
import { GemRarity } from '../../fortune/item.js';
|
|
6
6
|
import { FarmingToolType } from '../../items/tools.js';
|
|
7
7
|
import { getFortuneFromEnchant, getMaxFortuneFromEnchant } from '../../util/enchants.js';
|
|
8
8
|
import { getPeridotFortune, getPeridotGemFortune } from '../../util/gems.js';
|
|
9
|
-
import { getUpgradeableEnchant
|
|
9
|
+
import { getUpgradeableEnchant } from '../enchantupgrades.js';
|
|
10
|
+
import { getUpgradeableGems } from '../upgrades.js';
|
|
10
11
|
export const TOOL_FORTUNE_SOURCES = [
|
|
11
12
|
{
|
|
12
13
|
name: 'Base Stats',
|
|
@@ -154,7 +155,7 @@ export const TOOL_FORTUNE_SOURCES = [
|
|
|
154
155
|
name: 'Logarithmic Counter',
|
|
155
156
|
wiki: (tool) => tool.info.wiki,
|
|
156
157
|
exists: (tool) => tool.info.type === FarmingToolType.MathematicalHoe,
|
|
157
|
-
max: () => 16 * 7,
|
|
158
|
+
max: () => 16 * 7, // 10 billion counter
|
|
158
159
|
current: (tool) => {
|
|
159
160
|
const numberOfDigits = Math.max(Math.floor(Math.log10(Math.abs(tool.counter ?? 0))), 0) + 1;
|
|
160
161
|
return Math.max((numberOfDigits - 4) * 16, 0);
|
|
@@ -164,10 +165,43 @@ export const TOOL_FORTUNE_SOURCES = [
|
|
|
164
165
|
name: 'Collection Analysis',
|
|
165
166
|
wiki: (tool) => tool.info.wiki,
|
|
166
167
|
exists: (tool) => tool.info.type === FarmingToolType.MathematicalHoe,
|
|
167
|
-
max: () => 8 * 7,
|
|
168
|
+
max: () => 8 * 7, // 10 billion collection
|
|
168
169
|
current: (tool) => tool.collAnalysis ?? 0,
|
|
169
170
|
},
|
|
170
171
|
...Object.entries(FARMING_ENCHANTS).map(([id, enchant]) => enchantSourceBuilder(id, enchant)),
|
|
172
|
+
{
|
|
173
|
+
name: 'Axed Perk',
|
|
174
|
+
wiki: () => 'https://wiki.hypixel.net/Essence#Forest_Essence_',
|
|
175
|
+
exists: (tool) => tool.info.type === ReforgeTarget.Axe || tool.info.type === FarmingToolType.Dicer,
|
|
176
|
+
max: (tool) => {
|
|
177
|
+
const otherSources = TOOL_FORTUNE_SOURCES.filter((s) => s.name !== 'Axed Perk' && s.exists(tool));
|
|
178
|
+
const maxFortune = otherSources.reduce((acc, source) => acc + source.max(tool), 0);
|
|
179
|
+
return Math.max(0, maxFortune * 0.02); // 2% of the other sources
|
|
180
|
+
},
|
|
181
|
+
current: (tool) => {
|
|
182
|
+
const otherSources = TOOL_FORTUNE_SOURCES.filter((s) => s.name !== 'Axed Perk' && s.exists(tool));
|
|
183
|
+
const fortune = otherSources.reduce((acc, source) => acc + source.current(tool), 0);
|
|
184
|
+
return Math.max(0, fortune * 0.02); // 2% of the other sources
|
|
185
|
+
},
|
|
186
|
+
upgrades: (tool) => {
|
|
187
|
+
if (tool.options?.axed)
|
|
188
|
+
return [];
|
|
189
|
+
return [
|
|
190
|
+
{
|
|
191
|
+
title: 'Axed Perk',
|
|
192
|
+
increase: 1,
|
|
193
|
+
action: UpgradeAction.Unlock,
|
|
194
|
+
category: UpgradeCategory.Misc,
|
|
195
|
+
wiki: 'https://wiki.hypixel.net/Essence#Forest_Essence_',
|
|
196
|
+
cost: {
|
|
197
|
+
items: {
|
|
198
|
+
FOREST_ESSENCE: 10_000,
|
|
199
|
+
},
|
|
200
|
+
},
|
|
201
|
+
},
|
|
202
|
+
];
|
|
203
|
+
},
|
|
204
|
+
},
|
|
171
205
|
];
|
|
172
206
|
function enchantSourceBuilder(id, enchant) {
|
|
173
207
|
return {
|
|
@@ -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,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Upgradeable,
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
export declare function getFortune(level: number | null | undefined, source: FortuneSource): number;
|
|
1
|
+
import { type FortuneUpgrade, type Upgrade } from '../constants/upgrades.js';
|
|
2
|
+
import type { Upgradeable, UpgradeableInfo } from '../fortune/upgradeable.js';
|
|
3
|
+
import type { UpgradeableBase } from '../fortune/upgradeablebase.js';
|
|
4
|
+
import { type FarmingToolInfo } from '../items/tools.js';
|
|
6
5
|
export declare function getItemUpgrades(upgradeable: Upgradeable): FortuneUpgrade[];
|
|
7
6
|
export declare function getSelfFortuneUpgrade(upgradeable: Upgradeable): {
|
|
8
7
|
upgrade: FortuneUpgrade;
|
|
@@ -21,9 +20,6 @@ export declare function getLastItemUpgradeableTo(upgradeable: Upgradeable, optio
|
|
|
21
20
|
upgrade: Upgrade;
|
|
22
21
|
info: UpgradeableInfo;
|
|
23
22
|
} | undefined;
|
|
24
|
-
export declare function getSourceProgress<T extends object>(upgradeable: T, sources: DynamicFortuneSource<T>[], zeroed?: boolean): FortuneSourceProgress[];
|
|
25
23
|
export declare function getUpgradeableRarityUpgrade(upgradeable: Upgradeable): FortuneUpgrade | undefined;
|
|
26
|
-
export declare function getUpgradeableEnchants(upgradeable: Upgradeable): FortuneUpgrade[];
|
|
27
|
-
export declare function getUpgradeableEnchant(upgradeable: Upgradeable, enchantId: string): FortuneUpgrade[];
|
|
28
24
|
export declare function getUpgradeableReforges(upgradeable: Upgradeable): FortuneUpgrade[];
|
|
29
25
|
export declare function getUpgradeableGems(upgradeable: Upgradeable): FortuneUpgrade[];
|
|
@@ -1,22 +1,12 @@
|
|
|
1
|
-
import { EnchantTierProcurement, FARMING_ENCHANTS } from '../constants/enchants.js';
|
|
2
1
|
import { REFORGES } from '../constants/reforges.js';
|
|
3
2
|
import { Stat } from '../constants/stats.js';
|
|
4
3
|
import { UpgradeAction, UpgradeCategory, UpgradeReason, } from '../constants/upgrades.js';
|
|
5
|
-
import { FarmingAccessory } from '../fortune/farmingaccessory.js';
|
|
6
|
-
import { FarmingArmor } from '../fortune/farmingarmor.js';
|
|
7
|
-
import { FarmingEquipment } from '../fortune/farmingequipment.js';
|
|
8
|
-
import { FarmingTool } from '../fortune/farmingtool.js';
|
|
9
4
|
import { GemRarity } from '../fortune/item.js';
|
|
10
|
-
import { FARMING_ACCESSORIES_INFO } from '../items/accessories.js';
|
|
11
|
-
import { FARMING_ARMOR_INFO } from '../items/armor.js';
|
|
12
|
-
import { FARMING_EQUIPMENT_INFO } from '../items/equipment.js';
|
|
13
5
|
import { FARMING_TOOLS } from '../items/tools.js';
|
|
14
|
-
import { getFortuneFromEnchant } from '../util/enchants.js';
|
|
15
6
|
import { getGemRarityName, getNextGemRarity, getPeridotFortune, getPeridotGemFortune, getPeridotGems, } from '../util/gems.js';
|
|
16
7
|
import { nextRarity } from '../util/itemstats.js';
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}
|
|
8
|
+
import { getUpgradeableEnchants } from './enchantupgrades.js';
|
|
9
|
+
import { getFakeItem } from './itemregistry.js';
|
|
20
10
|
export function getItemUpgrades(upgradeable) {
|
|
21
11
|
const { deadEnd, upgrade } = getSelfFortuneUpgrade(upgradeable) ?? {};
|
|
22
12
|
if (deadEnd)
|
|
@@ -96,26 +86,16 @@ export function getLastToolUpgrade(tool) {
|
|
|
96
86
|
return item;
|
|
97
87
|
}
|
|
98
88
|
export function getUpgradeableInfo(skyblockId) {
|
|
99
|
-
const notFound = { info: undefined, fake: undefined };
|
|
100
89
|
if (!skyblockId)
|
|
101
|
-
return
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
return {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
return { info, fake: FarmingAccessory.fakeItem(info) };
|
|
109
|
-
}
|
|
110
|
-
if (FARMING_ARMOR_INFO[skyblockId]) {
|
|
111
|
-
const info = FARMING_ARMOR_INFO[skyblockId];
|
|
112
|
-
return { info, fake: FarmingArmor.fakeItem(info) };
|
|
113
|
-
}
|
|
114
|
-
if (FARMING_EQUIPMENT_INFO[skyblockId]) {
|
|
115
|
-
const info = FARMING_EQUIPMENT_INFO[skyblockId];
|
|
116
|
-
return { info, fake: FarmingEquipment.fakeItem(info) };
|
|
90
|
+
return { info: undefined, fake: undefined };
|
|
91
|
+
const fake = getFakeItem(skyblockId);
|
|
92
|
+
if (fake) {
|
|
93
|
+
return {
|
|
94
|
+
info: fake.info,
|
|
95
|
+
fake: fake,
|
|
96
|
+
};
|
|
117
97
|
}
|
|
118
|
-
return
|
|
98
|
+
return { info: undefined, fake: undefined };
|
|
119
99
|
}
|
|
120
100
|
export function getNextItemUpgradeableTo(upgradeable, options) {
|
|
121
101
|
const upgrade = upgradeable.getItemUpgrade();
|
|
@@ -142,62 +122,6 @@ export function getLastItemUpgradeableTo(upgradeable, options) {
|
|
|
142
122
|
return undefined;
|
|
143
123
|
return { upgrade: last, info: item };
|
|
144
124
|
}
|
|
145
|
-
export function getSourceProgress(upgradeable, sources, zeroed = false) {
|
|
146
|
-
const result = [];
|
|
147
|
-
// Ensure the item fortune is up to date
|
|
148
|
-
if ('getFortune' in upgradeable && typeof upgradeable.getFortune === 'function') {
|
|
149
|
-
upgradeable.getFortune();
|
|
150
|
-
}
|
|
151
|
-
for (const source of sources) {
|
|
152
|
-
if (!source.exists(upgradeable))
|
|
153
|
-
continue;
|
|
154
|
-
const max = source.max(upgradeable);
|
|
155
|
-
const current = zeroed ? 0 : source.current(upgradeable);
|
|
156
|
-
const progress = {
|
|
157
|
-
name: source.name,
|
|
158
|
-
fortune: current,
|
|
159
|
-
maxFortune: max,
|
|
160
|
-
ratio: Math.min(current / max, 1),
|
|
161
|
-
};
|
|
162
|
-
if (source.progress) {
|
|
163
|
-
const p = source.progress(upgradeable);
|
|
164
|
-
if (p) {
|
|
165
|
-
progress.progress = p;
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
|
-
if (source.info) {
|
|
169
|
-
const { item, info, maxInfo, nextInfo } = source.info(upgradeable);
|
|
170
|
-
if (item)
|
|
171
|
-
progress.item = item;
|
|
172
|
-
if (info)
|
|
173
|
-
progress.info = info;
|
|
174
|
-
if (maxInfo)
|
|
175
|
-
progress.maxInfo = maxInfo;
|
|
176
|
-
if (nextInfo)
|
|
177
|
-
progress.nextInfo = nextInfo;
|
|
178
|
-
}
|
|
179
|
-
if (source.wiki) {
|
|
180
|
-
const wiki = source.wiki(upgradeable);
|
|
181
|
-
if (wiki)
|
|
182
|
-
progress.wiki = wiki;
|
|
183
|
-
}
|
|
184
|
-
if (source.api === false) {
|
|
185
|
-
progress.api = false;
|
|
186
|
-
}
|
|
187
|
-
if (source.upgrades) {
|
|
188
|
-
const upgrades = source.upgrades(upgradeable);
|
|
189
|
-
for (const upgrade of upgrades) {
|
|
190
|
-
upgrade.max = upgrade.max ?? max;
|
|
191
|
-
upgrade.wiki = upgrade.wiki ?? progress.wiki;
|
|
192
|
-
}
|
|
193
|
-
if (upgrades.length > 0) {
|
|
194
|
-
progress.upgrades = upgrades;
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
|
-
result.push(progress);
|
|
198
|
-
}
|
|
199
|
-
return result;
|
|
200
|
-
}
|
|
201
125
|
export function getUpgradeableRarityUpgrade(upgradeable) {
|
|
202
126
|
// Skip if the item is already recombobulated
|
|
203
127
|
if (upgradeable.recombobulated)
|
|
@@ -252,105 +176,6 @@ export function getUpgradeableRarityUpgrade(upgradeable) {
|
|
|
252
176
|
return undefined;
|
|
253
177
|
return result;
|
|
254
178
|
}
|
|
255
|
-
export function getUpgradeableEnchants(upgradeable) {
|
|
256
|
-
if (!upgradeable.type)
|
|
257
|
-
return [];
|
|
258
|
-
const result = [];
|
|
259
|
-
for (const enchantId in FARMING_ENCHANTS) {
|
|
260
|
-
result.push(...getUpgradeableEnchant(upgradeable, enchantId));
|
|
261
|
-
}
|
|
262
|
-
return result;
|
|
263
|
-
}
|
|
264
|
-
export function getUpgradeableEnchant(upgradeable, enchantId) {
|
|
265
|
-
const enchant = FARMING_ENCHANTS[enchantId];
|
|
266
|
-
if (!upgradeable.type || !enchant)
|
|
267
|
-
return [];
|
|
268
|
-
const result = [];
|
|
269
|
-
// Skip if the enchantment doesn't apply to the item
|
|
270
|
-
if (!enchant || !enchant.appliesTo.includes(upgradeable.type))
|
|
271
|
-
return result;
|
|
272
|
-
// Skip if the enchantment is crop specific and the crop doesn't match
|
|
273
|
-
if (enchant.cropSpecific && enchant.cropSpecific !== upgradeable.crop)
|
|
274
|
-
return result;
|
|
275
|
-
const applied = upgradeable.item.enchantments?.[enchantId];
|
|
276
|
-
// If the enchantment is not applied, add an entry for applying it
|
|
277
|
-
if (!applied) {
|
|
278
|
-
const procurement = enchant.levels[enchant.minLevel]?.procurement;
|
|
279
|
-
result.push({
|
|
280
|
-
title: enchant.name + ' 1',
|
|
281
|
-
increase: getFortuneFromEnchant(enchant.minLevel, enchant, upgradeable.options, upgradeable.crop),
|
|
282
|
-
wiki: enchant.wiki,
|
|
283
|
-
action: !procurement || procurement === EnchantTierProcurement.Normal
|
|
284
|
-
? UpgradeAction.Apply
|
|
285
|
-
: UpgradeAction.LevelUp,
|
|
286
|
-
category: UpgradeCategory.Enchant,
|
|
287
|
-
cost: {
|
|
288
|
-
items: {
|
|
289
|
-
[enchantNameToId(enchant) + '_1']: 1,
|
|
290
|
-
},
|
|
291
|
-
},
|
|
292
|
-
onto: {
|
|
293
|
-
name: upgradeable.item.name,
|
|
294
|
-
skyblockId: upgradeable.item.skyblockId,
|
|
295
|
-
},
|
|
296
|
-
});
|
|
297
|
-
return result;
|
|
298
|
-
}
|
|
299
|
-
// If the enchantment is at max level already, we don't need to do anything
|
|
300
|
-
if (applied >= enchant.maxLevel)
|
|
301
|
-
return result;
|
|
302
|
-
// Add an entry for upgrading the enchantment
|
|
303
|
-
const currentFortune = getFortuneFromEnchant(applied, enchant, upgradeable.options, upgradeable.crop);
|
|
304
|
-
const nextFortune = getFortuneFromEnchant(applied + 1, enchant, upgradeable.options, upgradeable.crop);
|
|
305
|
-
const nextEnchant = enchant.levels[applied + 1];
|
|
306
|
-
if (!nextEnchant)
|
|
307
|
-
return result;
|
|
308
|
-
const normalNext = !nextEnchant.procurement ||
|
|
309
|
-
nextEnchant.procurement === EnchantTierProcurement.Normal ||
|
|
310
|
-
nextEnchant.procurement === EnchantTierProcurement.Loot;
|
|
311
|
-
const items = nextEnchant.cost?.items ?? {};
|
|
312
|
-
switch (nextEnchant.procurement) {
|
|
313
|
-
case undefined:
|
|
314
|
-
case EnchantTierProcurement.Normal: {
|
|
315
|
-
// Get amount of level 1 enchantment items needed to craft the same applied level
|
|
316
|
-
// Ex: 4 level 1 items = 2 level 2 items = 1 level 3 item
|
|
317
|
-
// Count = Math.pow(2, applied - 1)
|
|
318
|
-
const count = Math.pow(2, applied - 1);
|
|
319
|
-
items[enchantNameToId(enchant) + '_1'] = count;
|
|
320
|
-
break;
|
|
321
|
-
}
|
|
322
|
-
case EnchantTierProcurement.Loot:
|
|
323
|
-
// The desired level needs to be applied directly
|
|
324
|
-
items[enchantNameToId(enchant) + '_' + (applied + 1)] = 1;
|
|
325
|
-
break;
|
|
326
|
-
case EnchantTierProcurement.SelfLeveling:
|
|
327
|
-
return result; // Self-leveling enchantments do not have a cost
|
|
328
|
-
default:
|
|
329
|
-
break;
|
|
330
|
-
}
|
|
331
|
-
const cost = {
|
|
332
|
-
...(nextEnchant.cost ?? {}),
|
|
333
|
-
items: Object.keys(items).length > 0 ? items : undefined,
|
|
334
|
-
};
|
|
335
|
-
result.push({
|
|
336
|
-
title: enchant.name + ' ' + (applied + 1),
|
|
337
|
-
increase: nextFortune - currentFortune,
|
|
338
|
-
action: normalNext ? UpgradeAction.Apply : UpgradeAction.LevelUp,
|
|
339
|
-
category: UpgradeCategory.Enchant,
|
|
340
|
-
cost: cost,
|
|
341
|
-
wiki: enchant.wiki,
|
|
342
|
-
onto: {
|
|
343
|
-
name: upgradeable.item.name,
|
|
344
|
-
skyblockId: upgradeable.item.skyblockId,
|
|
345
|
-
},
|
|
346
|
-
});
|
|
347
|
-
return result;
|
|
348
|
-
}
|
|
349
|
-
function enchantNameToId(enchant) {
|
|
350
|
-
if (enchant.id)
|
|
351
|
-
return enchant.id;
|
|
352
|
-
return 'ENCHANTMENT_' + enchant.name.toLocaleUpperCase().replaceAll(' ', '_').replaceAll('-', '_');
|
|
353
|
-
}
|
|
354
179
|
export function getUpgradeableReforges(upgradeable) {
|
|
355
180
|
const currentFortune = upgradeable.reforgeStats?.stats?.[Stat.FarmingFortune] ?? 0;
|
|
356
181
|
const result = [];
|