Skip to content

Deploy #1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madcowfred merged 3 commits into from
Jun 29, 2026
Merged

Deploy #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1bf45e
Add Naigtal/Val to world maps
Jun 28, 2026
44d32dc
Add Naigtal/Val World Boss tasks
Jun 29, 2026
3b6c799
Support ParsedText strings for task/chore icons
Jun 29, 2026
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
6 changes: 5 additions & 1 deletion apps/frontend/components/home/table/head/HomeTableHeadTasks.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@
>
{#if chore}
{#if chore.icon}
<IconifyWrapper icon={chore.icon} />
{#if typeof chore.icon === 'string'}
<ParsedText text={chore.icon} />
{:else}
<IconifyWrapper icon={chore.icon} />
{/if}
{/if}
{:else}
<ParsedText text={task.shortName} />
Expand Down
9 changes: 8 additions & 1 deletion apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,12 @@
white-space: nowrap;
}
.status {
--scale: 1;

//padding-left: 0;
//padding-right: 0;
text-align: center;
white-space: nowrap;
width: 1rem;
}
.error-text {
Expand Down Expand Up @@ -168,7 +171,11 @@
]}"
>
{#if chore?.icon}
<IconifyWrapper icon={chore.icon} scale="1" />
{#if typeof chore.icon === 'string'}
<ParsedText text={chore.icon} />
{:else}
<IconifyWrapper icon={chore.icon} />
{/if}
{:else}
<IconifyWrapper
icon={[
Expand Down
28 changes: 26 additions & 2 deletions apps/frontend/data/tasks/11-midnight/12-0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ export const midChores12_0: Task = {
{
key: 'showdownNormal',
name: 'Showdown: Normal',
icon: uiIcons.squareN,
icon: 'S:squareN:',
minimumLevel: 80,
questReset: DbResetType.Weekly,
questResetForced: true,
Expand Down Expand Up @@ -313,7 +313,7 @@ export const midChores12_0: Task = {
{
key: 'showdownHeroic',
name: 'Showdown: Heroic',
icon: uiIcons.squareH,
icon: 'S:squareH:',
minimumLevel: 90,
questReset: DbResetType.Weekly,
questResetForced: true,
Expand All @@ -322,5 +322,29 @@ export const midChores12_0: Task = {
96718, // Showdown on Naigtal: Heroic
],
},
{
key: 'naigtalValWorldBossNormal',
name: 'Naigtal/Val World Boss [N]',
icon: 'B:squareN:',
minimumLevel: 80,
questReset: DbResetType.Weekly,
questResetForced: true,
questIds: [
96522, // Naigtal
96295, // Val
],
},
{
key: 'naigtalValWorldBossHeroic',
name: 'Naigtal/Val World Boss [H]',
icon: 'B:squareH:',
minimumLevel: 90,
questReset: DbResetType.Weekly,
questResetForced: true,
questIds: [
96942, // Naigtal
96941, // Val
],
},
],
};
2 changes: 1 addition & 1 deletion apps/frontend/shared/components/parsed-text/ParsedText.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
libraryMaybe ||
iconStrings[dataString] ||
iconStrings.question,
scale: '0.75',
scale: 'var(--scale, 0.75)',
dropShadow,
},
});
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/types/tasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export type Task = {
export type Chore = {
key: string;
name: string;
icon?: Icon;
icon?: Icon | string;
accountWide?: boolean;
alwaysStarted?: boolean;
noAlone?: boolean;
Expand Down
13 changes: 13 additions & 0 deletions apps/frontend/user-home/components/world-quests/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@ export const zoneData: WorldQuestZone[] = [
slug: 'midnight',
mapName: '11-midnight/quelthalas',
children: [
{
id: 2600,
name: 'Naigtal',
slug: 'naigtal',
mapName: '11-midnight/naigtal',
},
{
id: 2599,
name: 'Val',
slug: 'val',
mapName: '11-midnight/val',
},
null,
{
id: 2395,
name: 'Eversong Woods',
Expand Down
Loading