erdelf/qstbak
1
0
Fork 0
forked from aly/qstbak
Code Pull requests Activity

muffin v6.27

Browse source
This commit is contained in:
alydev 2025-10-18 23:54:48 +10:00
parent 1bcbf18654
commit 44d33a0b56
6 changed files with 59 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Questionable/Questionable.Controller.Steps.Shared/SkipCondition.cs
View file

@ -302,15 +302,18 @@ internal static class SkipCondition
private bool CheckAetherCurrentCondition(QuestStep step)
{
if (step != null && step.DataId.HasValue && step.InteractionType == EInteractionType.AttuneAetherCurrent && gameFunctions.IsAetherCurrentUnlocked(step.DataId.Value))
if (step.InteractionType == EInteractionType.AttuneAetherCurrent)
{
logger.LogInformation("Skipping step, as current is unlocked");
return true;
}
if (step != null && step.InteractionType == EInteractionType.AttuneAetherCurrent && configuration.Advanced.SkipAetherCurrents)
{
logger.LogInformation("Skipping step, as aether currents should be skipped");
return true;
if (configuration.Advanced.SkipAetherCurrents)
{
logger.LogInformation("Skipping step, as aether currents should be skipped");
return true;
}
if (step.DataId.HasValue && gameFunctions.IsAetherCurrentUnlocked(step.DataId.Value))
{
logger.LogInformation("Skipping step, as current is unlocked");
return true;
}
}
return false;
}
@ -435,7 +438,7 @@ internal static class SkipCondition
if (taxiStandId.HasValue)
{
byte valueOrDefault = taxiStandId.GetValueOrDefault();
if (ptr->IsChocoboTaxiStandUnlocked(valueOrDefault))
if (ptr->IsChocoboTaxiStandUnlocked((uint)(valueOrDefault + 1179648)))
{
logger.LogInformation("Skipping step, as taxi stand {TaxiStandId} is unlocked", valueOrDefault);
return true;