From 9bec00b471f7d16a71d6f268e07392672957012d Mon Sep 17 00:00:00 2001 From: Freddie Date: Mon, 30 Mar 2026 23:31:53 -0700 Subject: [PATCH 1/5] Split ProfessionsV2 into two components --- .../row/HomeTableRowProfessionsV2.svelte | 145 ++-------------- ...HomeTableRowProfessionsV2Profession.svelte | 157 ++++++++++++++++++ 2 files changed, 170 insertions(+), 132 deletions(-) create mode 100644 apps/frontend/components/home/table/row/HomeTableRowProfessionsV2Profession.svelte diff --git a/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte b/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte index 08aa38044..1558a78dc 100644 --- a/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte +++ b/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte @@ -1,19 +1,11 @@ @@ -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} +
From 932ac5c437f982ec4bcaa676f81367a823a525e7 Mon Sep 17 00:00:00 2001 From: Freddie Date: Mon, 30 Mar 2026 23:32:04 -0700 Subject: [PATCH 2/5] Remove "Use Bounty" chore --- .../frontend/data/tasks/11-midnight/delves.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) 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', From 91017ee762e56c5828182f7d698f4a55a6f26943 Mon Sep 17 00:00:00 2001 From: Freddie Date: Mon, 30 Mar 2026 23:32:25 -0700 Subject: [PATCH 3/5] Fix Prey hard unlock quest --- apps/frontend/data/tasks/11-midnight/prey.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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', From c875ac3a6195cae84a4ae5a0176463f2133c8813 Mon Sep 17 00:00:00 2001 From: Freddie Date: Mon, 30 Mar 2026 23:35:14 -0700 Subject: [PATCH 4/5] Fix missing quality color on Home currency headers --- .../components/home/table/head/HomeTableHeadItems.svelte | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 @@