Skip to content
Merged

Deploy #1765

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
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<td
class="sortable sorted-{getSortState(fullTaskName)} {customExpiry || ''}"
data-task={taskName}
style:--scale="0.9"
style:--scale="1"
onclick={() => setSortState(fullTaskName)}
use:componentTooltip={{
component: Tooltip,
Expand Down
24 changes: 13 additions & 11 deletions apps/frontend/components/items/ItemsSearch.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,19 @@

{#snippet bindType(bindType: ItemBinding, bound: boolean)}
{#if bound}
<IconifyWrapper
icon={iconLibrary.gamePadlock}
cls="status-warn"
tooltip="Bound to character"
/>
{:else if [ItemBinding.BindToBnetAccount, ItemBinding.BindToAccountUntilEquipped].includes(bindType)}
<IconifyWrapper
icon={iconLibrary.gameLockedHeart}
cls="status-shrug"
tooltip="Bound to account"
/>
{#if [ItemBinding.BindToBnetAccount, ItemBinding.BindToAccountUntilEquipped].includes(bindType)}
<IconifyWrapper
icon={iconLibrary.gameLockedHeart}
cls="status-shrug"
tooltip="Bound to account"
/>
{:else}
<IconifyWrapper
icon={iconLibrary.gamePadlock}
cls="status-warn"
tooltip="Bound to character"
/>
{/if}
{/if}
{/snippet}

Expand Down
1 change: 1 addition & 0 deletions apps/frontend/data/holidays.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export const holidayIds: Record<number, [number[], number[]?]> = {
[Holiday.TimewalkingLegion]: [timewalkingNameIds, [417]],
[Holiday.TimewalkingBfa]: [timewalkingNameIds, [483]],
[Holiday.TimewalkingSl]: [timewalkingNameIds, [492]],
[Holiday.TimewalkingDf]: [timewalkingNameIds, [493]],

[Holiday.BrawlArathiBlizzard]: [[262]],
[Holiday.BrawlClassicAshran]: [[398]],
Expand Down
42 changes: 41 additions & 1 deletion apps/frontend/data/tasks/11-midnight/12-0.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Constants } from '@/data/constants';
import { aliasedIcons, iconLibrary } from '@/shared/icons';
import { aliasedIcons, iconLibrary, uiIcons } from '@/shared/icons';
import { timeState } from '@/shared/state/time.svelte';
import { DbResetType } from '@/shared/stores/db/enums';
import { dynamicDataStore } from '@/user-home/stores/dynamicData';
Expand Down Expand Up @@ -282,5 +282,45 @@ export const midChores12_0: Task = {
94386, // Void Assaults: Zul'Aman
],
},
{
key: 'showdownNormal',
name: 'Showdown: Normal',
icon: uiIcons.squareN,
minimumLevel: 80,
questReset: DbResetType.Weekly,
questResetForced: true,
subChores: [
{
key: 'leveling',
name: 'Leveling',
maximumLevel: 89,
questIds: [
96716, // Showdown on Val
96720, // Showdown on Naigtal
],
},
{
key: 'max',
name: 'Max Level',
minimumLevel: 90,
questIds: [
96713, // Showdown on Val
96717, // Showdown on Naigtal
],
},
],
},
{
key: 'showdownHeroic',
name: 'Showdown: Heroic',
icon: uiIcons.squareH,
minimumLevel: 90,
questReset: DbResetType.Weekly,
questResetForced: true,
questIds: [
96714, // Showdown on Val: Heroic
96718, // Showdown on Naigtal: Heroic
],
},
],
};
1 change: 1 addition & 0 deletions apps/frontend/enums/holiday.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,5 @@ export const timewalkingHolidays = [
Holiday.TimewalkingLegion,
Holiday.TimewalkingBfa,
Holiday.TimewalkingSl,
Holiday.TimewalkingDf,
];
2 changes: 2 additions & 0 deletions apps/frontend/shared/icons/library.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,12 @@ export { default as mynauiLetterCSquare } from '~icons/mynaui/letter-c-square';
export { default as mynauiLetterDCircle } from '~icons/mynaui/letter-d-circle';
export { default as mynauiLetterDSquare } from '~icons/mynaui/letter-d-square';
export { default as mynauiLetterFCircle } from '~icons/mynaui/letter-f-circle';
export { default as mynauiLetterHSquare } from '~icons/mynaui/letter-h-square';
export { default as mynauiLetterICircle } from '~icons/mynaui/letter-i-circle';
export { default as mynauiLetterLSquare } from '~icons/mynaui/letter-l-square';
export { default as mynauiLetterMCircle } from '~icons/mynaui/letter-m-circle';
export { default as mynauiLetterMSquare } from '~icons/mynaui/letter-m-square';
export { default as mynauiLetterNSquare } from '~icons/mynaui/letter-n-square';
export { default as mynauiLetterPCircle } from '~icons/mynaui/letter-p-circle';
export { default as mynauiLetterPSquare } from '~icons/mynaui/letter-p-square';
export { default as mynauiLetterRCircle } from '~icons/mynaui/letter-r-circle';
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 @@ -23,8 +23,10 @@ export const uiIcons = {
squareA: iconLibrary.mynauiLetterASquare,
squareC: iconLibrary.mynauiLetterCSquare,
squareD: iconLibrary.mynauiLetterDSquare,
squareH: iconLibrary.mynauiLetterHSquare,
squareL: iconLibrary.mynauiLetterLSquare,
squareM: iconLibrary.mynauiLetterMSquare,
squareN: iconLibrary.mynauiLetterNSquare,
squareP: iconLibrary.mynauiLetterPSquare,
squareW: iconLibrary.mynauiLetterWSquare,
};
Expand Down
Loading