forked from liza/Questionable
Show validation info in journal window
This commit is contained in:
parent
005574a774
commit
a8e3eb95c9
QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor
Questionable
@ -104,7 +104,7 @@
|
|||||||
"Z": -299.8551
|
"Z": -299.8551
|
||||||
},
|
},
|
||||||
"TerritoryId": 957,
|
"TerritoryId": 957,
|
||||||
"InteractionType": "Interact",
|
"InteractionType": "CompleteQuest",
|
||||||
"AetheryteShortcut": "Thavnair - Palaka's Stand",
|
"AetheryteShortcut": "Thavnair - Palaka's Stand",
|
||||||
"Fly": true
|
"Fly": true
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@ using System.Threading;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Questionable.Model;
|
using Questionable.Model;
|
||||||
|
using Questionable.Model.Questing;
|
||||||
|
|
||||||
namespace Questionable.Validation;
|
namespace Questionable.Validation;
|
||||||
|
|
||||||
@ -91,6 +92,9 @@ internal sealed class QuestValidator
|
|||||||
}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
|
}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<ValidationIssue> GetIssues(ElementId elementId) =>
|
||||||
|
_validationIssues.Where(x => x.ElementId == elementId).ToList();
|
||||||
|
|
||||||
private static IEnumerable<ValidationIssue> DisabledTribesAsIssues(Dictionary<EAlliedSociety, int> disabledTribeQuests)
|
private static IEnumerable<ValidationIssue> DisabledTribesAsIssues(Dictionary<EAlliedSociety, int> disabledTribeQuests)
|
||||||
{
|
{
|
||||||
return disabledTribeQuests
|
return disabledTribeQuests
|
||||||
|
@ -13,19 +13,16 @@ using Questionable.Data;
|
|||||||
using Questionable.Functions;
|
using Questionable.Functions;
|
||||||
using Questionable.Model;
|
using Questionable.Model;
|
||||||
using Questionable.Model.Questing;
|
using Questionable.Model.Questing;
|
||||||
|
using Questionable.Validation;
|
||||||
using Questionable.Windows.QuestComponents;
|
using Questionable.Windows.QuestComponents;
|
||||||
|
|
||||||
namespace Questionable.Windows.JournalComponents;
|
namespace Questionable.Windows.JournalComponents;
|
||||||
|
|
||||||
internal sealed class QuestJournalComponent
|
internal sealed class QuestJournalComponent
|
||||||
{
|
{
|
||||||
private readonly Dictionary<JournalData.Genre, (int Available, int Obtainable, int Completed)> _genreCounts = [];
|
private readonly Dictionary<JournalData.Genre, JournalCounts> _genreCounts = [];
|
||||||
|
private readonly Dictionary<JournalData.Category, JournalCounts> _categoryCounts = [];
|
||||||
private readonly Dictionary<JournalData.Category, (int Available, int Obtainable, int Completed)> _categoryCounts =
|
private readonly Dictionary<JournalData.Section, JournalCounts> _sectionCounts = [];
|
||||||
[];
|
|
||||||
|
|
||||||
private readonly Dictionary<JournalData.Section, (int Available, int Obtainable, int Completed)> _sectionCounts =
|
|
||||||
[];
|
|
||||||
|
|
||||||
private readonly JournalData _journalData;
|
private readonly JournalData _journalData;
|
||||||
private readonly QuestRegistry _questRegistry;
|
private readonly QuestRegistry _questRegistry;
|
||||||
@ -35,13 +32,14 @@ internal sealed class QuestJournalComponent
|
|||||||
private readonly IDalamudPluginInterface _pluginInterface;
|
private readonly IDalamudPluginInterface _pluginInterface;
|
||||||
private readonly QuestController _questController;
|
private readonly QuestController _questController;
|
||||||
private readonly ICommandManager _commandManager;
|
private readonly ICommandManager _commandManager;
|
||||||
|
private readonly QuestValidator _questValidator;
|
||||||
|
|
||||||
private List<FilteredSection> _filteredSections = [];
|
private List<FilteredSection> _filteredSections = [];
|
||||||
private string _searchText = string.Empty;
|
private string _searchText = string.Empty;
|
||||||
|
|
||||||
public QuestJournalComponent(JournalData journalData, QuestRegistry questRegistry, QuestFunctions questFunctions,
|
public QuestJournalComponent(JournalData journalData, QuestRegistry questRegistry, QuestFunctions questFunctions,
|
||||||
UiUtils uiUtils, QuestTooltipComponent questTooltipComponent, IDalamudPluginInterface pluginInterface,
|
UiUtils uiUtils, QuestTooltipComponent questTooltipComponent, IDalamudPluginInterface pluginInterface,
|
||||||
QuestController questController, ICommandManager commandManager)
|
QuestController questController, ICommandManager commandManager, QuestValidator questValidator)
|
||||||
{
|
{
|
||||||
_journalData = journalData;
|
_journalData = journalData;
|
||||||
_questRegistry = questRegistry;
|
_questRegistry = questRegistry;
|
||||||
@ -51,6 +49,7 @@ internal sealed class QuestJournalComponent
|
|||||||
_pluginInterface = pluginInterface;
|
_pluginInterface = pluginInterface;
|
||||||
_questController = questController;
|
_questController = questController;
|
||||||
_commandManager = commandManager;
|
_commandManager = commandManager;
|
||||||
|
_questValidator = questValidator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DrawQuests()
|
public void DrawQuests()
|
||||||
@ -99,7 +98,7 @@ internal sealed class QuestJournalComponent
|
|||||||
if (filter.Section.QuestCount == 0)
|
if (filter.Section.QuestCount == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
(int available, int obtainable, int completed) = _sectionCounts.GetValueOrDefault(filter.Section);
|
(int available, int obtainable, int completed) = _sectionCounts.GetValueOrDefault(filter.Section, new());
|
||||||
|
|
||||||
ImGui.TableNextRow();
|
ImGui.TableNextRow();
|
||||||
ImGui.TableNextColumn();
|
ImGui.TableNextColumn();
|
||||||
@ -125,7 +124,7 @@ internal sealed class QuestJournalComponent
|
|||||||
if (filter.Category.QuestCount == 0)
|
if (filter.Category.QuestCount == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
(int available, int obtainable, int completed) = _categoryCounts.GetValueOrDefault(filter.Category);
|
(int available, int obtainable, int completed) = _categoryCounts.GetValueOrDefault(filter.Category, new());
|
||||||
|
|
||||||
ImGui.TableNextRow();
|
ImGui.TableNextRow();
|
||||||
ImGui.TableNextColumn();
|
ImGui.TableNextColumn();
|
||||||
@ -151,7 +150,7 @@ internal sealed class QuestJournalComponent
|
|||||||
if (filter.Genre.QuestCount == 0)
|
if (filter.Genre.QuestCount == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
(int supported, int obtainable, int completed) = _genreCounts.GetValueOrDefault(filter.Genre);
|
(int supported, int obtainable, int completed) = _genreCounts.GetValueOrDefault(filter.Genre, new());
|
||||||
|
|
||||||
ImGui.TableNextRow();
|
ImGui.TableNextRow();
|
||||||
ImGui.TableNextColumn();
|
ImGui.TableNextColumn();
|
||||||
@ -212,7 +211,19 @@ internal sealed class QuestJournalComponent
|
|||||||
}
|
}
|
||||||
|
|
||||||
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + spacing);
|
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + spacing);
|
||||||
_uiUtils.ChecklistItem(string.Empty, quest is { Root.Disabled: false });
|
|
||||||
|
if (quest is { Root.Disabled: false })
|
||||||
|
{
|
||||||
|
List<ValidationIssue> issues = _questValidator.GetIssues(quest.Id);
|
||||||
|
if (issues.Any(x => x.Severity == EIssueSeverity.Error))
|
||||||
|
_uiUtils.ChecklistItem(string.Empty, ImGuiColors.DalamudRed, FontAwesomeIcon.ExclamationTriangle);
|
||||||
|
else if (issues.Count > 0)
|
||||||
|
_uiUtils.ChecklistItem(string.Empty, ImGuiColors.ParsedBlue, FontAwesomeIcon.InfoCircle);
|
||||||
|
else
|
||||||
|
_uiUtils.ChecklistItem(string.Empty, true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
_uiUtils.ChecklistItem(string.Empty, false);
|
||||||
|
|
||||||
ImGui.TableNextColumn();
|
ImGui.TableNextColumn();
|
||||||
var (color, icon, text) = _uiUtils.GetQuestStyle(questInfo.QuestId);
|
var (color, icon, text) = _uiUtils.GetQuestStyle(questInfo.QuestId);
|
||||||
@ -329,7 +340,7 @@ internal sealed class QuestJournalComponent
|
|||||||
_questRegistry.TryGetQuest(x.QuestId, out var quest) && !quest.Root.Disabled);
|
_questRegistry.TryGetQuest(x.QuestId, out var quest) && !quest.Root.Disabled);
|
||||||
int obtainable = genre.Quests.Count(x => !_questFunctions.IsQuestUnobtainable(x.QuestId));
|
int obtainable = genre.Quests.Count(x => !_questFunctions.IsQuestUnobtainable(x.QuestId));
|
||||||
int completed = genre.Quests.Count(x => _questFunctions.IsQuestComplete(x.QuestId));
|
int completed = genre.Quests.Count(x => _questFunctions.IsQuestComplete(x.QuestId));
|
||||||
_genreCounts[genre] = (available, obtainable, completed);
|
_genreCounts[genre] = new(available, obtainable, completed);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var category in _journalData.Categories)
|
foreach (var category in _journalData.Categories)
|
||||||
@ -341,7 +352,7 @@ internal sealed class QuestJournalComponent
|
|||||||
int available = counts.Sum(x => x.Available);
|
int available = counts.Sum(x => x.Available);
|
||||||
int obtainable = counts.Sum(x => x.Obtainable);
|
int obtainable = counts.Sum(x => x.Obtainable);
|
||||||
int completed = counts.Sum(x => x.Completed);
|
int completed = counts.Sum(x => x.Completed);
|
||||||
_categoryCounts[category] = (available, obtainable, completed);
|
_categoryCounts[category] = new(available, obtainable, completed);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var section in _journalData.Sections)
|
foreach (var section in _journalData.Sections)
|
||||||
@ -353,20 +364,20 @@ internal sealed class QuestJournalComponent
|
|||||||
int available = counts.Sum(x => x.Available);
|
int available = counts.Sum(x => x.Available);
|
||||||
int obtainable = counts.Sum(x => x.Obtainable);
|
int obtainable = counts.Sum(x => x.Obtainable);
|
||||||
int completed = counts.Sum(x => x.Completed);
|
int completed = counts.Sum(x => x.Completed);
|
||||||
_sectionCounts[section] = (available, obtainable, completed);
|
_sectionCounts[section] = new(available, obtainable, completed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void ClearCounts()
|
internal void ClearCounts()
|
||||||
{
|
{
|
||||||
foreach (var genreCount in _genreCounts.ToList())
|
foreach (var genreCount in _genreCounts.ToList())
|
||||||
_genreCounts[genreCount.Key] = (genreCount.Value.Available, genreCount.Value.Available, 0);
|
_genreCounts[genreCount.Key] = genreCount.Value with { Completed = 0 };
|
||||||
|
|
||||||
foreach (var categoryCount in _categoryCounts.ToList())
|
foreach (var categoryCount in _categoryCounts.ToList())
|
||||||
_categoryCounts[categoryCount.Key] = (categoryCount.Value.Available, categoryCount.Value.Available, 0);
|
_categoryCounts[categoryCount.Key] = categoryCount.Value with { Completed = 0 };
|
||||||
|
|
||||||
foreach (var sectionCount in _sectionCounts.ToList())
|
foreach (var sectionCount in _sectionCounts.ToList())
|
||||||
_sectionCounts[sectionCount.Key] = (sectionCount.Value.Available, sectionCount.Value.Available, 0);
|
_sectionCounts[sectionCount.Key] = sectionCount.Value with { Completed = 0 };
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed record FilteredSection(JournalData.Section Section, List<FilteredCategory> Categories);
|
private sealed record FilteredSection(JournalData.Section Section, List<FilteredCategory> Categories);
|
||||||
@ -374,4 +385,6 @@ internal sealed class QuestJournalComponent
|
|||||||
private sealed record FilteredCategory(JournalData.Category Category, List<FilteredGenre> Genres);
|
private sealed record FilteredCategory(JournalData.Category Category, List<FilteredGenre> Genres);
|
||||||
|
|
||||||
private sealed record FilteredGenre(JournalData.Genre Genre, List<IQuestInfo> Quests);
|
private sealed record FilteredGenre(JournalData.Genre Genre, List<IQuestInfo> Quests);
|
||||||
|
|
||||||
|
private sealed record JournalCounts(int Available = 0, int Obtainable = 0, int Completed = 0);
|
||||||
}
|
}
|
||||||
|
@ -113,7 +113,7 @@ internal sealed class QuickAccessButtonsComponent
|
|||||||
int partsToRender = errorCount == 0 || infoCount == 0 ? 1 : 2;
|
int partsToRender = errorCount == 0 || infoCount == 0 ? 1 : 2;
|
||||||
using var id = ImRaii.PushId("validationissues");
|
using var id = ImRaii.PushId("validationissues");
|
||||||
|
|
||||||
var icon1 = FontAwesomeIcon.TimesCircle;
|
var icon1 = FontAwesomeIcon.ExclamationTriangle;
|
||||||
var icon2 = FontAwesomeIcon.InfoCircle;
|
var icon2 = FontAwesomeIcon.InfoCircle;
|
||||||
Vector2 iconSize1, iconSize2;
|
Vector2 iconSize1, iconSize2;
|
||||||
using (var _ = _pluginInterface.UiBuilder.IconFontFixedWidthHandle.Push())
|
using (var _ = _pluginInterface.UiBuilder.IconFontFixedWidthHandle.Push())
|
||||||
|
@ -77,7 +77,7 @@ internal sealed class QuestValidationWindow : LWindow
|
|||||||
if (validationIssue.Severity == EIssueSeverity.Error)
|
if (validationIssue.Severity == EIssueSeverity.Error)
|
||||||
{
|
{
|
||||||
using var color = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
|
using var color = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
|
||||||
ImGui.TextUnformatted(FontAwesomeIcon.TimesCircle.ToIconString());
|
ImGui.TextUnformatted(FontAwesomeIcon.ExclamationTriangle.ToIconString());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user