Skip to content
Merged

Deploy #1792

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
19 changes: 18 additions & 1 deletion apps/frontend/components/explore/Explore.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import BonusIDs from './ExploreBonusIDs.svelte';
import Chett from './Chett.svelte';
import Icons from './ExploreIcons.svelte';
import ModifierTrees from './ModifierTrees.svelte';
import Quests from './ExploreQuests.svelte';
import Sidebar from './ExploreSidebar.svelte';
import Transmog from './ExploreTransmog.svelte';
Expand All @@ -19,10 +20,26 @@
'bonus-ids': BonusIDs,
chett: Chett,
icons: Icons,
'modifier-trees': ModifierTrees,
quests: Quests,
transmog: Transmog,
};
</script>

<style lang="scss">
div {
:global(.thing-container) {
padding: 1rem;
width: 100%;

:global(input) {
width: 10rem;
}
}
}
</style>

<Sidebar />
<svelte:component this={componentMap[params.slug1 as keyof typeof componentMap]} />
<div>
<svelte:component this={componentMap[params.slug1 as keyof typeof componentMap]} />
</div>
17 changes: 11 additions & 6 deletions apps/frontend/components/explore/ExploreSidebar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,27 @@
name: 'Bonus IDs',
slug: 'bonus-ids',
},
{
name: 'CHETT',
slug: 'chett',
},
{
name: 'Icons',
slug: 'icons',
},
{
name: 'Quests',
slug: 'quests',
name: 'Modifier Trees',
slug: 'modifier-trees',
},
{
name: 'Transmog Sets',
slug: 'transmog',
},
null,
{
name: 'CHETT',
slug: 'chett',
},
{
name: 'Quests',
slug: 'quests',
},
];
</script>

Expand Down
19 changes: 19 additions & 0 deletions apps/frontend/components/explore/ModifierTrees.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<script lang="ts">
import { browserState } from '@/shared/state/browser.svelte';

import NumberInput from '@/shared/components/forms/NumberInput.svelte';

// meow
</script>

<style lang="scss">
</style>

