From: Liza Carvelli <liza@carvel.li>
Date: Mon, 19 Aug 2024 02:57:41 +0000 (+0200)
Subject: Hide old ishgard restoration instances from gathering point stats
X-Git-Tag: v2.12~18
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=2df220ba94aea15f6da17d6f0fabe8bd109bc9a6;p=Questionable.git

Hide old ishgard restoration instances from gathering point stats
---

diff --git a/Questionable/Windows/JournalComponents/GatheringJournalComponent.cs b/Questionable/Windows/JournalComponents/GatheringJournalComponent.cs
index 7a24ad0b..81588465 100644
--- a/Questionable/Windows/JournalComponents/GatheringJournalComponent.cs
+++ b/Questionable/Windows/JournalComponents/GatheringJournalComponent.cs
@@ -121,6 +121,7 @@ internal sealed class GatheringJournalComponent
 
         _gatheringPointsByExpansion = dataManager.GetExcelSheet<GatheringPoint>()!
             .Where(x => x.GatheringPointBase.Row != 0)
+            .Where(x => x.GatheringPointBase.Row is < 653 or > 680) // exclude ishgard restoration phase 1
             .DistinctBy(x => x.GatheringPointBase.Row)
             .Select(x => new
             {
@@ -170,6 +171,7 @@ internal sealed class GatheringJournalComponent
             })
             .Where(x => x.Expansion != (EExpansionVersion)byte.MaxValue)
             .Where(x => x.GatheringItemIds.Count > 0)
+            .Where(x => x.TerritoryType is not 901 and not 929) // exclude old diadem
             .GroupBy(x => x.Expansion)
             .Select(x => new ExpansionPoints(x.Key, x
                 .GroupBy(y => new