From ac85eea2302562b8026d14c8a096ae4f5a9e581b Mon Sep 17 00:00:00 2001 From: alydev Date: Mon, 24 Nov 2025 14:55:42 +1000 Subject: [PATCH] muffin v7.38.5 --- .../Questionable.Data/ChangelogData.cs | 820 +++++++++--------- .../Questionable.External/QuestionableIpc.cs | 148 +++- .../AlliedSocietyJournalComponent.cs | 418 ++++++++- 3 files changed, 966 insertions(+), 420 deletions(-) diff --git a/Questionable/Questionable.Data/ChangelogData.cs b/Questionable/Questionable.Data/ChangelogData.cs index 3c238e5..9299866 100644 --- a/Questionable/Questionable.Data/ChangelogData.cs +++ b/Questionable/Questionable.Data/ChangelogData.cs @@ -11,13 +11,13 @@ internal static class ChangelogData static ChangelogData() { - int num = 39; + int num = 40; List list = new List(num); CollectionsMarshal.SetCount(list, num); Span span = CollectionsMarshal.AsSpan(list); int num2 = 0; ref ChangelogEntry reference = ref span[num2]; - DateOnly releaseDate = new DateOnly(2025, 11, 23); + DateOnly releaseDate = new DateOnly(2025, 11, 24); int num3 = 2; List list2 = new List(num3); CollectionsMarshal.SetCount(list2, num3); @@ -29,15 +29,41 @@ internal static class ChangelogData CollectionsMarshal.SetCount(list3, num5); Span span3 = CollectionsMarshal.AsSpan(list3); int index = 0; - span3[index] = "Explicitly declare support for BMR singleplayer duty (The Rematch)"; - reference2 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list3); + span3[index] = "Added Allied Society daily allowance tracker with bulk quest adding buttons"; + reference2 = new ChangeEntry(EChangeCategory.Added, "Major features", list3); num4++; ref ChangeEntry reference3 = ref span2[num4]; - index = 8; + index = 1; List list4 = new List(index); CollectionsMarshal.SetCount(list4, index); span3 = CollectionsMarshal.AsSpan(list4); num5 = 0; + span3[num5] = "Added IPC for Allied Society: GetRemainingAllowances, GetTimeUntilReset, GetAvailableQuestIds, GetAllAvailableQuestCounts, IsMaxRank, GetCurrentRank, GetSocietiesWithAvailableQuests"; + reference3 = new ChangeEntry(EChangeCategory.Added, "IPC changes", list4); + reference = new ChangelogEntry("7.38.5", releaseDate, list2); + num2++; + ref ChangelogEntry reference4 = ref span[num2]; + DateOnly releaseDate2 = new DateOnly(2025, 11, 23); + num4 = 2; + List list5 = new List(num4); + CollectionsMarshal.SetCount(list5, num4); + span2 = CollectionsMarshal.AsSpan(list5); + num3 = 0; + ref ChangeEntry reference5 = ref span2[num3]; + num5 = 1; + List list6 = new List(num5); + CollectionsMarshal.SetCount(list6, num5); + span3 = CollectionsMarshal.AsSpan(list6); + index = 0; + span3[index] = "Explicitly declare support for BMR singleplayer duty (The Rematch)"; + reference5 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list6); + num3++; + ref ChangeEntry reference6 = ref span2[num3]; + index = 8; + List list7 = new List(index); + CollectionsMarshal.SetCount(list7, index); + span3 = CollectionsMarshal.AsSpan(list7); + num5 = 0; span3[num5] = "Fixed quest (Microbrewing) to not get stuck near ramp"; num5++; span3[num5] = "Fixed quest (The Illuminated Land) where pathing would kill the player due to fall damage"; @@ -53,69 +79,37 @@ internal static class ChangelogData span3[num5] = "Fixed quest (Poisoned Hearts) where incorrect pathing caused the player to die"; num5++; span3[num5] = "Fixed quests (Savage Snares) and (An Apple a Day) not detecting kills"; - reference3 = new ChangeEntry(EChangeCategory.Fixed, "Bug fixes", list4); - reference = new ChangelogEntry("7.38.4", releaseDate, list2); + reference6 = new ChangeEntry(EChangeCategory.Fixed, "Bug fixes", list7); + reference4 = new ChangelogEntry("7.38.4", releaseDate2, list5); num2++; - ref ChangelogEntry reference4 = ref span[num2]; - DateOnly releaseDate2 = new DateOnly(2025, 11, 23); - num4 = 3; - List list5 = new List(num4); - CollectionsMarshal.SetCount(list5, num4); - span2 = CollectionsMarshal.AsSpan(list5); - num3 = 0; - ref ChangeEntry reference5 = ref span2[num3]; + ref ChangelogEntry reference7 = ref span[num2]; + DateOnly releaseDate3 = new DateOnly(2025, 11, 23); + num3 = 3; + List list8 = new List(num3); + CollectionsMarshal.SetCount(list8, num3); + span2 = CollectionsMarshal.AsSpan(list8); + num4 = 0; + ref ChangeEntry reference8 = ref span2[num4]; num5 = 2; - List list6 = new List(num5); - CollectionsMarshal.SetCount(list6, num5); - span3 = CollectionsMarshal.AsSpan(list6); + List list9 = new List(num5); + CollectionsMarshal.SetCount(list9, num5); + span3 = CollectionsMarshal.AsSpan(list9); index = 0; span3[index] = "Added RequireHq to crafting InteractionType"; index++; span3[index] = "Mark GC quests as Locked if rank not achieved"; - reference5 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list6); - num3++; - ref ChangeEntry reference6 = ref span2[num3]; - index = 2; - List list7 = new List(index); - CollectionsMarshal.SetCount(list7, index); - span3 = CollectionsMarshal.AsSpan(list7); - num5 = 0; - span3[num5] = "Added IPC for stop conditions: GetStopConditionsEnabled, SetStopConditionsEnabled, GetStopQuestList, AddStopQuest, RemoveStopQuest, ClearStopQuests, GetLevelStopCondition, SetLevelStopCondition, GetSequenceStopCondition, SetSequenceStopCondition"; - num5++; - span3[num5] = "Added IPC for priority quests: GetPriorityQuests, RemovePriorityQuest, ReorderPriorityQuest, GetAvailablePresets, GetPresetQuests, AddPresetToPriority, IsPresetAvailable, IsQuestInPriority, GetQuestPriorityIndex, HasAvailablePriorityQuests"; - reference6 = new ChangeEntry(EChangeCategory.Added, "IPC changes", list7); - num3++; - ref ChangeEntry reference7 = ref span2[num3]; - num5 = 3; - List list8 = new List(num5); - CollectionsMarshal.SetCount(list8, num5); - span3 = CollectionsMarshal.AsSpan(list8); - index = 0; - span3[index] = "Fixed line breaks not working in dialog strings"; - index++; - span3[index] = "Fixed quest (Labor of Love)"; - index++; - span3[index] = "Fixed quest (Sea of Sorrow)"; - reference7 = new ChangeEntry(EChangeCategory.Fixed, "Bug fixes", list8); - reference4 = new ChangelogEntry("7.38.3", releaseDate2, list5); - num2++; - ref ChangelogEntry reference8 = ref span[num2]; - DateOnly releaseDate3 = new DateOnly(2025, 11, 18); - num3 = 3; - List list9 = new List(num3); - CollectionsMarshal.SetCount(list9, num3); - span2 = CollectionsMarshal.AsSpan(list9); - num4 = 0; + reference8 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list9); + num4++; ref ChangeEntry reference9 = ref span2[num4]; index = 2; List list10 = new List(index); CollectionsMarshal.SetCount(list10, index); span3 = CollectionsMarshal.AsSpan(list10); num5 = 0; - span3[num5] = "Auto Duty unsync options for each duty (Duty Support, Unsync Solo, Unsync Party)"; + span3[num5] = "Added IPC for stop conditions: GetStopConditionsEnabled, SetStopConditionsEnabled, GetStopQuestList, AddStopQuest, RemoveStopQuest, ClearStopQuests, GetLevelStopCondition, SetLevelStopCondition, GetSequenceStopCondition, SetSequenceStopCondition"; num5++; - span3[num5] = "Added Auto Duty unsync options to quest schema and updated quests using old unsync method"; - reference9 = new ChangeEntry(EChangeCategory.Added, "Major features", list10); + span3[num5] = "Added IPC for priority quests: GetPriorityQuests, RemovePriorityQuest, ReorderPriorityQuest, GetAvailablePresets, GetPresetQuests, AddPresetToPriority, IsPresetAvailable, IsQuestInPriority, GetQuestPriorityIndex, HasAvailablePriorityQuests"; + reference9 = new ChangeEntry(EChangeCategory.Added, "IPC changes", list10); num4++; ref ChangeEntry reference10 = ref span2[num4]; num5 = 3; @@ -123,15 +117,13 @@ internal static class ChangelogData CollectionsMarshal.SetCount(list11, num5); span3 = CollectionsMarshal.AsSpan(list11); index = 0; - span3[index] = "Added IPC for duty sync handling: GetDefaultDutyMode, SetDefaultDutyMode"; + span3[index] = "Fixed line breaks not working in dialog strings"; index++; - span3[index] = "Added IPC for duty mode overrides: GetDutyModeOverride, SetDutyModeOverride"; + span3[index] = "Fixed quest (Labor of Love)"; index++; - span3[index] = "Added IPC for clearing overrides: ClearDutyModeOverride, ClearAllDutyModeOverrides"; - reference10 = new ChangeEntry(EChangeCategory.Added, "IPC changes", list11); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed quest (Constant Cravings)"); - reference8 = new ChangelogEntry("7.38.2", releaseDate3, list9); + span3[index] = "Fixed quest (Sea of Sorrow)"; + reference10 = new ChangeEntry(EChangeCategory.Fixed, "Bug fixes", list11); + reference7 = new ChangelogEntry("7.38.3", releaseDate3, list8); num2++; ref ChangelogEntry reference11 = ref span[num2]; DateOnly releaseDate4 = new DateOnly(2025, 11, 18); @@ -141,13 +133,15 @@ internal static class ChangelogData span2 = CollectionsMarshal.AsSpan(list12); num3 = 0; ref ChangeEntry reference12 = ref span2[num3]; - index = 1; + index = 2; List list13 = new List(index); CollectionsMarshal.SetCount(list13, index); span3 = CollectionsMarshal.AsSpan(list13); num5 = 0; - span3[num5] = "Added new fields to quest schema"; - reference12 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list13); + span3[num5] = "Auto Duty unsync options for each duty (Duty Support, Unsync Solo, Unsync Party)"; + num5++; + span3[num5] = "Added Auto Duty unsync options to quest schema and updated quests using old unsync method"; + reference12 = new ChangeEntry(EChangeCategory.Added, "Major features", list13); num3++; ref ChangeEntry reference13 = ref span2[num3]; num5 = 3; @@ -155,390 +149,422 @@ internal static class ChangelogData CollectionsMarshal.SetCount(list14, num5); span3 = CollectionsMarshal.AsSpan(list14); index = 0; + span3[index] = "Added IPC for duty sync handling: GetDefaultDutyMode, SetDefaultDutyMode"; + index++; + span3[index] = "Added IPC for duty mode overrides: GetDutyModeOverride, SetDutyModeOverride"; + index++; + span3[index] = "Added IPC for clearing overrides: ClearDutyModeOverride, ClearAllDutyModeOverrides"; + reference13 = new ChangeEntry(EChangeCategory.Added, "IPC changes", list14); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed quest (Constant Cravings)"); + reference11 = new ChangelogEntry("7.38.2", releaseDate4, list12); + num2++; + ref ChangelogEntry reference14 = ref span[num2]; + DateOnly releaseDate5 = new DateOnly(2025, 11, 18); + num3 = 3; + List list15 = new List(num3); + CollectionsMarshal.SetCount(list15, num3); + span2 = CollectionsMarshal.AsSpan(list15); + num4 = 0; + ref ChangeEntry reference15 = ref span2[num4]; + index = 1; + List list16 = new List(index); + CollectionsMarshal.SetCount(list16, index); + span3 = CollectionsMarshal.AsSpan(list16); + num5 = 0; + span3[num5] = "Added new fields to quest schema"; + reference15 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list16); + num4++; + ref ChangeEntry reference16 = ref span2[num4]; + num5 = 3; + List list17 = new List(num5); + CollectionsMarshal.SetCount(list17, num5); + span3 = CollectionsMarshal.AsSpan(list17); + index = 0; span3[index] = "A Faerie Tale Come True"; index++; span3[index] = "Constant Cravings"; index++; span3[index] = "A Bridge Too Full"; - reference13 = new ChangeEntry(EChangeCategory.QuestUpdates, "Added new quest paths", list14); - num3++; - ref ChangeEntry reference14 = ref span2[num3]; + reference16 = new ChangeEntry(EChangeCategory.QuestUpdates, "Added new quest paths", list17); + num4++; + ref ChangeEntry reference17 = ref span2[num4]; index = 3; - List list15 = new List(index); - CollectionsMarshal.SetCount(list15, index); - span3 = CollectionsMarshal.AsSpan(list15); + List list18 = new List(index); + CollectionsMarshal.SetCount(list18, index); + span3 = CollectionsMarshal.AsSpan(list18); num5 = 0; span3[num5] = "Fixed various quest schemas"; num5++; span3[num5] = "Fixed changelog bullet point encoding"; num5++; span3[num5] = "Fixed item use to wait until item is used before next action"; - reference14 = new ChangeEntry(EChangeCategory.Fixed, "Bug fixes", list15); - reference11 = new ChangelogEntry("7.38.1", releaseDate4, list12); + reference17 = new ChangeEntry(EChangeCategory.Fixed, "Bug fixes", list18); + reference14 = new ChangelogEntry("7.38.1", releaseDate5, list15); num2++; - ref ChangelogEntry reference15 = ref span[num2]; - DateOnly releaseDate5 = new DateOnly(2025, 11, 17); - num3 = 5; - List list16 = new List(num3); - CollectionsMarshal.SetCount(list16, num3); - span2 = CollectionsMarshal.AsSpan(list16); - num4 = 0; - ref ChangeEntry reference16 = ref span2[num4]; + ref ChangelogEntry reference18 = ref span[num2]; + DateOnly releaseDate6 = new DateOnly(2025, 11, 17); + num4 = 5; + List list19 = new List(num4); + CollectionsMarshal.SetCount(list19, num4); + span2 = CollectionsMarshal.AsSpan(list19); + num3 = 0; + ref ChangeEntry reference19 = ref span2[num3]; num5 = 2; - List list17 = new List(num5); - CollectionsMarshal.SetCount(list17, num5); - span3 = CollectionsMarshal.AsSpan(list17); + List list20 = new List(num5); + CollectionsMarshal.SetCount(list20, num5); + span3 = CollectionsMarshal.AsSpan(list20); index = 0; span3[index] = "Quest sequence window to show expected sequences in each quest (with quest searching)"; index++; span3[index] = "Changelog"; - reference16 = new ChangeEntry(EChangeCategory.Added, "Major features", list17); - num4++; - ref ChangeEntry reference17 = ref span2[num4]; + reference19 = new ChangeEntry(EChangeCategory.Added, "Major features", list20); + num3++; + ref ChangeEntry reference20 = ref span2[num3]; index = 2; - List list18 = new List(index); - CollectionsMarshal.SetCount(list18, index); - span3 = CollectionsMarshal.AsSpan(list18); + List list21 = new List(index); + CollectionsMarshal.SetCount(list21, index); + span3 = CollectionsMarshal.AsSpan(list21); num5 = 0; span3[num5] = "Updated quest schemas"; num5++; span3[num5] = "Added search bar to preferred mounts and capitalization to mirror game mount names"; - reference17 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list18); - num4++; - ref ChangeEntry reference18 = ref span2[num4]; + reference20 = new ChangeEntry(EChangeCategory.Changed, "Improvements", list21); + num3++; + ref ChangeEntry reference21 = ref span2[num3]; num5 = 3; - List list19 = new List(num5); - CollectionsMarshal.SetCount(list19, num5); - span3 = CollectionsMarshal.AsSpan(list19); + List list22 = new List(num5); + CollectionsMarshal.SetCount(list22, num5); + span3 = CollectionsMarshal.AsSpan(list22); index = 0; span3[index] = "Renamed IsQuestCompleted → IsQuestComplete"; index++; span3[index] = "Renamed IsQuestAvailable → IsReadyToAcceptQuest"; index++; span3[index] = "Added GetCurrentTask IPC"; - reference18 = new ChangeEntry(EChangeCategory.Changed, "IPC changes", list19); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added all Hildibrand quests"); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed credits/cutscenes playback"); - reference15 = new ChangelogEntry("7.38.0", releaseDate5, list16); - num2++; - ref ChangelogEntry reference19 = ref span[num2]; - DateOnly releaseDate6 = new DateOnly(2025, 11, 8); - num4 = 1; - List list20 = new List(num4); - CollectionsMarshal.SetCount(list20, num4); - span2 = CollectionsMarshal.AsSpan(list20); - num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Fall Guys quest (Just Crowning Around)"); - reference19 = new ChangelogEntry("6.38", releaseDate6, list20); - num2++; - ref ChangelogEntry reference20 = ref span[num2]; - DateOnly releaseDate7 = new DateOnly(2025, 11, 8); - num3 = 1; - List list21 = new List(num3); - CollectionsMarshal.SetCount(list21, num3); - span2 = CollectionsMarshal.AsSpan(list21); - num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Cosmic Exploration and various unlock quests"); - reference20 = new ChangelogEntry("6.37", releaseDate7, list21); - num2++; - ref ChangelogEntry reference21 = ref span[num2]; - DateOnly releaseDate8 = new DateOnly(2025, 11, 2); - num4 = 1; - List list22 = new List(num4); - CollectionsMarshal.SetCount(list22, num4); - span2 = CollectionsMarshal.AsSpan(list22); - num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy Rank 6 quest (With High Spirits)"); - reference21 = new ChangelogEntry("6.36", releaseDate8, list22); + reference21 = new ChangeEntry(EChangeCategory.Changed, "IPC changes", list22); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added all Hildibrand quests"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed credits/cutscenes playback"); + reference18 = new ChangelogEntry("7.38.0", releaseDate6, list19); num2++; ref ChangelogEntry reference22 = ref span[num2]; - DateOnly releaseDate9 = new DateOnly(2025, 10, 28); + DateOnly releaseDate7 = new DateOnly(2025, 11, 8); num3 = 1; List list23 = new List(num3); CollectionsMarshal.SetCount(list23, num3); span2 = CollectionsMarshal.AsSpan(list23); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed level 3 MSQ handling if character started on non-XP buff world"); - reference22 = new ChangelogEntry("6.35", releaseDate9, list23); + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Fall Guys quest (Just Crowning Around)"); + reference22 = new ChangelogEntry("6.38", releaseDate7, list23); num2++; ref ChangelogEntry reference23 = ref span[num2]; - DateOnly releaseDate10 = new DateOnly(2025, 10, 23); - num4 = 2; + DateOnly releaseDate8 = new DateOnly(2025, 11, 8); + num4 = 1; List list24 = new List(num4); CollectionsMarshal.SetCount(list24, num4); span2 = CollectionsMarshal.AsSpan(list24); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.Added, "Added clear priority quests on logout and on completion config settings"); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed priority quest importing to respect import order"); - reference23 = new ChangelogEntry("6.34", releaseDate10, list24); + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Cosmic Exploration and various unlock quests"); + reference23 = new ChangelogEntry("6.37", releaseDate8, list24); num2++; ref ChangelogEntry reference24 = ref span[num2]; - DateOnly releaseDate11 = new DateOnly(2025, 10, 23); + DateOnly releaseDate9 = new DateOnly(2025, 11, 2); num3 = 1; List list25 = new List(num3); CollectionsMarshal.SetCount(list25, num3); span2 = CollectionsMarshal.AsSpan(list25); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed RSR combat module"); - reference24 = new ChangelogEntry("6.33", releaseDate11, list25); + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy Rank 6 quest (With High Spirits)"); + reference24 = new ChangelogEntry("6.36", releaseDate9, list25); num2++; ref ChangelogEntry reference25 = ref span[num2]; - DateOnly releaseDate12 = new DateOnly(2025, 10, 23); + DateOnly releaseDate10 = new DateOnly(2025, 10, 28); num4 = 1; List list26 = new List(num4); CollectionsMarshal.SetCount(list26, num4); span2 = CollectionsMarshal.AsSpan(list26); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy Rank 5 quest (Forged in Corn)"); - reference25 = new ChangelogEntry("6.32", releaseDate12, list26); + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed level 3 MSQ handling if character started on non-XP buff world"); + reference25 = new ChangelogEntry("6.35", releaseDate10, list26); num2++; ref ChangelogEntry reference26 = ref span[num2]; - DateOnly releaseDate13 = new DateOnly(2025, 10, 21); - num3 = 1; + DateOnly releaseDate11 = new DateOnly(2025, 10, 23); + num3 = 2; List list27 = new List(num3); CollectionsMarshal.SetCount(list27, num3); span2 = CollectionsMarshal.AsSpan(list27); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Added checks for moogle and allied society quests when using add all available quests"); - reference26 = new ChangelogEntry("6.31", releaseDate13, list27); + span2[num4] = new ChangeEntry(EChangeCategory.Added, "Added clear priority quests on logout and on completion config settings"); + num4++; + span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed priority quest importing to respect import order"); + reference26 = new ChangelogEntry("6.34", releaseDate11, list27); num2++; ref ChangelogEntry reference27 = ref span[num2]; - DateOnly releaseDate14 = new DateOnly(2025, 10, 21); + DateOnly releaseDate12 = new DateOnly(2025, 10, 23); num4 = 1; List list28 = new List(num4); CollectionsMarshal.SetCount(list28, num4); span2 = CollectionsMarshal.AsSpan(list28); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.Added, "Added button to journal that allows adding all available quests to priority"); - reference27 = new ChangelogEntry("6.30", releaseDate14, list28); + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed RSR combat module"); + reference27 = new ChangelogEntry("6.33", releaseDate12, list28); num2++; ref ChangelogEntry reference28 = ref span[num2]; - DateOnly releaseDate15 = new DateOnly(2025, 10, 20); - num3 = 2; + DateOnly releaseDate13 = new DateOnly(2025, 10, 23); + num3 = 1; List list29 = new List(num3); CollectionsMarshal.SetCount(list29, num3); span2 = CollectionsMarshal.AsSpan(list29); num4 = 0; - ref ChangeEntry reference29 = ref span2[num4]; + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy Rank 5 quest (Forged in Corn)"); + reference28 = new ChangelogEntry("6.32", releaseDate13, list29); + num2++; + ref ChangelogEntry reference29 = ref span[num2]; + DateOnly releaseDate14 = new DateOnly(2025, 10, 21); + num4 = 1; + List list30 = new List(num4); + CollectionsMarshal.SetCount(list30, num4); + span2 = CollectionsMarshal.AsSpan(list30); + num3 = 0; + span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Added checks for moogle and allied society quests when using add all available quests"); + reference29 = new ChangelogEntry("6.31", releaseDate14, list30); + num2++; + ref ChangelogEntry reference30 = ref span[num2]; + DateOnly releaseDate15 = new DateOnly(2025, 10, 21); + num3 = 1; + List list31 = new List(num3); + CollectionsMarshal.SetCount(list31, num3); + span2 = CollectionsMarshal.AsSpan(list31); + num4 = 0; + span2[num4] = new ChangeEntry(EChangeCategory.Added, "Added button to journal that allows adding all available quests to priority"); + reference30 = new ChangelogEntry("6.30", releaseDate15, list31); + num2++; + ref ChangelogEntry reference31 = ref span[num2]; + DateOnly releaseDate16 = new DateOnly(2025, 10, 20); + num4 = 2; + List list32 = new List(num4); + CollectionsMarshal.SetCount(list32, num4); + span2 = CollectionsMarshal.AsSpan(list32); + num3 = 0; + ref ChangeEntry reference32 = ref span2[num3]; index = 2; - List list30 = new List(index); - CollectionsMarshal.SetCount(list30, index); - span3 = CollectionsMarshal.AsSpan(list30); + List list33 = new List(index); + CollectionsMarshal.SetCount(list33, index); + span3 = CollectionsMarshal.AsSpan(list33); num5 = 0; span3[num5] = "Added item count to combat handling rework"; num5++; span3[num5] = "Updated Pandora conflicting features"; - reference29 = new ChangeEntry(EChangeCategory.Changed, "Combat handling improvements", list30); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed quest to purchase Gysahl Greens if not in inventory"); - reference28 = new ChangelogEntry("6.29", releaseDate15, list29); - num2++; - ref ChangelogEntry reference30 = ref span[num2]; - DateOnly releaseDate16 = new DateOnly(2025, 10, 19); - num4 = 1; - List list31 = new List(num4); - CollectionsMarshal.SetCount(list31, num4); - span2 = CollectionsMarshal.AsSpan(list31); - num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Reworked kill count combat handling - combat and enemy kills are now processed instantly"); - reference30 = new ChangelogEntry("6.28", releaseDate16, list31); - num2++; - ref ChangelogEntry reference31 = ref span[num2]; - DateOnly releaseDate17 = new DateOnly(2025, 10, 18); - num3 = 2; - List list32 = new List(num3); - CollectionsMarshal.SetCount(list32, num3); - span2 = CollectionsMarshal.AsSpan(list32); - num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Improved Aether Current checking logic"); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed Chocobo Taxi Stand CheckSkip error and Patch 7.3 Fantasia unlock quest date/time"); - reference31 = new ChangelogEntry("6.27", releaseDate17, list32); - num2++; - ref ChangelogEntry reference32 = ref span[num2]; - DateOnly releaseDate18 = new DateOnly(2025, 10, 18); - num4 = 1; - List list33 = new List(num4); - CollectionsMarshal.SetCount(list33, num4); - span2 = CollectionsMarshal.AsSpan(list33); - num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 4 quests"); - reference32 = new ChangelogEntry("6.26", releaseDate18, list33); + reference32 = new ChangeEntry(EChangeCategory.Changed, "Combat handling improvements", list33); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed quest to purchase Gysahl Greens if not in inventory"); + reference31 = new ChangelogEntry("6.29", releaseDate16, list32); num2++; ref ChangelogEntry reference33 = ref span[num2]; - DateOnly releaseDate19 = new DateOnly(2025, 10, 17); + DateOnly releaseDate17 = new DateOnly(2025, 10, 19); num3 = 1; List list34 = new List(num3); CollectionsMarshal.SetCount(list34, num3); span2 = CollectionsMarshal.AsSpan(list34); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added All Saints' Wake 2025 quests and 7.35 Yok Huy rank 4 quests"); - reference33 = new ChangelogEntry("6.25", releaseDate19, list34); + span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Reworked kill count combat handling - combat and enemy kills are now processed instantly"); + reference33 = new ChangelogEntry("6.28", releaseDate17, list34); num2++; ref ChangelogEntry reference34 = ref span[num2]; - DateOnly releaseDate20 = new DateOnly(2025, 10, 16); - num4 = 1; + DateOnly releaseDate18 = new DateOnly(2025, 10, 18); + num4 = 2; List list35 = new List(num4); CollectionsMarshal.SetCount(list35, num4); span2 = CollectionsMarshal.AsSpan(list35); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 4 quests and Deep Dungeon quest"); - reference34 = new ChangelogEntry("6.24", releaseDate20, list35); + span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Improved Aether Current checking logic"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed Chocobo Taxi Stand CheckSkip error and Patch 7.3 Fantasia unlock quest date/time"); + reference34 = new ChangelogEntry("6.27", releaseDate18, list35); num2++; ref ChangelogEntry reference35 = ref span[num2]; - DateOnly releaseDate21 = new DateOnly(2025, 10, 13); + DateOnly releaseDate19 = new DateOnly(2025, 10, 18); num3 = 1; List list36 = new List(num3); CollectionsMarshal.SetCount(list36, num3); span2 = CollectionsMarshal.AsSpan(list36); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 3 quest (Larder Logistics)"); - reference35 = new ChangelogEntry("6.23", releaseDate21, list36); + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 4 quests"); + reference35 = new ChangelogEntry("6.26", releaseDate19, list36); num2++; ref ChangelogEntry reference36 = ref span[num2]; - DateOnly releaseDate22 = new DateOnly(2025, 10, 12); - num4 = 3; + DateOnly releaseDate20 = new DateOnly(2025, 10, 17); + num4 = 1; List list37 = new List(num4); CollectionsMarshal.SetCount(list37, num4); span2 = CollectionsMarshal.AsSpan(list37); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Prevent disabled or Locked quests from being started as 'Start as next quest'"); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 3 quests"); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed Yok Huy quest and journal quest chain priority issues"); - reference36 = new ChangelogEntry("6.22", releaseDate22, list37); + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added All Saints' Wake 2025 quests and 7.35 Yok Huy rank 4 quests"); + reference36 = new ChangelogEntry("6.25", releaseDate20, list37); num2++; ref ChangelogEntry reference37 = ref span[num2]; - DateOnly releaseDate23 = new DateOnly(2025, 10, 12); - num3 = 2; + DateOnly releaseDate21 = new DateOnly(2025, 10, 16); + num3 = 1; List list38 = new List(num3); CollectionsMarshal.SetCount(list38, num3); span2 = CollectionsMarshal.AsSpan(list38); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Added, "Added expansion abbreviation to journal window"); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 3 quests"); - reference37 = new ChangelogEntry("6.21", releaseDate23, list38); + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 4 quests and Deep Dungeon quest"); + reference37 = new ChangelogEntry("6.24", releaseDate21, list38); num2++; ref ChangelogEntry reference38 = ref span[num2]; - DateOnly releaseDate24 = new DateOnly(2025, 10, 10); - num4 = 2; + DateOnly releaseDate22 = new DateOnly(2025, 10, 13); + num4 = 1; List list39 = new List(num4); CollectionsMarshal.SetCount(list39, num4); span2 = CollectionsMarshal.AsSpan(list39); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Allow completed repeatable quests to be used with 'Add quest and requirements to priority' feature"); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 1 quest (A Work of Cart)"); - reference38 = new ChangelogEntry("6.20", releaseDate24, list39); + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 3 quest (Larder Logistics)"); + reference38 = new ChangelogEntry("6.23", releaseDate22, list39); num2++; ref ChangelogEntry reference39 = ref span[num2]; - DateOnly releaseDate25 = new DateOnly(2025, 10, 9); + DateOnly releaseDate23 = new DateOnly(2025, 10, 12); num3 = 3; List list40 = new List(num3); CollectionsMarshal.SetCount(list40, num3); span2 = CollectionsMarshal.AsSpan(list40); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Added, "Added config to batch Allied Society quest turn-ins"); + span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Prevent disabled or Locked quests from being started as 'Start as next quest'"); num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Repeatable quests now show correct availability state in journal"); + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 3 quests"); num4++; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 2 quests"); - reference39 = new ChangelogEntry("6.19", releaseDate25, list40); + span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed Yok Huy quest and journal quest chain priority issues"); + reference39 = new ChangelogEntry("6.22", releaseDate23, list40); num2++; ref ChangelogEntry reference40 = ref span[num2]; - DateOnly releaseDate26 = new DateOnly(2025, 10, 9); + DateOnly releaseDate24 = new DateOnly(2025, 10, 12); num4 = 2; List list41 = new List(num4); CollectionsMarshal.SetCount(list41, num4); span2 = CollectionsMarshal.AsSpan(list41); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Show once completed quests with improved state display"); + span2[num3] = new ChangeEntry(EChangeCategory.Added, "Added expansion abbreviation to journal window"); num3++; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy daily quest and improvements to various Yok Huy quests"); - reference40 = new ChangelogEntry("6.18", releaseDate26, list41); + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 3 quests"); + reference40 = new ChangelogEntry("6.21", releaseDate24, list41); num2++; ref ChangelogEntry reference41 = ref span[num2]; - DateOnly releaseDate27 = new DateOnly(2025, 10, 8); - num3 = 1; + DateOnly releaseDate25 = new DateOnly(2025, 10, 10); + num3 = 2; List list42 = new List(num3); CollectionsMarshal.SetCount(list42, num3); span2 = CollectionsMarshal.AsSpan(list42); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 1 and rank 2 quests"); - reference41 = new ChangelogEntry("6.17", releaseDate27, list42); + span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Allow completed repeatable quests to be used with 'Add quest and requirements to priority' feature"); + num4++; + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 1 quest (A Work of Cart)"); + reference41 = new ChangelogEntry("6.20", releaseDate25, list42); num2++; ref ChangelogEntry reference42 = ref span[num2]; - DateOnly releaseDate28 = new DateOnly(2025, 10, 8); - num4 = 1; + DateOnly releaseDate26 = new DateOnly(2025, 10, 9); + num4 = 3; List list43 = new List(num4); CollectionsMarshal.SetCount(list43, num4); span2 = CollectionsMarshal.AsSpan(list43); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Deep Dungeon quest (Faerie Tale)"); - reference42 = new ChangelogEntry("6.16", releaseDate28, list43); + span2[num3] = new ChangeEntry(EChangeCategory.Added, "Added config to batch Allied Society quest turn-ins"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Repeatable quests now show correct availability state in journal"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 2 quests"); + reference42 = new ChangelogEntry("6.19", releaseDate26, list43); num2++; ref ChangelogEntry reference43 = ref span[num2]; - DateOnly releaseDate29 = new DateOnly(2025, 10, 8); + DateOnly releaseDate27 = new DateOnly(2025, 10, 9); num3 = 2; List list44 = new List(num3); CollectionsMarshal.SetCount(list44, num3); span2 = CollectionsMarshal.AsSpan(list44); num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Dalamud cleanup"); + span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Show once completed quests with improved state display"); num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed quest level requirement check log spam"); - reference43 = new ChangelogEntry("6.15", releaseDate29, list44); + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy daily quest and improvements to various Yok Huy quests"); + reference43 = new ChangelogEntry("6.18", releaseDate27, list44); num2++; ref ChangelogEntry reference44 = ref span[num2]; - DateOnly releaseDate30 = new DateOnly(2025, 10, 8); + DateOnly releaseDate28 = new DateOnly(2025, 10, 8); num4 = 1; List list45 = new List(num4); CollectionsMarshal.SetCount(list45, num4); span2 = CollectionsMarshal.AsSpan(list45); num3 = 0; - span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed abandoned quest check logic if quest were MSQ"); - reference44 = new ChangelogEntry("6.14", releaseDate30, list45); + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Yok Huy rank 1 and rank 2 quests"); + reference44 = new ChangelogEntry("6.17", releaseDate28, list45); num2++; ref ChangelogEntry reference45 = ref span[num2]; - DateOnly releaseDate31 = new DateOnly(2025, 10, 8); - num3 = 2; + DateOnly releaseDate29 = new DateOnly(2025, 10, 8); + num3 = 1; List list46 = new List(num3); CollectionsMarshal.SetCount(list46, num3); span2 = CollectionsMarshal.AsSpan(list46); num4 = 0; - ref ChangeEntry reference46 = ref span2[num4]; + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Deep Dungeon quest (Faerie Tale)"); + reference45 = new ChangelogEntry("6.16", releaseDate29, list46); + num2++; + ref ChangelogEntry reference46 = ref span[num2]; + DateOnly releaseDate30 = new DateOnly(2025, 10, 8); + num4 = 2; + List list47 = new List(num4); + CollectionsMarshal.SetCount(list47, num4); + span2 = CollectionsMarshal.AsSpan(list47); + num3 = 0; + span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Dalamud cleanup"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed quest level requirement check log spam"); + reference46 = new ChangelogEntry("6.15", releaseDate30, list47); + num2++; + ref ChangelogEntry reference47 = ref span[num2]; + DateOnly releaseDate31 = new DateOnly(2025, 10, 8); + num3 = 1; + List list48 = new List(num3); + CollectionsMarshal.SetCount(list48, num3); + span2 = CollectionsMarshal.AsSpan(list48); + num4 = 0; + span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed abandoned quest check logic if quest were MSQ"); + reference47 = new ChangelogEntry("6.14", releaseDate31, list48); + num2++; + ref ChangelogEntry reference48 = ref span[num2]; + DateOnly releaseDate32 = new DateOnly(2025, 10, 8); + num4 = 2; + List list49 = new List(num4); + CollectionsMarshal.SetCount(list49, num4); + span2 = CollectionsMarshal.AsSpan(list49); + num3 = 0; + ref ChangeEntry reference49 = ref span2[num3]; num5 = 3; - List list47 = new List(num5); - CollectionsMarshal.SetCount(list47, num5); - span3 = CollectionsMarshal.AsSpan(list47); + List list50 = new List(num5); + CollectionsMarshal.SetCount(list50, num5); + span3 = CollectionsMarshal.AsSpan(list50); index = 0; span3[index] = "Context menu option to add required quests and their chain to priority list"; index++; span3[index] = "AetheryteShortcut to multiple quests"; index++; span3[index] = "Artisan as a recommended plugin/dependency"; - reference46 = new ChangeEntry(EChangeCategory.Added, "Quest improvements", list47); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed abandoned quest check and priority list issues"); - reference45 = new ChangelogEntry("6.13", releaseDate31, list46); + reference49 = new ChangeEntry(EChangeCategory.Added, "Quest improvements", list50); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed abandoned quest check and priority list issues"); + reference48 = new ChangelogEntry("6.13", releaseDate32, list49); num2++; - ref ChangelogEntry reference47 = ref span[num2]; - DateOnly releaseDate32 = new DateOnly(2025, 10, 7); - num4 = 4; - List list48 = new List(num4); - CollectionsMarshal.SetCount(list48, num4); - span2 = CollectionsMarshal.AsSpan(list48); - num3 = 0; - ref ChangeEntry reference48 = ref span2[num3]; + ref ChangelogEntry reference50 = ref span[num2]; + DateOnly releaseDate33 = new DateOnly(2025, 10, 7); + num3 = 4; + List list51 = new List(num3); + CollectionsMarshal.SetCount(list51, num3); + span2 = CollectionsMarshal.AsSpan(list51); + num4 = 0; + ref ChangeEntry reference51 = ref span2[num4]; index = 4; - List list49 = new List(index); - CollectionsMarshal.SetCount(list49, index); - span3 = CollectionsMarshal.AsSpan(list49); + List list52 = new List(index); + CollectionsMarshal.SetCount(list52, index); + span3 = CollectionsMarshal.AsSpan(list52); num5 = 0; span3[num5] = "FATE combat handling with auto level syncing"; num5++; @@ -547,67 +573,67 @@ internal static class ChangelogData span3[num5] = "Update quest tracking when quests are hidden or prioritised in game"; num5++; span3[num5] = "QuestMap as a recommended plugin/dependency"; - reference48 = new ChangeEntry(EChangeCategory.Added, "FATE and quest tracking", list49); - num3++; - ref ChangeEntry reference49 = ref span2[num3]; + reference51 = new ChangeEntry(EChangeCategory.Added, "FATE and quest tracking", list52); + num4++; + ref ChangeEntry reference52 = ref span2[num4]; num5 = 3; - List list50 = new List(num5); - CollectionsMarshal.SetCount(list50, num5); - span3 = CollectionsMarshal.AsSpan(list50); + List list53 = new List(num5); + CollectionsMarshal.SetCount(list53, num5); + span3 = CollectionsMarshal.AsSpan(list53); index = 0; span3[index] = "Always prioritise next quest during teleportation/zone transitions"; index++; span3[index] = "Improved accepted quest logic with abandoned quest detection"; index++; span3[index] = "Show quests without quest paths as Locked"; - reference49 = new ChangeEntry(EChangeCategory.Changed, "Quest prioritisation improvements", list50); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Deep Dungeon, Hildibrand, Yok Huy, Monster Hunter Wilds Collab, and Doman Enclave quests"); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed accepted/active quest display and Hildibrand quest issues"); - reference47 = new ChangelogEntry("6.12", releaseDate32, list48); + reference52 = new ChangeEntry(EChangeCategory.Changed, "Quest prioritisation improvements", list53); + num4++; + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.35 Deep Dungeon, Hildibrand, Yok Huy, Monster Hunter Wilds Collab, and Doman Enclave quests"); + num4++; + span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed accepted/active quest display and Hildibrand quest issues"); + reference50 = new ChangelogEntry("6.12", releaseDate33, list51); num2++; - ref ChangelogEntry reference50 = ref span[num2]; - DateOnly releaseDate33 = new DateOnly(2025, 10, 3); - num3 = 1; - List list51 = new List(num3); - CollectionsMarshal.SetCount(list51, num3); - span2 = CollectionsMarshal.AsSpan(list51); - num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Added remaining checks for quest priority to prevent infinite teleport looping"); - reference50 = new ChangelogEntry("6.11", releaseDate33, list51); - num2++; - ref ChangelogEntry reference51 = ref span[num2]; - DateOnly releaseDate34 = new DateOnly(2025, 10, 2); + ref ChangelogEntry reference53 = ref span[num2]; + DateOnly releaseDate34 = new DateOnly(2025, 10, 3); num4 = 1; - List list52 = new List(num4); - CollectionsMarshal.SetCount(list52, num4); - span2 = CollectionsMarshal.AsSpan(list52); + List list54 = new List(num4); + CollectionsMarshal.SetCount(list54, num4); + span2 = CollectionsMarshal.AsSpan(list54); num3 = 0; - ref ChangeEntry reference52 = ref span2[num3]; + span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Added remaining checks for quest priority to prevent infinite teleport looping"); + reference53 = new ChangelogEntry("6.11", releaseDate34, list54); + num2++; + ref ChangelogEntry reference54 = ref span[num2]; + DateOnly releaseDate35 = new DateOnly(2025, 10, 2); + num3 = 1; + List list55 = new List(num3); + CollectionsMarshal.SetCount(list55, num3); + span2 = CollectionsMarshal.AsSpan(list55); + num4 = 0; + ref ChangeEntry reference55 = ref span2[num4]; index = 2; - List list53 = new List(index); - CollectionsMarshal.SetCount(list53, index); - span3 = CollectionsMarshal.AsSpan(list53); + List list56 = new List(index); + CollectionsMarshal.SetCount(list56, index); + span3 = CollectionsMarshal.AsSpan(list56); num5 = 0; span3[num5] = "Don't show quests as available if player doesn't meet level requirements"; num5++; span3[num5] = "Updated 'required for MSQ' text in Crystal Tower quest preset window"; - reference52 = new ChangeEntry(EChangeCategory.Changed, "Quest window improvements", list53); - reference51 = new ChangelogEntry("6.10", releaseDate34, list52); + reference55 = new ChangeEntry(EChangeCategory.Changed, "Quest window improvements", list56); + reference54 = new ChangelogEntry("6.10", releaseDate35, list55); num2++; - ref ChangelogEntry reference53 = ref span[num2]; - DateOnly releaseDate35 = new DateOnly(2025, 9, 21); - num3 = 5; - List list54 = new List(num3); - CollectionsMarshal.SetCount(list54, num3); - span2 = CollectionsMarshal.AsSpan(list54); - num4 = 0; - ref ChangeEntry reference54 = ref span2[num4]; + ref ChangelogEntry reference56 = ref span[num2]; + DateOnly releaseDate36 = new DateOnly(2025, 9, 21); + num4 = 5; + List list57 = new List(num4); + CollectionsMarshal.SetCount(list57, num4); + span2 = CollectionsMarshal.AsSpan(list57); + num3 = 0; + ref ChangeEntry reference57 = ref span2[num3]; num5 = 4; - List list55 = new List(num5); - CollectionsMarshal.SetCount(list55, num5); - span3 = CollectionsMarshal.AsSpan(list55); + List list58 = new List(num5); + CollectionsMarshal.SetCount(list58, num5); + span3 = CollectionsMarshal.AsSpan(list58); index = 0; span3[index] = "Reworked event quest handling - automatically displays when events are active"; index++; @@ -616,13 +642,13 @@ internal static class ChangelogData span3[index] = "Reworked Priority Quests tab (Manual Priority and Quest Presets)"; index++; span3[index] = "Quest path viewer site (https://wigglymuffin.github.io/FFXIV-Tools/)"; - reference54 = new ChangeEntry(EChangeCategory.Added, "Major system reworks", list55); - num4++; - ref ChangeEntry reference55 = ref span2[num4]; + reference57 = new ChangeEntry(EChangeCategory.Added, "Major system reworks", list58); + num3++; + ref ChangeEntry reference58 = ref span2[num3]; index = 4; - List list56 = new List(index); - CollectionsMarshal.SetCount(list56, index); - span3 = CollectionsMarshal.AsSpan(list56); + List list59 = new List(index); + CollectionsMarshal.SetCount(list59, index); + span3 = CollectionsMarshal.AsSpan(list59); num5 = 0; span3[num5] = "Questionable.IsQuestCompleted"; num5++; @@ -631,13 +657,13 @@ internal static class ChangelogData span3[num5] = "Questionable.IsQuestAccepted"; num5++; span3[num5] = "Questionable.IsQuestUnobtainable"; - reference55 = new ChangeEntry(EChangeCategory.Added, "New IPC commands", list56); - num4++; - ref ChangeEntry reference56 = ref span2[num4]; + reference58 = new ChangeEntry(EChangeCategory.Added, "New IPC commands", list59); + num3++; + ref ChangeEntry reference59 = ref span2[num3]; num5 = 5; - List list57 = new List(num5); - CollectionsMarshal.SetCount(list57, num5); - span3 = CollectionsMarshal.AsSpan(list57); + List list60 = new List(num5); + CollectionsMarshal.SetCount(list60, num5); + span3 = CollectionsMarshal.AsSpan(list60); index = 0; span3[index] = "Improved JSON quest validation with specific error reasons"; index++; @@ -648,25 +674,25 @@ internal static class ChangelogData span3[index] = "Improved DialogueChoices regex matching"; index++; span3[index] = "Improved refresh checker for all quest states"; - reference56 = new ChangeEntry(EChangeCategory.Changed, "Various improvements", list57); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.31 Occult Crescent quests"); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed cutscene crashes, Single Player Duty triggers, and various quest issues"); - reference53 = new ChangelogEntry("6.9", releaseDate35, list54); + reference59 = new ChangeEntry(EChangeCategory.Changed, "Various improvements", list60); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added 7.31 Occult Crescent quests"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed cutscene crashes, Single Player Duty triggers, and various quest issues"); + reference56 = new ChangelogEntry("6.9", releaseDate36, list57); num2++; - ref ChangelogEntry reference57 = ref span[num2]; - DateOnly releaseDate36 = new DateOnly(2025, 9, 2); - num4 = 4; - List list58 = new List(num4); - CollectionsMarshal.SetCount(list58, num4); - span2 = CollectionsMarshal.AsSpan(list58); - num3 = 0; - ref ChangeEntry reference58 = ref span2[num3]; + ref ChangelogEntry reference60 = ref span[num2]; + DateOnly releaseDate37 = new DateOnly(2025, 9, 2); + num3 = 4; + List list61 = new List(num3); + CollectionsMarshal.SetCount(list61, num3); + span2 = CollectionsMarshal.AsSpan(list61); + num4 = 0; + ref ChangeEntry reference61 = ref span2[num4]; index = 4; - List list59 = new List(index); - CollectionsMarshal.SetCount(list59, index); - span3 = CollectionsMarshal.AsSpan(list59); + List list62 = new List(index); + CollectionsMarshal.SetCount(list62, index); + span3 = CollectionsMarshal.AsSpan(list62); num5 = 0; span3[num5] = "Help commands and priority quest command"; num5++; @@ -675,72 +701,72 @@ internal static class ChangelogData span3[num5] = "Duty counts and controls in 'Quest Battles' tab"; num5++; span3[num5] = "'Refresh quest timer' setting (WIP)"; - reference58 = new ChangeEntry(EChangeCategory.Added, "Command and UI improvements", list59); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Improved 'Clear All' buttons to require CTRL being held"); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Zodiac quests and 7.31 Cosmic/Occult Crescent quests"); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed Fishing for Friendship and Cosmic Exploration quests"); - reference57 = new ChangelogEntry("6.8", releaseDate36, list58); + reference61 = new ChangeEntry(EChangeCategory.Added, "Command and UI improvements", list62); + num4++; + span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Improved 'Clear All' buttons to require CTRL being held"); + num4++; + span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Zodiac quests and 7.31 Cosmic/Occult Crescent quests"); + num4++; + span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed Fishing for Friendship and Cosmic Exploration quests"); + reference60 = new ChangelogEntry("6.8", releaseDate37, list61); num2++; - ref ChangelogEntry reference59 = ref span[num2]; - DateOnly releaseDate37 = new DateOnly(2025, 8, 27); - num3 = 4; - List list60 = new List(num3); - CollectionsMarshal.SetCount(list60, num3); - span2 = CollectionsMarshal.AsSpan(list60); - num4 = 0; - ref ChangeEntry reference60 = ref span2[num4]; + ref ChangelogEntry reference62 = ref span[num2]; + DateOnly releaseDate38 = new DateOnly(2025, 8, 27); + num4 = 4; + List list63 = new List(num4); + CollectionsMarshal.SetCount(list63, num4); + span2 = CollectionsMarshal.AsSpan(list63); + num3 = 0; + ref ChangeEntry reference63 = ref span2[num3]; num5 = 2; - List list61 = new List(num5); - CollectionsMarshal.SetCount(list61, num5); - span3 = CollectionsMarshal.AsSpan(list61); + List list64 = new List(num5); + CollectionsMarshal.SetCount(list64, num5); + span3 = CollectionsMarshal.AsSpan(list64); index = 0; span3[index] = "Icon to 'Clear All' button in stop conditions"; index++; span3[index] = "Duty counts and 'Enable All' button in 'Duties' tab"; - reference60 = new ChangeEntry(EChangeCategory.Added, "UI improvements", list61); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Renamed 'Clear' button to 'Clear All' in priority window"); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Rising 2025 Event Quests"); - num4++; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Fixed clipboard assigning blacklist to whitelist in 'Duties' tab"); - reference59 = new ChangelogEntry("6.7", releaseDate37, list60); + reference63 = new ChangeEntry(EChangeCategory.Added, "UI improvements", list64); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Renamed 'Clear' button to 'Clear All' in priority window"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added Rising 2025 Event Quests"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Fixed clipboard assigning blacklist to whitelist in 'Duties' tab"); + reference62 = new ChangelogEntry("6.7", releaseDate38, list63); num2++; - ref ChangelogEntry reference61 = ref span[num2]; - DateOnly releaseDate38 = new DateOnly(2025, 8, 25); - num4 = 2; - List list62 = new List(num4); - CollectionsMarshal.SetCount(list62, num4); - span2 = CollectionsMarshal.AsSpan(list62); - num3 = 0; - ref ChangeEntry reference62 = ref span2[num3]; + ref ChangelogEntry reference64 = ref span[num2]; + DateOnly releaseDate39 = new DateOnly(2025, 8, 25); + num3 = 2; + List list65 = new List(num3); + CollectionsMarshal.SetCount(list65, num3); + span2 = CollectionsMarshal.AsSpan(list65); + num4 = 0; + ref ChangeEntry reference65 = ref span2[num4]; index = 2; - List list63 = new List(index); - CollectionsMarshal.SetCount(list63, index); - span3 = CollectionsMarshal.AsSpan(list63); + List list66 = new List(index); + CollectionsMarshal.SetCount(list66, index); + span3 = CollectionsMarshal.AsSpan(list66); num5 = 0; span3[num5] = "Missing emotes to schema and emote handler"; num5++; span3[num5] = "Improved stop conditions with 'Clear All' button"; - reference62 = new ChangeEntry(EChangeCategory.Added, "Emote support and stop conditions", list63); - num3++; - span2[num3] = new ChangeEntry(EChangeCategory.Changed, "Stop at level functionality"); - reference61 = new ChangelogEntry("6.6", releaseDate38, list62); - num2++; - ref ChangelogEntry reference63 = ref span[num2]; - DateOnly releaseDate39 = new DateOnly(2025, 8, 25); - num3 = 2; - List list64 = new List(num3); - CollectionsMarshal.SetCount(list64, num3); - span2 = CollectionsMarshal.AsSpan(list64); - num4 = 0; - span2[num4] = new ChangeEntry(EChangeCategory.Fixed, "Potential fix to single/solo duties softlocking"); + reference65 = new ChangeEntry(EChangeCategory.Added, "Emote support and stop conditions", list66); num4++; - span2[num4] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added San d'Oria: The Second Walk and various side quests"); - reference63 = new ChangelogEntry("6.5", releaseDate39, list64); + span2[num4] = new ChangeEntry(EChangeCategory.Changed, "Stop at level functionality"); + reference64 = new ChangelogEntry("6.6", releaseDate39, list65); + num2++; + ref ChangelogEntry reference66 = ref span[num2]; + DateOnly releaseDate40 = new DateOnly(2025, 8, 25); + num4 = 2; + List list67 = new List(num4); + CollectionsMarshal.SetCount(list67, num4); + span2 = CollectionsMarshal.AsSpan(list67); + num3 = 0; + span2[num3] = new ChangeEntry(EChangeCategory.Fixed, "Potential fix to single/solo duties softlocking"); + num3++; + span2[num3] = new ChangeEntry(EChangeCategory.QuestUpdates, "Added San d'Oria: The Second Walk and various side quests"); + reference66 = new ChangelogEntry("6.5", releaseDate40, list67); Changelogs = list; } } diff --git a/Questionable/Questionable.External/QuestionableIpc.cs b/Questionable/Questionable.External/QuestionableIpc.cs index cc6498b..5ae91f0 100644 --- a/Questionable/Questionable.External/QuestionableIpc.cs +++ b/Questionable/Questionable.External/QuestionableIpc.cs @@ -6,6 +6,8 @@ using System.Numerics; using System.Runtime.InteropServices; using Dalamud.Plugin; using Dalamud.Plugin.Ipc; +using FFXIVClientStructs.FFXIV.Client.Game; +using Microsoft.Extensions.DependencyInjection; using Questionable.Controller; using Questionable.Controller.Steps; using Questionable.Data; @@ -13,6 +15,7 @@ using Questionable.Functions; using Questionable.Model; using Questionable.Model.Questing; using Questionable.Windows; +using Questionable.Windows.JournalComponents; using Questionable.Windows.QuestComponents; namespace Questionable.External; @@ -134,6 +137,20 @@ internal sealed class QuestionableIpc : IDisposable private const string IpcSetSequenceStopCondition = "Questionable.SetSequenceStopCondition"; + private const string IpcGetAlliedSocietyRemainingAllowances = "Questionable.AlliedSociety.GetRemainingAllowances"; + + private const string IpcGetAlliedSocietyTimeUntilReset = "Questionable.AlliedSociety.GetTimeUntilReset"; + + private const string IpcGetAlliedSocietyAvailableQuestIds = "Questionable.AlliedSociety.GetAvailableQuestIds"; + + private const string IpcGetAlliedSocietyAllAvailableQuestCounts = "Questionable.AlliedSociety.GetAllAvailableQuestCounts"; + + private const string IpcGetAlliedSocietyIsMaxRank = "Questionable.AlliedSociety.IsMaxRank"; + + private const string IpcGetAlliedSocietyCurrentRank = "Questionable.AlliedSociety.GetCurrentRank"; + + private const string IpcGetAlliedSocietiesWithAvailableQuests = "Questionable.AlliedSociety.GetSocietiesWithAvailableQuests"; + private readonly QuestController _questController; private readonly QuestRegistry _questRegistry; @@ -150,6 +167,8 @@ internal sealed class QuestionableIpc : IDisposable private readonly IDalamudPluginInterface _pluginInterface; + private readonly IServiceProvider _serviceProvider; + private readonly ICallGateProvider _isRunning; private readonly ICallGateProvider _getCurrentQuestId; @@ -236,7 +255,21 @@ internal sealed class QuestionableIpc : IDisposable private readonly ICallGateProvider _setSequenceStopCondition; - public QuestionableIpc(QuestController questController, EventInfoComponent eventInfoComponent, QuestRegistry questRegistry, QuestFunctions questFunctions, QuestData questData, ManualPriorityComponent manualPriorityComponent, PresetBuilderComponent presetBuilderComponent, Configuration configuration, IDalamudPluginInterface pluginInterface) + private readonly ICallGateProvider _getAlliedSocietyRemainingAllowances; + + private readonly ICallGateProvider _getAlliedSocietyTimeUntilReset; + + private readonly ICallGateProvider> _getAlliedSocietyAvailableQuestIds; + + private readonly ICallGateProvider> _getAlliedSocietyAllAvailableQuestCounts; + + private readonly ICallGateProvider _getAlliedSocietyIsMaxRank; + + private readonly ICallGateProvider _getAlliedSocietyCurrentRank; + + private readonly ICallGateProvider> _getAlliedSocietiesWithAvailableQuests; + + public QuestionableIpc(QuestController questController, EventInfoComponent eventInfoComponent, QuestRegistry questRegistry, QuestFunctions questFunctions, QuestData questData, ManualPriorityComponent manualPriorityComponent, PresetBuilderComponent presetBuilderComponent, Configuration configuration, IDalamudPluginInterface pluginInterface, IServiceProvider serviceProvider) { QuestionableIpc questionableIpc = this; _questController = questController; @@ -247,6 +280,7 @@ internal sealed class QuestionableIpc : IDisposable _presetBuilderComponent = presetBuilderComponent; _configuration = configuration; _pluginInterface = pluginInterface; + _serviceProvider = serviceProvider; _isRunning = pluginInterface.GetIpcProvider("Questionable.IsRunning"); _isRunning.RegisterFunc(() => questController.AutomationType != QuestController.EAutomationType.Manual || questController.IsRunning); _getCurrentQuestId = pluginInterface.GetIpcProvider("Questionable.GetCurrentQuestId"); @@ -334,6 +368,20 @@ internal sealed class QuestionableIpc : IDisposable _getSequenceStopCondition.RegisterFunc(GetSequenceStopCondition); _setSequenceStopCondition = pluginInterface.GetIpcProvider("Questionable.SetSequenceStopCondition"); _setSequenceStopCondition.RegisterFunc(SetSequenceStopCondition); + _getAlliedSocietyRemainingAllowances = pluginInterface.GetIpcProvider("Questionable.AlliedSociety.GetRemainingAllowances"); + _getAlliedSocietyRemainingAllowances.RegisterFunc(GetAlliedSocietyRemainingAllowances); + _getAlliedSocietyTimeUntilReset = pluginInterface.GetIpcProvider("Questionable.AlliedSociety.GetTimeUntilReset"); + _getAlliedSocietyTimeUntilReset.RegisterFunc(GetAlliedSocietyTimeUntilReset); + _getAlliedSocietyAvailableQuestIds = pluginInterface.GetIpcProvider>("Questionable.AlliedSociety.GetAvailableQuestIds"); + _getAlliedSocietyAvailableQuestIds.RegisterFunc(GetAlliedSocietyAvailableQuestIds); + _getAlliedSocietyAllAvailableQuestCounts = pluginInterface.GetIpcProvider>("Questionable.AlliedSociety.GetAllAvailableQuestCounts"); + _getAlliedSocietyAllAvailableQuestCounts.RegisterFunc(GetAlliedSocietyAllAvailableQuestCounts); + _getAlliedSocietyIsMaxRank = pluginInterface.GetIpcProvider("Questionable.AlliedSociety.IsMaxRank"); + _getAlliedSocietyIsMaxRank.RegisterFunc(GetAlliedSocietyIsMaxRank); + _getAlliedSocietyCurrentRank = pluginInterface.GetIpcProvider("Questionable.AlliedSociety.GetCurrentRank"); + _getAlliedSocietyCurrentRank.RegisterFunc(GetAlliedSocietyCurrentRank); + _getAlliedSocietiesWithAvailableQuests = pluginInterface.GetIpcProvider>("Questionable.AlliedSociety.GetSocietiesWithAvailableQuests"); + _getAlliedSocietiesWithAvailableQuests.RegisterFunc(GetAlliedSocietiesWithAvailableQuests); } private bool StartQuest(string questId, bool single) @@ -921,6 +969,97 @@ internal sealed class QuestionableIpc : IDisposable return true; } + private unsafe int GetAlliedSocietyRemainingAllowances() + { + QuestManager* ptr = QuestManager.Instance(); + if (ptr == null) + { + return 12; + } + return (int)ptr->GetBeastTribeAllowance(); + } + + private long GetAlliedSocietyTimeUntilReset() + { + TimeSpan item = AlliedSocietyJournalComponent.CalculateTimeUntilReset().TimeUntilReset; + return item.Ticks; + } + + private List GetAlliedSocietyAvailableQuestIds(byte alliedSocietyId) + { + if (!Enum.IsDefined(typeof(EAlliedSociety), alliedSocietyId)) + { + return new List(); + } + EAlliedSociety alliedSociety = (EAlliedSociety)alliedSocietyId; + return (from q in _serviceProvider.GetRequiredService().GetAvailableAlliedSocietyQuests(alliedSociety) + select q.ToString()).ToList(); + } + + private Dictionary GetAlliedSocietyAllAvailableQuestCounts() + { + Dictionary dictionary = new Dictionary(); + AlliedSocietyQuestFunctions requiredService = _serviceProvider.GetRequiredService(); + EAlliedSociety[] values = Enum.GetValues(); + foreach (EAlliedSociety eAlliedSociety in values) + { + if (eAlliedSociety != EAlliedSociety.None) + { + int count = requiredService.GetAvailableAlliedSocietyQuests(eAlliedSociety).Count; + if (count > 0) + { + dictionary[(byte)eAlliedSociety] = count; + } + } + } + return dictionary; + } + + private unsafe bool GetAlliedSocietyIsMaxRank(byte alliedSocietyId) + { + if (!Enum.IsDefined(typeof(EAlliedSociety), alliedSocietyId) || alliedSocietyId == 0) + { + return false; + } + QuestManager* ptr = QuestManager.Instance(); + if (ptr == null) + { + return false; + } + byte num = (byte)(ptr->BeastReputation[alliedSocietyId - 1].Rank & 0x7F); + byte b = (byte)((alliedSocietyId <= 5) ? 8 : 3); + return num >= b; + } + + private unsafe int GetAlliedSocietyCurrentRank(byte alliedSocietyId) + { + if (!Enum.IsDefined(typeof(EAlliedSociety), alliedSocietyId) || alliedSocietyId == 0) + { + return -1; + } + QuestManager* ptr = QuestManager.Instance(); + if (ptr == null) + { + return -1; + } + return (byte)(ptr->BeastReputation[alliedSocietyId - 1].Rank & 0x7F); + } + + private List GetAlliedSocietiesWithAvailableQuests() + { + List list = new List(); + AlliedSocietyQuestFunctions requiredService = _serviceProvider.GetRequiredService(); + EAlliedSociety[] values = Enum.GetValues(); + foreach (EAlliedSociety eAlliedSociety in values) + { + if (eAlliedSociety != EAlliedSociety.None && requiredService.GetAvailableAlliedSocietyQuests(eAlliedSociety).Count > 0) + { + list.Add((byte)eAlliedSociety); + } + } + return list; + } + public void Dispose() { _exportQuestPriority.UnregisterFunc(); @@ -966,5 +1105,12 @@ internal sealed class QuestionableIpc : IDisposable _getStopQuestList.UnregisterFunc(); _setStopConditionsEnabled.UnregisterFunc(); _getStopConditionsEnabled.UnregisterFunc(); + _getAlliedSocietiesWithAvailableQuests.UnregisterFunc(); + _getAlliedSocietyCurrentRank.UnregisterFunc(); + _getAlliedSocietyIsMaxRank.UnregisterFunc(); + _getAlliedSocietyAllAvailableQuestCounts.UnregisterFunc(); + _getAlliedSocietyAvailableQuestIds.UnregisterFunc(); + _getAlliedSocietyTimeUntilReset.UnregisterFunc(); + _getAlliedSocietyRemainingAllowances.UnregisterFunc(); } } diff --git a/Questionable/Questionable.Windows.JournalComponents/AlliedSocietyJournalComponent.cs b/Questionable/Questionable.Windows.JournalComponents/AlliedSocietyJournalComponent.cs index e3c0726..21367d2 100644 --- a/Questionable/Questionable.Windows.JournalComponents/AlliedSocietyJournalComponent.cs +++ b/Questionable/Questionable.Windows.JournalComponents/AlliedSocietyJournalComponent.cs @@ -1,9 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Numerics; using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; +using Dalamud.Interface.Components; using Dalamud.Interface.Utility.Raii; +using Dalamud.Plugin.Services; +using FFXIVClientStructs.FFXIV.Client.Game; +using Microsoft.Extensions.Logging; using Questionable.Controller; using Questionable.Data; using Questionable.Functions; @@ -17,6 +23,10 @@ internal sealed class AlliedSocietyJournalComponent { private static readonly string[] RankNames = new string[8] { "Neutral", "Recognized", "Friendly", "Trusted", "Respected", "Honored", "Sworn", "Allied" }; + private const int DefaultDailyQuestLimit = 3; + + private const int SharedDailyAllowanceLimit = 12; + private readonly AlliedSocietyQuestFunctions _alliedSocietyQuestFunctions; private readonly QuestData _questData; @@ -29,7 +39,13 @@ internal sealed class AlliedSocietyJournalComponent private readonly UiUtils _uiUtils; - public AlliedSocietyJournalComponent(AlliedSocietyQuestFunctions alliedSocietyQuestFunctions, QuestData questData, QuestRegistry questRegistry, QuestJournalUtils questJournalUtils, QuestTooltipComponent questTooltipComponent, UiUtils uiUtils) + private readonly QuestController _questController; + + private readonly IChatGui _chatGui; + + private readonly ILogger _logger; + + public AlliedSocietyJournalComponent(AlliedSocietyQuestFunctions alliedSocietyQuestFunctions, QuestData questData, QuestRegistry questRegistry, QuestJournalUtils questJournalUtils, QuestTooltipComponent questTooltipComponent, UiUtils uiUtils, QuestController questController, IChatGui chatGui, ILogger logger) { _alliedSocietyQuestFunctions = alliedSocietyQuestFunctions; _questData = questData; @@ -37,6 +53,9 @@ internal sealed class AlliedSocietyJournalComponent _questJournalUtils = questJournalUtils; _questTooltipComponent = questTooltipComponent; _uiUtils = uiUtils; + _questController = questController; + _chatGui = chatGui; + _logger = logger; } public void DrawAlliedSocietyQuests() @@ -46,39 +65,394 @@ internal sealed class AlliedSocietyJournalComponent { return; } + DrawDailyAllowanceHeader(); foreach (EAlliedSociety item in from x in Enum.GetValues() where x != EAlliedSociety.None select x) { List list = (from x in _alliedSocietyQuestFunctions.GetAvailableAlliedSocietyQuests(item) select (QuestInfo)_questData.GetQuestInfo(x)).ToList(); - if (list.Count == 0 || !ImGui.CollapsingHeader($"{item}###AlliedSociety{item}")) + if (list.Count != 0 && DrawAlliedSocietyHeader(item, list)) { - continue; - } - if ((int)item <= 5) - { - byte i = 1; - while (i <= 8) + using (ImRaii.PushIndent()) { - List list2 = list.Where((QuestInfo x) => x.AlliedSocietyRank == i).ToList(); - if (list2.Count != 0) - { - ImGui.Text(RankNames[i - 1]); - foreach (QuestInfo item2 in list2) - { - DrawQuest(item2); - } - } - byte b = (byte)(i + 1); - i = b; + DrawAddToPriorityButtons(item, list); + ImGui.Spacing(); + ImGui.Separator(); + ImGui.Spacing(); + DrawQuestList(item, list); } - continue; } - foreach (QuestInfo item3 in list) + } + } + + private unsafe void DrawDailyAllowanceHeader() + { + QuestManager* ptr = QuestManager.Instance(); + if (ptr != null) + { + byte b = (byte)ptr->GetBeastTribeAllowance(); + int value = 12 - b; + (DateTime ResetTime, TimeSpan TimeUntilReset) tuple = CalculateTimeUntilReset(); + DateTime item = tuple.ResetTime; + string value2 = FormatTimeSpan(tuple.TimeUntilReset); + Vector4 col = ((b > 0) ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed); + ImU8String text = new ImU8String(31, 2); + text.AppendLiteral("Daily Allowances: "); + text.AppendFormatted(b); + text.AppendLiteral(" / "); + text.AppendFormatted(12); + text.AppendLiteral(" remaining"); + ImGui.TextColored(in col, text); + ImGui.SameLine(); + col = ImGuiColors.DalamudGrey3; + text = new ImU8String(13, 1); + text.AppendLiteral("(Resets in: "); + text.AppendFormatted(value2); + text.AppendLiteral(")"); + ImGui.TextColored(in col, text); + if (ImGui.IsItemHovered()) { - DrawQuest(item3); + ImGui.BeginTooltip(); + ImGui.TextUnformatted("Shared across ALL allied societies (all expansions)"); + text = new ImU8String(12, 1); + text.AppendLiteral("Used today: "); + text.AppendFormatted(value); + ImGui.TextUnformatted(text); + ImGui.TextUnformatted("Each allied society has a limit of 3 quests per day"); + ImGui.Spacing(); + ImGui.Separator(); + ImGui.Spacing(); + col = ImGuiColors.DalamudGrey3; + text = new ImU8String(12, 1); + text.AppendLiteral("Next reset: "); + text.AppendFormatted(item, "g"); + ImGui.TextColored(in col, text); + col = ImGuiColors.DalamudGrey3; + text = new ImU8String(18, 1); + text.AppendLiteral("Time until reset: "); + text.AppendFormatted(value2); + ImGui.TextColored(in col, text); + ImGui.EndTooltip(); } + ImGui.Spacing(); + ImGui.Separator(); + ImGui.Spacing(); + } + } + + internal static (DateTime ResetTime, TimeSpan TimeUntilReset) CalculateTimeUntilReset() + { + DateTime utcNow = DateTime.UtcNow; + DateTime dateTime = new DateTime(utcNow.Year, utcNow.Month, utcNow.Day, 15, 0, 0, DateTimeKind.Utc); + DateTime dateTime2 = ((utcNow >= dateTime) ? dateTime.AddDays(1.0) : dateTime); + TimeSpan item = dateTime2 - utcNow; + return (ResetTime: dateTime2.ToLocalTime(), TimeUntilReset: item); + } + + private static string FormatTimeSpan(TimeSpan timeSpan) + { + if (timeSpan.TotalMinutes < 1.0) + { + return "< 1m"; + } + if (!(timeSpan.TotalHours < 1.0)) + { + if (!(timeSpan.TotalDays < 1.0)) + { + return $"{(int)timeSpan.TotalDays}d {timeSpan.Hours}h"; + } + return $"{timeSpan.Hours}h {timeSpan.Minutes}m"; + } + return $"{timeSpan.Minutes}m"; + } + + private bool DrawAlliedSocietyHeader(EAlliedSociety alliedSociety, List quests) + { + return ImGui.CollapsingHeader($"{alliedSociety}###AlliedSociety{alliedSociety}"); + } + + private void DrawQuestList(EAlliedSociety alliedSociety, List quests) + { + if ((int)alliedSociety <= 5) + { + byte rank = 1; + while (rank <= 8) + { + List list = quests.Where((QuestInfo x) => x.AlliedSocietyRank == rank).ToList(); + if (list.Count != 0) + { + ImGui.Text(RankNames[rank - 1]); + foreach (QuestInfo item in list) + { + DrawQuest(item); + } + } + byte b = (byte)(rank + 1); + rank = b; + } + return; + } + foreach (QuestInfo quest in quests) + { + DrawQuest(quest); + } + } + + private void DrawAddToPriorityButtons(EAlliedSociety alliedSociety, List quests) + { + bool flag = (int)alliedSociety <= 5; + int dailyLimit = (flag ? 12 : 3); + int remainingAllowances = GetRemainingAllowances(); + Quest quest; + List list = (from q in quests + where _questRegistry.TryGetQuest(q.QuestId, out quest) && !quest.Root.Disabled + where !_questController.ManualPriorityQuests.Any((Quest pq) => pq.Id.Equals(q.QuestId)) + orderby q.AlliedSocietyRank descending + select q).ToList(); + if (list.Count == 0) + { + DrawDisabledAddButton(); + } + else if (flag && list.Count > 3) + { + DrawArrSocietyButtons(alliedSociety, list, dailyLimit, remainingAllowances); + } + else + { + DrawStandardAddButton(alliedSociety, list, remainingAllowances); + } + } + + private unsafe int GetRemainingAllowances() + { + QuestManager* ptr = QuestManager.Instance(); + if (ptr == null) + { + return 12; + } + return (int)ptr->GetBeastTribeAllowance(); + } + + private static void DrawDisabledAddButton() + { + using (ImRaii.Disabled(disabled: true)) + { + ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Plus, "Add to Priority"); + } + if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) + { + ImGui.SetTooltip("No quests available to add (may be disabled, already in priority, or not available)"); + } + } + + private void DrawArrSocietyButtons(EAlliedSociety alliedSociety, List availableQuests, int dailyLimit, int remainingAllowances) + { + int num = Math.Min(Math.Min(dailyLimit, remainingAllowances), availableQuests.Count); + using (ImRaii.Disabled(remainingAllowances == 0)) + { + string text = ((num == remainingAllowances) ? $"Add {num} (Today's Remaining)" : $"Add {num} (Recommended)"); + if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Plus, text)) + { + AddQuestsToPriority(alliedSociety, availableQuests.Take(num).ToList()); + } + } + if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) + { + DrawRecommendedButtonTooltip(num, remainingAllowances, dailyLimit, alliedSociety, availableQuests.Count); + } + ImGui.SameLine(); + if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.ListOl, $"Add All {availableQuests.Count} (Ignore Limit)")) + { + AddQuestsToPriority(alliedSociety, availableQuests); + } + if (ImGui.IsItemHovered()) + { + DrawAddAllButtonTooltip(availableQuests.Count, remainingAllowances, dailyLimit, alliedSociety); + } + } + + private static void DrawRecommendedButtonTooltip(int questsToAddCount, int remainingAllowances, int dailyLimit, EAlliedSociety alliedSociety, int availableCount) + { + ImGui.BeginTooltip(); + if (remainingAllowances == 0) + { + ImGui.TextUnformatted("No daily allowances remaining"); + Vector4 col = ImGuiColors.DalamudGrey3; + ImU8String text = new ImU8String(44, 1); + text.AppendLiteral("You've used all "); + text.AppendFormatted(12); + text.AppendLiteral(" shared allowances for today"); + ImGui.TextColored(in col, text); + } + else if (questsToAddCount == remainingAllowances) + { + ImU8String text = new ImU8String(47, 1); + text.AppendLiteral("Add "); + text.AppendFormatted(questsToAddCount); + text.AppendLiteral(" quests - matches your remaining allowances"); + ImGui.TextUnformatted(text); + Vector4 col = ImGuiColors.ParsedGreen; + text = new ImU8String(50, 1); + text.AppendLiteral("You can complete "); + text.AppendFormatted(remainingAllowances); + text.AppendLiteral(" more allied society quests today"); + ImGui.TextColored(in col, text); + ImGui.Spacing(); + ImGui.TextColored(ImGuiColors.DalamudGrey3, "Prioritises highest rank quests first"); + } + else if (questsToAddCount == dailyLimit) + { + ImU8String text = new ImU8String(41, 1); + text.AppendLiteral("Add "); + text.AppendFormatted(dailyLimit); + text.AppendLiteral(" quests - using all shared allowances"); + ImGui.TextUnformatted(text); + ImGui.TextColored(ImGuiColors.DalamudGrey3, "This will use all 12 shared allowances"); + ImGui.Spacing(); + ImGui.TextColored(ImGuiColors.DalamudGrey3, "Prioritises highest rank quests first"); + } + else + { + ImU8String text = new ImU8String(12, 2); + text.AppendLiteral("Add "); + text.AppendFormatted(questsToAddCount); + text.AppendLiteral(" "); + text.AppendFormatted(alliedSociety); + text.AppendLiteral(" quests"); + ImGui.TextUnformatted(text); + Vector4 col = ImGuiColors.DalamudGrey3; + text = new ImU8String(55, 2); + text.AppendLiteral("Limited by available quests ("); + text.AppendFormatted(availableCount); + text.AppendLiteral(") and shared allowances ("); + text.AppendFormatted(remainingAllowances); + text.AppendLiteral(")"); + ImGui.TextColored(in col, text); + ImGui.Spacing(); + ImGui.TextColored(ImGuiColors.DalamudGrey3, "Prioritises highest rank quests first"); + } + ImGui.EndTooltip(); + } + + private static void DrawAddAllButtonTooltip(int availableCount, int remainingAllowances, int dailyLimit, EAlliedSociety alliedSociety) + { + ImGui.BeginTooltip(); + if (availableCount > remainingAllowances) + { + using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudOrange)) + { + ImGuiComponents.IconButtonWithText(FontAwesomeIcon.ExclamationTriangle, "Warning: Exceeds shared allowances"); + } + ImGui.Spacing(); + ImU8String text = new ImU8String(54, 1); + text.AppendLiteral("This adds all "); + text.AppendFormatted(availableCount); + text.AppendLiteral(" available quests to your priority list,"); + ImGui.TextUnformatted(text); + text = new ImU8String(47, 1); + text.AppendLiteral("but you only have "); + text.AppendFormatted(remainingAllowances); + text.AppendLiteral(" shared allowances remaining."); + ImGui.TextUnformatted(text); + ImGui.Spacing(); + ImGui.TextColored(ImGuiColors.DalamudGrey3, "The excess quests won't be completable until tomorrow."); + } + else if (availableCount > dailyLimit) + { + using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudOrange)) + { + ImGuiComponents.IconButtonWithText(FontAwesomeIcon.ExclamationTriangle, "Warning: Exceeds shared allowances"); + } + ImGui.Spacing(); + ImU8String text = new ImU8String(32, 1); + text.AppendLiteral("This adds all "); + text.AppendFormatted(availableCount); + text.AppendLiteral(" available quests,"); + ImGui.TextUnformatted(text); + text = new ImU8String(57, 1); + text.AppendLiteral("but you can only complete "); + text.AppendFormatted(12); + text.AppendLiteral(" allied society quests per day."); + ImGui.TextUnformatted(text); + ImGui.Spacing(); + ImGui.TextColored(ImGuiColors.DalamudGrey3, "You'll need multiple days to complete them all."); + } + else + { + ImU8String text = new ImU8String(26, 2); + text.AppendLiteral("Add all "); + text.AppendFormatted(availableCount); + text.AppendLiteral(" available "); + text.AppendFormatted(alliedSociety); + text.AppendLiteral(" quests"); + ImGui.TextUnformatted(text); + using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.ParsedGreen)) + { + ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Check, $"All can be completed today ({remainingAllowances} shared allowances remaining)"); + } + } + ImGui.EndTooltip(); + } + + private void DrawStandardAddButton(EAlliedSociety alliedSociety, List availableQuests, int remainingAllowances) + { + if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Plus, availableQuests.Count switch + { + 1 => "Add Quest to Priority", + 2 => "Add Both Quests to Priority", + 3 => "Add All 3 Quests to Priority", + _ => $"Add All {availableQuests.Count} Quests to Priority", + })) + { + AddQuestsToPriority(alliedSociety, availableQuests); + } + if (!ImGui.IsItemHovered()) + { + return; + } + ImGui.BeginTooltip(); + ImU8String text = new ImU8String(18, 3); + text.AppendLiteral("Add "); + text.AppendFormatted(availableQuests.Count); + text.AppendLiteral(" "); + text.AppendFormatted(alliedSociety); + text.AppendLiteral(" "); + text.AppendFormatted((availableQuests.Count == 1) ? "quest" : "quests"); + text.AppendLiteral(" to priority"); + ImGui.TextUnformatted(text); + if (availableQuests.Count <= remainingAllowances) + { + using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.ParsedGreen)) + { + ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Check, $"Uses {availableQuests.Count} of {remainingAllowances} shared allowances"); + } + } + else + { + using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudOrange)) + { + ImGuiComponents.IconButtonWithText(FontAwesomeIcon.ExclamationTriangle, $"Exceeds remaining allowances ({remainingAllowances})"); + } + } + ImGui.EndTooltip(); + } + + private void AddQuestsToPriority(EAlliedSociety alliedSociety, List questsToAdd) + { + int num = 0; + foreach (QuestInfo item in questsToAdd) + { + if (_questController.AddQuestPriority(item.QuestId)) + { + num++; + } + } + if (num > 0) + { + string text = ((num == 1) ? "quest" : "quests"); + _logger.LogInformation("Added {Count} {Society} {QuestWord} to priority list", num, alliedSociety, text); + _chatGui.Print($"Added {num} {alliedSociety} {text} to priority list.", "Questionable", 576); } }