From: Liza Carvelli Date: Sat, 17 Aug 2024 17:16:33 +0000 (+0200) Subject: Rename beast tribe to allied society in code X-Git-Tag: v2.12~34 X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=179e6e341f83e607d9e2913ce5dd4d6acba70952;p=Questionable.git Rename beast tribe to allied society in code --- diff --git a/Questionable/Model/EAlliedSociety.cs b/Questionable/Model/EAlliedSociety.cs new file mode 100644 index 00000000..2f7281f7 --- /dev/null +++ b/Questionable/Model/EAlliedSociety.cs @@ -0,0 +1,28 @@ +using System.Diagnostics.CodeAnalysis; +using JetBrains.Annotations; + +namespace Questionable.Model; + +[SuppressMessage("Design", "CA1028", Justification = "Game type")] +[UsedImplicitly(ImplicitUseTargetFlags.Members)] +public enum EAlliedSociety : byte +{ + None = 0, + Amaljaa = 1, + Sylphs = 2, + Kobolds = 3, + Sahagin = 4, + Ixal = 5, + VanuVanu = 6, + Vath = 7, + Moogles = 8, + Kojin = 9, + Ananta = 10, + Namazu = 11, + Pixies = 12, + Qitari = 13, + Dwarves = 14, + Arkasodara = 15, + Omicrons = 16, + Loporrits = 17, +} diff --git a/Questionable/Model/EBeastTribe.cs b/Questionable/Model/EBeastTribe.cs deleted file mode 100644 index e26fb672..00000000 --- a/Questionable/Model/EBeastTribe.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Diagnostics.CodeAnalysis; -using JetBrains.Annotations; - -namespace Questionable.Model; - -[SuppressMessage("Design", "CA1028", Justification = "Game type")] -[UsedImplicitly(ImplicitUseTargetFlags.Members)] -public enum EBeastTribe : byte -{ - None = 0, - Amaljaa = 1, - Sylphs = 2, - Kobolds = 3, - Sahagin = 4, - Ixal = 5, - VanuVanu = 6, - Vath = 7, - Moogles = 8, - Kojin = 9, - Ananta = 10, - Namazu = 11, - Pixies = 12, - Qitari = 13, - Dwarves = 14, - Arkasodara = 15, - Omicrons = 16, - Loporrits = 17, -} diff --git a/Questionable/Model/IQuestInfo.cs b/Questionable/Model/IQuestInfo.cs index 1a2f557a..5bc8d5f9 100644 --- a/Questionable/Model/IQuestInfo.cs +++ b/Questionable/Model/IQuestInfo.cs @@ -13,7 +13,7 @@ public interface IQuestInfo public uint IssuerDataId { get; } public bool IsRepeatable { get; } public ushort Level { get; } - public EBeastTribe BeastTribe { get; } + public EAlliedSociety AlliedSociety { get; } public uint? JournalGenre { get; } public ushort SortKey { get; } public bool IsMainScenarioQuest { get; } diff --git a/Questionable/Model/LeveInfo.cs b/Questionable/Model/LeveInfo.cs index 8d454e5b..b446da9a 100644 --- a/Questionable/Model/LeveInfo.cs +++ b/Questionable/Model/LeveInfo.cs @@ -24,7 +24,7 @@ internal sealed class LeveInfo : IQuestInfo public uint IssuerDataId { get; } public bool IsRepeatable => true; public ushort Level { get; } - public EBeastTribe BeastTribe => EBeastTribe.None; + public EAlliedSociety AlliedSociety => EAlliedSociety.None; public uint? JournalGenre { get; } public ushort SortKey { get; } public bool IsMainScenarioQuest => false; diff --git a/Questionable/Model/QuestInfo.cs b/Questionable/Model/QuestInfo.cs index e9a70ea3..2c9c2951 100644 --- a/Questionable/Model/QuestInfo.cs +++ b/Questionable/Model/QuestInfo.cs @@ -51,7 +51,7 @@ internal sealed class QuestInfo : IQuestInfo PreviousInstanceContent = quest.InstanceContent.Select(x => (ushort)x.Row).Where(x => x != 0).ToList(); PreviousInstanceContentJoin = (QuestJoin)quest.InstanceContentJoin; GrandCompany = (GrandCompany)quest.GrandCompany.Row; - BeastTribe = (EBeastTribe)quest.BeastTribe.Row; + AlliedSociety = (EAlliedSociety)quest.BeastTribe.Row; ClassJobs = QuestInfoUtils.AsList(quest.ClassJobCategory0.Value!); IsSeasonalEvent = quest.Festival.Row != 0; NewGamePlusChapter = newGamePlusChapter; @@ -75,7 +75,7 @@ internal sealed class QuestInfo : IQuestInfo public bool IsMainScenarioQuest { get; } public bool CompletesInstantly { get; } public GrandCompany GrandCompany { get; } - public EBeastTribe BeastTribe { get; } + public EAlliedSociety AlliedSociety { get; } public IReadOnlyList ClassJobs { get; } public bool IsSeasonalEvent { get; } public ushort NewGamePlusChapter { get; } diff --git a/Questionable/Model/SatisfactionSupplyInfo.cs b/Questionable/Model/SatisfactionSupplyInfo.cs index 17c56772..9b3a7a6d 100644 --- a/Questionable/Model/SatisfactionSupplyInfo.cs +++ b/Questionable/Model/SatisfactionSupplyInfo.cs @@ -22,7 +22,7 @@ internal sealed class SatisfactionSupplyInfo : IQuestInfo public uint IssuerDataId { get; } public bool IsRepeatable => true; public ushort Level { get; } - public EBeastTribe BeastTribe => EBeastTribe.None; + public EAlliedSociety AlliedSociety => EAlliedSociety.None; public uint? JournalGenre => null; public ushort SortKey { get; } public bool IsMainScenarioQuest => false; diff --git a/Questionable/Validation/QuestValidator.cs b/Questionable/Validation/QuestValidator.cs index 44f952f3..c91f0df2 100644 --- a/Questionable/Validation/QuestValidator.cs +++ b/Questionable/Validation/QuestValidator.cs @@ -44,7 +44,7 @@ internal sealed class QuestValidator _validationIssues.Clear(); List issues = []; - Dictionary disabledTribeQuests = new(); + Dictionary disabledTribeQuests = new(); foreach (var quest in quests) { foreach (var validator in _validators) @@ -57,10 +57,10 @@ internal sealed class QuestValidator _logger.Log(level, "Validation failed: {QuestId} ({QuestName}) / {QuestSequence} / {QuestStep} - {Description}", issue.ElementId, quest.Info.Name, issue.Sequence, issue.Step, issue.Description); - if (issue.Type == EIssueType.QuestDisabled && quest.Info.BeastTribe != EBeastTribe.None) + if (issue.Type == EIssueType.QuestDisabled && quest.Info.AlliedSociety != EAlliedSociety.None) { - disabledTribeQuests.TryAdd(quest.Info.BeastTribe, 0); - disabledTribeQuests[quest.Info.BeastTribe]++; + disabledTribeQuests.TryAdd(quest.Info.AlliedSociety, 0); + disabledTribeQuests[quest.Info.AlliedSociety]++; } else issues.Add(issue); @@ -89,7 +89,7 @@ internal sealed class QuestValidator }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); } - private static IEnumerable DisabledTribesAsIssues(Dictionary disabledTribeQuests) + private static IEnumerable DisabledTribesAsIssues(Dictionary disabledTribeQuests) { return disabledTribeQuests .OrderBy(x => x.Key) @@ -98,7 +98,7 @@ internal sealed class QuestValidator ElementId = null, Sequence = null, Step = null, - BeastTribe = x.Key, + AlliedSociety = x.Key, Type = EIssueType.QuestDisabled, Severity = EIssueSeverity.None, Description = $"{x.Value} disabled quest(s)", diff --git a/Questionable/Validation/ValidationIssue.cs b/Questionable/Validation/ValidationIssue.cs index 654ac514..b77c21fe 100644 --- a/Questionable/Validation/ValidationIssue.cs +++ b/Questionable/Validation/ValidationIssue.cs @@ -8,7 +8,7 @@ internal sealed record ValidationIssue public required ElementId? ElementId { get; init; } public required byte? Sequence { get; init; } public required int? Step { get; init; } - public EBeastTribe BeastTribe { get; init; } = EBeastTribe.None; + public EAlliedSociety AlliedSociety { get; init; } = EAlliedSociety.None; public required EIssueType Type { get; init; } public required EIssueSeverity Severity { get; init; } public required string Description { get; init; } diff --git a/Questionable/Windows/QuestValidationWindow.cs b/Questionable/Windows/QuestValidationWindow.cs index 8f3eb3ac..173c82f3 100644 --- a/Questionable/Windows/QuestValidationWindow.cs +++ b/Questionable/Windows/QuestValidationWindow.cs @@ -61,7 +61,7 @@ internal sealed class QuestValidationWindow : LWindow if (ImGui.TableNextColumn()) ImGui.TextUnformatted(validationIssue.ElementId != null ? _questData.GetQuestInfo(validationIssue.ElementId).Name - : validationIssue.BeastTribe.ToString()); + : validationIssue.AlliedSociety.ToString()); if (ImGui.TableNextColumn()) ImGui.TextUnformatted(validationIssue.Sequence?.ToString(CultureInfo.InvariantCulture) ?? string.Empty);