forked from aly/qstbak
muffin v7.4
This commit is contained in:
parent
8a7847ff37
commit
a4175abacd
54 changed files with 95984 additions and 123967 deletions
|
|
@ -517,7 +517,7 @@ internal sealed class QuestFunctions
|
|||
if (dataId.HasValue)
|
||||
{
|
||||
uint valueOrDefault = dataId.GetValueOrDefault();
|
||||
return dataIds.Contains(valueOrDefault);
|
||||
return ((ReadOnlySpan<uint>)dataIds).Contains(valueOrDefault);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
|
@ -567,11 +567,10 @@ internal sealed class QuestFunctions
|
|||
{
|
||||
return new PriorityQuestInfo(x, "Can't teleport to start");
|
||||
}
|
||||
DefaultInterpolatedStringHandler handler;
|
||||
if (gil < EstimateTeleportCosts(quest))
|
||||
{
|
||||
IFormatProvider invariantCulture = CultureInfo.InvariantCulture;
|
||||
handler = new DefaultInterpolatedStringHandler(32, 2, invariantCulture);
|
||||
DefaultInterpolatedStringHandler handler = new DefaultInterpolatedStringHandler(32, 2, invariantCulture);
|
||||
handler.AppendLiteral("Not enough gil, estimated cost: ");
|
||||
handler.AppendFormatted(EstimateTeleportCosts(quest), "N0");
|
||||
handler.AppendFormatted(SeIconChar.Gil.ToIconString());
|
||||
|
|
@ -606,14 +605,7 @@ internal sealed class QuestFunctions
|
|||
}
|
||||
return (EAetheryteLocation?)null;
|
||||
}).FirstOrDefault((EAetheryteLocation? y) => y.HasValue);
|
||||
if (value.HasValue)
|
||||
{
|
||||
handler = new DefaultInterpolatedStringHandler(18, 1);
|
||||
handler.AppendLiteral("Aetheryte locked: ");
|
||||
handler.AppendFormatted(value);
|
||||
return new PriorityQuestInfo(x, handler.ToStringAndClear());
|
||||
}
|
||||
return new PriorityQuestInfo(x);
|
||||
return value.HasValue ? new PriorityQuestInfo(x, $"Aetheryte locked: {value}") : new PriorityQuestInfo(x);
|
||||
}).ToList();
|
||||
}
|
||||
|
||||
|
|
@ -654,7 +646,7 @@ internal sealed class QuestFunctions
|
|||
QuestInfo questInfo = info as QuestInfo;
|
||||
if (questInfo != null)
|
||||
{
|
||||
if (shadowbringersRoleQuestChapters.Contains(questInfo.NewGamePlusChapter))
|
||||
if (((ReadOnlySpan<uint>)shadowbringersRoleQuestChapters).Contains(questInfo.NewGamePlusChapter))
|
||||
{
|
||||
return !QuestData.FinalShadowbringersRoleQuests.Any(IsQuestComplete);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue