Skip to content
Merged

Deploy #1786

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions apps/frontend/components/items/convertible/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,67 @@ export const modifierToTier: Record<number, number> = {

export const currentUpgrade1: ConvertibleCategoryUpgrade[] = [
{
upgradeId: 3341,
upgradeId: 3443,
upgradeCost: 20,
achievementId: 42767, // Veteran of the Dawn
achievementId: 62411, // Veteran of the Mist
achievementUpgradeCost: 10,
},
];
export const currentUpgrade2: ConvertibleCategoryUpgrade[] = [
{
upgradeId: 3343,
upgradeId: 3444,
upgradeCost: 20,
achievementId: 42768, // Champion of the Dawn
achievementId: 62412, // Champion of the Mist
achievementUpgradeCost: 10,
},
];
export const currentUpgrade3: ConvertibleCategoryUpgrade[] = [
{
upgradeId: 3345,
upgradeId: 3445,
upgradeCost: 20,
achievementId: 42769, // Hero of the Dawn
achievementId: 62414, // Hero of the Mist
achievementUpgradeCost: 10,
},
];
export const currentUpgrade4: ConvertibleCategoryUpgrade[] = [
{
upgradeId: 3347,
upgradeId: 3446,
upgradeCost: 20,
achievementId: 42770, // Myth of the Dawn
achievementId: 62416, // Myth of the Mist
achievementUpgradeCost: 10,
},
];

// ID = ItemConversion.db2
export const convertibleCategories: ConvertibleCategory[] = [
{
id: 13,
minimumLevel: 90,
name: '[Mid] Season 2',
slug: 'mid-season-2',
conversionCurrencyId: 3465, // Venomblight Manaflux
tiers: [
{
itemLevel: 318,
highUpgrade: currentUpgrade4,
lowUpgrade: currentUpgrade3,
},
{
itemLevel: 305,
highUpgrade: currentUpgrade3,
lowUpgrade: currentUpgrade2,
},
{
itemLevel: 292,
highUpgrade: currentUpgrade2,
lowUpgrade: currentUpgrade1,
},
{
itemLevel: 279,
highUpgrade: currentUpgrade1,
},
],
},
{
id: 12,
minimumLevel: 90,
Expand All @@ -54,22 +82,15 @@ export const convertibleCategories: ConvertibleCategory[] = [
tiers: [
{
itemLevel: 272,
highUpgrade: currentUpgrade4,
lowUpgrade: currentUpgrade3,
},
{
itemLevel: 259,
highUpgrade: currentUpgrade3,
lowUpgrade: currentUpgrade2,
},
{
itemLevel: 246,
highUpgrade: currentUpgrade2,
lowUpgrade: currentUpgrade1,
},
{
itemLevel: 233,
highUpgrade: currentUpgrade1,
},
],
purchases: [
Expand Down
10 changes: 5 additions & 5 deletions apps/frontend/components/tooltips/reputation/hacks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ export function brannHack(levelString: string): number {

export function valeeraHack(levelString: string): number {
const level = parseInt(levelString);
if (level >= 51) {
if (level >= 71) {
return 1;
} else if (level >= 41) {
} else if (level >= 61) {
return 2;
} else if (level >= 31) {
} else if (level >= 51) {
return 3;
} else if (level >= 21) {
} else if (level >= 41) {
return 4;
} else if (level >= 11) {
} else if (level >= 31) {
return 5;
} else {
return 6;
Expand Down
40 changes: 21 additions & 19 deletions apps/frontend/data/currencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,22 @@ export const categoryChildren: Record<number, StaticDataCurrencyCategory[]> = {

// Midnight
264: [
{
id: 283,
name: 'Zones',
slug: 'zones',
},
{
id: 126411,
name: 'Season 1',
slug: 'season-1',
},
{
id: 126412,
name: 'Season 2',
slug: 'season-2',
},
null,
{
id: 126401,
name: 'Crafting Concentration',
Expand All @@ -64,16 +80,6 @@ export const categoryChildren: Record<number, StaticDataCurrencyCategory[]> = {
name: 'Crafting Catchup',
slug: 'crafting-catchup',
},
{
id: 126411,
name: 'Season 1',
slug: 'season-1',
},
{
id: 126412,
name: 'Season 2',
slug: 'season-2',
},
],

// The War Within
Expand Down Expand Up @@ -141,7 +147,11 @@ export const categoryChildren: Record<number, StaticDataCurrencyCategory[]> = {
};

export const currencyExtra: Record<number, number[]> = {
264: [3393],
264: [
3405, // Field Accolade
3393, // Illusionary Coin
3392, // Remnant of Anguish
],
// Midnight - Crafting Concentration
126401: [
3161, // Alchemy,
Expand Down Expand Up @@ -197,15 +207,8 @@ export const currencyExtra: Record<number, number[]> = {
],
// Midnight - Season 1
126411: [
3356, // Untainted Mana-Crystals
3418, // Nebulous Voidcore
null,
3383, // Adventurer Dawncrest
3341, // Veteran Dawncrest
3343, // Champion Dawncrest
3345, // Hero Dawncrest
3347, // Myth Dawncrest
null,
3378, // Dawnlight Manaflux
3212, // Radiant Spark Dust (spark tracker)
],
Expand Down Expand Up @@ -449,7 +452,6 @@ export const currencyItems: Record<number, number[]> = {
// Midnight - Season 1
126411: [
232875, // Spark of Radiance
258556, // Thalassian Token of Merit
],
// Midnight - Season 2
126412: [
Expand Down
34 changes: 17 additions & 17 deletions apps/frontend/data/dungeon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ export const dungeonMap: Record<number, Dungeon> = Object.fromEntries(

// [key level, item level] first match >= key is used
export const keyVaultItemLevel: Array<Array<number>> = [
[10, 272, 5], // Myth 1
[7, 269, 4], // Hero 4
[6, 266, 4], // Hero 3
[4, 263, 4], // Hero 2
[2, 259, 4], // Hero 1
[1, 256, 3], // [0] Champion 4
[0, 243, 2], // [H] Veteran 4
[10, 318, 5], // Myth 1
[7, 315, 4], // Hero 4
[6, 311, 4], // Hero 3
[4, 308, 4], // Hero 2
[2, 305, 4], // Hero 1
[1, 302, 3], // [0] Champion 4
[0, 289, 2], // [H] Veteran 4
];

export const raidVaultItemLevel: Record<number, Array<number>> = {
Expand All @@ -144,16 +144,16 @@ export const raidVaultItemLevel: Record<number, Array<number>> = {
};

export const worldVaultItemLevel: Array<Array<number>> = [
[13, 269, 4], // Hero 4 (ritual 5?)
[12, 263, 4], // Hero 2 (ritual 4?)
[8, 259, 4], // Hero 1
[7, 256, 3], // Champion 4
[6, 253, 3], // Champion 3
[5, 246, 3], // Champion 1
[4, 243, 2], // Veteran 4
[3, 240, 2], // Veteran 3
[2, 237, 2], // Veteran 2
[1, 233, 2], // Veteran 1
[13, 315, 4], // Hero 4 (ritual 5?)
[12, 308, 4], // Hero 2 (ritual 4?)
[8, 305, 4], // Hero 1
[7, 302, 3], // Champion 4
[6, 298, 3], // Champion 3
[5, 292, 3], // Champion 1
[4, 289, 2], // Veteran 4
[3, 285, 2], // Veteran 3
[2, 282, 2], // Veteran 2
[1, 279, 2], // Veteran 1
];

export const keyTiers = ['2-5', '6-10', '11-15', '16-20', '21-25', '26-30', '31+'];
Expand Down
7 changes: 6 additions & 1 deletion apps/frontend/stores/user-auctions/missing-recipes.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,12 @@ export class UserAuctionMissingRecipeDataStore {
const meetsDontHave = auctionState.showDontHave || thing.hasItems.length > 0;
const meetsHave = auctionState.showHave || thing.hasItems.length === 0;

const [skillLineId] = wowthingData.static.itemToSkillLine[item.id];
const [skillLineId] = wowthingData.static.itemToSkillLine[item.id] || [];
if (!skillLineId) {
console.warn('missing itemToSkillLine for item', item.id);
return false;
}

const [profession, skillLineExpansion] =
wowthingData.static.professionBySkillLineId.get(skillLineId);

Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/user-home/components/currencies/Table.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
let ret = wowthingData.static.currencyCategoryBySlug.get(params.slug1);

if (params.slug2) {
ret = (categoryChildren[ret.id] || []).find((cat) => cat.slug === params.slug2);
ret = (categoryChildren[ret.id] || []).find((cat) => cat?.slug === params.slug2);
}

return ret;
Expand Down
Loading