forked from liza/Questionable
Fix leves showing under the wrong filtered expac
This commit is contained in:
parent
e3040607a6
commit
92b6ce315f
@ -1,5 +1,5 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>2.10</Version>
|
<Version>2.11</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Dalamud.Interface;
|
using Dalamud.Interface;
|
||||||
@ -8,7 +7,6 @@ using Dalamud.Interface.Colors;
|
|||||||
using Dalamud.Interface.Utility.Raii;
|
using Dalamud.Interface.Utility.Raii;
|
||||||
using Dalamud.Plugin;
|
using Dalamud.Plugin;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
using Dalamud.Utility;
|
|
||||||
using Dalamud.Utility.Signatures;
|
using Dalamud.Utility.Signatures;
|
||||||
using ImGuiNET;
|
using ImGuiNET;
|
||||||
using LLib.GameData;
|
using LLib.GameData;
|
||||||
@ -81,6 +79,7 @@ internal sealed class GatheringJournalComponent
|
|||||||
LeveName = x.Name.ToString(),
|
LeveName = x.Name.ToString(),
|
||||||
TerritoryType = (ushort)territoryType.RowId,
|
TerritoryType = (ushort)territoryType.RowId,
|
||||||
TerritoryName = territoryType.PlaceName.Value?.Name.ToString(),
|
TerritoryName = territoryType.PlaceName.Value?.Name.ToString(),
|
||||||
|
Expansion = (EExpansionVersion)territoryType.ExVersion.Row,
|
||||||
GatheringLeve = gatheringLeveSheet.GetRow((uint)x.DataId),
|
GatheringLeve = gatheringLeveSheet.GetRow((uint)x.DataId),
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
@ -91,6 +90,7 @@ internal sealed class GatheringJournalComponent
|
|||||||
x.LeveName,
|
x.LeveName,
|
||||||
x.TerritoryType,
|
x.TerritoryType,
|
||||||
x.TerritoryName,
|
x.TerritoryName,
|
||||||
|
x.Expansion,
|
||||||
GatheringPoints = x.GatheringLeve!.Route
|
GatheringPoints = x.GatheringLeve!.Route
|
||||||
.Where(y => y.Row != 0)
|
.Where(y => y.Row != 0)
|
||||||
.SelectMany(y => routeToGatheringPoint[y.Row]),
|
.SelectMany(y => routeToGatheringPoint[y.Row]),
|
||||||
@ -101,6 +101,7 @@ internal sealed class GatheringJournalComponent
|
|||||||
x.LeveName,
|
x.LeveName,
|
||||||
x.TerritoryType,
|
x.TerritoryType,
|
||||||
x.TerritoryName,
|
x.TerritoryName,
|
||||||
|
x.Expansion,
|
||||||
GatheringPointId = y
|
GatheringPointId = y
|
||||||
}))
|
}))
|
||||||
.GroupBy(x => x.GatheringPointId)
|
.GroupBy(x => x.GatheringPointId)
|
||||||
@ -146,7 +147,7 @@ internal sealed class GatheringJournalComponent
|
|||||||
// it's a leve
|
// it's a leve
|
||||||
return x.Point with
|
return x.Point with
|
||||||
{
|
{
|
||||||
Expansion = EExpansionVersion.Shadowbringers,
|
Expansion = leve.Expansion,
|
||||||
TerritoryType = leve.TerritoryType,
|
TerritoryType = leve.TerritoryType,
|
||||||
TerritoryName = leve.TerritoryName,
|
TerritoryName = leve.TerritoryName,
|
||||||
PlaceName = $"Leve: {leve.LeveName}",
|
PlaceName = $"Leve: {leve.LeveName}",
|
||||||
|
Loading…
Reference in New Issue
Block a user