Skip to content
Merged

Deploy #1801

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
2 changes: 1 addition & 1 deletion apps/frontend/data/professions/mining.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export const dragonflightMining: TaskProfession = {
questId: 72164,
},
{
itemId: 198841, // Large Sample of Curious Hide
itemId: 201301, // Iridescent Ore
questId: 72165,
},
],
Expand Down
4 changes: 4 additions & 0 deletions apps/frontend/data/tasks/11-midnight/12-0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { DbResetType } from '@/shared/stores/db/enums';
import { dynamicDataStore } from '@/user-home/stores/dynamicData';
import type { Character } from '@/types';
import type { Chore, Task } from '@/types/tasks';
import { twoWeekDecorator } from './utils';
import { customResetPeriod } from '../custom-reset-period';

const specialAssignmentUnlocks = [
94865, // Special Assignment: What Remains of a Temple Broken
Expand Down Expand Up @@ -92,6 +94,8 @@ export const midChores12_0: Task = {
name: 'Hope/Unity',
icon: aliasedIcons.planet,
questReset: DbResetType.Weekly,
customExpiryFunc: (char, scannedAt) => customResetPeriod(char, scannedAt, 1079, 2),
decorationFunc: twoWeekDecorator,
subChoresAnyOrder: true,
subChores: [
{
Expand Down
12 changes: 12 additions & 0 deletions apps/frontend/data/tasks/11-midnight/12-1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { nthActiveQuest } from '@/utils/tasks/nth-active-quest';
import type { Task } from '@/types/tasks';

import { specialAssignmentFunc } from './12-0';
import { customResetPeriod } from '../custom-reset-period';
import { twoWeekDecorator } from './utils';

const specialAssignmentUnlocks = [
96492, // Special Assignment: Demand and Supply
Expand Down Expand Up @@ -35,6 +37,8 @@ export const midChores12_1: Task = {
minimumLevel: 90,
questReset: DbResetType.Weekly,
questIds: [98172],
customExpiryFunc: (char, scannedAt) => customResetPeriod(char, scannedAt, 1078, 2),
decorationFunc: twoWeekDecorator,
},
{
key: 'curseSurge',
Expand All @@ -52,6 +56,14 @@ export const midChores12_1: Task = {
questReset: DbResetType.Weekly,
questIds: [95520],
},
{
key: 'ancientFoe',
name: 'Ancient Foe',
icon: iconLibrary.gameDeathSkull,
minimumLevel: 90,
questReset: DbResetType.Weekly,
questIds: [97768],
},
{
key: 'vaultDailies',
name: 'Vault Dailies',
Expand Down
11 changes: 11 additions & 0 deletions apps/frontend/data/tasks/11-midnight/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { timeState } from '@/shared/state/time.svelte';
import type { DateTime } from 'luxon';

export const twoWeekDecorator = (expires: DateTime) => {
const daysRemaining = expires.diff(timeState.slowTime).toMillis() / 1000 / 86400;
if (daysRemaining < 7) {
return 'decorator-warn';
} else {
return 'decorator-success';
}
};
1 change: 1 addition & 0 deletions apps/frontend/data/tasks/pvp/weekly.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const pvpWeekly: Task = {
{
key: 'pvpSparks',
name: '[PvP] Sparks of War',
icon: ':stars::swords:',
questIds: [
93423, // Sparks of War: Eversong
93424, // Sparks of War: Zul'Aman
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/shared/icons/library.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export { default as gameSmallFire } from '~icons/game-icons/small-fire';
export { default as gameSpellBook } from '~icons/game-icons/spell-book';
export { default as gameSpiderFace } from '~icons/game-icons/spider-face';
export { default as gameSpikedDragonHead } from '~icons/game-icons/spiked-dragon-head';
export { default as gameStarsStack } from '~icons/game-icons/stars-stack';
export { default as gameStaryu } from '~icons/game-icons/staryu';
export { default as gameStopwatch } from '~icons/game-icons/stopwatch';
export { default as gameStrongbox } from '~icons/game-icons/strongbox';
Expand Down
2 changes: 2 additions & 0 deletions apps/frontend/shared/icons/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ export const aliasedIcons = {
planet: iconLibrary.mdiPlanet,
rose: iconLibrary.notoRose,
snowflake: iconLibrary.notoSnowflake,
stars: iconLibrary.gameStarsStack,
swords: iconLibrary.gameCrossedSwords,
sun: iconLibrary.notoSunWithFace,
water: iconLibrary.notoWaterWave,
};
Loading