diff --git a/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte b/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte index b2346ffba..cdc8c3063 100644 --- a/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte +++ b/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte @@ -78,6 +78,7 @@ // Midnight S2 added new IDs for some reason 248: 'World Activity', 249: 'Delve', + 251: 'Hard Prey', 258: 'Purging the Vaults', }; diff --git a/apps/frontend/data/constants.ts b/apps/frontend/data/constants.ts index ebc7022f3..1ff40125a 100644 --- a/apps/frontend/data/constants.ts +++ b/apps/frontend/data/constants.ts @@ -9,6 +9,7 @@ export abstract class Constants { static readonly charactersPerAccount: number = 70; static readonly expansion: number = 11; static readonly guildBankTabItems = 98; + static readonly lockoutDifficultyMultiplier = 1_000_000; static readonly maxRenown: number = 80; static readonly restedDuration: number = 10 * 24 * 60 * 60; // 10 days diff --git a/apps/frontend/data/tasks/11-midnight/12-1.ts b/apps/frontend/data/tasks/11-midnight/12-1.ts index 4f9b9c910..90cd88dae 100644 --- a/apps/frontend/data/tasks/11-midnight/12-1.ts +++ b/apps/frontend/data/tasks/11-midnight/12-1.ts @@ -16,6 +16,7 @@ const vaultDailies = [ 96641, // Relentless Strikes 96642, // Decisive Incursions 96643, // From Whence it Came + 96644, // Essence of Malice 98419, // Shoulder to Shoulder 98420, // What's Out There? ]; diff --git a/apps/frontend/shared/utils/view-has-lockout.ts b/apps/frontend/shared/utils/view-has-lockout.ts index 5eecbd29d..f2f5ab216 100644 --- a/apps/frontend/shared/utils/view-has-lockout.ts +++ b/apps/frontend/shared/utils/view-has-lockout.ts @@ -1,9 +1,12 @@ +import { Constants } from '@/data/constants'; import type { SettingsView } from '@/shared/stores/settings/types'; import type { DifficultyData } from '@/types'; export function viewHasLockout(view: SettingsView, difficulty: DifficultyData, instanceId: number) { return ( view.homeLockouts.includes(instanceId) || - view.homeLockouts.includes((difficulty?.id || 0) * 10000000 + instanceId) + view.homeLockouts.includes( + (difficulty?.id || 0) * Constants.lockoutDifficultyMultiplier + instanceId + ) ); } diff --git a/apps/frontend/user-home/components/settings/sections/views/Lockouts.svelte b/apps/frontend/user-home/components/settings/sections/views/Lockouts.svelte index 810eea264..bf98394f3 100644 --- a/apps/frontend/user-home/components/settings/sections/views/Lockouts.svelte +++ b/apps/frontend/user-home/components/settings/sections/views/Lockouts.svelte @@ -1,6 +1,7 @@ - +
diff --git a/apps/frontend/user-home/state/user/general.svelte.ts b/apps/frontend/user-home/state/user/general.svelte.ts index 581d7bd56..b11f091a4 100644 --- a/apps/frontend/user-home/state/user/general.svelte.ts +++ b/apps/frontend/user-home/state/user/general.svelte.ts @@ -4,6 +4,7 @@ import sortBy from 'lodash/sortBy'; import uniq from 'lodash/uniq'; import { SvelteMap, SvelteSet } from 'svelte/reactivity'; +import { Constants } from '@/data/constants'; import { difficultyMap, lockoutDifficultyOrder, @@ -406,9 +407,11 @@ export class DataUserGeneral { } if (!found) { - if (instanceId >= 10000000) { - const actualDifficulty = Math.floor(instanceId / 10000000); - const actualInstanceId = instanceId % 10000000; + if (instanceId >= Constants.lockoutDifficultyMultiplier) { + const actualDifficulty = Math.floor( + instanceId / Constants.lockoutDifficultyMultiplier + ); + const actualInstanceId = instanceId % Constants.lockoutDifficultyMultiplier; homeLockouts.push({ difficulty: difficultyMap[actualDifficulty], instanceId: actualInstanceId,