From fde0c2f43e18698716e51fe9f39cae17f5b4987a Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Mon, 18 Aug 2025 14:19:15 +0200 Subject: [PATCH] Fix aetheryte/aethernet shard skip conditions --- .../Controller/Steps/Shared/SkipCondition.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Questionable/Controller/Steps/Shared/SkipCondition.cs b/Questionable/Controller/Steps/Shared/SkipCondition.cs index f9f47b21..1347ee78 100644 --- a/Questionable/Controller/Steps/Shared/SkipCondition.cs +++ b/Questionable/Controller/Steps/Shared/SkipCondition.cs @@ -275,14 +275,17 @@ internal static class SkipCondition private bool CheckAetheryteCondition(QuestStep step, SkipStepConditions skipConditions) { - if (step is - { - DataId: not null, - InteractionType: EInteractionType.AttuneAetheryte or EInteractionType.AttuneAethernetShard - } && - aetheryteFunctions.IsAetheryteUnlocked((EAetheryteLocation)step.DataId.Value)) + if (step is { Aetheryte: {} aetheryteLocation, InteractionType: EInteractionType.AttuneAetheryte } && + aetheryteFunctions.IsAetheryteUnlocked(aetheryteLocation)) + { + logger.LogInformation("Skipping step, as aetheryte is unlocked"); + return true; + } + + if (step is { Aetheryte: {} aethernetShard, InteractionType: EInteractionType.AttuneAethernetShard } && + aetheryteFunctions.IsAetheryteUnlocked(aethernetShard)) { - logger.LogInformation("Skipping step, as aetheryte/aethernet shard is unlocked"); + logger.LogInformation("Skipping step, as aethernet shard is unlocked"); return true; } -- 2.30.2