Skip to content
Merged

Deploy #1783

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
2 changes: 1 addition & 1 deletion apps/backend/Jobs/Magic/MagicAggregateMiscReportsJob.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class MagicAggregateMiscReportsJob : JobBase, IScheduledJob
{
Type = JobType.MagicAggregateMiscReports,
Priority = JobPriority.High,
Interval = TimeSpan.FromMinutes(1),
Interval = TimeSpan.FromMinutes(10),
Version = 1,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script lang="ts">
import { timeState } from '@/shared/state/time.svelte';
import type { CharacterWeeklyProgress } from '@/types';
import type { CharacterProps } from '@/types/props';

Expand All @@ -11,12 +10,7 @@
let { character, progresses, qualityFunc = null, textFunc }: Props = $props();

let generatedRewards = $derived(character.weekly?.vault?.generatedRewards);
let availableRewards = $derived(
character.weekly?.vault?.availableRewards ||
(character.weekly?.vault?.anyThreshold &&
character.weeklyReset < timeState.slowTime &&
character.weeklyReset > character.weekly.vaultScannedTime)
);
let availableRewards = $derived(character.hasVaultRewards);
</script>

<style lang="scss">
Expand Down
17 changes: 13 additions & 4 deletions apps/frontend/data/tasks/11-midnight/delves.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { Region } from '@/enums/region';
import { iconLibrary } from '@/shared/icons';
import { timeState } from '@/shared/state/time.svelte';
import { DbResetType } from '@/shared/stores/db/enums';
import { getNextWeeklyResetFromTime } from '@/utils/get-next-reset';
import type { Task } from '@/types/tasks';

export const midDelves: Task = {
Expand Down Expand Up @@ -89,10 +92,16 @@ export const midDelves: Task = {
key: 'stashes',
name: '{currency:3290}',
alwaysStarted: true,
progressFunc: (char) => ({
have: char.weekly?.delveGilded || 0,
need: 4,
}),
progressFunc: (char) => {
const expiresAt = getNextWeeklyResetFromTime(
char.lastSeenAddon,
char.realm?.region || Region.US,
char
);
const have =
expiresAt < timeState.slowTime ? 0 : char.weekly?.delveGilded || 0;
return { have, need: 4 };
},
},
],
},
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"svelte-multiselect": "^11.6.4",
"svelte-preprocess": "^6.0.3",
"svelte-spa-router": "^5.0.0",
"tslib": "^2.8.1",
"typescript": "^5.9.3",
"typescript-eslint": "^8.57.2",
"unplugin-icons": "^22.2.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/shared/components/forms/Button.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
type Props = ChildrenProp & {
cls?: string;
disabled?: boolean;
onclick?: (e: Event) => void;
onclick?: (e: MouseEvent) => void;
};
let { children, cls, disabled, onclick }: Props = $props();
</script>
Expand Down
7 changes: 7 additions & 0 deletions apps/frontend/types/character/character.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,13 @@ export class Character implements ContainsItems, HasNameAndRealm {
.flat();
});

public hasVaultRewards = $derived(
this.weekly?.vault?.availableRewards ||
(this.weekly?.vault?.anyThreshold &&
this.weeklyReset < timeState.slowTime &&
this.weeklyReset > this.weekly.vaultScannedTime)
);

