Skip to content
Merged

Deploy #1721

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 @@ -4,7 +4,7 @@

import { Constants } from '@/data/constants';
import { expansionSlugMap } from '@/data/expansion';
import { dragonflightProfessionMap, warWithinProfessionMap } from '@/data/professions';
import { expansionProfessionMap } from '@/data/professions';
import { zoneShortName } from '@/data/zones';
import { wowthingData } from '@/shared/stores/data';
import { userState } from '@/user-home/state/user';
Expand Down Expand Up @@ -39,9 +39,7 @@
return;
}

return expansion.id === 9
? dragonflightProfessionMap[staticProfession.id]
: warWithinProfessionMap[staticProfession.id];
return expansionProfessionMap[expansion.id][staticProfession.id];
});

let things = $derived.by(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
settingsState.value.professions.fullConcentrationIsBad,
percent
)}"
class:faded={['leatherworking', 'tailoring'].includes(profession.slug)}
data-tooltip={tooltip}
>
<WowthingImage name={imageStrings[profession.slug]} size={20} border={1} />
Expand Down
46 changes: 46 additions & 0 deletions apps/frontend/data/professions/cooldowns.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Profession } from '@/enums/profession';
import { DbResetType } from '@/shared/stores/db/enums';
import type { ProfessionCooldownQuest, ProfessionCooldownSpell } from '@/types';

export const expansionProfessionConcentration: Record<number, Record<number, number>> = {
Expand Down Expand Up @@ -393,6 +394,51 @@ export const professionCooldowns: (ProfessionCooldownQuest | ProfessionCooldownS
},

// Skinning
{
type: 'quest',
key: 'midProfessionSkinningGloomclaw',
name: '[Mid] Skin Gloomclaw (Eversong)',
profession: Profession.Skinning,
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88545],
},
{
type: 'quest',
key: 'midProfessionSkinningSilverscale',
name: "[Mid] Skin Silverscale (Zul'Aman)",
profession: Profession.Skinning,
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88526],
},
{
type: 'quest',
key: 'midProfessionSkinningLumenfin',
name: '[Mid] Skin Lumenfin (Harandar)',
profession: Profession.Skinning,
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88531],
},
{
type: 'quest',
key: 'midProfessionSkinningUmbrafang',
name: '[Mid] Skin Umbrafang (Voidstorm)',
profession: Profession.Skinning,
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88532],
},
{
type: 'quest',
key: 'midProfessionSkinningNetherscythe',
name: '[Mid] Skin Netherscythe (Voidstorm)',
profession: Profession.Skinning,
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88524],
},
{
type: 'quest',
key: 'twwProfessionSkinningSlatefang',
Expand Down
6 changes: 6 additions & 0 deletions apps/frontend/data/professions/professions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,9 @@ export const midnightProfessions: TaskProfession[] = [
export const midnightProfessionMap: Record<number, TaskProfession> = Object.fromEntries(
midnightProfessions.map((profession) => [profession.id, profession])
);

export const expansionProfessionMap: Record<number, typeof midnightProfessionMap> = {
9: dragonflightProfessionMap,
10: warWithinProfessionMap,
11: midnightProfessionMap,
};
2 changes: 1 addition & 1 deletion apps/frontend/data/professions/skinning.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const midnightSkinning: TaskProfession = {
],
bookQuests: [
{
itemId: 250445, // Echo of Abundance: Skinning
itemId: 250360, // Echo of Abundance: Skinning
questId: 92188,
source: 'AB',
},
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/types/data/professions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Profession } from '@/enums/profession';
export interface TaskProfessionQuest {
itemId: number;
points?: number;
questId: number;
questId?: number;
source?: string;
costs?: {
amount: number;
Expand Down
2 changes: 2 additions & 0 deletions apps/frontend/types/profession-cooldown.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { DateTime } from 'luxon';

import type { Profession } from '@/enums/profession';
import type { DbResetType } from '@/shared/stores/db/enums';

export interface ProfessionCooldown {
data: ProfessionCooldownQuest | ProfessionCooldownSpell;
Expand All @@ -18,6 +19,7 @@ export interface ProfessionCooldownQuest {
name: string;
profession: Profession;
minimumLevel?: number;
reset?: DbResetType;
unimportant?: boolean;
ids: number[];
}
Expand Down
Loading