From 74a798816c013ea4c157a7c1b3691e17a076db44 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Mon, 17 Jun 2024 22:08:27 +0200 Subject: [PATCH] Fix problems with ACN weapons as scholar --- Gearsetter/GameData/GameDataHolder.cs | 4 +++- Gearsetter/Gearsetter.csproj | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gearsetter/GameData/GameDataHolder.cs b/Gearsetter/GameData/GameDataHolder.cs index 25b17e2..6f649c3 100644 --- a/Gearsetter/GameData/GameDataHolder.cs +++ b/Gearsetter/GameData/GameDataHolder.cs @@ -93,6 +93,7 @@ internal sealed class GameDataHolder .Where(x => x.ItemSeries.Row is <= 3 or >= 28) .SelectMany(LoadItem) .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 => { bool isGatheringItem = x.HasAnyStat(EBaseParam.Gathering, EBaseParam.Perception, EBaseParam.GP); @@ -117,7 +118,8 @@ internal sealed class GameDataHolder EquipSlotCategory = x.Key.EquipSlotCategory, ItemUiCategory = x.Key.ItemUiCategory, Items = x.ToList(), - }).ToList() + }) + .ToList() .AsReadOnly(); UpdateAndSortLists(); diff --git a/Gearsetter/Gearsetter.csproj b/Gearsetter/Gearsetter.csproj index fc2a64e..caa3d77 100644 --- a/Gearsetter/Gearsetter.csproj +++ b/Gearsetter/Gearsetter.csproj @@ -1,7 +1,7 @@ net8.0-windows - 0.4 + 0.5 12 enable true