Fix problems with ACN weapons as scholar

This commit is contained in:
Liza 2024-06-17 22:08:27 +02:00
parent 894c0d2f69
commit 74a798816c
Signed by: liza
GPG Key ID: 7199F8D727D55F67
2 changed files with 4 additions and 2 deletions

View File

@ -93,6 +93,7 @@ internal sealed class GameDataHolder
.Where(x => x.ItemSeries.Row is <= 3 or >= 28) .Where(x => x.ItemSeries.Row is <= 3 or >= 28)
.SelectMany(LoadItem) .SelectMany(LoadItem)
.SelectMany(x => x.ClassJobs.Select(y => x.Item with { ClassJob = y })) .SelectMany(x => x.ClassJobs.Select(y => x.Item with { ClassJob = y }))
.Where(x => x.ClassJob != EClassJob.Scholar || x.ItemUiCategory != 10) // exclude ACN weapon as scholar
.Where(x => .Where(x =>
{ {
bool isGatheringItem = x.HasAnyStat(EBaseParam.Gathering, EBaseParam.Perception, EBaseParam.GP); bool isGatheringItem = x.HasAnyStat(EBaseParam.Gathering, EBaseParam.Perception, EBaseParam.GP);
@ -117,7 +118,8 @@ internal sealed class GameDataHolder
EquipSlotCategory = x.Key.EquipSlotCategory, EquipSlotCategory = x.Key.EquipSlotCategory,
ItemUiCategory = x.Key.ItemUiCategory, ItemUiCategory = x.Key.ItemUiCategory,
Items = x.ToList(), Items = x.ToList(),
}).ToList() })
.ToList()
.AsReadOnly(); .AsReadOnly();
UpdateAndSortLists(); UpdateAndSortLists();

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<Version>0.4</Version> <Version>0.5</Version>
<LangVersion>12</LangVersion> <LangVersion>12</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>