<div class="thing-container border">
<NumberInput
name="modifier_tree_id"
minValue={0}
maxValue={999999}
bind:value={browserState.current.explore.modifierTreeId}
/>
</div>
4 changes: 2 additions & 2 deletions apps/frontend/components/home/view-switcher/Delves.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
story,
settingsState.value.delveRankings[`${poiId}:${story}`] || 0,
]) as [Delve, string, number][],
([delve, , ranking]) => `${9 - ranking}:${delve.shortName}`
([delve, , ranking]) => `${9 - ranking}:${delve?.shortName || '??'}`
);
});
</script>
Expand Down Expand Up @@ -50,7 +50,7 @@
<IconifyWrapper icon={iconLibrary.faDungeon} />
{#each delves as [delve, , ranking] (delve)}
<div class="delve quality{ranking}">
{delve.shortName}
{delve?.shortName ?? '??'}
</div>
{/each}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<tbody>
{#each delves as [delve, story, ranking] (story)}
<tr>
<td class="name text-overflow">{delve.name}</td>
<td class="name text-overflow">{delve?.name ?? 'UNKNOWN DELVE'}</td>
<td class="story text-overflow quality{ranking}">{story}</td>
</tr>
{/each}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import sortBy from 'lodash/sortBy';

import { keyVaultItemLevel } from '@/data/dungeon';
import { keyVaultItemLevel } from '@/data/vault';
import { timeStore } from '@/shared/stores/time';
import { userStore } from '@/stores';
import { getVaultQualityByItemLevel } from '@/utils/mythic-plus';
Expand All @@ -22,7 +22,7 @@
const currentPeriod = userStore.getCurrentPeriodForCharacter($timeStore, character);
runs = sortBy(
character.mythicPlusWeeks?.[currentPeriod.endTime.toUnixInteger()] || [],
(run: CharacterMythicPlusAddonRun) => -run.level,
(run: CharacterMythicPlusAddonRun) => -run.level
);

const firstLevel = getDungeonLevel(progress[0]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import sortBy from 'lodash/sortBy';

import { timeStore } from '@/shared/stores/time';
import { worldVaultItemLevel } from '@/data/dungeon';
import { worldVaultItemLevel } from '@/data/vault';
import { leftPad } from '@/utils/formatting';
import { getNextWeeklyResetFromTime } from '@/utils/get-next-reset';
import { getWorldTier } from '@/utils/vault/get-world-tier';
Expand Down
18 changes: 18 additions & 0 deletions apps/frontend/data/delve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,22 @@ export const delveMap: Record<number, Delve> = {
'Totem Annihilation': 3,
},
},
8760: {
name: 'The Ring of Glory',
shortName: 'RG',
storyRanks: {
"Minchi's Osseous Adventure": 3,
'Olds and Ends': 3,
'Speaking THeir Language': 3,
},
},
8763: {
name: 'Gnarldor Isle',
shortName: 'GI',
storyRanks: {
'Adopt-a-thon': 3,
'Game Day': 3,
'Open Night': 3,
},
},
};
34 changes: 1 addition & 33 deletions apps/frontend/data/dungeon.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { MapChallengeMode } from '@/enums/map-challenge-mode';
import { Dungeon } from '@/types';
import type { StaticDataInstance } from '@/shared/stores/static/types';
import { convertibleCategories } from '@/components/items/convertible/data';
import { MapChallengeMode } from '@/enums/map-challenge-mode';

// MapChallengeMode.db2
export const dungeons: Dungeon[] = [
Expand Down Expand Up @@ -179,37 +178,6 @@ export const dungeonMap: Record<number, Dungeon> = Object.fromEntries(
dungeons.map((dungeon) => [dungeon.id, dungeon])
);

// [key level, item level] first match >= key is used
export const keyVaultItemLevel: Array<Array<number>> = [
[10, 318, 5], // Myth 1
[7, 315, 4], // Hero 4
[6, 311, 4], // Hero 3
[4, 308, 4], // Hero 2
[2, 305, 4], // Hero 1
[1, 302, 3], // [0] Champion 4
[0, 289, 2], // [H] Veteran 4
];

export const raidVaultItemLevel: Record<number, Array<number>> = {
16: [convertibleCategories[0].tiers[0].itemLevel, 5], // Mythic
15: [convertibleCategories[0].tiers[1].itemLevel, 4], // Heroic
14: [convertibleCategories[0].tiers[2].itemLevel, 3], // Normal
17: [convertibleCategories[0].tiers[3].itemLevel, 2], // LFR
};

export const worldVaultItemLevel: Array<Array<number>> = [
// [13, 315, 4], // Hero 4 (ritual 5?)
// [12, 308, 4], // Hero 2 (ritual 4?)
// [8, 298, 4], // Hero 1
[7, 298, 3], // Champion 3
[6, 295, 3], // Champion 2
[5, 292, 3], // Champion 1
[4, 289, 2], // Veteran 4
[3, 285, 2], // Veteran 3
[2, 282, 2], // Veteran 2
[1, 279, 2], // Veteran 1
];

export const keyTiers = ['2-5', '6-10', '11-15', '16-20', '21-25', '26-30', '31+'];

// Fake 'instances' for tracking world bosses
Expand Down
18 changes: 16 additions & 2 deletions apps/frontend/data/gear.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
export const currentTier: number[] = [
2055, // Baleful Grave-Knight's Crucible [Death Knight]
2056, // Abyssal Doomhound's Pursuit [Demon Hunter]
2057, // Bark of the Enigmatic Dreamwatcher [Druid]
2058, // Echo of Calamity [Evoker]
2059, // Skulking Viper's Ambush [Hunter]
2060, // Primal Leywarden's Attire [Mage]
2061, // Guile of the Monkey King [Monk]
2062, // Radiance of the Consecrated Flame [Paladin]
2063, // Cosmic Penitent's Raiment [Priest]
2064, // Chosen Bloodslayer's Hexweave [Rogue]
2065, // Ophidian Oracle's Prophecy [Shaman]
2066, // Damned Necrolyte's Shattered Restraints [Warlock]
2067, // Jade Warlord's Dominion [Warrior]
];

export const previousTier: number[] = [
1978, // Relentless Rider's Lament [Death Knight]
1979, // Devouring Reaver's Sheathe [Demon Hunter]
1980, // Sprouts of the Luminous Bloom [Druid]
Expand All @@ -13,5 +29,3 @@ export const currentTier: number[] = [
1989, // Reign of the Abyssal Immolator [Warlock]
1990, // Rage of the Night Ender [Warrior]
];

export const previousTier: number[] = [];
30 changes: 30 additions & 0 deletions apps/frontend/data/vault.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { convertibleCategories } from '@/components/items/convertible/data';

// [key level, item level] first match >= key is used
export const keyVaultItemLevel: Array<Array<number>> = [
[10, 318, 5], // Myth 1
[7, 315, 4], // Hero 4
[6, 311, 4], // Hero 3
[4, 308, 4], // Hero 2
[2, 305, 4], // Hero 1
[1, 302, 3], // [0] Champion 4
[0, 289, 2], // [H] Veteran 4
];

export const raidVaultItemLevel: Record<number, Array<number>> = {
16: [convertibleCategories[0].tiers[0].itemLevel, 5], // Mythic
15: [convertibleCategories[0].tiers[1].itemLevel, 4], // Heroic
14: [convertibleCategories[0].tiers[2].itemLevel, 3], // Normal
17: [convertibleCategories[0].tiers[3].itemLevel, 2], // LFR
};

export const worldVaultItemLevel: Array<Array<number>> = [
[8, 305, 4], // Hero 1
[7, 298, 3], // Champion 3
[6, 295, 3], // Champion 2
[5, 292, 3], // Champion 1
[4, 289, 2], // Veteran 4
[3, 285, 2], // Veteran 3
[2, 282, 2], // Veteran 2
[1, 279, 2], // Veteran 1
];
2 changes: 2 additions & 0 deletions apps/frontend/shared/state/browser.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ interface BrowserStateIdk {
explore: {
achievementId: number;
bonusIds: string;
modifierTreeId: number;
questId: number;
transmogSetId: number;
};
Expand Down Expand Up @@ -194,6 +195,7 @@ const initialState: BrowserStateIdk = {
explore: {
achievementId: 0,
bonusIds: '',
modifierTreeId: 0,
questId: 0,
transmogSetId: 0,
},
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/utils/get-raid-vault-item-level.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { raidVaultItemLevel } from '@/data/dungeon';
import { raidVaultItemLevel } from '@/data/vault';
import type { CharacterWeeklyProgress } from '@/types';

export default function getRaidVaultItemLevel(progress?: CharacterWeeklyProgress): number[] {
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/utils/mythic-plus/get-vault-item-level.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { keyVaultItemLevel } from '@/data/dungeon';
import { keyVaultItemLevel } from '@/data/vault';

export function getVaultItemLevel(keyLevel: number): number[] {
for (const [tierKeyLevel, tierItemLevel, tierQuality] of keyVaultItemLevel) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { keyVaultItemLevel } from '@/data/dungeon';
import { keyVaultItemLevel } from '@/data/vault';

export function getVaultQualityByItemLevel(itemLevel: number) {
for (const [, tierItemLevel, tierQuality] of keyVaultItemLevel) {
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/utils/vault/get-world-tier.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { worldVaultItemLevel } from '@/data/dungeon';
import { worldVaultItemLevel } from '@/data/vault';

export function getWorldTier(tier: number): [number, number] {
for (const [tierLevel, tierItemLevel, tierQuality] of worldVaultItemLevel) {
Expand Down
Loading