Hide old ishgard restoration instances from gathering point stats
authorLiza Carvelli <liza@carvel.li>
Mon, 19 Aug 2024 02:57:41 +0000 (04:57 +0200)
committerLiza Carvelli <liza@carvel.li>
Mon, 19 Aug 2024 02:57:41 +0000 (04:57 +0200)
Questionable/Windows/JournalComponents/GatheringJournalComponent.cs

index 7a24ad0b315956b2e508e090aa38882df6d8706d..81588465fc9ab8ee4110cb1f9074d7d758b3fbd6 100644 (file)
@@ -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