aly/qstbak
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

muffin v6.19

Browse source
This commit is contained in:
alydev 2025-10-10 10:13:06 +10:00
parent 5bd47e3d16
commit bb6fd2f2bf
9 changed files with 1167 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Questionable/Questionable.Windows.JournalComponents/AlliedSocietyJournalComponent.cs
View file

@ -84,12 +84,13 @@ internal sealed class AlliedSocietyJournalComponent
private void DrawQuest(QuestInfo questInfo)
{
var (color, icon, text) = _uiUtils.GetQuestStyle(questInfo.QuestId);
var (color, icon, value) = _uiUtils.GetQuestStyle(questInfo.QuestId);
if (!_questRegistry.TryGetQuest(questInfo.QuestId, out Quest quest) || quest.Root.Disabled)
{
color = ImGuiColors.DalamudGrey;
}
if (_uiUtils.ChecklistItem(questInfo.Name + " (" + text + ")", color, icon))
string text = $"{questInfo.Name} ({value}) [{questInfo.QuestId}]";
if (_uiUtils.ChecklistItem(text, color, icon))
{
_questTooltipComponent.Draw(questInfo);
}

27
Questionable/Questionable.Windows.JournalComponents/QuestJournalComponent.cs
View file

@ -318,9 +318,18 @@ internal sealed class QuestJournalComponent
}
if (_questFunctions.IsQuestComplete(questInfo.QuestId))
{
if (questInfo.IsRepeatable && _questFunctions.IsReadyToAcceptQuest(questInfo.QuestId))
if (questInfo.IsRepeatable)
{
_uiUtils.ChecklistItem("Complete", ImGuiColors.ParsedBlue, FontAwesomeIcon.Check);
bool num2 = _questFunctions.IsQuestLocked(questInfo.QuestId);
bool flag = _questFunctions.IsReadyToAcceptQuest(questInfo.QuestId);
if (!num2 && flag)
{
_uiUtils.ChecklistItem("Available", ImGuiColors.ParsedBlue, FontAwesomeIcon.Running);
}
else
{
_uiUtils.ChecklistItem("Complete", ImGuiColors.ParsedGreen, FontAwesomeIcon.Check);
}
}
else
{
@ -328,10 +337,10 @@ internal sealed class QuestJournalComponent
}
return;
}
bool flag = false;
bool flag2 = _questFunctions.IsQuestUnobtainable(questInfo.QuestId);
bool flag3 = _questFunctions.IsQuestLocked(questInfo.QuestId);
bool flag4 = _questFunctions.IsReadyToAcceptQuest(questInfo.QuestId);
bool flag2 = false;
bool flag3 = _questFunctions.IsQuestUnobtainable(questInfo.QuestId);
bool flag4 = _questFunctions.IsQuestLocked(questInfo.QuestId);
bool flag5 = _questFunctions.IsReadyToAcceptQuest(questInfo.QuestId);
DateTime? seasonalQuestExpiry = questInfo.SeasonalQuestExpiry;
if (seasonalQuestExpiry.HasValue)
{
@ -339,14 +348,14 @@ internal sealed class QuestJournalComponent
DateTime dateTime = ((valueOrDefault.Kind == DateTimeKind.Utc) ? valueOrDefault : valueOrDefault.ToUniversalTime());
if (DateTime.UtcNow > dateTime)
{
flag = true;
flag2 = true;
}
}
if (flag || flag2)
if (flag2 || flag3)
{
_uiUtils.ChecklistItem("Unobtainable", ImGuiColors.DalamudGrey, FontAwesomeIcon.Minus);
}
else if (flag3 || !flag4 || !_questRegistry.IsKnownQuest(questInfo.QuestId))
else if (flag4 || !flag5 || !_questRegistry.IsKnownQuest(questInfo.QuestId))
{
_uiUtils.ChecklistItem("Locked", ImGuiColors.DalamudRed, FontAwesomeIcon.Times);
}