From 5f8e43b4cfa1e198692931eb0f1f4e248f3b08b7 Mon Sep 17 00:00:00 2001 From: yoshy2002 Date: Wed, 1 Oct 2025 23:02:37 +0200 Subject: [PATCH 1/2] fix cropmilestones --- src/Utils/Constants.ts | 620 ++++++++++++++++++++--------------------- 1 file changed, 310 insertions(+), 310 deletions(-) diff --git a/src/Utils/Constants.ts b/src/Utils/Constants.ts index 392c0339d..7ffd8a8cd 100644 --- a/src/Utils/Constants.ts +++ b/src/Utils/Constants.ts @@ -856,36 +856,35 @@ export const GARDEN_XP = { }; export const WHEAT = { - 0: 30, - 1: 50, - 2: 80, - 3: 170, - 4: 330, - 5: 670, - 6: 1330, - 7: 2500, - 8: 3500, - 9: 5000, - 10: 6500, - 11: 8000, - 12: 10000, - 13: 20000, - 14: 35000, - 15: 50000, - 16: 75000, - 17: 100000, - 18: 175000, - 19: 250000, - 20: 350000, - 21: 500000, - 22: 750000, - 23: 1000000, - 24: 1300000, - 25: 1600000, - 26: 2000000, - 27: 2300000, - 28: 2600000, - 29: 3000000, + 1: 30, + 2: 50, + 3: 80, + 4: 170, + 5: 330, + 6: 670, + 7: 1330, + 8: 2500, + 9: 3500, + 10: 5000, + 11: 6500, + 12: 8000, + 13: 10000, + 14: 20000, + 15: 35000, + 16: 50000, + 17: 75000, + 18: 100000, + 19: 175000, + 20: 250000, + 21: 350000, + 22: 500000, + 23: 750000, + 24: 1000000, + 25: 1300000, + 26: 1600000, + 27: 2000000, + 28: 2300000, + 29: 2600000, 30: 3000000, 31: 3000000, 32: 3000000, @@ -901,41 +900,41 @@ export const WHEAT = { 42: 3000000, 43: 3000000, 44: 3000000, - 45: 3000000 + 45: 3000000, + 46: 3000000 }; export const CARROT = { - 0: 100, - 1: 150, - 2: 250, - 3: 500, - 4: 1500, - 5: 2500, - 6: 5000, - 7: 7500, - 8: 10000, - 9: 15000, - 10: 20000, - 11: 25000, - 12: 40000, - 13: 70000, - 14: 100000, - 15: 200000, - 16: 250000, + 1: 100, + 2: 150, + 3: 250, + 4: 500, + 5: 1500, + 6: 2500, + 7: 5000, + 8: 7500, + 9: 10000, + 10: 15000, + 11: 20000, + 12: 25000, + 13: 40000, + 14: 70000, + 15: 100000, + 16: 200000, 17: 250000, - 18: 500000, - 19: 750000, - 20: 1000000, - 21: 1500000, - 22: 2000000, - 23: 3000000, - 24: 4000000, - 25: 5000000, - 26: 6000000, - 27: 7000000, - 28: 8000000, - 29: 9000000, - 30: 10000000, + 18: 250000, + 19: 500000, + 20: 750000, + 21: 1000000, + 22: 1500000, + 23: 2000000, + 24: 3000000, + 25: 4000000, + 26: 5000000, + 27: 6000000, + 28: 7000000, + 29: 8000000, + 30: 9000000, 31: 10000000, 32: 10000000, 33: 10000000, @@ -950,41 +949,41 @@ export const CARROT = { 42: 10000000, 43: 10000000, 44: 10000000, - 45: 10000000 + 45: 10000000, + 46: 10000000 }; export const POTATO = { - 0: 100, - 1: 150, - 2: 250, - 3: 500, - 4: 1500, - 5: 2500, - 6: 5000, - 7: 7500, - 8: 10000, - 9: 15000, - 10: 20000, - 11: 25000, - 12: 40000, - 13: 70000, - 14: 100000, - 15: 200000, - 16: 250000, + 1: 100, + 2: 150, + 3: 250, + 4: 500, + 5: 1500, + 6: 2500, + 7: 5000, + 8: 7500, + 9: 10000, + 10: 15000, + 11: 20000, + 12: 25000, + 13: 40000, + 14: 70000, + 15: 100000, + 16: 200000, 17: 250000, - 18: 500000, - 19: 750000, - 20: 1000000, - 21: 1500000, - 22: 2000000, - 23: 3000000, - 24: 4000000, - 25: 5000000, - 26: 6000000, - 27: 7000000, - 28: 8000000, - 29: 9000000, - 30: 10000000, + 18: 250000, + 19: 500000, + 20: 750000, + 21: 1000000, + 22: 1500000, + 23: 2000000, + 24: 3000000, + 25: 4000000, + 26: 5000000, + 27: 6000000, + 28: 7000000, + 29: 8000000, + 30: 9000000, 31: 10000000, 32: 10000000, 33: 10000000, @@ -999,40 +998,40 @@ export const POTATO = { 42: 10000000, 43: 10000000, 44: 10000000, - 45: 10000000 + 45: 10000000, + 46: 10000000 }; export const MELON = { - 0: 150, - 1: 250, - 2: 400, - 3: 850, - 4: 1650, - 5: 3350, - 6: 6650, - 7: 12500, - 8: 17500, - 9: 25000, - 10: 32500, - 11: 40000, - 12: 50000, - 13: 100000, - 14: 175000, - 15: 250000, - 16: 375000, - 17: 500000, - 18: 875000, - 19: 1250000, - 20: 1750000, - 21: 2500000, - 22: 3750000, - 23: 5000000, - 24: 6500000, - 25: 8000000, - 26: 10000000, - 27: 11500000, - 28: 13000000, - 29: 15000000, + 1: 150, + 2: 250, + 3: 400, + 4: 850, + 5: 1650, + 6: 3350, + 7: 6650, + 8: 12500, + 9: 17500, + 10: 25000, + 11: 32500, + 12: 40000, + 13: 50000, + 14: 100000, + 15: 175000, + 16: 250000, + 17: 375000, + 18: 500000, + 19: 875000, + 20: 1250000, + 21: 1750000, + 22: 2500000, + 23: 3750000, + 24: 5000000, + 25: 6500000, + 26: 8000000, + 27: 10000000, + 28: 11500000, + 29: 13000000, 30: 15000000, 31: 15000000, 32: 15000000, @@ -1048,40 +1047,40 @@ export const MELON = { 42: 15000000, 43: 15000000, 44: 15000000, - 45: 15000000 + 45: 15000000, + 46: 15000000 }; export const PUMPKIN = { - 0: 30, - 1: 50, - 2: 80, - 3: 170, - 4: 330, - 5: 670, - 6: 1330, - 7: 2500, - 8: 3500, - 9: 5000, - 10: 6500, - 11: 8000, - 12: 10000, - 13: 20000, - 14: 35000, - 15: 50000, - 16: 75000, - 17: 100000, - 18: 175000, - 19: 250000, - 20: 350000, - 21: 500000, - 22: 750000, - 23: 1000000, - 24: 1300000, - 25: 1600000, - 26: 2000000, - 27: 2300000, - 28: 2600000, - 29: 3000000, + 1: 30, + 2: 50, + 3: 80, + 4: 170, + 5: 330, + 6: 670, + 7: 1330, + 8: 2500, + 9: 3500, + 10: 5000, + 11: 6500, + 12: 8000, + 13: 10000, + 14: 20000, + 15: 35000, + 16: 50000, + 17: 75000, + 18: 100000, + 19: 175000, + 20: 250000, + 21: 350000, + 22: 500000, + 23: 750000, + 24: 1000000, + 25: 1300000, + 26: 1600000, + 27: 2000000, + 28: 2300000, + 29: 2600000, 30: 3000000, 31: 3000000, 32: 3000000, @@ -1097,40 +1096,40 @@ export const PUMPKIN = { 42: 3000000, 43: 3000000, 44: 3000000, - 45: 3000000 + 45: 3000000, + 46: 3000000 }; export const SUGAR_CANE = { - 0: 60, - 1: 100, - 2: 160, - 3: 340, - 4: 660, - 5: 1340, - 6: 2660, - 7: 5000, - 8: 7000, - 9: 10000, - 10: 13000, - 11: 16000, - 12: 20000, - 13: 40000, - 14: 70000, - 15: 100000, - 16: 150000, - 17: 200000, - 18: 350000, - 19: 500000, - 20: 700000, - 21: 1000000, - 22: 1500000, - 23: 2000000, - 24: 2600000, - 25: 3200000, - 26: 4000000, - 27: 4600000, - 28: 5200000, - 29: 6000000, + 1: 60, + 2: 100, + 3: 160, + 4: 340, + 5: 660, + 6: 1340, + 7: 2660, + 8: 5000, + 9: 7000, + 10: 10000, + 11: 13000, + 12: 16000, + 13: 20000, + 14: 40000, + 15: 70000, + 16: 100000, + 17: 150000, + 18: 200000, + 19: 350000, + 20: 500000, + 21: 700000, + 22: 1000000, + 23: 1500000, + 24: 2000000, + 25: 2600000, + 26: 3200000, + 27: 4000000, + 28: 4600000, + 29: 5200000, 30: 6000000, 31: 6000000, 32: 6000000, @@ -1146,40 +1145,40 @@ export const SUGAR_CANE = { 42: 6000000, 43: 6000000, 44: 6000000, - 45: 6000000 + 45: 6000000, + 46: 6000000 }; export const COCOA_BEANS = { - 0: 90, - 1: 150, - 2: 250, - 3: 500, - 4: 1000, - 5: 2000, - 6: 4000, - 7: 7500, - 8: 10000, - 9: 15000, - 10: 20000, - 11: 25000, - 12: 30000, - 13: 50000, - 14: 100000, - 15: 150000, - 16: 200000, - 17: 300000, - 18: 500000, - 19: 750000, - 20: 1000000, - 21: 1500000, - 22: 2000000, - 23: 3000000, - 24: 4000000, - 25: 5000000, - 26: 6000000, - 27: 7000000, - 28: 8000000, - 29: 9000000, + 1: 90, + 2: 150, + 3: 250, + 4: 500, + 5: 1000, + 6: 2000, + 7: 4000, + 8: 7500, + 9: 10000, + 10: 15000, + 11: 20000, + 12: 25000, + 13: 30000, + 14: 50000, + 15: 100000, + 16: 150000, + 17: 200000, + 18: 300000, + 19: 500000, + 20: 750000, + 21: 1000000, + 22: 1500000, + 23: 2000000, + 24: 3000000, + 25: 4000000, + 26: 5000000, + 27: 6000000, + 28: 7000000, + 29: 8000000, 30: 9000000, 31: 9000000, 32: 9000000, @@ -1195,40 +1194,40 @@ export const COCOA_BEANS = { 42: 9000000, 43: 9000000, 44: 9000000, - 45: 9000000 + 45: 9000000, + 46: 9000000 }; export const CACTUS = { - 0: 60, - 1: 100, - 2: 160, - 3: 340, - 4: 660, - 5: 1340, - 6: 2660, - 7: 5000, - 8: 7000, - 9: 10000, - 10: 13000, - 11: 16000, - 12: 20000, - 13: 40000, - 14: 70000, - 15: 100000, - 16: 150000, - 17: 200000, - 18: 350000, - 19: 500000, - 20: 700000, - 21: 1000000, - 22: 1500000, - 23: 2000000, - 24: 2600000, - 25: 3200000, - 26: 4000000, - 27: 4600000, - 28: 5200000, - 29: 6000000, + 1: 60, + 2: 100, + 3: 160, + 4: 340, + 5: 660, + 6: 1340, + 7: 2660, + 8: 5000, + 9: 7000, + 10: 10000, + 11: 13000, + 12: 16000, + 13: 20000, + 14: 40000, + 15: 70000, + 16: 100000, + 17: 150000, + 18: 200000, + 19: 350000, + 20: 500000, + 21: 700000, + 22: 1000000, + 23: 1500000, + 24: 2000000, + 25: 2600000, + 26: 3200000, + 27: 4000000, + 28: 4600000, + 29: 5200000, 30: 6000000, 31: 6000000, 32: 6000000, @@ -1244,40 +1243,40 @@ export const CACTUS = { 42: 6000000, 43: 6000000, 44: 6000000, - 45: 6000000 + 45: 6000000, + 46: 6000000 }; export const MUSHROOM = { - 0: 30, - 1: 50, - 2: 80, - 3: 170, - 4: 330, - 5: 670, - 6: 1330, - 7: 2500, - 8: 3500, - 9: 5000, - 10: 6500, - 11: 8000, - 12: 10000, - 13: 20000, - 14: 35000, - 15: 50000, - 16: 75000, - 17: 100000, - 18: 175000, - 19: 250000, - 20: 350000, - 21: 500000, - 22: 750000, - 23: 1000000, - 24: 1300000, - 25: 1600000, - 26: 2000000, - 27: 2300000, - 28: 2600000, - 29: 3000000, + 1: 30, + 2: 50, + 3: 80, + 4: 170, + 5: 330, + 6: 670, + 7: 1330, + 8: 2500, + 9: 3500, + 10: 5000, + 11: 6500, + 12: 8000, + 13: 10000, + 14: 20000, + 15: 35000, + 16: 50000, + 17: 75000, + 18: 100000, + 19: 175000, + 20: 250000, + 21: 350000, + 22: 500000, + 23: 750000, + 24: 1000000, + 25: 1300000, + 26: 1600000, + 27: 2000000, + 28: 2300000, + 29: 2600000, 30: 3000000, 31: 3000000, 32: 3000000, @@ -1293,40 +1292,40 @@ export const MUSHROOM = { 42: 3000000, 43: 3000000, 44: 3000000, - 45: 3000000 + 45: 3000000, + 46: 3000000 }; export const NETHER_WART = { - 0: 90, - 1: 150, - 2: 250, - 3: 500, - 4: 1000, - 5: 2000, - 6: 4000, - 7: 7500, - 8: 10000, - 9: 15000, - 10: 20000, - 11: 25000, - 12: 30000, - 13: 50000, - 14: 100000, - 15: 150000, - 16: 200000, - 17: 300000, - 18: 500000, - 19: 750000, - 20: 1000000, - 21: 1500000, - 22: 2000000, - 23: 3000000, - 24: 4000000, - 25: 5000000, - 26: 6000000, - 27: 7000000, - 28: 8000000, - 29: 9000000, + 1: 90, + 2: 150, + 3: 250, + 4: 500, + 5: 1000, + 6: 2000, + 7: 4000, + 8: 7500, + 9: 10000, + 10: 15000, + 11: 20000, + 12: 25000, + 13: 30000, + 14: 50000, + 15: 100000, + 16: 150000, + 17: 200000, + 18: 300000, + 19: 500000, + 20: 750000, + 21: 1000000, + 22: 1500000, + 23: 2000000, + 24: 3000000, + 25: 4000000, + 26: 5000000, + 27: 6000000, + 28: 7000000, + 29: 8000000, 30: 9000000, 31: 9000000, 32: 9000000, @@ -1342,7 +1341,8 @@ export const NETHER_WART = { 42: 9000000, 43: 9000000, 44: 9000000, - 45: 9000000 + 45: 9000000, + 46: 9000000 }; /* eslint-disable camelcase */ From 4528c561eb7a2a98ac7088408c2287ccdf9d1e75 Mon Sep 17 00:00:00 2001 From: yoshy2002 Date: Wed, 1 Oct 2025 23:32:33 +0200 Subject: [PATCH 2/2] prettier --- src/Structures/MiniGames/SkyWars/SkyWars.ts | 6 +- .../Inventory/SkyBlockInventoryItem.ts | 28 +- src/Utils/Constants.ts | 343 ++---------------- src/Utils/Guild.ts | 27 +- 4 files changed, 48 insertions(+), 356 deletions(-) diff --git a/src/Structures/MiniGames/SkyWars/SkyWars.ts b/src/Structures/MiniGames/SkyWars/SkyWars.ts index d7a9e8e11..025ac860b 100644 --- a/src/Structures/MiniGames/SkyWars/SkyWars.ts +++ b/src/Structures/MiniGames/SkyWars/SkyWars.ts @@ -104,9 +104,9 @@ class SkyWars { this.levelProgress = getSkyWarsLevelProgress(data?.skywars_experience); this.levelFormatted = data?.levelFormatted ? data?.levelFormatted - ?.replace(/§l/gm, '**') - ?.replace(/§([a-f]|[1-9])/gm, '') - ?.replace(/§r/gm, '') + ?.replace(/§l/gm, '**') + ?.replace(/§([a-f]|[1-9])/gm, '') + ?.replace(/§r/gm, '') : null; this.prestige = getSkyWarsPrestige(this.level); this.opals = data?.opals || 0; diff --git a/src/Structures/SkyBlock/Inventory/SkyBlockInventoryItem.ts b/src/Structures/SkyBlock/Inventory/SkyBlockInventoryItem.ts index 72f54ceaa..caa1f63d1 100644 --- a/src/Structures/SkyBlock/Inventory/SkyBlockInventoryItem.ts +++ b/src/Structures/SkyBlock/Inventory/SkyBlockInventoryItem.ts @@ -88,20 +88,20 @@ class SkyBlockInventoryItem { this.statsBook = data?.tag?.ExtraAttributes?.stats_book || null; this.runes = data?.tag?.ExtraAttributes?.runes ? Object.keys(data?.tag?.ExtraAttributes?.runes).map( - (rune) => new SkyBlockInventoryItemRune({ id: rune, tier: data?.tag?.ExtraAttributes?.runes?.[rune] }) - ) + (rune) => new SkyBlockInventoryItemRune({ id: rune, tier: data?.tag?.ExtraAttributes?.runes?.[rune] }) + ) : null; this.reforge = data?.tag?.ExtraAttributes?.modifier || 'none'; this.hasArtOfWar = Boolean(data?.tag?.ExtraAttributes?.art_of_war_count || 0); this.starCount = data?.tag?.ExtraAttributes?.upgrade_level || 0; this.enchantments = data?.tag?.ExtraAttributes?.enchantments ? Object.keys(data?.tag?.ExtraAttributes?.enchantments).map( - (enchantment) => - new SkyBlockInventoryItemEnchantment({ - id: enchantment, - level: data?.tag?.ExtraAttributes?.enchantments?.[enchantment] - }) - ) + (enchantment) => + new SkyBlockInventoryItemEnchantment({ + id: enchantment, + level: data?.tag?.ExtraAttributes?.enchantments?.[enchantment] + }) + ) : null; this.uuid = data?.tag?.ExtraAttributes?.uuid || null; this.hotPotatoBookCount = data?.tag?.ExtraAttributes?.hot_potato_count || null; @@ -126,12 +126,12 @@ class SkyBlockInventoryItem { this.isShiny = Boolean(data?.tag?.ExtraAttributes?.is_shiny || 0); this.attributes = data?.tag?.ExtraAttributes?.attributes ? Object.keys(data?.tag?.ExtraAttributes?.attributes).map( - (attribute) => - new SkyBlockInventoryItemAttribute({ - id: attribute, - level: data?.tag?.ExtraAttributes?.attributes[attribute] - }) - ) + (attribute) => + new SkyBlockInventoryItemAttribute({ + id: attribute, + level: data?.tag?.ExtraAttributes?.attributes[attribute] + }) + ) : null; this.jalapenoCount = data?.tag?.ExtraAttributes?.jalapeono_count || null; this.hecatombSRuns = data?.tag?.ExtraAttributes?.hecatomb_s_runs || null; diff --git a/src/Utils/Constants.ts b/src/Utils/Constants.ts index 7ffd8a8cd..0f70546af 100644 --- a/src/Utils/Constants.ts +++ b/src/Utils/Constants.ts @@ -363,231 +363,28 @@ export const petRarityOffset: { [key in Rarity | 'UNKNOWN']: number } = { }; export const PetLevels: number[] = [ - 100, - 110, - 120, - 130, - 145, - 160, - 175, - 190, - 210, - 230, - 250, - 275, - 300, - 330, - 360, - 400, - 440, - 490, - 540, - 600, - 660, - 730, - 800, - 880, - 960, - 1050, - 1150, - 1260, - 1380, - 1510, - 1650, - 1800, - 1960, - 2130, - 2310, - 2500, - 2700, - 2920, - 3160, - 3420, - 3700, - 4000, - 4350, - 4750, - 5200, - 5700, - 6300, - 7000, - 7800, - 8700, - 9700, - 10800, - 12000, - 13300, - 14700, - 16200, - 17800, - 19500, - 21300, - 23200, - 25200, - 27400, - 29800, - 32400, - 35200, - 38200, - 41400, - 44800, - 48400, - 52200, - 56200, - 60400, - 64800, - 69400, - 74200, - 79200, - 84700, - 90700, - 97200, - 104200, - 111700, - 119700, - 128200, - 137200, - 146700, - 156700, - 167700, - 179700, - 192700, - 206700, - 221700, - 237700, - 254700, - 272700, - 291700, - 311700, - 333700, - 357700, - 383700, - 411700, - 441700, - 476700, - 516700, - 561700, - 611700, - 666700, - 726700, - 791700, - 861700, - 936700, - 1016700, - 1101700, - 1191700, - 1286700, - 1386700, - 1496700, - 1616700, - 1746700, - 1886700 + 100, 110, 120, 130, 145, 160, 175, 190, 210, 230, 250, 275, 300, 330, 360, 400, 440, 490, 540, 600, 660, 730, 800, + 880, 960, 1050, 1150, 1260, 1380, 1510, 1650, 1800, 1960, 2130, 2310, 2500, 2700, 2920, 3160, 3420, 3700, 4000, 4350, + 4750, 5200, 5700, 6300, 7000, 7800, 8700, 9700, 10800, 12000, 13300, 14700, 16200, 17800, 19500, 21300, 23200, 25200, + 27400, 29800, 32400, 35200, 38200, 41400, 44800, 48400, 52200, 56200, 60400, 64800, 69400, 74200, 79200, 84700, 90700, + 97200, 104200, 111700, 119700, 128200, 137200, 146700, 156700, 167700, 179700, 192700, 206700, 221700, 237700, 254700, + 272700, 291700, 311700, 333700, 357700, 383700, 411700, 441700, 476700, 516700, 561700, 611700, 666700, 726700, + 791700, 861700, 936700, 1016700, 1101700, 1191700, 1286700, 1386700, 1496700, 1616700, 1746700, 1886700 ]; export const CustomPetLeveling: CustomPetLevelingData = { GOLDEN_DRAGON: { type: 1, petLevels: [ - 0, - 5555, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700, - 1886700 + 0, 5555, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, 1886700, + 1886700, 1886700, 1886700 ], maxLevel: 200 }, @@ -1349,112 +1146,20 @@ export const NETHER_WART = { export const BestiaryBrackets: { [key: number]: number[] } = { 1: [ - 20, - 40, - 60, - 100, - 200, - 400, - 800, - 1400, - 2000, - 3000, - 6000, - 12000, - 20000, - 30000, - 40000, - 50000, - 60000, - 72000, - 86000, - 100000, - 200000, - 400000, - 600000, - 800000, - 1000000 + 20, 40, 60, 100, 200, 400, 800, 1400, 2000, 3000, 6000, 12000, 20000, 30000, 40000, 50000, 60000, 72000, 86000, + 100000, 200000, 400000, 600000, 800000, 1000000 ], 2: [ - 5, - 10, - 15, - 25, - 50, - 100, - 200, - 350, - 500, - 750, - 1500, - 3000, - 5000, - 7500, - 10000, - 12500, - 15000, - 18000, - 21500, - 25000, - 50000, - 100000, - 150000, - 200000, - 250000 + 5, 10, 15, 25, 50, 100, 200, 350, 500, 750, 1500, 3000, 5000, 7500, 10000, 12500, 15000, 18000, 21500, 25000, 50000, + 100000, 150000, 200000, 250000 ], 3: [ - 4, - 8, - 12, - 16, - 20, - 40, - 80, - 140, - 200, - 300, - 600, - 1200, - 2000, - 3000, - 4000, - 5000, - 6000, - 7200, - 8600, - 10000, - 20000, - 40000, - 60000, - 80000, - 100000 + 4, 8, 12, 16, 20, 40, 80, 140, 200, 300, 600, 1200, 2000, 3000, 4000, 5000, 6000, 7200, 8600, 10000, 20000, 40000, + 60000, 80000, 100000 ], 4: [ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 35, - 50, - 75, - 150, - 300, - 500, - 750, - 1000, - 1350, - 1650, - 2000, - 2500, - 3000, - 5000, - 10000, - 15000, - 20000, - 25000 + 2, 4, 6, 10, 15, 20, 25, 35, 50, 75, 150, 300, 500, 750, 1000, 1350, 1650, 2000, 2500, 3000, 5000, 10000, 15000, + 20000, 25000 ], 5: [ 1, 2, 3, 5, 7, 10, 15, 20, 25, 30, 60, 120, 200, 300, 400, 500, 600, 720, 860, 1000, 2000, 4000, 6000, 8000, 10000 diff --git a/src/Utils/Guild.ts b/src/Utils/Guild.ts index 02d617b80..46a9170d2 100644 --- a/src/Utils/Guild.ts +++ b/src/Utils/Guild.ts @@ -15,11 +15,11 @@ export function parseHistory(historyData: Record): ExpHistory[] { day: x[0], date: x[0].match(dateRegExp) ? parseDate( - x[0] - .match(dateRegExp)! - .slice(1) - .map((x) => parseInt(x, 10)) - ) + x[0] + .match(dateRegExp)! + .slice(1) + .map((x) => parseInt(x, 10)) + ) : undefined, exp: x[1] || 0, totalExp: @@ -31,21 +31,8 @@ export function parseHistory(historyData: Record): ExpHistory[] { export function getGuildLevel(exp: number) { const EXP_NEEDED: number[] = [ - 100000, - 150000, - 250000, - 500000, - 750000, - 1000000, - 1250000, - 1500000, - 2000000, - 2500000, - 2500000, - 2500000, - 2500000, - 2500000, - 3000000 + 100000, 150000, 250000, 500000, 750000, 1000000, 1250000, 1500000, 2000000, 2500000, 2500000, 2500000, 2500000, + 2500000, 3000000 ]; let level = 0; for (let i = 0; i <= 1000; i += 1) {