Skip to content
Merged

Deploy #1790

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
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions apps/frontend/data/currencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,8 @@ export const currencyItems: Record<number, number[]> = {
126412: [
274476, // Spark of Tides
269862, // Thalassian Token of Merit
273000, // Corrosive Soul
279382, // Venom-Cursed Fragment
],

// Player vs Player
Expand Down Expand Up @@ -786,6 +788,8 @@ export const pvpCurrencies = new Set<number>([
export const currencyGood: Record<number, number> = {
[Constants.currencies.honor]: 2000,

1279382: 2, // Venom-Cursed Fragment

// Midnight - Crafting Moxie
3256: 600, // Alchemy
3257: 600, // Blacksmithing
Expand Down
10 changes: 5 additions & 5 deletions apps/frontend/data/dungeon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ export const raidVaultItemLevel: Record<number, Array<number>> = {
};

export const worldVaultItemLevel: Array<Array<number>> = [
[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
Expand Down
6 changes: 6 additions & 0 deletions apps/frontend/data/holidays.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const holidayIds: Record<number, [number[], number[]?]> = {
[Holiday.DarkmoonFaire]: [[1]],
[Holiday.DarkspearDash]: [[458]],
[Holiday.DayOfTheDead]: [[81]],
[Holiday.FreeTshirtDay]: [[393]],
[Holiday.HallowsEnd]: [[16]],
[Holiday.LoveIsInTheAir]: [[9]],
[Holiday.LunarFestival]: [[18]],
Expand Down Expand Up @@ -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: '🎃',
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/enums/holiday.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export enum Holiday {
DarkmoonFaire,
DarkspearDash,
DayOfTheDead,
FreeTshirtDay,
HallowsEnd,
LoveIsInTheAir,
LunarFestival,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions apps/frontend/user-home/components/everything/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ export const everythingData: Record<string, EverythingData> = {
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',
Expand Down
2 changes: 1 addition & 1 deletion apps/tool/Tools/DumpsTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Loading