liza/Gearsetter
liza/Gearsetter
1
0
Fork 0
Code Issues 1 Pull Requests Releases 11 Activity

Fix wrong items being shown for crafters; remove some additional glam items from suggestions

Browse Source
This commit is contained in:
Liza 2024-06-17 21:42:27 +02:00
parent 7febb06f3e
commit 21e3f7c0a9
Signed by: liza
GPG Key ID: 7199F8D727D55F67
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gearsetter/GameData/GameDataHolder.cs
View File

@ -90,6 +90,7 @@ internal sealed class GameDataHolder
.Where(x => x.EquipSlotCategory.Row > 0 && .Where(x => x.EquipSlotCategory.Row > 0 &&
Enum.IsDefined(typeof(EEquipSlotCategory), x.EquipSlotCategory.Row)) Enum.IsDefined(typeof(EEquipSlotCategory), x.EquipSlotCategory.Row))
.Where(x => x.LevelItem.Row > 1) // ignore ilvl 1 glamour items (also includes starter weapons) .Where(x => x.LevelItem.Row > 1) // ignore ilvl 1 glamour items (also includes starter weapons)
.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 => .Where(x =>
@ -99,7 +100,7 @@ internal sealed class GameDataHolder
return isGatheringItem; return isGatheringItem;
bool isCraftingItem = x.HasAnyStat(EBaseParam.Craftsmanship, EBaseParam.Control, EBaseParam.CP); bool isCraftingItem = x.HasAnyStat(EBaseParam.Craftsmanship, EBaseParam.Control, EBaseParam.CP);
if (x.ClassJob.IsGatherer()) if (x.ClassJob.IsCrafter())
return isCraftingItem; return isCraftingItem;
return !isGatheringItem && !isCraftingItem; return !isGatheringItem && !isCraftingItem;
@ -113,7 +114,7 @@ internal sealed class GameDataHolder
.Select(x => new ItemList .Select(x => new ItemList
{ {
ClassJob = x.Key.ClassJob, ClassJob = x.Key.ClassJob,
EquipSlotCategory = (EEquipSlotCategory)x.Key.EquipSlotCategory, EquipSlotCategory = x.Key.EquipSlotCategory,
ItemUiCategory = x.Key.ItemUiCategory, ItemUiCategory = x.Key.ItemUiCategory,
Items = x.ToList(), Items = x.ToList(),
}).ToList() }).ToList()