diff --git a/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte b/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte index dba648391..b2346ffba 100644 --- a/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte +++ b/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte @@ -75,6 +75,10 @@ 115: 'Hard Prey', 116: 'Nightmare Prey', 157: 'Ritual Site', + // Midnight S2 added new IDs for some reason + 248: 'World Activity', + 249: 'Delve', + 258: 'Purging the Vaults', }; function getRunCount(index: number): number { diff --git a/apps/frontend/data/currencies.ts b/apps/frontend/data/currencies.ts index 723e08b63..75170f75b 100644 --- a/apps/frontend/data/currencies.ts +++ b/apps/frontend/data/currencies.ts @@ -457,6 +457,8 @@ export const currencyItems: Record = { 126412: [ 274476, // Spark of Tides 269862, // Thalassian Token of Merit + 273000, // Corrosive Soul + 279382, // Venom-Cursed Fragment ], // Player vs Player @@ -786,6 +788,8 @@ export const pvpCurrencies = new Set([ export const currencyGood: Record = { [Constants.currencies.honor]: 2000, + 1279382: 2, // Venom-Cursed Fragment + // Midnight - Crafting Moxie 3256: 600, // Alchemy 3257: 600, // Blacksmithing diff --git a/apps/frontend/data/dungeon.ts b/apps/frontend/data/dungeon.ts index b50b31071..dead96458 100644 --- a/apps/frontend/data/dungeon.ts +++ b/apps/frontend/data/dungeon.ts @@ -198,11 +198,11 @@ export const raidVaultItemLevel: Record> = { }; export const worldVaultItemLevel: Array> = [ - [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 + // [13, 315, 4], // Hero 4 (ritual 5?) + // [12, 308, 4], // Hero 2 (ritual 4?) + // [8, 298, 4], // Hero 1 + [7, 298, 3], // Champion 3 + [6, 295, 3], // Champion 2 [5, 292, 3], // Champion 1 [4, 289, 2], // Veteran 4 [3, 285, 2], // Veteran 3 diff --git a/apps/frontend/data/holidays.ts b/apps/frontend/data/holidays.ts index 557606acc..c4ae02283 100644 --- a/apps/frontend/data/holidays.ts +++ b/apps/frontend/data/holidays.ts @@ -46,6 +46,7 @@ export const holidayIds: Record = { [Holiday.DarkmoonFaire]: [[1]], [Holiday.DarkspearDash]: [[458]], [Holiday.DayOfTheDead]: [[81]], + [Holiday.FreeTshirtDay]: [[393]], [Holiday.HallowsEnd]: [[16]], [Holiday.LoveIsInTheAir]: [[9]], [Holiday.LunarFestival]: [[18]], @@ -128,6 +129,11 @@ export const fancyHolidays: FancyHoliday[] = [ shortName: '💀', everything: 'day-of-the-dead', }, + { + holiday: Holiday.FreeTshirtDay, + shortName: '👕', + everything: 'free-tshirt-day', + }, { holiday: Holiday.HallowsEnd, shortName: '🎃', diff --git a/apps/frontend/enums/holiday.ts b/apps/frontend/enums/holiday.ts index de8bb1c17..3adae66bb 100644 --- a/apps/frontend/enums/holiday.ts +++ b/apps/frontend/enums/holiday.ts @@ -5,6 +5,7 @@ export enum Holiday { DarkmoonFaire, DarkspearDash, DayOfTheDead, + FreeTshirtDay, HallowsEnd, LoveIsInTheAir, LunarFestival, diff --git a/apps/frontend/user-home/components/everything/LookupThing.svelte b/apps/frontend/user-home/components/everything/LookupThing.svelte index 6410b83c9..6bf3612c6 100644 --- a/apps/frontend/user-home/components/everything/LookupThing.svelte +++ b/apps/frontend/user-home/components/everything/LookupThing.svelte @@ -74,7 +74,9 @@ if (ret.linkType === 'item') { ret.linkQuality = - quality || wowthingData.items.items[ret.linkId]?.quality || ItemQuality.Poor; + quality >= 0 + ? quality + : wowthingData.items.items[ret.linkId]?.quality || ItemQuality.Poor; } return ret; diff --git a/apps/frontend/user-home/components/everything/data.ts b/apps/frontend/user-home/components/everything/data.ts index 88a9b4a98..284b2d9b9 100644 --- a/apps/frontend/user-home/components/everything/data.ts +++ b/apps/frontend/user-home/components/everything/data.ts @@ -35,6 +35,11 @@ export const everythingData: Record = { achievementsKey: ['world-events', 'day-of-the-dead'], vendorsKey: ['world-events', 'day-of-the-dead'], }, + 'free-tshirt-day': { + name: 'Free T-Shirt Day', + tag: 'event:free-tshirt-day', + vendorsKey: ['world-events', 'free-t-shirt-day'], + }, 'hallows-end': { name: "Hallow's End", tag: 'event:hallows-end', diff --git a/apps/tool/Tools/DumpsTool.cs b/apps/tool/Tools/DumpsTool.cs index b65352865..5c4a5e658 100644 --- a/apps/tool/Tools/DumpsTool.cs +++ b/apps/tool/Tools/DumpsTool.cs @@ -894,7 +894,7 @@ private async Task ImportHolidays(WowDbContext context) if (validDates.Length == 1) { dbHoliday.StartDates = new(); - var startDate = DateTimeUtilities.ParseBlizzardDateTime(holiday.Dates[0]); + var startDate = DateTimeUtilities.ParseBlizzardDateTime(validDates[0]); // A year mask of 11111 (31) is "every year on this date" if (startDate.Year == 2031) {