diff --git a/apps/frontend/components/home/table/head/HomeTableHeadItems.svelte b/apps/frontend/components/home/table/head/HomeTableHeadItems.svelte index 3cb152dd7..cefe3f3b0 100644 --- a/apps/frontend/components/home/table/head/HomeTableHeadItems.svelte +++ b/apps/frontend/components/home/table/head/HomeTableHeadItems.svelte @@ -10,6 +10,9 @@ @@ -116,87 +68,16 @@
{#each professions as [profession, charProfession, current], index (profession.id)} - {@const currentSkill = charProfession?.skillCurrent || 0} -
0} - style:--columns={columnCounts[index]} - data-id={profession.id} - > - - - 0 && - currentSkill >= charProfession.skillMax} - > - {currentSkill || '---'} - - - - {#if current} - {#each fields as field (field)} - {#if field === 'concentration' && anyConcentration[index]} - {@const concCurrency = wowthingData.static.currencyById.get( - concentrationData[profession.id] - )} - {#if concCurrency} - {@const { amount, percent, tooltip } = getCurrencyData( - $timeStore, - character, - concCurrency - )} - {@const status = statusClass( - settingsState.value.professions.fullConcentrationIsBad, - percent - )} -
- - {amount} -
- {:else} -
- {/if} - {:else if field === 'moxie' && anyMoxie[index]} - {@const moxieCurrency = wowthingData.static.currencyById.get( - professionMoxie[profession.id] - )} - {#if moxieCurrency} - {@const { amount, tooltip } = getCurrencyData( - $timeStore, - character, - moxieCurrency - )} -
- - {amount} -
- {:else} -
- {/if} - {/if} - {/each} - {/if} -
+ {/each}
diff --git a/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2Profession.svelte b/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2Profession.svelte new file mode 100644 index 000000000..d13dc720e --- /dev/null +++ b/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2Profession.svelte @@ -0,0 +1,157 @@ + + + + +
+ + + 0 && + currentSkill >= charProfession.skillMax} + > + {currentSkill || '---'} + + + + {#if current} + {#each fields as field (field)} + {#if field === 'concentration' && showConcentration} + {#if concData} + {@const { amount, percent, tooltip } = concData} + {@const status = statusClass( + settingsState.value.professions.fullConcentrationIsBad, + percent + )} +
+ + {amount} +
+ {:else} +
+ {/if} + {:else if field === 'moxie' && showMoxie} + {#if moxieData} + {@const { amount, tooltip } = moxieData} +
+ + {amount} +
+ {:else} +
+ {/if} + {/if} + {/each} + {/if} +
diff --git a/apps/frontend/data/tasks/11-midnight/delves.ts b/apps/frontend/data/tasks/11-midnight/delves.ts index f01108cab..bfab7a2ee 100644 --- a/apps/frontend/data/tasks/11-midnight/delves.ts +++ b/apps/frontend/data/tasks/11-midnight/delves.ts @@ -30,18 +30,20 @@ export const midDelves: Task = { subChoresAnyOrder: true, questReset: DbResetType.Weekly, questResetForced: true, - subChores: [ - { - key: 'get', - name: 'Get Bounty', - questIds: [86371], - }, - { - key: 'use', - name: 'Use Bounty', - questIds: [92887], - }, - ], + questIds: [86371], + // This seems wrong, I got no tracking quest for using the map or looting the box + // subChores: [ + // { + // key: 'get', + // name: 'Get Bounty', + // questIds: [86371], + // }, + // { + // key: 'use', + // name: 'Use Bounty', + // questIds: [92887], + // }, + // ], }, { key: 'gilded', diff --git a/apps/frontend/data/tasks/11-midnight/prey.ts b/apps/frontend/data/tasks/11-midnight/prey.ts index a020fcfbf..0122c5c53 100644 --- a/apps/frontend/data/tasks/11-midnight/prey.ts +++ b/apps/frontend/data/tasks/11-midnight/prey.ts @@ -6,7 +6,7 @@ import type { Task } from '@/types/tasks'; const PREY_REPUTATION_ID = 2764; const NORMAL_UNLOCK = 93086; // To the Sanctum! -const HEROIC_UNLOCK = 92177; // One Hero's Prey +const HARD_UNLOCK = 92178; // Practical Magic const NIGHTMARE_UNLOCK = 92182; // The Sheep or the Wolf const renownFunc = (renown?: number) => { @@ -61,9 +61,7 @@ export const midPrey: Task = { questIds: [93169, 93857], couldGetFunc: () => renownFunc(1), canGetFunc: (char) => - userState.quests.anyCharacterHasById.has(HEROIC_UNLOCK) - ? '' - : Strings.doUnlockQuests, + userState.quests.anyCharacterHasById.has(HARD_UNLOCK) ? '' : Strings.doUnlockQuests, }, { key: 'preyNightmare', diff --git a/apps/frontend/data/tasks/events/bonus.ts b/apps/frontend/data/tasks/events/bonus.ts index 013ef4d45..54b1d74bb 100644 --- a/apps/frontend/data/tasks/events/bonus.ts +++ b/apps/frontend/data/tasks/events/bonus.ts @@ -21,34 +21,34 @@ export const eventBonus: Task = { { key: 'dungeons', name: 'Dungeons', - minimumLevel: 10, + minimumLevel: 90, requiredHolidays: [Holiday.BonusDungeon], questReset: DbResetType.Weekly, questResetForced: true, - questIds: [83347], // Emissary of War + questIds: [93598], // Emissary of War }, { key: 'worldQuests', name: 'World Quests', - minimumLevel: 10, + minimumLevel: 90, requiredHolidays: [Holiday.BonusWorldQuest], questReset: DbResetType.Weekly, questResetForced: true, - questIds: [83366], // The World Awaits + questIds: [93605], // The World Awaits }, { key: 'arenaSkirmish', name: '[PvP] Arena Skirmishes', - minimumLevel: 10, + minimumLevel: 90, requiredHolidays: [Holiday.BonusArenaSkirmish], questReset: DbResetType.Weekly, questResetForced: true, - questIds: [83358], // The Arena Calls + questIds: [93600], // The Arena Calls }, { key: 'battleground', name: '[PvP] Battlegrounds', - minimumLevel: 10, + minimumLevel: 90, requiredHolidays: [Holiday.BonusBattleground], questReset: DbResetType.Weekly, questResetForced: true, @@ -57,11 +57,11 @@ export const eventBonus: Task = { { key: 'petBattles', name: '[PvP] Pet Battles', - minimumLevel: 10, + minimumLevel: 90, requiredHolidays: [Holiday.BonusPetBattle], questReset: DbResetType.Weekly, questResetForced: true, - questIds: [83357], // The Very Best + questIds: [93599], // The Very Best }, ], }; diff --git a/apps/frontend/data/tasks/events/timewalking.ts b/apps/frontend/data/tasks/events/timewalking.ts index 18b89d17a..1d6ade933 100644 --- a/apps/frontend/data/tasks/events/timewalking.ts +++ b/apps/frontend/data/tasks/events/timewalking.ts @@ -31,15 +31,16 @@ export const eventTimewalking: Task = { ]; } else { return [ - 83274, // An Original Path Through Time [Classic max] - 83363, // A Burning Path Through Time [TBC max] - 83365, // A Frozen Path Through Time [Wrath max] - 83359, // A Shattered Path Through Time [Cata max] - 83362, // A Shrouded Path Through Time [MoP max] - 83364, // A Savage Path Through Time [WoD max] - 83360, // A Fel Path Through Time [Legion max] - 88805, // A Scarred Path Through Time [BfA max] + 93607, // An Original Path Through Time [Classic max] + 93608, // A Burning Path Through Time [TBC max] + 93610, // A Frozen Path Through Time [Wrath max] + 93611, // A Shattered Path Through Time [Cata max] + 93612, // A Shrouded Path Through Time [MoP max] + 93613, // A Savage Path Through Time [WoD max] + 93614, // A Fel Path Through Time [Legion max] + 93627, // A Scarred Path Through Time [BfA max] 92649, // A Shadowed Path Through Time [SL max] + 93628, // A Shadowed Path Through Time [SL max] ]; } },