public movementSpeed = $derived.by(() => {
const ret: CharacterMovementSpeed = {
enchants: 0,
Expand Down
12 changes: 6 additions & 6 deletions apps/frontend/utils/home/home-sort.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ export function homeSort(char: Character, sortingBy: string): string {
} else if (sortingBy === 'vaultMythicPlus') {
if (char.weekly?.vault?.generatedRewards) {
return '000|000|000';
} else if (char.weekly?.vault?.availableRewards) {
return '001|001|001';
} else if (char.hasVaultRewards) {
return '000|000|001';
}

const progress = char.isMaxLevel ? char.weekly?.vault?.dungeonProgress : [];
Expand All @@ -101,8 +101,8 @@ export function homeSort(char: Character, sortingBy: string): string {
} else if (sortingBy === 'vaultRaid') {
if (char.weekly?.vault?.generatedRewards) {
return '000|000|000';
} else if (char.weekly?.vault?.availableRewards) {
return '001|001|001';
} else if (char.hasVaultRewards) {
return '000|000|001';
}

const progress = char.isMaxLevel ? char.weekly?.vault?.raidProgress : [];
Expand All @@ -114,8 +114,8 @@ export function homeSort(char: Character, sortingBy: string): string {
} else if (sortingBy === 'vaultWorld') {
if (char.weekly?.vault?.generatedRewards) {
return '000|000|000';
} else if (char.weekly?.vault?.availableRewards) {
return '001|001|001';
} else if (char.hasVaultRewards) {
return '000|000|001';
}

const progress = char.isMaxLevel ? char.weekly?.vault?.worldProgress : [];
Expand Down
28 changes: 18 additions & 10 deletions apps/tool/Data/ExtraItemDrops.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,6 @@ public static partial class Hardcoded
new(275219, RaidDifficultiesNormal), // Pertinax's Beast Prod [stave]
new(275223, RaidDifficultiesNormal), // Phasebolt Thrower [gun]
new(275218, RaidDifficultiesNormal), // Mertei's Command Baton [wand]

new(275224, RaidDifficultiesNormalHeroic), // Mertei's Adjutant Leggings [cloth]
new(275225, RaidDifficultiesNormalHeroic), // Toxic Voidscythe Spaulders [leather]
new(275226, RaidDifficultiesNormalHeroic), // Shredclaw Handler's Grips [mail]
new(275227, RaidDifficultiesNormalHeroic), // Leth'ir's Dress Sabatons [plate]
];

/*
Expand Down Expand Up @@ -2855,6 +2850,13 @@ public static partial class Hardcoded
new(199227, RaidDifficultiesAll), // Schematic: Sophisticated Problem Solver
]
},
// Amirdrassil, the Dream's Hope > Tindral Sageswift
{
2565,
[
new(211280, RaidDifficultiesAll), // Feather of the Smoke Red Moon [Druid]
]
},
// Amirdrassil, the Dream's Hope > Trash
{
1001207,
Expand All @@ -2874,7 +2876,7 @@ public static partial class Hardcoded
{
2001207,
[
new(210490, RaidDifficultiesAll), // Vantus Rune
new(210490, RaidDifficultiesAll), // Technique: Vantus Rune
]
},

Expand Down Expand Up @@ -2915,16 +2917,22 @@ public static partial class Hardcoded
#endregion

#region Midnight
// Midnight > Midnight > Nexus Captain Leth'ir
// Midnight > Midnight > Nexus Captain Leth'ir (Naigtal)
{
1_1312_0,
NaigtalValWorldBosses
NaigtalValWorldBosses.Concat([
new(275224, RaidDifficultiesNoLfr), // Mertei's Adjutant Leggings [cloth]
new(275227, RaidDifficultiesNoLfr), // Leth'ir's Dress Sabatons [plate]
]).ToList()
},

// Midnight > Midnight > Imperator Pertinax
// Midnight > Midnight > Imperator Pertinax (Val)
{
1_1312_1,
NaigtalValWorldBosses
NaigtalValWorldBosses.Concat([
new(275225, RaidDifficultiesNoLfr), // Toxic Voidscythe Spaulders [leather]
new(275226, RaidDifficultiesNoLfr), // Shredclaw Handler's Grips [mail]
]).ToList()
},
#endregion Midnight
};
Expand Down
5 changes: 5 additions & 0 deletions apps/tool/Data/IgnoredSkillLineAbilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ public static partial class Hardcoded
1229929, // Mid ??
1261938, // Mid ??

// Fishing
1231090, // Mid Rootland Crab Lure

// Inscription
127475, // MoP Incarnadine Ink
130407, // MoP Mystery of the Mists
Expand All @@ -228,6 +231,8 @@ public static partial class Hardcoded
26918, // TBC Arcanite Sword Pendant
26920, // TBC Blood Crown
32810, // TBC Primal Stone Statue
73233, // Cata Mystic Alicite
73259, // Cata Resolute Hessonite
407161, // Immaculate Coalescing Dracothyst (temporary legendary craft)

// Leatherworking
Expand Down
1 change: 1 addition & 0 deletions apps/tool/Data/InstanceBonusIds.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ public static partial class Hardcoded
{
{ 14, 13471 }, // Normal
{ 15, 13472 }, // Heroic
{ 16, 13473 }, // Mythic
};

public static readonly Dictionary<int, Dictionary<int, int>> InstanceBonusIds = new()
Expand Down
Loading