diff --git a/apps/frontend/data/currencies.ts b/apps/frontend/data/currencies.ts index 73d297976..13c33d0af 100644 --- a/apps/frontend/data/currencies.ts +++ b/apps/frontend/data/currencies.ts @@ -194,6 +194,7 @@ export const currencyExtra: Record = { 3310, // Coffer Key Shards 3028, // Restored Coffer Key 3356, // Untainted Mana-Crystals + 3418, // Nebulous Voidcore null, 3378, // Dawnlight Manaflux 3383, // Adventurer Dawncrest diff --git a/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts b/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts index a9381bde9..de133da8e 100644 --- a/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts +++ b/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts @@ -8,21 +8,6 @@ export const bfaNazjatar: Task = { shortName: 'Naz', showSeparate: true, chores: [ - { - key: 'ancientBark', - name: '{item:170184}', - icon: iconLibrary.gameTreeFace, - alwaysStarted: true, - questReset: DbResetType.Weekly, - questIds: [57140], - }, - { - key: 'mardivas', - name: 'Laboritory of Mardivas', - icon: iconLibrary.gameFizzingFlask, - questReset: DbResetType.Weekly, - questIds: [55121], - }, { key: 'friend', name: 'Friend', @@ -59,5 +44,30 @@ export const bfaNazjatar: Task = { }, ], }, + { + key: 'ancientBark', + name: '{item:170184}', + icon: iconLibrary.gameTreeFace, + alwaysStarted: true, + questReset: DbResetType.Weekly, + questIds: [57140], + }, + { + key: 'mardivas', + name: 'Laboritory of Mardivas', + icon: iconLibrary.gameFizzingFlask, + questReset: DbResetType.Weekly, + questIds: [55121], + }, + { + key: 'worldBoss', + name: 'World Boss', + icon: iconLibrary.gameSpikedDragonHead, + questReset: DbResetType.Weekly, + questIds: [ + 56056, // Wekemara + 56057, // Ulmath, the Soulbinder + ], + }, ], }; diff --git a/apps/frontend/data/tasks/11-midnight/12-0-0.ts b/apps/frontend/data/tasks/11-midnight/12-0.ts similarity index 96% rename from apps/frontend/data/tasks/11-midnight/12-0-0.ts rename to apps/frontend/data/tasks/11-midnight/12-0.ts index 5870feb20..134f66589 100644 --- a/apps/frontend/data/tasks/11-midnight/12-0-0.ts +++ b/apps/frontend/data/tasks/11-midnight/12-0.ts @@ -66,7 +66,7 @@ const specialAssignmentExpiry: Chore['customExpiryFunc'] = (char, scannedAt, que return worldQuest?.expires || Constants.defaultTime; }; -export const midChores12_0_0: Task = { +export const midChores12_0: Task = { key: 'midChores12_0', name: '[Mid] 12.0.x', shortName: '12.0', @@ -273,6 +273,16 @@ export const midChores12_0_0: Task = { 92034, // Thorm'belan ], }, - // 94446, A Nightmarish Task, weekly? + { + key: 'voidAssaults', + name: 'Void Assaults', + icon: iconLibrary.gameAbstract024, + minimumLevel: 80, + questReset: DbResetType.Weekly, + questIds: [ + 94385, // Void Assaults: Eversong Woods + 94386, // Void Assaults: Zul'Aman + ], + }, ], }; diff --git a/apps/frontend/data/tasks/11-midnight/index.ts b/apps/frontend/data/tasks/11-midnight/index.ts index c1a276e21..9faf9f8ab 100644 --- a/apps/frontend/data/tasks/11-midnight/index.ts +++ b/apps/frontend/data/tasks/11-midnight/index.ts @@ -1,6 +1,6 @@ -import { midChores12_0_0 } from './12-0-0'; +import { midChores12_0 } from './12-0'; import { midDelves } from './delves'; import { midPrey } from './prey'; import { midProfessions } from './professions'; -export const midTasks = [midChores12_0_0, midDelves, midPrey, midProfessions]; +export const midTasks = [midChores12_0, midDelves, midPrey, midProfessions]; diff --git a/apps/frontend/shared/icons/library.ts b/apps/frontend/shared/icons/library.ts index a23d1511f..87c6f7ce2 100644 --- a/apps/frontend/shared/icons/library.ts +++ b/apps/frontend/shared/icons/library.ts @@ -8,6 +8,7 @@ export { default as faDungeon } from '~icons/fa-solid/dungeon'; export { default as fluentAngryFaceWithHorns } from '~icons/fluent-emoji-high-contrast/angry-face-with-horns'; +export { default as gameAbstract024 } from '~icons/game-icons/abstract-024'; export { default as gameAnimalHide } from '~icons/game-icons/animal-hide'; export { default as gameAnvil } from '~icons/game-icons/anvil'; export { default as gameBabyFace } from '~icons/game-icons/baby-face'; diff --git a/apps/frontend/user-home/components/currencies/Table.svelte b/apps/frontend/user-home/components/currencies/Table.svelte index d857466d3..feb0527cb 100644 --- a/apps/frontend/user-home/components/currencies/Table.svelte +++ b/apps/frontend/user-home/components/currencies/Table.svelte @@ -140,7 +140,7 @@ {#key slugKey} - {#each currencies as currency (currency)} + {#each currencies as currency, currencyIndex (currencyIndex)} {#if !currency} {:else}